ls-pro-common 3.0.73 → 3.0.75

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 (13) hide show
  1. package/dist/common.js +1 -1
  2. package/dist/common.min.js +1 -1
  3. package/es/components/ImageSelector.d.ts +2 -0
  4. package/es/components/ImageSelector.js +1 -1
  5. package/es/components/InputMultiLine.js +6 -2
  6. package/es/hooks/useDtl/index.js +4 -3
  7. package/es/utils/index.js +46 -22
  8. package/lib/components/ImageSelector.d.ts +2 -0
  9. package/lib/components/ImageSelector.js +1 -1
  10. package/lib/components/InputMultiLine.js +6 -2
  11. package/lib/hooks/useDtl/index.js +4 -3
  12. package/lib/utils/index.js +46 -22
  13. package/package.json +1 -1
package/es/components/ImageSelector.d.ts CHANGED
@@ -26,6 +26,8 @@ export declare type ImageSelectorProps = ProFormItemProps<InputProps> & {
26
26
  maxCount?: number;
27
27
  uploadRender?: (currentImgUrl: any) => any;
28
28
  afterSelect?: (imgUrl: string) => void;
29
+ /** 无上传图片时自定义展示 */
30
+ emptyRender?: () => any;
29
31
  };
30
32
  declare function ImageSelector(prop: ImageSelectorProps): JSX.Element;
31
33
  export default ImageSelector;
package/es/components/ImageSelector.js CHANGED
@@ -334,7 +334,7 @@ function ImageSelector(prop) {
334
334
  e.stopPropagation();
335
335
  clearValue(undefined);
336
336
  }
337
- }))) : /*#__PURE__*/React.createElement("img", {
337
+ }))) : rest.emptyRender ? rest.emptyRender() : /*#__PURE__*/React.createElement("img", {
338
338
  className: "img-upload",
339
339
  src: "data:image/png;base64,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"
340
340
  })), /*#__PURE__*/React.createElement("div", {
package/es/components/InputMultiLine.js CHANGED
@@ -86,7 +86,11 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
86
86
  setVisible(flag);
87
87
  if (flag) {
88
88
  var _textareaRef$current;
89
- setLineText((value || innerValue || '').split(',').join('\n'));
89
+ var v = value;
90
+ if (label && name) {
91
+ v = innerValue;
92
+ }
93
+ setLineText((v || '').split(',').join('\n'));
90
94
  (_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 ? void 0 : _textareaRef$current.focus();
91
95
  } else {
92
96
  // 关闭时清除左右空格及空行
@@ -125,7 +129,7 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
125
129
  setVisible(true);
126
130
  }
127
131
  }));
