@titaui/pc 1.8.4 → 1.8.61

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.
Files changed (42) hide show
  1. package/lib/components/dialog/index.css +1 -1
  2. package/lib/components/form/form-fields/duties/index.js +2 -1
  3. package/lib/components/form/form-fields/input/index.js +1 -1
  4. package/lib/components/form/form-fields/input-verification-code/index.js +18 -15
  5. package/lib/components/form/form-fields/password/index.css +18 -0
  6. package/lib/components/form/form-fields/password/index.js +33 -20
  7. package/lib/components/form/index.js +4 -1
  8. package/lib/components/table/index.css +1 -0
  9. package/lib/components/upload-photo-modal/constant.js +10 -4
  10. package/lib/components/upload-photo-modal/index.css +1 -2
  11. package/lib/components/upload-photo-modal/index.js +58 -186
  12. package/lib/components/user-selector/request-apis.js +1 -1
  13. package/lib/pages/personal-info/components/base-info/index.css +31 -3
  14. package/lib/pages/personal-info/components/base-info/index.js +13 -5
  15. package/lib/pages/personal-info/components/{edit-info → edit-base-info}/index.css +1 -1
  16. package/lib/pages/personal-info/components/{edit-info → edit-base-info}/index.js +3 -4
  17. package/lib/pages/personal-info/components/person-photo/index.css +18 -5
  18. package/lib/pages/personal-info/components/person-photo/index.js +18 -3
  19. package/package.json +1 -1
  20. package/src/components/dialog/index.scss +1 -1
  21. package/src/components/form/form-fields/duties/index.tsx +1 -1
  22. package/src/components/form/form-fields/input/index.tsx +2 -2
  23. package/src/components/form/form-fields/input-verification-code/index.tsx +100 -70
  24. package/src/components/form/form-fields/password/index.scss +20 -4
  25. package/src/components/form/form-fields/password/index.tsx +73 -51
  26. package/src/components/form/index.tsx +3 -1
  27. package/src/components/table/index.scss +1 -0
  28. package/src/components/upload-photo-modal/constant.ts +7 -1
  29. package/src/components/upload-photo-modal/index.scss +1 -2
  30. package/src/components/upload-photo-modal/index.tsx +53 -156
  31. package/src/components/user-selector/export-modules/duties-selector/index.tsx +1 -1
  32. package/src/components/user-selector/request-apis.js +1 -1
  33. package/src/pages/personal-info/components/base-info/index.scss +26 -3
  34. package/src/pages/personal-info/components/base-info/index.tsx +12 -3
  35. package/src/pages/personal-info/components/{edit-info → edit-base-info}/index.scss +1 -1
  36. package/src/pages/personal-info/components/{edit-info → edit-base-info}/index.tsx +2 -4
  37. package/src/pages/personal-info/components/person-photo/index.scss +17 -5
  38. package/src/pages/personal-info/components/person-photo/index.tsx +12 -4
  39. package/lib/pages/personal-info/components/edit-info/input/index.css +0 -89
  40. package/lib/pages/personal-info/components/edit-info/input/index.js +0 -199
  41. package/src/pages/personal-info/components/edit-info/input/index.scss +0 -82
  42. package/src/pages/personal-info/components/edit-info/input/index.tsx +0 -145
@@ -13,8 +13,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
14
  var _reactCropper = _interopRequireDefault(require("react-cropper"));
15
15
 
16
- require("cropperjs/dist/cropper.css");
17
-
18
16
  var _toast = _interopRequireDefault(require("../../components/toast"));
19
17
 
20
18
  var _conditionRender = _interopRequireDefault(require("../condition-render"));
@@ -25,11 +23,9 @@ var _dialog = _interopRequireDefault(require("../../components/dialog"));
25
23
 
26
24
  var _constant = require("./constant");
27
25
 
28
- require("./index.css");
29
-
30
- var _uuid = _interopRequireDefault(require("uuid"));
26
+ require("cropperjs/dist/cropper.css");
31
27
 
