ztxkui 1.8.7 → 1.9.1
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.
- package/dist/components/EnhanceTree/index.js +8 -1
- package/dist/components/Table/hooks/useColumns.js +1 -1
- package/dist/components/business/Common/UserInfo/component/MakingForm.d.ts +9 -0
- package/dist/components/business/Common/UserInfo/component/MakingForm.js +91 -0
- package/dist/components/business/Common/UserInfo/index.d.ts +11 -0
- package/dist/components/business/Common/UserInfo/index.js +180 -0
- package/dist/components/business/Common/UserPassword/index.d.ts +11 -0
- package/dist/components/business/Common/UserPassword/index.js +159 -0
- package/dist/components/business/Common/index.d.ts +3 -0
- package/dist/components/business/Common/index.js +3 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/package.json +3 -4
|
@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
20
20
|
}
|
|
21
21
|
return t;
|
|
22
22
|
};
|
|
23
|
-
import React, { useEffect, useCallback } from 'react';
|
|
23
|
+
import React, { useEffect, useCallback, useRef } from 'react';
|
|
24
24
|
import { Tree } from 'antd';
|
|
25
25
|
import { useFetchState } from 'ztxkutils/dist/hooks';
|
|
26
26
|
// 获取接口数据
|
|
@@ -65,6 +65,7 @@ function EnhanceTree(_a) {
|
|
|
65
65
|
* 保证数据源唯一
|
|
66
66
|
*/
|
|
67
67
|
var _d = useFetchState([]), treeData = _d[0], setTreeData = _d[1];
|
|
68
|
+
var fetchId = useRef(0); // 请求Id,每次请求都会加1
|
|
68
69
|
// 如果selectList 发生改变,那么触发onCompleted事件
|
|
69
70
|
useEffect(function () {
|
|
70
71
|
if (Array.isArray(treeData) && onCompleted) {
|
|
@@ -73,9 +74,15 @@ function EnhanceTree(_a) {
|
|
|
73
74
|
}, [treeData, onCompleted]);
|
|
74
75
|
// 获取数据,并设置数据
|
|
75
76
|
var getDataHandle = useCallback(function (request, options, isConcat, dataNode) {
|
|
77
|
+
// 利用闭包,存到当前请求的id
|
|
78
|
+
fetchId.current++;
|
|
79
|
+
var fetchIdClosure = fetchId.current;
|
|
76
80
|
return getData(request, options)
|
|
77
81
|
.then(function (resData) {
|
|
78
82
|
var _a;
|
|
83
|
+
if (fetchIdClosure < fetchId.current) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
79
86
|
var res = transformData ? transformData(resData) : resData;
|
|
80
87
|
var result;
|
|
81
88
|
if (Array.isArray(res.data)) {
|
|
@@ -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) {
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
12
|
+
import React, { memo, useEffect, useCallback } from 'react';
|
|
13
|
+
import { Form, SearchContainer, Input } from '../../../../../index';
|
|
14
|
+
import { validate, commonMessage } from 'ztxkutils/dist/validate';
|
|
15
|
+
import isEqual from 'lodash/isEqual';
|
|
16
|
+
var SearchLeft = SearchContainer.SearchLeft, Item = SearchContainer.SearchItem;
|
|
17
|
+
var MakingForm = function (_a) {
|
|
18
|
+
var params = _a.params, getFormObj = _a.getFormObj, isEdit = _a.isEdit, setParams = _a.setParams;
|
|
19
|
+
var form = Form.useForm()[0];
|
|
20
|
+
/**将表单对象传递给上层组件 */
|
|
21
|
+
useEffect(function () {
|
|
22
|
+
getFormObj && getFormObj(form);
|
|
23
|
+
}, [form, getFormObj]);
|
|
24
|
+
/**
|
|
25
|
+
* @description 表单数据初始化 转换时间数据 为 dayjs类型
|
|
26
|
+
*/
|
|
27
|
+
useEffect(function () {
|
|
28
|
+
form.setFieldsValue(params);
|
|
29
|
+
}, [params, form]);
|
|
30
|
+
/**
|
|
31
|
+
* 保存事件
|
|
32
|
+
*/
|
|
33
|
+
var saveParams = useCallback(function (currentParams) {
|
|
34
|
+
if (currentParams === void 0) { currentParams = {}; }
|
|
35
|
+
var mergeParams = __assign(__assign(__assign({}, params), form.getFieldsValue()), currentParams);
|
|
36
|
+
// 如果数据没有发生改变 就不走redux的更新流程
|
|
37
|
+
if (!isEqual(mergeParams, params)) {
|
|
38
|
+
setParams && setParams(mergeParams);
|
|
39
|
+
}
|
|
40
|
+
}, [form, params, setParams]);
|
|
41
|
+
var onFormItemBlur = useCallback(function () {
|
|
42
|
+
saveParams();
|
|
43
|
+
}, [saveParams]);
|
|
44
|
+
return (React.createElement(Form, { name: "user-info-making", form: form },
|
|
45
|
+
React.createElement(SearchContainer, { dark: true },
|
|
46
|
+
React.createElement(SearchLeft, null,
|
|
47
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
48
|
+
React.createElement(Item, { disabled: true, name: "account", label: "\u8D26\u53F7", rules: [
|
|
49
|
+
{ required: true, message: '请输入账号' },
|
|
50
|
+
{
|
|
51
|
+
pattern: validate.smallLenValidate,
|
|
52
|
+
message: commonMessage.smallLenMessage('账号'),
|
|
53
|
+
},
|
|
54
|
+
] },
|
|
55
|
+
React.createElement(Input, { autoComplete: "new-password", disabled: true }))),
|
|
56
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
57
|
+
React.createElement(Item, { disabled: !isEdit, name: "realName", label: "\u59D3\u540D", rules: [
|
|
58
|
+
{ required: true, message: '请输入姓名' },
|
|
59
|
+
{
|
|
60
|
+
pattern: validate.smallLenValidate,
|
|
61
|
+
message: commonMessage.smallLenMessage('姓名'),
|
|
62
|
+
},
|
|
63
|
+
] },
|
|
64
|
+
React.createElement(Input, { autoComplete: "new-password", onBlur: onFormItemBlur, disabled: !isEdit }))),
|
|
65
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
66
|
+
React.createElement(Item, { disabled: !isEdit, name: "phone", label: "\u7535\u8BDD", rules: [
|
|
67
|
+
{ required: true, message: '请输入电话' },
|
|
68
|
+
{
|
|
69
|
+
pattern: validate.phoneValidate,
|
|
70
|
+
message: commonMessage.phoneMessage,
|
|
71
|
+
},
|
|
72
|
+
] },
|
|
73
|
+
React.createElement(Input, { autoComplete: "new-password", onBlur: onFormItemBlur, disabled: !isEdit }))),
|
|
74
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
75
|
+
React.createElement(Item, { disabled: !isEdit, name: "email", label: "\u90AE\u7BB1", rules: [
|
|
76
|
+
{
|
|
77
|
+
pattern: validate.emailValidate,
|
|
78
|
+
message: commonMessage.emailMessage,
|
|
79
|
+
},
|
|
80
|
+
] },
|
|
81
|
+
React.createElement(Input, { autoComplete: "new-password", onBlur: onFormItemBlur, disabled: !isEdit }))),
|
|
82
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
83
|
+
React.createElement(Item, { disabled: !isEdit, name: "identityCard", label: "\u8EAB\u4EFD\u8BC1\u53F7", rules: [
|
|
84
|
+
{
|
|
85
|
+
pattern: validate.idCardValidate,
|
|
86
|
+
message: commonMessage.idCardMessage,
|
|
87
|
+
},
|
|
88
|
+
] },
|
|
89
|
+
React.createElement(Input, { autoComplete: "new-password", onBlur: onFormItemBlur, disabled: !isEdit })))))));
|
|
90
|
+
};
|
|
91
|
+
export default memo(MakingForm);
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
12
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
13
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
14
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
15
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
16
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
17
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
18
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
22
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
23
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
24
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
25
|
+
function step(op) {
|
|
26
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
27
|
+
while (_) try {
|
|
28
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
29
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
30
|
+
switch (op[0]) {
|
|
31
|
+
case 0: case 1: t = op; break;
|
|
32
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
33
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
34
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
35
|
+
default:
|
|
36
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
37
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
38
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
39
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
40
|
+
if (t[2]) _.ops.pop();
|
|
41
|
+
_.trys.pop(); continue;
|
|
42
|
+
}
|
|
43
|
+
op = body.call(thisArg, _);
|
|
44
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
45
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
import React, { useEffect, useRef, useCallback, useState } from 'react';
|
|
49
|
+
import { Button, Container, message, Modal } from '../../../../index';
|
|
50
|
+
import MakingForm from './component/MakingForm';
|
|
51
|
+
var UserInfo = function (_a) {
|
|
52
|
+
var visible = _a.visible, onCancel = _a.onCancel, setUserInfo = _a.setUserInfo, request = _a.request, getUserInfoOption = _a.getUserInfoOption, setUserInfoOption = _a.setUserInfoOption;
|
|
53
|
+
var _b = useState(false), loading = _b[0], setLoading = _b[1];
|
|
54
|
+
var _c = useState({}), params = _c[0], setParams = _c[1];
|
|
55
|
+
var _d = useState(false), isEdit = _d[0], setIsEdit = _d[1];
|
|
56
|
+
var currentDirectionForm = useRef(null);
|
|
57
|
+
// 获取详情数据
|
|
58
|
+
useEffect(function () {
|
|
59
|
+
setLoading(true);
|
|
60
|
+
request(getUserInfoOption
|
|
61
|
+
? getUserInfoOption
|
|
62
|
+
: {
|
|
63
|
+
url: '/api/zmdms-user/info',
|
|
64
|
+
method: 'GET',
|
|
65
|
+
})
|
|
66
|
+
.then(function (res) {
|
|
67
|
+
var data = res.data.data, status = res.status;
|
|
68
|
+
setLoading(false);
|
|
69
|
+
if (status === 200) {
|
|
70
|
+
setParams(data);
|
|
71
|
+
}
|
|
72
|
+
})
|
|
73
|
+
.catch(function () {
|
|
74
|
+
setLoading(false);
|
|
75
|
+
});
|
|
76
|
+
}, [request, getUserInfoOption]);
|
|
77
|
+
/**获取表单对象到上层组件 以便调用表单的方法 */
|
|
78
|
+
var getFormObjHandle = useCallback(function (form) {
|
|
79
|
+
currentDirectionForm.current = form;
|
|
80
|
+
}, []);
|
|
81
|
+
/**开始编辑 */
|
|
82
|
+
var onStartHandle = useCallback(function () {
|
|
83
|
+
setIsEdit(true);
|
|
84
|
+
}, []);
|
|
85
|
+
/**关闭事件 */
|
|
86
|
+
var onCloseHandle = useCallback(function () {
|
|
87
|
+
setIsEdit(false);
|
|
88
|
+
}, []);
|
|
89
|
+
/**提交验证 */
|
|
90
|
+
var vallidateFn = useCallback(function (callback) { return __awaiter(void 0, void 0, void 0, function () {
|
|
91
|
+
var formRef, err_1, errorFields;
|
|
92
|
+
return __generator(this, function (_a) {
|
|
93
|
+
switch (_a.label) {
|
|
94
|
+
case 0:
|
|
95
|
+
_a.trys.push([0, 2, , 3]);
|
|
96
|
+
formRef = currentDirectionForm.current;
|
|
97
|
+
// 表单验证
|
|
98
|
+
return [4 /*yield*/, (formRef === null || formRef === void 0 ? void 0 : formRef.validateFields())];
|
|
99
|
+
case 1:
|
|
100
|
+
// 表单验证
|
|
101
|
+
_a.sent();
|
|
102
|
+
// 验证成功 提交数据
|
|
103
|
+
callback();
|
|
104
|
+
return [3 /*break*/, 3];
|
|
105
|
+
case 2:
|
|
106
|
+
err_1 = _a.sent();
|
|
107
|
+
errorFields = err_1.errorFields;
|
|
108
|
+
if (errorFields) {
|
|
109
|
+
message.warning(errorFields[0].errors + '');
|
|
110
|
+
}
|
|
111
|
+
return [3 /*break*/, 3];
|
|
112
|
+
case 3: return [2 /*return*/];
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
}); }, []);
|
|
116
|
+
/**发起提交 */
|
|
117
|
+
var submitParamsHandle = useCallback(function () {
|
|
118
|
+
setLoading(true);
|
|
119
|
+
var submitParams = __assign({}, params);
|
|
120
|
+
if (submitParams.resourceRoleIds) {
|
|
121
|
+
if (submitParams.roleIds) {
|
|
122
|
+
submitParams.roleIds += ',' + submitParams.resourceRoleIds;
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
submitParams.roleIds = submitParams.resourceRoleIds;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if (submitParams.dataRoleIds) {
|
|
129
|
+
if (submitParams.roleIds) {
|
|
130
|
+
submitParams.roleIds += ',' + submitParams.dataRoleIds;
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
submitParams.roleIds = submitParams.dataRoleIds;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
delete submitParams.resourceRoleIds;
|
|
137
|
+
delete submitParams.dataRoleIds;
|
|
138
|
+
request(setUserInfoOption
|
|
139
|
+
? __assign(__assign({}, setUserInfoOption), { data: __assign(__assign({}, setUserInfoOption.data), submitParams) }) : {
|
|
140
|
+
url: '/api/zmdms-user/update',
|
|
141
|
+
method: 'POST',
|
|
142
|
+
data: submitParams,
|
|
143
|
+
})
|
|
144
|
+
.then(function (res) {
|
|
145
|
+
setLoading(false);
|
|
146
|
+
var _a = res.data, msg = _a.msg, code = _a.code;
|
|
147
|
+
if (code === 200) {
|
|
148
|
+
message.success(msg);
|
|
149
|
+
onCloseHandle();
|
|
150
|
+
// 设置用户信息
|
|
151
|
+
setUserInfo && setUserInfo(submitParams);
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
message.error(msg);
|
|
155
|
+
}
|
|
156
|
+
})
|
|
157
|
+
.catch(function (err) {
|
|
158
|
+
var _a, _b;
|
|
159
|
+
setLoading(false);
|
|
160
|
+
message.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '用户信息修改失败!');
|
|
161
|
+
});
|
|
162
|
+
}, [params, onCloseHandle, request, setUserInfoOption, setUserInfo]);
|
|
163
|
+
var onSaveHandle = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
164
|
+
return __generator(this, function (_a) {
|
|
165
|
+
vallidateFn(function () {
|
|
166
|
+
submitParamsHandle();
|
|
167
|
+
});
|
|
168
|
+
return [2 /*return*/];
|
|
169
|
+
});
|
|
170
|
+
}); }, [vallidateFn, submitParamsHandle]);
|
|
171
|
+
var footerDomFn = function () {
|
|
172
|
+
return isEdit ? (React.createElement(React.Fragment, null,
|
|
173
|
+
React.createElement(Button, { type: "primary", onClick: onSaveHandle, loading: loading }, "\u4FDD\u5B58"),
|
|
174
|
+
React.createElement(Button, { type: "default", onClick: onCloseHandle, loading: loading }, "\u53D6\u6D88"))) : (React.createElement(Button, { type: "primary", onClick: onStartHandle, loading: loading }, "\u7F16\u8F91"));
|
|
175
|
+
};
|
|
176
|
+
return (React.createElement(Modal, { visible: visible, loading: loading, onCancel: onCancel, title: "\u7528\u6237\u4FE1\u606F", footer: footerDomFn(), maskClosable: false, width: "80%" },
|
|
177
|
+
React.createElement(Container, null,
|
|
178
|
+
React.createElement(MakingForm, { params: params, isEdit: isEdit, getFormObj: getFormObjHandle, setParams: setParams }))));
|
|
179
|
+
};
|
|
180
|
+
export default UserInfo;
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
12
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
13
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
14
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
15
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
16
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
17
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
18
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
22
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
23
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
24
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
25
|
+
function step(op) {
|
|
26
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
27
|
+
while (_) try {
|
|
28
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
29
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
30
|
+
switch (op[0]) {
|
|
31
|
+
case 0: case 1: t = op; break;
|
|
32
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
33
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
34
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
35
|
+
default:
|
|
36
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
37
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
38
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
39
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
40
|
+
if (t[2]) _.ops.pop();
|
|
41
|
+
_.trys.pop(); continue;
|
|
42
|
+
}
|
|
43
|
+
op = body.call(thisArg, _);
|
|
44
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
45
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
import React, { useCallback, useState } from 'react';
|
|
49
|
+
import { Container, Form, SearchContainer, Input, message, Modal, Button, } from '../../../../index';
|
|
50
|
+
import { validate, commonMessage } from 'ztxkutils/dist/validate';
|
|
51
|
+
var SearchLeft = SearchContainer.SearchLeft, Item = SearchContainer.SearchItem;
|
|
52
|
+
var Making = function (_a) {
|
|
53
|
+
var visible = _a.visible, onCancel = _a.onCancel, setUserPassword = _a.setUserPassword, request = _a.request, setUserPasswordOption = _a.setUserPasswordOption, encryptionHandle = _a.encryptionHandle;
|
|
54
|
+
var form = Form.useForm()[0];
|
|
55
|
+
var _b = useState(false), loading = _b[0], setLoading = _b[1];
|
|
56
|
+
/**提交验证 */
|
|
57
|
+
var vallidateFn = useCallback(function (callback) { return __awaiter(void 0, void 0, void 0, function () {
|
|
58
|
+
var err_1, errorFields;
|
|
59
|
+
return __generator(this, function (_a) {
|
|
60
|
+
switch (_a.label) {
|
|
61
|
+
case 0:
|
|
62
|
+
_a.trys.push([0, 2, , 3]);
|
|
63
|
+
// 表单验证
|
|
64
|
+
return [4 /*yield*/, form.validateFields()];
|
|
65
|
+
case 1:
|
|
66
|
+
// 表单验证
|
|
67
|
+
_a.sent();
|
|
68
|
+
// 验证成功 提交数据
|
|
69
|
+
callback();
|
|
70
|
+
return [3 /*break*/, 3];
|
|
71
|
+
case 2:
|
|
72
|
+
err_1 = _a.sent();
|
|
73
|
+
errorFields = err_1.errorFields;
|
|
74
|
+
if (errorFields) {
|
|
75
|
+
message.warning(errorFields[0].errors + '');
|
|
76
|
+
}
|
|
77
|
+
return [3 /*break*/, 3];
|
|
78
|
+
case 3: return [2 /*return*/];
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
}); }, [form]);
|
|
82
|
+
/**发起提交 */
|
|
83
|
+
var submitParamsHandle = useCallback(function () {
|
|
84
|
+
setLoading(true);
|
|
85
|
+
var params = form.getFieldsValue();
|
|
86
|
+
var submitParams = {
|
|
87
|
+
oldPassword: encryptionHandle(params === null || params === void 0 ? void 0 : params.oldPassword),
|
|
88
|
+
newPassword: encryptionHandle(params === null || params === void 0 ? void 0 : params.newPassword),
|
|
89
|
+
newPassword1: encryptionHandle(params === null || params === void 0 ? void 0 : params.newPassword1),
|
|
90
|
+
};
|
|
91
|
+
request(setUserPasswordOption
|
|
92
|
+
? __assign(__assign({}, setUserPasswordOption), { data: __assign(__assign({}, setUserPasswordOption.data), submitParams) }) : {
|
|
93
|
+
url: '/api/zmdms-user/update-password',
|
|
94
|
+
method: 'POST',
|
|
95
|
+
data: submitParams,
|
|
96
|
+
isFormData: true,
|
|
97
|
+
})
|
|
98
|
+
.then(function (res) {
|
|
99
|
+
setLoading(false);
|
|
100
|
+
var _a = res.data, msg = _a.msg, code = _a.code;
|
|
101
|
+
if (code === 200) {
|
|
102
|
+
message.success(msg || '密码修改成功!');
|
|
103
|
+
setUserPassword && setUserPassword();
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
message.warning(msg || '密码修改失败!');
|
|
107
|
+
}
|
|
108
|
+
})
|
|
109
|
+
.catch(function (err) {
|
|
110
|
+
var _a, _b;
|
|
111
|
+
setLoading(false);
|
|
112
|
+
message.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '密码修改失败!');
|
|
113
|
+
});
|
|
114
|
+
}, [form, encryptionHandle, request, setUserPasswordOption, setUserPassword]);
|
|
115
|
+
var onSaveHandle = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
116
|
+
return __generator(this, function (_a) {
|
|
117
|
+
vallidateFn(function () {
|
|
118
|
+
submitParamsHandle();
|
|
119
|
+
});
|
|
120
|
+
return [2 /*return*/];
|
|
121
|
+
});
|
|
122
|
+
}); }, [vallidateFn, submitParamsHandle]);
|
|
123
|
+
var footerDomFn = function () {
|
|
124
|
+
return (React.createElement(Button, { type: "primary", onClick: onSaveHandle, loading: loading }, "\u4FDD\u5B58"));
|
|
125
|
+
};
|
|
126
|
+
return (React.createElement(Modal, { visible: visible, loading: loading, onCancel: onCancel, title: "\u7528\u6237\u4FE1\u606F", footer: footerDomFn(), maskClosable: false, width: "80%" },
|
|
127
|
+
React.createElement(Container, null,
|
|
128
|
+
React.createElement(Form, { name: "user-password-making", form: form },
|
|
129
|
+
React.createElement(SearchContainer, { dark: true },
|
|
130
|
+
React.createElement(SearchLeft, null,
|
|
131
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
132
|
+
React.createElement(Item, { name: "oldPassword", label: "\u539F\u5BC6\u7801", rules: [{ required: true, message: '请输入原密码' }] },
|
|
133
|
+
React.createElement(Input, { autoComplete: "new-password", type: "password" }))),
|
|
134
|
+
React.createElement("div", { style: { width: '100%' } },
|
|
135
|
+
React.createElement(Item, { name: "newPassword", label: "\u65B0\u5BC6\u7801", rules: [
|
|
136
|
+
{ required: true, message: '请输入新密码' },
|
|
137
|
+
{
|
|
138
|
+
pattern: validate.passwordValidate,
|
|
139
|
+
message: commonMessage.passwordMessage,
|
|
140
|
+
},
|
|
141
|
+
] },
|
|
142
|
+
React.createElement(Input, { placeholder: "\u75319-128\u4F4D\u7684\u5B57\u6BCD+\u6570\u5B57\uFF0C\u5B57\u6BCD+\u7279\u6B8A\u5B57\u7B26\uFF0C\u6570\u5B57+\u7279\u6B8A\u5B57\u7B26\u7EC4\u6210", autoComplete: "new-password", type: "password" }))),
|
|
143
|
+
React.createElement(Item, { name: "newPassword1", label: "\u786E\u8BA4\u65B0\u5BC6\u7801", rules: [
|
|
144
|
+
{ required: true, message: '请确认密码' },
|
|
145
|
+
function (_a) {
|
|
146
|
+
var getFieldValue = _a.getFieldValue;
|
|
147
|
+
return ({
|
|
148
|
+
validator: function (rule, value) {
|
|
149
|
+
if (!value || getFieldValue('newPassword') === value) {
|
|
150
|
+
return Promise.resolve();
|
|
151
|
+
}
|
|
152
|
+
return Promise.reject('两次密码输入不一致');
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
},
|
|
156
|
+
], dependencies: ['newPassword'] },
|
|
157
|
+
React.createElement(Input, { autoComplete: "new-password", type: "password" }))))))));
|
|
158
|
+
};
|
|
159
|
+
export default Making;
|
package/dist/index.d.ts
CHANGED
|
@@ -34,6 +34,7 @@ export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
|
|
|
34
34
|
export { default as Collapse } from './components/Collapse';
|
|
35
35
|
export { default as GridList } from './components/business/GridList';
|
|
36
36
|
export { default as Timeline } from './components/Timeline';
|
|
37
|
+
export { UserInfo, UserPassword } from './components/business/Common';
|
|
37
38
|
export { ConfigProvider, Drawer, message, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tag, Empty, Tooltip, Descriptions, Image, Popover, } from 'antd';
|
|
38
39
|
export { default as zhCN } from 'antd/lib/locale/zh_CN';
|
|
39
40
|
export { default as Icon, createFromIconfontCN } from '@ant-design/icons';
|
package/dist/index.js
CHANGED
|
@@ -97,6 +97,7 @@ export { default as EnhanceTreeSelect } from './components/EnhanceTreeSelect';
|
|
|
97
97
|
export { default as Collapse } from './components/Collapse';
|
|
98
98
|
export { default as GridList } from './components/business/GridList';
|
|
99
99
|
export { default as Timeline } from './components/Timeline';
|
|
100
|
+
export { UserInfo, UserPassword } from './components/business/Common';
|
|
100
101
|
export { ConfigProvider, Drawer, message, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tag, Empty, Tooltip, Descriptions, Image, Popover, } from 'antd';
|
|
101
102
|
export { default as zhCN } from 'antd/lib/locale/zh_CN';
|
|
102
103
|
export { default as Icon, createFromIconfontCN } from '@ant-design/icons';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ztxkui",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.9.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "React components library",
|
|
6
6
|
"author": "zt-front-end",
|
|
@@ -77,8 +77,7 @@
|
|
|
77
77
|
"sass": "^1.32.8",
|
|
78
78
|
"source-map-explorer": "^2.5.2",
|
|
79
79
|
"typescript": "^4.1.2",
|
|
80
|
-
"web-vitals": "^1.0.1"
|
|
81
|
-
"ztxkutils": "^2.0.1"
|
|
80
|
+
"web-vitals": "^1.0.1"
|
|
82
81
|
},
|
|
83
82
|
"peerDependencies": {
|
|
84
83
|
"axios": ">=0.21.1",
|
|
@@ -86,6 +85,6 @@
|
|
|
86
85
|
"lodash": ">=4.17.21",
|
|
87
86
|
"react": ">=16.9.0",
|
|
88
87
|
"react-dom": ">=16.9.0",
|
|
89
|
-
"ztxkutils": ">=1.
|
|
88
|
+
"ztxkutils": ">=2.1.1"
|
|
90
89
|
}
|
|
91
90
|
}
|