128
- }, [visible, popWidth, lineText, rest]);
132
+ }, [visible, popWidth, lineText, value, name, label, rest]);
129
133
  return /*#__PURE__*/React.createElement(React.Fragment, null, label && name ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProFormText, _extends({
130
134
  name: name,
131
135
  label: label
package/es/hooks/useDtl/index.js CHANGED
@@ -124,10 +124,11 @@ function useDtl(dtlParam) {
124
124
  return _context.abrupt("return", false);
125
125
  case 23:
126
126
  if (!((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0')) {
127
- _context.next = 29;
127
+ _context.next = 30;
128
128
  break;
129
129
  }
130
130
  showSuccess(result.flag.retMsg || '操作成功');
131
+ Object.assign(masterObject, values);
131
132
  if (result.data) {
132
133
  Object.assign(masterObject, result.data);
133
134
  }
@@ -136,9 +137,9 @@ function useDtl(dtlParam) {
136
137
  }
137
138
  setEditItem({});
138
139
  return _context.abrupt("return", true);
139
- case 29:
140
- return _context.abrupt("return", false);
141
140
  case 30:
141
+ return _context.abrupt("return", false);
142
+ case 31:
142
143
  case "end":
143
144
  return _context.stop();
144
145
  }
package/es/utils/index.js CHANGED
@@ -358,22 +358,30 @@ _message.config({
358
358
  /** @name 显示错误 */
359
359
  export var showError = function showError(text) {
360
360
  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
361
- var win = top || window;
362
- //@ts-ignore
363
- if (!win.lsAppList || !!document.fullscreenElement) {
364
- win = window;
361
+ if (!text) {
362
+ text = '出错了!!';
365
363
  }
366
364
  _message.error({
367
365
  content: text,
368
366
  duration: duration,
369
367
  getPopupContainer: function getPopupContainer(e) {
370
- return getFullScreenElement() || win.document.body;
368
+ return getFullScreenElement() || document.body;
371
369
  },
372
370
  onClick: function onClick(e) {
373
371
  var _e$target;
374
372
  var tag = (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.tagName.toLowerCase();
375
373
  if (tag === 'img' || tag === 'path' || tag === 'svg') {
376
- _message.destroy();
374
+ try {
375
+ _message.destroy();
376
+ } catch (e) {}
377
+ try {
378
+ var _e$target2, _e$target2$closest;
379
+ var msg = (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$closest = _e$target2.closest('.ant-message')) === null || _e$target2$closest === void 0 ? void 0 : _e$target2$closest.parentNode;
380
+ if (msg) {
381
+ var _msg$parentNode;
382
+ (_msg$parentNode = msg.parentNode) === null || _msg$parentNode === void 0 ? void 0 : _msg$parentNode.removeChild(msg);
383
+ }
384
+ } catch (e) {}
377
385
  }
378
386
  }
379
387
  });
@@ -381,22 +389,30 @@ export var showError = function showError(text) {
381
389
  /** @name 显示警示 */
382
390
  export var showWarn = function showWarn(text) {
383
391
  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
384
- var win = top || window;
385
- //@ts-ignore
386
- if (!win.lsAppList || !!document.fullscreenElement) {
387
- win = window;
392
+ if (!text) {
393
+ text = '请注意!';
388
394
  }
389
395
  _message.warn({
390
396
  content: text,
391
397
  duration: duration,
392
398
  getPopupContainer: function getPopupContainer(e) {
393
- return getFullScreenElement() || win.document.body;
399
+ return getFullScreenElement() || document.body;
394
400
  },
395
401
  onClick: function onClick(e) {
396
- var _e$target2;
397
- var tag = (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.tagName.toLowerCase();
402
+ var _e$target3;
403
+ var tag = (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.tagName.toLowerCase();
398
404
  if (tag === 'img' || tag === 'path' || tag === 'svg') {
399
- _message.destroy();
405
+ try {
406
+ _message.destroy();
407
+ } catch (e) {}
408
+ try {
409
+ var _e$target4, _e$target4$closest;
410
+ var msg = (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$closest = _e$target4.closest('.ant-message')) === null || _e$target4$closest === void 0 ? void 0 : _e$target4$closest.parentNode;
411
+ if (msg) {
412
+ var _msg$parentNode2;
413
+ (_msg$parentNode2 = msg.parentNode) === null || _msg$parentNode2 === void 0 ? void 0 : _msg$parentNode2.removeChild(msg);
414
+ }
415
+ } catch (e) {}
400
416
  }
401
417
  }
402
418
  });
@@ -404,22 +420,30 @@ export var showWarn = function showWarn(text) {
404
420
  /** @name 显示成功 */
405
421
  export var showSuccess = function showSuccess(text) {
406
422
  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
407
- var win = top || window;
408
- //@ts-ignore
409
- if (!win.lsAppList || !!document.fullscreenElement) {
410
- win = window;
423
+ if (!text) {
424
+ text = '操作成功!';
411
425
  }
412
426
  _message.success({
413
427
  content: text,
414
428
  duration: duration,
415
429
  getPopupContainer: function getPopupContainer(e) {
416
- return getFullScreenElement() || win.document.body;
430
+ return getFullScreenElement() || document.body;
417
431
  },
418
432
  onClick: function onClick(e) {
419
- var _e$target3;
420
- var tag = (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.tagName.toLowerCase();
433
+ var _e$target5;
434
+ var tag = (_e$target5 = e.target) === null || _e$target5 === void 0 ? void 0 : _e$target5.tagName.toLowerCase();
421
435
  if (tag === 'img' || tag === 'path' || tag === 'svg') {
422
- _message.destroy();
436
+ try {
437
+ _message.destroy();
438
+ } catch (e) {}
439
+ try {
440
+ var _e$target6, _e$target6$closest;
441
+ var msg = (_e$target6 = e.target) === null || _e$target6 === void 0 ? void 0 : (_e$target6$closest = _e$target6.closest('.ant-message')) === null || _e$target6$closest === void 0 ? void 0 : _e$target6$closest.parentNode;
442
+ if (msg) {
443
+ var _msg$parentNode3;
444
+ (_msg$parentNode3 = msg.parentNode) === null || _msg$parentNode3 === void 0 ? void 0 : _msg$parentNode3.removeChild(msg);
445
+ }
446
+ } catch (e) {}
423
447
  }
424
448
  }
425
449
  });
package/lib/components/ImageSelector.d.ts CHANGED
@@ -26,6 +26,8 @@ export declare type ImageSelectorProps = ProFormItemProps<InputProps> & {
26
26
  maxCount?: number;
27
27
  uploadRender?: (currentImgUrl: any) => any;
28
28
  afterSelect?: (imgUrl: string) => void;
29
+ /** 无上传图片时自定义展示 */
30
+ emptyRender?: () => any;
29
31
  };
30
32
  declare function ImageSelector(prop: ImageSelectorProps): JSX.Element;
31
33
  export default ImageSelector;
package/lib/components/ImageSelector.js CHANGED
@@ -334,7 +334,7 @@ function ImageSelector(prop) {
334
334
  e.stopPropagation();
335
335
  clearValue(undefined);
336
336
  }
337
- }))) : /*#__PURE__*/React.createElement("img", {
337
+ }))) : rest.emptyRender ? rest.emptyRender() : /*#__PURE__*/React.createElement("img", {
338
338
  className: "img-upload",
339
339
  src: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAABB9SURBVHhe7ZyJV1THtsb5F1+Sm0Gj8SZOiVFUVBBFmhkZBGRukKmbbqbuZp5EJpFmUFEZFKPxOiT3Je8ac2OuCgLf21+dPs3p9oDNYDTxnrW+RfepOlW7frVr167TLsPguxaXlvBsfgn3/72I0R8X0XVvEc13F+G+AyXXd0DDSrq95Jfr9qJoAe7ZeXhm5+TvHFzyuWF2wad5dY9iuapzS+rc0ussam19p2u5n3q5r8vYZ4AM9YPFMVAcT6Oo8x/A1Z+AH38H5hd8IHyXAjO/sIRfni1g+ueXGHzwEi3fvUTNzQXYby7CdhMhaEnTzCLsMy9RPTOP6ul52H2yTb+UsgUlfndMvfCrenrOX6dKnq+aYTtaW5q056gqpSWtjqkda5PzFtByF7j0A3DnCfDrC8VEXWELi0t4IlBmf55Hy+0XqJmmsTSUxqwNjF0M50D1wWoD1WSfpgSalDmnnisRjB+K9KdL9T0lMKcE7JTe3pwP3uaB0UVA3eI9t38Bnr/k6hEwvz2bx/RPL9D+3XPU3qQBYpAMQilkAzQwCqT+rEiHwgHpwBwC3ilAKIdv0Lxn9CKtTFO1iPA0uzbXY4winAv3l+GEff94DoP3X6BuRgxRBtBTOMj1dO57TknzEG1QGgAjHIf6rA1YeZJ4R4CkTC9fXkraUnsTYKiG28DAQ+DxcwEz9mhOYoqsezFCA0ND1uItBvmA6FA4eEIgDJvEHjVAQlCDFiCsG/CsQcZ2/0B57kA2IAFz4cEi6mU30IzVZlGboXUYRyAq+BKIry2CVl6oAXvXwdSL11z/WcC031uCg4FTjNddXQuIHMgaDfSBscuupAdVPxQVd7SlpfXh80yzdt6iameBYdmlwppku1I3CUGM1uMBB7H27ZGzTaB64PU9q9o2gmf7PmCm7bw91QiY3gcChomOuqkGoOUZfq9ZFxhN+nMamEVpc3ln0jyJAENt948Td6eOewKGwUa7SSNprB4DtKWgz3xwA6FJa1PFHR8UHfi7CIVyCJh2gmF6HFAoLq6SKpVj6INYz+xKfXqKQOFup3mKJH3Svt+TTJ97u1oZjBgcEIhlYOsHI+34jgd+KCrx+zOC8c20Fmv0Qa0nUGpgeEwgaCMU8/rvhpbByAn2FW/gd862QGE+ouIC4aiY8W4PbKMKAcxy9qof4N4vMLfNlokPgPIa426ynljz55IBzCoZKO8b8o/lbHVtcOybJLO2N1sGMKt4Ae9LbHnFa0IEw8HUydnD7G3aesR03RHUx2brlRijb6EBu4YPjHZK1oPwKiAN4ivEC5Ja80A283hzNPUv7VVk930NlFm/G5UfjIdguI3q0uOID4q2ZeuvIF+fytNLeN7ofwh8/yvwIuhd6kYvvkTiy6QegVMd1PdmyACGeQYHbMhXZPDaVs0XSs/VX/+W/RowdPfBR8A9QvG9JtzMi+0RDj2oWQ7AHIiZHeuVH0yjBF9C8A9cwGjvZ7U0nlu1VuYLvK+B0iWN3n0C/DbnG8kbuv71TFumPARXbyKcZTCzJqm/8hp6kX6IDC1jbf9eM/Y/8z7r3+C1sAj88hwYEu90b2K8MYDx/SogOcsymGWZBuUg6bvPFQmM/xZPodFv+lqSJTUn8evn/wCj/9T634wtPQCMWio6FJPKq4kBkDNG4354CrwUKDT6j7gYbwjnwW/A8I/aa8mNwvGD8dzWvOV1XrGSuG32izv/JDNHI9/GxWDMSemWATHOmdkZqvxgeCTYyC983JY5Y8/ewA4U6sV+n8oSviHxjYMyszNUGcBwCYlMKoUir7jwkxfaEnqbF/Olu5Ii9EhSaWZnqFoGI9udWYVQNSax5fc/KOCudnEZ8/egPvFgMztD1aaB4U8NjyWneFc8hscQMztD1aaBOc/feyWhYwBc6WIMWBCZ7Va8x7LV4lModZg7Xf5fLRs2szNUbRoYbtVD4jXMROnONF4HwM+8xyz4iSRjPCIYlxzrzcv3X6WcdQiXnmcEwO8M7IxjDLD8dyx6+/zLuvSWf8quyH/v4ty0XWmDYJg3sI0J2RF+lC3zmcycPjA9xxiXmRyQLZ2ffzdkxRwkgY5InGId9W9UBKBx22d2e0sOjUMS5G/8n5bQESYv9sP+uIQYWza6VVN+MFnNVxBb492Q4mu9ONvoRVmbF7XdXjT1amro8aK01YszHi9SG7TPNVLeKGXNIpeUV3V4keGWOqKiFi/sndp9lrMevxc0eZHm0vqolPos1/tgf8XyHNu3mNi2ViXWj8J6fgph+1NL8Flk5oa1RbQtKhNfRmfi61OZ2BuTiV0nMvF3+W7UV6LdJzPxjdTh3+Byapeh/CuTNtgu22c/7G/bcXOb1qMdJ3MQk+dA2F5LDj44EL8hfSjaejge+6LicfxUPKKpWO2zmVimZFKmS69jVkYZn98bGY+Pw81tW6s+jUjB0fRShO05lY3/+dayIX0o2nbQgvAoCyyWZcXGWnDilAWRJy04ckLTUVGUfD8lZca6rHfMV8dMLDsRE/iMrn2RFny834IPguxajz45lIQjp62bBEaM+uKwBQePBxocI4PnoGj4ziOadou+le8cJMHpOhJtwd6jy/WCxbIIqaPXN/bzpwPDwRPElnALPpI6uraKdxFYjHgJB0lv2XsssI6Z9ggc1v3Tg4kWMF9FSGcHAuvz+2GZ/ZMGMLtk0MY6ZtolkKOlbvAy/C+Y/4Ix13sJZneIYP4yMWbn0Th8Gh7nr/uB1N1yKA4REnx1MNy9vpHg+7EAW01fCzw9YBv7CQXMh/vj8DfJdczKjFozGDb66eEkGdjyIHWtBOakJGEHYtOw/Wiyv+5nEcnYfSINx2Li/WCo45LbHJbnD0guZKZwKWM+pNc39hMKmO2Rp7EnNkvGkWBarmvNYA4k5iOpyIFvE3Kx9WhKQJkZmPT0dOQVFCG1oAIHk/Kx7Vgq9sZmI+ZsBc6U1SAhLRMJSSlITk5GQkICYixxiE1MQbnNAWe9B44g8V69ywOPR1NjY6P6W15ejuOJmX4wB5MLkVzsxOdHU5VtnMjPZEKjMkuRfq5O2WG0PVhrBpMinbXIoS3FWoPdQc+YgbFarWhsaUOJswkJBTYcSy9BZnk9nG19aO8bRvG5CuTlFyIvLw/pGRk4GZeEuNNZGBm/ionJm7g4NoGh8Qlclc/Tt+/i8o1pXL0+hcnJSdy4cQMzMzOYnp5Gb28vUnJL/WByqjzoG5mAPq6PJM3n+eys3G/oGlRnL6PtwXrjYOrq6uAdHUdaYSXSrQ7YGs+jVwweGL+B80PjaO08j9a2DjQ2NaGg2IoISxr2iav3eq+irKEDX4t3hSfloaqxGyPXZlDobEZRVS2qHU6UlZXDZrPB5XKhq6sLafllbxdMW98Isipcyl23HklR2i7Lamdkkhzk4lQ2m5iYiOLiYnR3d2N07DJyispwpqgCdk8Hrk7Pot97GU5PG+rdjXC5PQKwHkXWEkQnZuBwfBb6RwRMXQvC487grM2N1gtDGBoZR1mNGzXuZnRJu4ROMHa7XYHJKirH9kMyKAnQeTYPRq/fRGl9h4KUa29EuasT3UOXMXJ9xn8/rbQOh1IKVewxjnNdYDoHx1Dh7hKvceJomlXpRIYVlvR8HDuVKHEiAdnZ2ejo7IR3ZASXLg2josqOgtIKVNV5MDV7Bz2Dwygqs6v7NpsdlZVVKCktRbLEnHhZSl5ZSu5WGWxhGQZHLmP8ygQuXhxSAEakzcnJKQWntpZw7Ojs7EJ+Sbna1XaI1xZVe3Bt5g76x67jgndCvPQahq5MYezGLVyekokZ1e7zfU9qSY0E5MDxrwtMr+poAu0CyHN+SKmlZ0gNJCE1HWdyciVAujEsS+jKxHVZSmNoam1Hc1sn+oe8uP/wB4kTk2hp70KrqK2jC81SXlPvQlZuPlIzsgTEVfT0DcBaXoWikjK4G5sF8igmp6Zw7dp19Pb1I1vqZp+VZSZgOgSM9Vy5dggVOKVODwZluTLY7j6VpcQx7o3NwdeWHP+9nScz8bl4fPAutS4wXRfH4WjtRV51k/Ia6rQoKa8C+04kIzIpC5nFVThX24zmnkF0Dwwjw2pHfmU9mroHcP2mzKT3ChyNHUo2VxusDjcSckpxyJKhnr80dhVd/ZdQWt2A6oYmuNu6Bf4A6lp70Mo2+4dQWeNCcaUTJfY6uFq7kV5Yjq8k+eNysjob4b02jfh8m1oqRh1MLsC38bmvLB+jNjX46mKOsuvkGexPyEOBo9kf7MJlu84XmO0Do6hp75PY4VHledWNSJbA/Llv+98Vk4UeCb5u8cTsSpd6vr5zEKUSjBMLq2Gta0ObtOHquqhiBQOqrek8TmaX+20ocLbg+uz3KHd3qn6CxT4jThf56wfrjYBhVvvJoURxUwbO5V2A6zihoFrB0FUj23arBPP6zgH/TqGDqfB0q5nl98iMUgmWjajr6Edte7/sTi3Yn5inNgDmVawbKpiS+nYMXZ1CdpXbXz9YbwQMZbY9cvfaLwnimfIGtatlV7rRMTgugx1Qy1FPxnQwHPzfj6er3IdJWYVblpP0Xd1yAaclYDI+7BNwCfkSxGUzIJgPD8Rh+7HTalvvG70GSx6XUlGA4qT+8MQM8mVigu3WtSIYzjrTfy4LZri6mJx1DIz5tuuCgLItR5LVceEjeW6lvIFwUgVCjkChx/QMX1HL5VMxRD9m6GBoOJ/jVmtv7lGeUiseU1LfJhPkQERqESIFGier0ucx7J8gi2pa1TNfRmcEjMvYfq6t8ZUyXSuCIRBGcEtulepYF2d35NpNtRMVyYwayxIL7IgSl+dgVgLzt4MJ+MZyVhK28xifnEWZqwuHU4sD+tYNt8nAjjENyKtCQqFdUnwHMsrqlDcw+Tsjk0SoxbWtqJa6BLMjKh3lni5ZWl1qiXHCjG0b218XGOX2EjzTSmsD1melZKCe85dkNi7AWtsWUMYlQpBsSwdDz3K29fpnjl6xRaDHiYvzWECdOlupvEzvm4G7U5YY4edIHDAq39GkEjWHLCfCqRQA/EzQBMPlVSWBOEuAMaaZHRZZp0XiWqbYG1ymyw+GBztjwbLH2MQbakJSogRW3WP4U8oXUWlqu+ROtD0y7ZX2uRQdrRfkWacyRF9KjCvcZZySEtAbVtM5gUNQnH0mmjulb04QPxv7M4p2lda1I1YmxKycWhFMYIxJDUlbxMv0GMM2GAjpHQyG/Bzc/seHEvClQKB3GsvobYRDL+MgXqcdom3SBwfDZz+XkzPtMLZplD5ptM2snGLMixS4YTysmVV4X0Wwx9MFzP64bHU6Nqv0PorvbmIyBUxE0ln12tCs0vuorRFJSM4WMCk5Vuw4svrrvvdJX0alosLpQpitpgGH42U3Man0vumTcIt6JzQw5EXYjclJFJRXq3cZ/BnU7IH3QRz7N9HJyC06h/sPHiLs8ePH6B0cQlquFXuikvCZUFvtbftfTVwpWw7GYV90EvJLqzDsHcXTp79r/xXTo0ePcKGvH1n5JTiacAa7ok/ji2Mp2GY4D/3VxLFRe06kISopB/nFZQJlRKA8xcLCggZmbm4OT578irv3/oHBSyNwuppQWFmLrFIn0vlCynAu+isoTcaUdc6JvDIn6ps6MDJ+BQ8f/eCHsrS0hP8HWEep3cNGCJsAAAAASUVORK5CYII="
340
340
  })), /*#__PURE__*/React.createElement("div", {
package/lib/components/InputMultiLine.js CHANGED
@@ -86,7 +86,11 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
86
86
  setVisible(flag);
87
87
  if (flag) {
88
88
  var _textareaRef$current;
89
- setLineText((value || innerValue || '').split(',').join('\n'));
89
+ var v = value;
90
+ if (label && name) {
91
+ v = innerValue;
92
+ }
93
+ setLineText((v || '').split(',').join('\n'));
90
94
  (_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 ? void 0 : _textareaRef$current.focus();
91
95
  } else {
92
96
  // 关闭时清除左右空格及空行
@@ -125,7 +129,7 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
125
129
  setVisible(true);
126
130
  }
127
131
  }));
128
- }, [visible, popWidth, lineText, rest]);
132
+ }, [visible, popWidth, lineText, value, name, label, rest]);
129
133
  return /*#__PURE__*/React.createElement(React.Fragment, null, label && name ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProFormText, _extends({
130
134
  name: name,
131
135
  label: label
package/lib/hooks/useDtl/index.js CHANGED
@@ -124,10 +124,11 @@ function useDtl(dtlParam) {
124
124
  return _context.abrupt("return", false);
125
125
  case 23:
126
126
  if (!((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0')) {
127
- _context.next = 29;
127
+ _context.next = 30;
128
128
  break;
129
129
  }
130
130
  showSuccess(result.flag.retMsg || '操作成功');
131
+ Object.assign(masterObject, values);
131
132
  if (result.data) {
132
133
  Object.assign(masterObject, result.data);
133
134
  }
@@ -136,9 +137,9 @@ function useDtl(dtlParam) {
136
137
  }
137
138
  setEditItem({});
138
139
  return _context.abrupt("return", true);
139
- case 29:
140
- return _context.abrupt("return", false);
141
140
  case 30:
141
+ return _context.abrupt("return", false);
142
+ case 31:
142
143
  case "end":
143
144
  return _context.stop();
144
145
  }
package/lib/utils/index.js CHANGED
@@ -358,22 +358,30 @@ _message.config({
358
358
  /** @name 显示错误 */
359
359
  export var showError = function showError(text) {
360
360
  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
361
- var win = top || window;
362
- //@ts-ignore
363
- if (!win.lsAppList || !!document.fullscreenElement) {
364
- win = window;
361
+ if (!text) {
362
+ text = '出错了!!';
365
363
  }
366
364
  _message.error({
367
365
  content: text,
368
366
  duration: duration,
369
367
  getPopupContainer: function getPopupContainer(e) {
370
- return getFullScreenElement() || win.document.body;
368
+ return getFullScreenElement() || document.body;
371
369
  },
372
370
  onClick: function onClick(e) {
373
371
  var _e$target;
374
372
  var tag = (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.tagName.toLowerCase();
375
373
  if (tag === 'img' || tag === 'path' || tag === 'svg') {
376
- _message.destroy();
374
+ try {
375
+ _message.destroy();
376
+ } catch (e) {}
377
+ try {
378
+ var _e$target2, _e$target2$closest;
379
+ var msg = (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$closest = _e$target2.closest('.ant-message')) === null || _e$target2$closest === void 0 ? void 0 : _e$target2$closest.parentNode;
380
+ if (msg) {
381
+ var _msg$parentNode;
382
+ (_msg$parentNode = msg.parentNode) === null || _msg$parentNode === void 0 ? void 0 : _msg$parentNode.removeChild(msg);
383
+ }
384
+ } catch (e) {}
377
385
  }
378
386
  }
379
387
  });
@@ -381,22 +389,30 @@ export var showError = function showError(text) {
381
389
  /** @name 显示警示 */
382
390
  export var showWarn = function showWarn(text) {
383
391
  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
384
- var win = top || window;
385
- //@ts-ignore
386
- if (!win.lsAppList || !!document.fullscreenElement) {
387
- win = window;
392
+ if (!text) {
393
+ text = '请注意!';
388
394
  }
389
395
  _message.warn({
390
396
  content: text,
391
397
  duration: duration,
392
398
  getPopupContainer: function getPopupContainer(e) {
393
- return getFullScreenElement() || win.document.body;
399
+ return getFullScreenElement() || document.body;
394
400
  },
395
401
  onClick: function onClick(e) {
396
- var _e$target2;
397
- var tag = (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.tagName.toLowerCase();
402
+ var _e$target3;
403
+ var tag = (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.tagName.toLowerCase();
398
404
  if (tag === 'img' || tag === 'path' || tag === 'svg') {
399
- _message.destroy();
405
+ try {
406
+ _message.destroy();
407
+ } catch (e) {}
408
+ try {
409
+ var _e$target4, _e$target4$closest;
410
+ var msg = (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$closest = _e$target4.closest('.ant-message')) === null || _e$target4$closest === void 0 ? void 0 : _e$target4$closest.parentNode;
411
+ if (msg) {
412
+ var _msg$parentNode2;
413
+ (_msg$parentNode2 = msg.parentNode) === null || _msg$parentNode2 === void 0 ? void 0 : _msg$parentNode2.removeChild(msg);
414
+ }
415
+ } catch (e) {}
400
416
  }
401
417
  }
402
418
  });
@@ -404,22 +420,30 @@ export var showWarn = function showWarn(text) {
404
420
  /** @name 显示成功 */
405
421
  export var showSuccess = function showSuccess(text) {
406
422
  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
407
- var win = top || window;
408
- //@ts-ignore
409
- if (!win.lsAppList || !!document.fullscreenElement) {
410
- win = window;
423
+ if (!text) {
424
+ text = '操作成功!';
411
425
  }
412
426
  _message.success({
413
427
  content: text,
414
428
  duration: duration,
415
429
  getPopupContainer: function getPopupContainer(e) {
416
- return getFullScreenElement() || win.document.body;
430
+ return getFullScreenElement() || document.body;
417
431
  },
418
432
  onClick: function onClick(e) {
419
- var _e$target3;
420
- var tag = (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.tagName.toLowerCase();
433
+ var _e$target5;
434
+ var tag = (_e$target5 = e.target) === null || _e$target5 === void 0 ? void 0 : _e$target5.tagName.toLowerCase();
421
435
  if (tag === 'img' || tag === 'path' || tag === 'svg') {
422
- _message.destroy();
436
+ try {
437
+ _message.destroy();
438
+ } catch (e) {}
439
+ try {
440
+ var _e$target6, _e$target6$closest;
441
+ var msg = (_e$target6 = e.target) === null || _e$target6 === void 0 ? void 0 : (_e$target6$closest = _e$target6.closest('.ant-message')) === null || _e$target6$closest === void 0 ? void 0 : _e$target6$closest.parentNode;
442
+ if (msg) {
443
+ var _msg$parentNode3;
444
+ (_msg$parentNode3 = msg.parentNode) === null || _msg$parentNode3 === void 0 ? void 0 : _msg$parentNode3.removeChild(msg);
445
+ }
446
+ } catch (e) {}
423
447
  }
424
448
  }
425
449
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "3.0.73",
3
+ "version": "3.0.75",
4
4
  "description": "ls-pro-common",
5
5
  "license": "MIT",
6
6
  "sideEffects": [