32
- var _bsGlobal = require("../../utils/bs-global");
28
+ require("./index.css");
33
29
 
34
30
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
35
31
 
@@ -37,10 +33,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
37
33
 
38
34
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
39
35
 
40
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
41
-
42
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
43
-
44
36
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
45
37
 
46
38
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -55,17 +47,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
55
47
 
56
48
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
57
49
 
58
- var apiServer = (0, _bsGlobal.getBSGlobal)("apiPath");
59
- var userid = (0, _bsGlobal.getUserInfo)().Id;
60
- var tenantId = (0, _bsGlobal.getTenantInfo)().Id;
61
50
  var preCls = 'tita-ui-change-person-photo';
62
51
 
63
52
  var ChangePhoto = function ChangePhoto(props) {
64
53
  var visible = props.visible,
65
54
  onCancel = props.onCancel,
66
55
  _props$type = props.type,
67
- type = _props$type === void 0 ? 'browser' : _props$type;
56
+ type = _props$type === void 0 ? 'person' : _props$type,
57
+ handleSuccessUploadPhoto = props.handleSuccessUploadPhoto;
68
58
  var modalRef = (0, _react.useRef)();
59
+ var cropperRef = (0, _react.useRef)(null);
69
60
 
70
61
  var _useState = (0, _react.useState)(''),
71
62
  _useState2 = _slicedToArray(_useState, 2),
@@ -82,33 +73,21 @@ var ChangePhoto = function ChangePhoto(props) {
82
73
  cropData = _useState6[0],
83
74
  setCropData = _useState6[1];
84
75
 
85
- var _useState7 = (0, _react.useState)({
86
- Avatar: ''
87
- }),
76
+ var _useState7 = (0, _react.useState)(false),
88
77
  _useState8 = _slicedToArray(_useState7, 2),
89
- userInfo = _useState8[0],
90
- setUserInfo = _useState8[1];
91
-
92
- var _useState9 = (0, _react.useState)(_constant.List.find(function (item) {
93
- return item.id === type;
94
- })),
95
- _useState10 = _slicedToArray(_useState9, 1),
96
- item = _useState10[0];
97
-
98
- var _useState11 = (0, _react.useState)(false),
99
- _useState12 = _slicedToArray(_useState11, 2),
100
- isEnter = _useState12[0],
101
- setIsEnter = _useState12[1];
78
+ isEnter = _useState8[0],
79
+ setIsEnter = _useState8[1];
102
80
 
103
- var _useState13 = (0, _react.useState)(''),
104
- _useState14 = _slicedToArray(_useState13, 2),
105
- fileName = _useState14[0],
106
- setFileName = _useState14[1];
81
+ var _useState9 = (0, _react.useState)(''),
82
+ _useState10 = _slicedToArray(_useState9, 2),
83
+ fileName = _useState10[0],
84
+ setFileName = _useState10[1];
107
85
 
108
- var cropperRef = (0, _react.useRef)(null);
86
+ var item = _constant.List.find(function (item) {
87
+ return item.id === type;
88
+ });
109
89
 
110
90
  var onChange = function onChange(e) {
111
- e.preventDefault();
112
91
  var files;
113
92
 
114
93
  if (e.dataTransfer) {
@@ -147,152 +126,59 @@ var ChangePhoto = function ChangePhoto(props) {
147
126
  var imageElement = cropperRef.current;
148
127
  var cropper = imageElement.cropper;
149
128
  setCropData(cropper.getCroppedCanvas().toDataURL());
150
- setUserInfo(cropper.getCroppedCanvas().toDataURL());
151
129
  var base64Url = cropper.getCroppedCanvas().toDataURL();
152
130
  var newFile = dataURLtoFile(base64Url, fileName);
153
- console.log(newFile);
154
131
  var formData = new FormData();
155
132
  formData.append('file', newFile);
156
- console.log(formData);
157
133
  setCropper(formData);
158
134
  };
159
135
 
160
- var handleSaveInfo = function handleSaveInfo() {
161
- var timestamp = new Date().getTime(); // 给每个文件加一个时间戳
136
+ var handleSuccessSave = function handleSuccessSave(resp) {
137
+ if (resp.Code === 1) {
138
+ _toast["default"].Success('保存成功', {
139
+ style: {
140
+ position: "fixed",
141
+ top: " 36px",
142
+ left: "50%"
143
+ }
144
+ });
145
+
146
+ onCancel();
147
+ setImage('');
148
+ handleSuccessUploadPhoto(cropData);
149
+ } else {
150
+ _toast["default"].Error(resp.Message, {
151
+ style: {
152
+ position: "fixed",
153
+ top: " 36px",
154
+ left: "50%"
155
+ }
156
+ });
157
+
158
+ setImage('');
159
+ }
160
+ };
162
161
 
162
+ var handleSaveInfo = function handleSaveInfo() {
163
163
  if (!image) {
164
164
  return;
165
165
  } else {
166
166
  if (type === "person") {
167
167
  (0, _requestApi.saveUserPhoto)(cropper).then(function (resp) {
168
- if (resp.Code === 1) {
169
- _toast["default"].Success('保存成功', {
170
- canClose: false
171
- });
172
-
173
- onCancel();
174
- } else {
175
- _toast["default"].Error(resp.Message, {
176
- canClose: false
177
- });
178
- }
168
+ handleSuccessSave(resp);
179
169
  });
180
170
  } else if (type === "enterprise") {
181
- // console.log(cropper);
182
171
  (0, _requestApi.saveTenantLogo)(cropper).then(function (resp) {
183
- if (resp.Code === 1) {
184
- _toast["default"].Success('保存成功', {
185
- canClose: false
186
- });
187
-
188
- onCancel();
189
- } else {
190
- _toast["default"].Error(resp.Message, {
191
- canClose: false
192
- });
193
- }
194
- }); // axios({headers: {
195
- // 'Content-Type': 'multipart/form-data',
196
- // },
197
- // method: 'post',
198
- // data: cropper,
199
- // url: `${apiServer}/api/v1/${tenantId}/${userid}/tenant/update/logo?format=json&timestamp=${timestamp}`})
200
- // dealSelectFiles(image)
172
+ handleSuccessSave(resp);
173
+ });
201
174
  } else {
202
175
  (0, _requestApi.saveBrowserIcon)(cropper).then(function (resp) {
203
- if (resp.Code === 1) {
204
- _toast["default"].Success('保存成功', {
205
- canClose: false
206
- });
207
-
208
- onCancel();
209
- } else {
210
- _toast["default"].Error(resp.Message, {
211
- canClose: false
212
- });
213
- }
176
+ handleSuccessSave(resp);
214
177
  });
215
178
  }
216
179
  }
217
180
  };
218
181
 
219
- var _useState15 = (0, _react.useState)(),
220
- _useState16 = _slicedToArray(_useState15, 2),
221
- uploadSuccessFile = _useState16[0],
222
- setUploadSuccessFile = _useState16[1];
223
-
224
- var dealSelectFiles = function dealSelectFiles(uploadSelectFile) {
225
- var uploadStartFiles = []; // 开始上传的文件
226
-
227
- var formData = new FormData(); // FormData 对象
228
-
229
- var uploadStartFile;
230
- var timestamp = new Date().getTime(); // 给每个文件加一个时间戳
231
- // let uploadFileType = uploadSelectFile.name.substring(uploadSelectFile.name.lastIndexOf('.') + 1);
232
-
233
- uploadStartFile = {
234
- FileName: uploadSelectFile.name,
235
- // FileType: _dealAttachmentType(uploadFileType).FileType,
236
- FileSize: uploadSelectFile.size,
237
- FileLastModified: uploadSelectFile.lastModified,
238
- // IsImage: _dealAttachmentType(uploadFileType).IsImage,
239
- percentComplete: 0,
240
- uploadStatus: 1,
241
- // 开始上传
242
- IsSuccess: false,
243
- uid: (0, _uuid["default"])(),
244
- _smallImageUrl: '',
245
- _bigImageUrl: '',
246
- MediaType: '',
247
- UserId: 0,
248
- MaxDocCount: 0,
249
- DfsPath: '',
250
- ClientUrl: '',
251
- SmallImageUrl: '',
252
- BigImageUrl: '',
253
- DownloadUrl: '',
254
- Msg: '',
255
- AllowUploadAttachmentSize: 50,
256
- Deleteable: true,
257
- requestXHR: new XMLHttpRequest() //在这创建是为了取消用
258
-
259
- }; // uploadStartFiles.push(uploadStartFile);
260
- // _dealUploadStart(uploadStartFiles); // 处理开始上传的文件
261
-
262
- formData.append('file', uploadSelectFile);
263
- var url = "".concat(apiServer, "/api/v1/").concat(tenantId, "/").concat(userid, "/tenant/update/logo");
264
-
265
- _dealUploadXHRRequest(formData, url, uploadStartFile);
266
- };
267
- /**
268
- * 处理文件上传请求
269
- *
270
- * @formData
271
- * @url 上传文件请求地址
272
- * @uploadStartFile 上传的文件
273
- *
274
- * @memberof Upload
275
- */
276
-
277
-
278
- var _dealUploadXHRRequest = function _dealUploadXHRRequest(formData, url, uploadStartFile) {
279
- var xhr = uploadStartFile.requestXHR;
280
-
281
- xhr.onreadystatechange = function () {
282
- if (xhr.readyState == 4 && xhr.status == 200) {
283
- var result = Object.assign({}, _objectSpread({}, JSON.parse(xhr.responseText).Result[0])); // 上传成功接口返回数据
284
-
285
- result.percentComplete = 100;
286
- result.IsSuccess = !!result.IsSuccess;
287
- result.uploadStatus = result.IsSuccess ? 3 : 4; // 3上传成功;4上传失败
288
- // _dealUploadSuccess({ ...uploadStartFile, ...result });
289
- }
290
- };
291
-
292
- xhr.open('POST', url, true);
293
- xhr.send(formData); //开始上传,发送form数据
294
- };
295
-
296
182
  var handleEnterAgain = function handleEnterAgain() {
297
183
  setIsEnter(true);
298
184
  };
@@ -301,6 +187,11 @@ var ChangePhoto = function ChangePhoto(props) {
301
187
  setIsEnter(false);
302
188
  };
303
189
 
190
+ var handleCancel = function handleCancel() {
191
+ onCancel();
192
+ setImage('');
193
+ };
194
+
304
195
  return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
305
196
  visible: visible,
306
197
  ref: modalRef,
@@ -310,8 +201,8 @@ var ChangePhoto = function ChangePhoto(props) {
310
201
  title: '上传头像',
311
202
  noHeadLine: true,
312
203
  maskClosable: false,
313
- onClose: onCancel,
314
- onCancel: onCancel,
204
+ onClose: handleCancel,
205
+ onCancel: handleCancel,
315
206
  okText: "\u4FDD\u5B58",
316
207
  noFooterLine: true,
317
208
  onOk: handleSaveInfo
@@ -332,19 +223,9 @@ var ChangePhoto = function ChangePhoto(props) {
332
223
  accept: item === null || item === void 0 ? void 0 : item.accept
333
224
  }), /*#__PURE__*/_react["default"].createElement("span", {
334
225
  className: "".concat(preCls, "__upload-right-title")
335
- }, "\u70B9\u51FB\u4E0A\u4F20"), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
336
- condition: type === 'person'
337
- }, /*#__PURE__*/_react["default"].createElement("span", {
226
+ }, "\u70B9\u51FB\u4E0A\u4F20"), /*#__PURE__*/_react["default"].createElement("span", {
338
227
  className: "".concat(preCls, "__upload-right-tips")
339
- }, item === null || item === void 0 ? void 0 : item.tips)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
340
- condition: type === 'enterprise'
341
- }, /*#__PURE__*/_react["default"].createElement("span", {
342
- className: "".concat(preCls, "__upload-right-tips")
343
- }, item === null || item === void 0 ? void 0 : item.tips)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
344
- condition: type === 'browser'
345
- }, /*#__PURE__*/_react["default"].createElement("span", {
346
- className: "".concat(preCls, "__upload-right-tips")
347
- }, item === null || item === void 0 ? void 0 : item.tips)))), /*#__PURE__*/_react["default"].createElement("div", {
228
+ }, item === null || item === void 0 ? void 0 : item.tips))), /*#__PURE__*/_react["default"].createElement("div", {
348
229
  className: "".concat(preCls, "__upload-left")
349
230
  }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
350
231
  condition: type === 'person'
@@ -355,13 +236,7 @@ var ChangePhoto = function ChangePhoto(props) {
355
236
  }), /*#__PURE__*/_react["default"].createElement("div", {
356
237
  className: "".concat(preCls, "__upload-left-box3")
357
238
  })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
