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

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

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