Commit 44ed9dd9 by zhaochengxiang

bug fix

parent 76a5a2d7
...@@ -171,12 +171,12 @@ export const Basic = React.forwardRef(function ({ type, item }, ref) { ...@@ -171,12 +171,12 @@ export const Basic = React.forwardRef(function ({ type, item }, ref) {
return Promise.reject(new Error('请选择表达式!')); return Promise.reject(new Error('请选择表达式!'));
} }
if (value?.verifyExpression?.valueType !== 'none') { if ((value?.verifyExpression?.valueType==='string' || value?.verifyExpression?.valueType === 'int') && !value?.verifyExpression?.value) {
if (value?.verifyExpression?.valueType === 'List<String>' && (value?.verifyExpression?.value??[]).length === 0) { return Promise.reject(new Error('请输入表达式的值!'));
return Promise.reject(new Error('请输入表达式的值!')); }
} else if (value?.verifyExpression?.value==null||value?.verifyExpression?.value==undefined) {
return Promise.reject(new Error('请输入表达式的值!')); if (value?.verifyExpression?.valueType === 'List<String>' && (value?.verifyExpression?.value??[]).length === 0) {
} return Promise.reject(new Error('请输入表达式的值!'));
} }
return Promise.resolve(); return Promise.resolve();
...@@ -447,11 +447,11 @@ const CheckItem = ({ value, onChange }) => { ...@@ -447,11 +447,11 @@ const CheckItem = ({ value, onChange }) => {
...currentExpression, value: e.target.value ...currentExpression, value: e.target.value
}) })
}}/> } }}/> }
{ (currentExpression?.valueType === 'int') && <InputNumber value={currentExpressionValue} { (currentExpression?.valueType === 'int') && <InputNumber min={1} value={currentExpressionValue}
onChange={(e) => { onChange={(val) => {
setCurrentExpressionValue(e.target.value) setCurrentExpressionValue(val)
setCurrentExpression({ setCurrentExpression({
...currentExpression, value: e.target.value ...currentExpression, value: val
}) })
}}/> } }}/> }
{ (currentExpression?.valueType === 'List<String>') && <Input placeholder='枚举值用;隔开 如高;中;低' value={currentExpressionValue} onChange={(e) => { { (currentExpression?.valueType === 'List<String>') && <Input placeholder='枚举值用;隔开 如高;中;低' value={currentExpressionValue} onChange={(e) => {
......
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