358
- condition: type === 'enterprise'
359
- }, /*#__PURE__*/_react["default"].createElement("div", {
360
- className: "".concat(preCls, "__upload-left-box")
361
- }), /*#__PURE__*/_react["default"].createElement("span", {
362
- className: "".concat(preCls, "__upload-left-preview")
363
- }, item === null || item === void 0 ? void 0 : item.previewTitle)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
364
- condition: type === 'browser'
239
+ condition: type === 'enterprise' || type === 'browser'
365
240
  }, /*#__PURE__*/_react["default"].createElement("div", {
366
241
  className: "".concat(preCls, "__upload-left-box")
367
242
  }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -378,15 +253,12 @@ var ChangePhoto = function ChangePhoto(props) {
378
253
  responsive: true,
379
254
  autoCropArea: item === null || item === void 0 ? void 0 : item.autoCropArea,
380
255
  checkOrientation: true,
381
- minCropBoxHeight: 10,
382
- minCropBoxWidth: 10,
256
+ minCropBoxHeight: item === null || item === void 0 ? void 0 : item.minCropBoxHeight,
257
+ minCropBoxWidth: item === null || item === void 0 ? void 0 : item.minCropBoxWidth,
383
258
  initialAspectRatio: item === null || item === void 0 ? void 0 : item.initialAspectRatio,
384
259
  guides: true,
385
260
  preview: ".img-preview",
386
- ref: cropperRef // onInitialized={(instance) => {
387
- // setCropper(instance);
388
- // }}
389
- ,
261
+ ref: cropperRef,
390
262
  crop: onCrop
391
263
  }), /*#__PURE__*/_react["default"].createElement("div", {
392
264
  className: (0, _classnames["default"])("".concat(preCls, "__preview-box"), _defineProperty({}, "".concat(preCls, "__preview-box-bgc"), type === "enterprise"), _defineProperty({}, "".concat(preCls, "__preview-box-browser"), type === "browser"))
@@ -163,7 +163,7 @@ var searchGroups = function searchGroups(_ref4) {
163
163
  exports.searchGroups = searchGroups;
164
164
 
165
165
  var getDuties = function getDuties() {
166
- return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/position/get?status=1&pageNum=1&pageSize=100")).then(function (res) {
166
+ return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/position/get?status=1&pageNum=1&pageSize=1000")).then(function (res) {
167
167
  return res.data;
168
168
  });
169
169
  };
@@ -2,7 +2,7 @@
2
2
  background: #ffffff;
3
3
  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
4
4
  border-radius: 12px;
5
- padding: 20px 32px;
5
+ padding: 20px 32px 30px 36px;
6
6
  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
7
7
  }
