|
|
@ -297,18 +297,27 @@ export default { |
|
|
|
let initForm = (obj, arr) => { |
|
|
|
let _form = {} |
|
|
|
console.log('formInfo---obj', obj) |
|
|
|
if (Object.keys(obj).length > 0) { |
|
|
|
for(const n in obj) { |
|
|
|
if (obj[n] == null) obj[n] = '' |
|
|
|
} |
|
|
|
_form = { ...obj } |
|
|
|
return _form |
|
|
|
} |
|
|
|
// if (Object.keys(obj).length > 0) { |
|
|
|
// for(const n in obj) { |
|
|
|
// if (obj[n] == null) obj[n] = '' |
|
|
|
// } |
|
|
|
// _form = { ...obj } |
|
|
|
// return _form |
|
|
|
// } |
|
|
|
const len = Object.keys(obj).length |
|
|
|
arr.forEach(item => { |
|
|
|
|
|
|
|
if (item.multiSelect) _form[item.columnName] = [] |
|
|
|
else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue |
|
|
|
else _form[item.columnName] = '' |
|
|
|
if (len) { |
|
|
|
if (obj[item.columnName]) { |
|
|
|
_form[item.columnName] = obj[item.columnName] |
|
|
|
item.isChange = true |
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
if (item.multiSelect) _form[item.columnName] = [] |
|
|
|
else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue |
|
|
|
else _form[item.columnName] = '' |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// if (item.optionSourceType === 'remote') { |
|
|
|
// this.getOptionsLists(item.optionSourceValue).then(res => { |
|
|
@ -343,9 +352,10 @@ export default { |
|
|
|
let rules = initRules(this.formList) |
|
|
|
console.log('rulessss', rules) |
|
|
|
let tempFormList = [ ...this.formList ].map(item => { |
|
|
|
const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true |
|
|
|
return { |
|
|
|
...item, |
|
|
|
isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false |
|
|
|
isChange: isChange || item.isChange || false |
|
|
|
} |
|
|
|
}) |
|
|
|
let constForm = { |
|
|
|