|
@@ -104,10 +104,11 @@
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- label: '是否必填',
|
|
|
+ label: '说明是否必填',
|
|
|
field: 'inputNotNull',
|
|
|
component: 'Switch',
|
|
|
colProps: { span: 24 },
|
|
|
+ required: true,
|
|
|
componentProps: {
|
|
|
checkedValue: true,
|
|
|
unCheckedValue: false,
|
|
@@ -126,8 +127,11 @@
|
|
|
const formatData = { ...data.baseData.item };
|
|
|
formatData.type = formatData.type || '1';
|
|
|
if (formatData.type !== '1') {
|
|
|
- formatData.optionJson = JSON.parse(formatData.optionJson);
|
|
|
+ if (formatData.optionJson) {
|
|
|
+ formatData.optionJson = JSON.parse(formatData.optionJson);
|
|
|
+ }
|
|
|
}
|
|
|
+ // console.log('formatData', formatData);
|
|
|
setFieldsValue({
|
|
|
...formatData,
|
|
|
});
|