|
|
@ -360,13 +360,22 @@ watch( |
|
|
|
} else { |
|
|
|
modelValueObject['operator'] = criteriaMode.and.name; |
|
|
|
modelValueObject['criteria'] = [{ fieldName: '', operator: criteriaOperator.equals.name, value: undefined }]; |
|
|
|
console.info(''); |
|
|
|
} |
|
|
|
} else { |
|
|
|
if (Tools.isEmpty(newVal)) { |
|
|
|
modelValueObject['operator'] = criteriaMode.and.name; |
|
|
|
modelValueObject['criteria'] = [{ fieldName: '', operator: criteriaOperator.equals.name, value: undefined }]; |
|
|
|
} else if (newVal !== oldVal && Tools.isEmpty(modelValueObject['criteria'][0]['fieldName'])) { |
|
|
|
sqlToCriteria(modelValue.value); |
|
|
|
let flag = true; |
|
|
|
try { |
|
|
|
CriteriaUtil.sqlToCriteria('select * from t where ' + modelValue.value); |
|
|
|
} catch (error) { |
|
|
|
flag = false; |
|
|
|
} |
|
|
|
if (flag) { |
|
|
|
sqlToCriteria(modelValue.value); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (newVal !== oldVal) { |
|
|
|