8
8
 
@@ -10,7 +10,7 @@
10
10
  display: flex;
11
11
  align-items: center;
12
12
  justify-content: space-between;
13
- margin-bottom: 12px;
13
+ margin-bottom: 20px;
14
14
  }
15
15
 
16
16
  .titaui-personal-info-base-info__header-title {
@@ -31,10 +31,28 @@
31
31
  border-radius: 2px;
32
32
  display: inline-block;
33
33
  position: absolute;
34
- left: -8px;
34
+ left: -12px;
35
35
  top: 3px;
36
36
  }
37
37
 
38
+ .titaui-personal-info-base-info__header .titaui-rect-btn--primary {
39
+ font-size: 14px;
40
+ font-weight: normal;
41
+ color: #2879FF;
42
+ line-height: 26px;
43
+ background: rgba(40, 121, 255, 0.2);
44
+ }
45
+
46
+ .titaui-personal-info-base-info__header .titaui-rect-btn--primary:hover {
47
+ color: #fff;
48
+ background-color: #2879ff;
49
+ }
50
+
51
+ .titaui-personal-info-base-info__header .titaui-rect-btn--normal {
52
+ height: 28px;
53
+ min-width: 64px;
54
+ }
55
+
38
56
  .titaui-personal-info-base-info__header-btn {
39
57
  width: 64px;
40
58
  height: 28px;
@@ -57,6 +75,14 @@
57
75
  width: 342px;
58
76
  }
