|
|
|
@ -295,7 +295,7 @@ export default { |
|
|
|
if (col.bodyFillType === this.templateFillType || col.bodySubFillType === this.templateFillType) { |
|
|
|
// 检查主字段 |
|
|
|
const mainValue = row[col.prop]; |
|
|
|
if (this.isValueEmpty(mainValue) && !col.bodyDisabled) { |
|
|
|
if (this.isValueEmpty(mainValue) && !col.bodyDisabled && col.bodyType!=='span') { |
|
|
|
const errorItem = { |
|
|
|
rowIndex, |
|
|
|
colIndex, |
|
|
|
@ -308,7 +308,7 @@ export default { |
|
|
|
} |
|
|
|
|
|
|
|
// 检查子字段(如果有) |
|
|
|
if (col.bodySubKey && !col.bodySubDisabled) { |
|
|
|
if (col.bodySubKey && !col.bodySubDisabled && col.bodySubType!=='span') { |
|
|
|
const subValue = row[col.bodySubKey]; |
|
|
|
console.log(col, subValue, "subValue") |
|
|
|
if (this.isValueEmpty(subValue)) { |
|
|
|
@ -326,7 +326,7 @@ export default { |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
console.log(errors,this.localDataSource,"errors") |
|
|
|
return { |
|
|
|
valid: errors.length === 0, |
|
|
|
errors: errors |
|
|
|
@ -411,6 +411,7 @@ export default { |
|
|
|
placeholder: col.bodySubPlaceholder || "请输入", |
|
|
|
precision: col.subPrecision || 0, |
|
|
|
compareTo: col.bodySubCompareTo, // 添加 compareTo 字段 |
|
|
|
type: col.bodySubType || "input", |
|
|
|
} |
|
|
|
if (col.bodySubDisabled) { |
|
|
|
item.disabled = col.bodySubDisabled; |
|
|
|
|