ztxkui 4.2.23-567 → 4.2.23-568
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.
|
@@ -29,12 +29,17 @@ var TableMenu = function (_a) {
|
|
|
29
29
|
})
|
|
30
30
|
.map(function (item) {
|
|
31
31
|
var originItem = originColumns.find(function (originItem) { return originItem.key === item.key; });
|
|
32
|
+
console.log(originItem, item);
|
|
32
33
|
return {
|
|
33
34
|
key: item.key,
|
|
34
35
|
label: (originItem === null || originItem === void 0 ? void 0 : originItem.title) || item.title,
|
|
35
36
|
render: originItem === null || originItem === void 0 ? void 0 : originItem.render,
|
|
36
37
|
onCell: item.onCell,
|
|
37
38
|
editable: item.editable,
|
|
39
|
+
validate: (item === null || item === void 0 ? void 0 : item.validate) ||
|
|
40
|
+
(originItem === null || originItem === void 0 ? void 0 : originItem.validate) ||
|
|
41
|
+
(item === null || item === void 0 ? void 0 : item.required) ||
|
|
42
|
+
(originItem === null || originItem === void 0 ? void 0 : originItem.required),
|
|
38
43
|
};
|
|
39
44
|
});
|
|
40
45
|
function onMenuItemClick(e) {
|
|
@@ -112,7 +117,9 @@ var TableMenu = function (_a) {
|
|
|
112
117
|
}
|
|
113
118
|
// 如果item.render 返回的不是ReactElement，那么就使用span来包裹
|
|
114
119
|
// 做列合并时，render返回的是一个对象
|
|
115
|
-
return (React.createElement(Descriptions.Item, { key: item.key, label:
|
|
120
|
+
return (React.createElement(Descriptions.Item, { key: item.key, label: React.createElement("span", { style: { display: 'flex', alignItems: 'center' } },
|
|
121
|
+
React.createElement("span", { style: { color: 'red' } }, item.validate ? '*' : ''),
|
|
122
|
+
item.label) }, isValidElement(renderItem) ? (renderItem) : isValidElement(renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) ? (renderItem === null || renderItem === void 0 ? void 0 : renderItem.children) : (React.createElement("span", { title: currentRecord[item.key] }, currentRecord[item.key]))));
|
|
116
123
|
});
|
|
117
124
|
}
|
|
118
125
|
return (React.createElement(React.Fragment, null,
|