59
77
 
78
+ .titaui-personal-info-base-info__form .form-field-input__border--disabled input:disabled {
79
+ color: #6F7886;
80
+ }
81
+
82
+ .titaui-personal-info-base-info .form-field-input__label {
83
+ margin-bottom: 4px;
84
+ }
85
+
60
86
  .titaui-personal-info-base-info .form-field-input__border {
61
87
  padding: 0;
62
88
  border: none;
@@ -68,6 +94,8 @@
68
94
  }
69
95
 
70
96
  .titaui-personal-info-base-info .form-field-input__input {
97
+ font-size: 12px;
98
+ line-height: 18px;
71
99
  background-color: #fff;
72
100
  }
73
101
 
@@ -11,9 +11,11 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _requestApi = require("../../request-api");
13
13
 
14
+ var _button = require("../../../../components/button");
15
+
14
16
  var _form = _interopRequireDefault(require("../../../../components/form"));
15
17
 
16
- var _editInfo = _interopRequireDefault(require("../edit-info"));
18
+ var _editBaseInfo = _interopRequireDefault(require("../edit-base-info"));
17
19
 
18
20
  require("./index.css");
19
21
 
@@ -69,6 +71,10 @@ var BaseInfo = function BaseInfo() {
69
71
  setVisible(false);
70
72
  };
