Commit 46dde126 authored by 田翔's avatar 田翔

fix: 数值形态去掉默认问题,时间组件去掉秒显示,分钟步长改为5

parent 4441481c
{
"name": "panda-xform",
"version": "3.0.4",
"description": "3.0.4: 开关形态默认值不生效问题",
"version": "3.0.5",
"description": "3.0.5: 数值形态去掉默认问题,时间组件去掉秒显示,分钟步长改为5",
"keywords": [
"panda-xform"
],
......
......@@ -412,15 +412,18 @@ const textWidgets = [
title: '正则校验',
type: 'array',
default: [
{
name: 'number',
pattern: '^[+-]?[0-9]+([.][0-9]+)?$',
message: '数值校验未通过!',
}
// {
// name: 'number',
// pattern: '^[+-]?[0-9]+([.][0-9]+)?$',
// message: '数值校验未通过!',
// }
],
widget: 'VerifyNumberInput',
disabled: disabled,
dependencies: ['tableTypeParent', 'IsSystemField'],
props: {
allowClear: true
},
},
presetValue: {
title: '默认值',
......
......@@ -258,6 +258,7 @@ const FormDesigner = (props, ref) => {
const testSubmit = async () => {
const { formValue, relationForm, errors } = await formRenderRef?.current?.getValues()
if (errors.length) {
setTextShow(false)
return message.error('表单校验未通过!')
} else {
setTextShow(true)
......
......@@ -46,6 +46,8 @@ const Time = (props) => {
disabled={disabled}
placeholder={!disabled ? placeholder : ''}
getPopupContainer={(targterNode) => targterNode.parentElement || document.body}
minuteStep={5}
format={'HH:mm'}
/>
)
......
......@@ -51,6 +51,7 @@ const VerifyNumberInput = (props) => {
value={valueShow}
options={options}
onChange={selectChange}
allowClear
/>
)
......
......@@ -168,13 +168,45 @@ export const getVerify = (json) => {
return true
}
const getInputSetting = ({ title, tableName, tableType }) => {
const getWidgetSetting = (type, { title, tableName, tableType }) => {
if (type === '日期') {
return {
title: title,
"type": "string",
"widget": "DateTime",
"placeholder": "请选择日期",
tableNameParent: tableName,
tableTypeParent: tableType,
"required": false,
"disabled": false,
"format": "date",
"options": "默认为空",
"groupStyle": {},
"labelWidth": 110
}
} else if (type === '数值') {
return {
title: "数值",
"type": "string",
"widget": "NumberInput",
"presetValue": "0",
"placeholder": "请输入内容",
tableNameParent: tableName,
tableTypeParent: tableType,
"rules": [],
"required": false,
"disabled": false,
"groupStyle": {},
"labelWidth": 110,
"IsSystemField": false
}
}
return {
"title": title,
title: title,
"type": "string",
"widget": "TextInput",
"placeholder": "请输入内容",
"tableNameParent": tableName,
tableNameParent: tableName,
tableTypeParent: tableType,
"maxLength": 200,
"rules": [],
......@@ -205,7 +237,7 @@ export const setFieldJson = (json, fieldName) => {
})
fieldName.forEach(j => {
if (!keys.includes(j.name)) {
extaObj[j.name] = getInputSetting({ ...json, title: j.name })
extaObj[j.name] = getWidgetSetting(j.shapeTip, { ...json, title: j.name })
}
})
if (JSON.stringify(extaObj) !== '{}') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment