ztxkui 1.9.1 → 1.9.2
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.
|
@@ -240,6 +240,8 @@ function EnhanceSelect(_a) {
|
|
|
240
240
|
var resultData = originalData.slice() || [];
|
|
241
241
|
if (Array.isArray(newData)) {
|
|
242
242
|
newData.forEach(function (item) {
|
|
243
|
+
// 如果源数组中找到了该条数据，那么不添加
|
|
244
|
+
// 否则添加
|
|
243
245
|
if (!resultData.find(function (resultItem) { return resultItem[dataKey] === item[dataKey]; })) {
|
|
244
246
|
resultData.unshift(item);
|
|
245
247
|
}
|
|
@@ -64,7 +64,7 @@ function useColumns(props) {
|
|
|
64
64
|
}
|
|
65
65
|
// 添加render字段
|
|
66
66
|
if (!_column.render) {
|
|
67
|
-
_column.render = function (text, record, index) { return (text ? text : '
|
|
67
|
+
_column.render = function (text, record, index) { return (text ? text : '— —'); };
|
|
68
68
|
}
|
|
69
69
|
});
|
|
70
70
|
if (showColumnDynamic) {
|
|
@@ -131,7 +131,7 @@ var Making = function (_a) {
|
|
|
131
131
|
React.createElement("div", { style: { width: '100%' } },
|
|
132
132
|
React.createElement(Item, { name: "oldPassword", label: "\u539F\u5BC6\u7801", rules: [{ required: true, message: '请输入原密码' }] },
|
|
133
133
|
React.createElement(Input, { autoComplete: "new-password", type: "password" }))),
|
|
134
|
-
React.createElement("div", { style: { width: '100%' } },
|
|
134
|
+
React.createElement("div", { style: { width: '100%', display: 'flex' } },
|
|
135
135
|
React.createElement(Item, { name: "newPassword", label: "\u65B0\u5BC6\u7801", rules: [
|
|
136
136
|
{ required: true, message: '请输入新密码' },
|
|
137
137
|
{
|
|
@@ -139,7 +139,9 @@ var Making = function (_a) {
|
|
|
139
139
|
message: commonMessage.passwordMessage,
|
|
140
140
|
},
|
|
141
141
|
] },
|
|
142
|
-
React.createElement(Input, {
|
|
142
|
+
React.createElement(Input, { autoComplete: "new-password", type: "password" })),
|
|
143
|
+
React.createElement("div", null,
|
|
144
|
+
React.createElement("p", { style: { height: 32, lineHeight: '32px', color: 'red' } }, "\u75319-128\u4F4D\u7684\u5B57\u6BCD+\u6570\u5B57\uFF0C\u5B57\u6BCD+\u7279\u6B8A\u5B57\u7B26\uFF0C\u6570\u5B57+\u7279\u6B8A\u5B57\u7B26\u7EC4\u6210"))),
|
|
143
145
|
React.createElement(Item, { name: "newPassword1", label: "\u786E\u8BA4\u65B0\u5BC6\u7801", rules: [
|
|
144
146
|
{ required: true, message: '请确认密码' },
|
|
145
147
|
function (_a) {
|