71
73
 
74
+ var handleSuccessEditBaseInfo = function handleSuccessEditBaseInfo(userInfo) {
75
+ setUserInfo(_objectSpread({}, userInfo));
76
+ };
77
+
72
78
  (0, _react.useEffect)(function () {
73
79
  (0, _requestApi.getUserInfoFun)().then(function (resp) {
74
80
  if (resp.Code === 1 && resp.Data) {
@@ -84,12 +90,14 @@ var BaseInfo = function BaseInfo() {
84
90
  className: "".concat(prefix, "__header")
85
91
  }, /*#__PURE__*/_react["default"].createElement("span", {
86
92
  className: "".concat(prefix, "__header-title")
87
- }, "\u57FA\u672C\u4FE1\u606F"), /*#__PURE__*/_react["default"].createElement("span", {
88
- className: "".concat(prefix, "__header-btn"),
93
+ }, "\u57FA\u672C\u4FE1\u606F"), /*#__PURE__*/_react["default"].createElement(_button.RectBtn, {
94
+ type: "primary",
95
+ text: "编辑",
89
96
  onClick: handleClickEdit
90
- }, "\u7F16\u8F91"), /*#__PURE__*/_react["default"].createElement(_editInfo["default"], {
97
+ }), /*#__PURE__*/_react["default"].createElement(_editBaseInfo["default"], {
91
98
  visible: visible,
92
- onCancel: handleCancelEdit
99
+ onCancel: handleCancelEdit,
100
+ handleSuccessEditBaseInfo: handleSuccessEditBaseInfo
93
101
  })), /*#__PURE__*/_react["default"].createElement("div", {
94
102
  className: "".concat(prefix, "__form")
95
103
  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
@@ -4,7 +4,7 @@
4
4
  }
5
5
 
6
6
  .titaui-edit-personal-info__form .form-field-input__label {
7
- width: 62px;
7
+ min-width: 64px;
8
8
  }
9
9
 
10
10
  .titaui-edit-personal-info__form .form-field-input__label-text {
@@ -48,7 +48,8 @@ var prefix = "titaui-edit-personal-info";
48
48
 
49
49
  var EditBaseInfo = function EditBaseInfo(props) {
50
50
  var visible = props.visible,
51
- onCancel = props.onCancel;
51
+ onCancel = props.onCancel,
52
+ handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo;
52
53
  var modalRef = (0, _react.useRef)();
53
54
  var formContainerRef = (0, _react.useRef)();
54
55
  var formRef = (0, _react.useRef)();
@@ -106,10 +107,8 @@ var EditBaseInfo = function EditBaseInfo(props) {
106
107
  canClose: false
107
108
  });
108
109
 
110
+ handleSuccessEditBaseInfo(userInfo);
109
111
  onCancel();
110
- setTimeout(function () {
111
- window.location.reload();
112
- }, 2000);
113
112
  } else {
114
113
  _toast["default"].Error(resp.Message, {
115
114
  canClose: false
@@ -4,7 +4,7 @@
4
4
  background: #ffffff;
5
5
  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
6
6
  border-radius: 12px;
7
- padding: 20px 32px;
7
+ padding: 20px 32px 30px 36px;
8
8
  margin-top: 10px;
9
9
  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
10
10
  }
@@ -13,7 +13,7 @@
13
13
  display: flex;
14
14
  align-items: center;
15
15
  justify-content: space-between;
16
- margin-bottom: 12px;
16
+ margin-bottom: 20px;
17
17
  }
18
18
 
19
19
  .titaui-personal-info-person-photo__header-title {
@@ -34,7 +34,7 @@
34
34
  border-radius: 2px;
35
35
  display: inline-block;
36
36
  position: absolute;
37
- left: -8px;
37
+ left: -12px;
38
38
  top: 3px;
39
39
  }
40
40
 
@@ -55,11 +55,24 @@
55
55
  line-height: 18px;
56
56
  }
57
57
 
58
- .titaui-personal-info-person-photo__main > span {
59
- margin-left: 24px;
58
+ .titaui-personal-info-person-photo__main-tip {
59
+ margin-left: 32px;
60
60
  font-size: 12px;
61
61
  color: #A4ACB9;
62
62
  line-height: 20px;
63
+ position: relative;
64
+ }
65
+
66
+ .titaui-personal-info-person-photo__main-tip::before {
67
+ display: block;
68
+ content: '';
69
+ width: 4px;
70
+ height: 4px;
71
+ background: #A4ACB9;
72
+ position: absolute;
73
+ top: 7px;
74
+ left: -12px;
75
+ border-radius: 50%;
63
76
  }
64
77
 
65
78
  .titaui-personal-info-person-photo .titaui-pc-avator-container {
@@ -48,6 +48,11 @@ var PersonPhoto = function PersonPhoto() {
48
48
  visible = _useState2[0],
49
49
  setVisible = _useState2[1];
50
50
 
51
+ var _useState3 = (0, _react.useState)(''),
52
+ _useState4 = _slicedToArray(_useState3, 2),
53
+ avatar = _useState4[0],
54
+ setAvatar = _useState4[1];
55
+
51
56
  var handleChangePhoto = function handleChangePhoto() {
52
57
  setVisible(true);
53
58
  };
@@ -56,6 +61,13 @@ var PersonPhoto = function PersonPhoto() {
56
61
  setVisible(false);
57
62
  };
58
63
 
64
+ var handleSuccessUploadPhoto = function handleSuccessUploadPhoto(image) {
65
+ setAvatar(image);
66
+ };
67
+
68
+ (0, _react.useEffect)(function () {
69
+ setAvatar(UserAvatar.Large);
70
+ }, []);
59
71
  return /*#__PURE__*/_react["default"].createElement("div", {
60
72
  className: prefix
61
73
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -68,17 +80,20 @@ var PersonPhoto = function PersonPhoto() {
68
80
  userId: Id,
69
81
  name: Name,
70
82
  color: UserAvatar.Color,
71
- src: UserAvatar.Large,
83
+ src: avatar,
72
84
  size: {
73
85
  width: 160,
74
86
  textNum: 1,
75
87
  fontSize: 24
76
88
  },
77
89
  onClick: handleChangePhoto
78
- }), /*#__PURE__*/_react["default"].createElement("span", null, "\xB7 \u5EFA\u8BAE\u56FE\u7247\u6700\u5C0F\u5C3A\u5BF8 150*150px")), /*#__PURE__*/_react["default"].createElement(_uploadPhotoModal["default"], {
90
+ }), /*#__PURE__*/_react["default"].createElement("span", {
91
+ className: "".concat(prefix, "__main-tip")
92
+ }, "\u5EFA\u8BAE\u56FE\u7247\u6700\u5C0F\u5C3A\u5BF8 150*150px")), /*#__PURE__*/_react["default"].createElement(_uploadPhotoModal["default"], {
79
93
  visible: visible,
80
94
  onCancel: handleCancel,
81
- type: "person"
95
+ type: "person",
96
+ handleSuccessUploadPhoto: handleSuccessUploadPhoto
82
97
  }));
83
98
  };
84
99
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.8.4",
3
+ "version": "1.8.61",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "src/index.js",
@@ -10,7 +10,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
10
10
  }
11
11
  .rc-dialog-mask {
12
12
  z-index: 1299 !important;
13
- background: rgba(20, 28, 40, 0.5) !important;
13
+ background: rgba(20, 28, 40, 0.7) !important;
14
14
  }
15
15
 
16
16
  .titaui-dialog {
@@ -115,9 +115,9 @@ export default forwardRef((props: Props, ref) => {
115
115
  overlay={<OverlayInner hasActive={hasActive} hasError={hasError} tip={tip} />}
116
116
  getTooltipContainer={getContainer}
117
117
  >
118
- {/* @ts-ignore */}
119
118
  <DutiesSelector
120
119
  ref={dutiedPopRef}
120
+ // @ts-ignore
121
121
  multiple={false}
122
122
  // position="bottomLeft"
123
123
  position='centerRight'
@@ -110,10 +110,10 @@ export default forwardRef((props: Props, ref) => {
110
110
  }))
111
111
 
112
112
  return <div className={classNames(preCls,{[`${preCls}-row`]:layout==='row'},className)}>
113
- <div className={classNames(`${preCls}__label`)}>
113
+ {!!label && <div className={classNames(`${preCls}__label`)}>
114
114
  <span className={classNames(`${preCls}__label-text`)}>{label}</span>
115
115
  {require && <span className={classNames(`${preCls}__label-require`)}>*</span>}
116
- </div>
116
+ </div>}
117
117
  <div className={classNames(`${preCls}__border`, {
118
118
  [`${preCls}__border--error`]: hasError,
119
119
  [`${preCls}__border--active`]: hasActive,