zmdms-webui 1.2.7 → 1.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -73,8 +73,12 @@ function tableValidate(dataSource, columns, restParams) {
|
|
|
73
73
|
columns.forEach(function (column, index) {
|
|
74
74
|
var _a, _b;
|
|
75
75
|
if (!isMerge) {
|
|
76
|
+
// 这里判断需要改动，只需要有rowSpan属性或者colSpan属性就有合并
|
|
76
77
|
var mergeColumn = (_a = column === null || column === void 0 ? void 0 : column.onCell) === null || _a === void 0 ? void 0 : _a.call(column, {}, 1);
|
|
77
|
-
if (mergeColumn && (mergeColumn
|
|
78
|
+
// if (mergeColumn && (mergeColumn?.rowSpan || mergeColumn?.colSpan)) {
|
|
79
|
+
if (mergeColumn &&
|
|
80
|
+
(Reflect.has(mergeColumn, "rowSpan") ||
|
|
81
|
+
Reflect.has(mergeColumn, "colSpan"))) {
|
|
78
82
|
isMerge = true;
|
|
79
83
|
}
|
|
80
84
|
}
|
|
@@ -96,6 +100,7 @@ function tableValidate(dataSource, columns, restParams) {
|
|
|
96
100
|
column.__title ||
|
|
97
101
|
column.title,
|
|
98
102
|
validate: column.validate,
|
|
103
|
+
// 错误发生的列
|
|
99
104
|
index: childrenLen + (rowSelection ? 1 : 0) + (expandable ? 1 : 0),
|
|
100
105
|
});
|
|
101
106
|
}
|