wargerm 0.5.12 → 0.5.13

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 (3) hide show
  1. package/dist/index.esm.js +36 -9
  2. package/dist/index.js +36 -9
  3. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -584,11 +584,12 @@ var Index = WInput;
584
584
  Index.TextArea = _Input.TextArea;
585
585
  WInput.defaultProps = {};
586
586
 
587
- var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
587
+ var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
588
588
 
589
589
  function Index$1(_ref, ref) {
590
590
  var value = _ref.value,
591
591
  onChange = _ref.onChange,
592
+ onRemove = _ref.onRemove,
592
593
  beforeUpload = _ref.beforeUpload,
593
594
  uploadButton = _ref.uploadButton,
594
595
  maxCount = _ref.maxCount,
@@ -684,7 +685,7 @@ function Index$1(_ref, ref) {
684
685
  }
685
686
 
686
687
  _context.next = 4;
687
- return fetchMethod ? fetchMethod(file.originFileObj) : getBase64(file.originFileObj);
688
+ return fetchMethod ? fetchMethod(file.originFileObj) : file.originFileObj ? getBase64(file.originFileObj) : Promise.resolve(file.url);
688
689
 
689
690
  case 4:
690
691
  url = _context.sent;
@@ -713,6 +714,15 @@ function Index$1(_ref, ref) {
713
714
  };
714
715
  }();
715
716
 
717
+ var handleronRemove = function handleronRemove(file) {
718
+ var index = fileList.indexOf(file);
719
+ onRemove && onRemove(file, function () {
720
+ var newFileList = fileList.slice();
721
+ newFileList.splice(index, 1);
722
+ setFileList(newFileList);
723
+ });
724
+ };
725
+
716
726
  var handlePreview = /*#__PURE__*/function () {
717
727
  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
718
728
  return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -763,7 +773,8 @@ function Index$1(_ref, ref) {
763
773
  listType: "picture-card",
764
774
  beforeUpload: beforeUploadIn,
765
775
  onPreview: handlePreview,
766
- onChange: handleChange
776
+ onChange: handleChange,
777
+ onRemove: handleronRemove
767
778
  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(_Modal, {
768
779
  visible: previewVisible,
769
780
  title: previewTitle,
@@ -830,7 +841,7 @@ Index$4.Group = _Checkbox.Group;
830
841
  /*
831
842
  * @Author: lijin
832
843
  * @Date: 2021-10-27 22:18:49
833
- * @LastEditTime: 2022-08-09 09:35:23
844
+ * @LastEditTime: 2022-08-11 10:57:14
834
845
  * @LastEditors: lijin
835
846
  * @Description:
836
847
  * @FilePath: \wargerm-components\src\utils\index.ts
@@ -904,10 +915,26 @@ function deepCopy(target) {
904
915
  var result = Array.isArray(target) ? [] : {}; // eslint-disable-next-line no-restricted-syntax
905
916
 
906
917
  for (var key in target) {
907
- var _target$key;
918
+ if (_typeof(target[key]) === 'object') {
919
+ if (Object.prototype.toString.call(target).slice(8, -1) == 'Object') {
920
+ var _target$key, _target$key2;
921
+
922
+ if (((_target$key = target[key]) === null || _target$key === void 0 ? void 0 : _target$key['$$typeof']) || ((_target$key2 = target[key]) === null || _target$key2 === void 0 ? void 0 : _target$key2['_isAMomentObject'])) {
923
+ result[key] = target[key];
924
+ } else {
925
+ result[key] = deepCopy(target[key]);
926
+ }
927
+ } else if (Object.prototype.toString.call(target).slice(8, -1) == 'Array') {
928
+ var _target$key3, _target$key4;
908
929
 
909
- if (Object.prototype.toString.call(target).slice(8, -1) == 'Object' && !((_target$key = target[key]) === null || _target$key === void 0 ? void 0 : _target$key['$$typeof'])) {
910
- result[key] = deepCopy(target[key]);
930
+ if (((_target$key3 = target[key]) === null || _target$key3 === void 0 ? void 0 : _target$key3['$$typeof']) || ((_target$key4 = target[key]) === null || _target$key4 === void 0 ? void 0 : _target$key4['_isAMomentObject'])) {
931
+ result[key] = target[key];
932
+ } else {
933
+ result[key] = deepCopy(target[key]);
934
+ }
935
+ } else {
936
+ result[key] = target[key];
937
+ }
911
938
  } else {
912
939
  result[key] = target[key];
913
940
  }
@@ -11041,6 +11068,8 @@ var TabelCard = function TabelCard(props, ref) {
11041
11068
  formSearch = _useState6[0],
11042
11069
  setFormSearch = _useState6[1];
11043
11070
 
11071
+ var modalFormColumn = deepCopy(columns) || [];
11072
+ var formSearchColumn = deepCopy(columns) || [];
11044
11073
  useImperativeHandle(ref, function () {
11045
11074
  return {
11046
11075
  actionRef: actionRef.current,
@@ -11392,8 +11421,6 @@ var TabelCard = function TabelCard(props, ref) {
11392
11421
  setFormSearch(obj);
11393
11422
  }
11394
11423
  }, [columns]);
11395
- var modalFormColumn = deepCopy(columns) || [];
11396
- var formSearchColumn = columns || [];
11397
11424
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
11398
11425
  ref: modalFormRef,
11399
11426
  title: modalFormConfig.type || '新增',
package/dist/index.js CHANGED
@@ -644,11 +644,12 @@ var Index = WInput;
644
644
  Index.TextArea = _Input__default['default'].TextArea;
645
645
  WInput.defaultProps = {};
646
646
 
647
- var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
647
+ var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
648
648
 
649
649
  function Index$1(_ref, ref) {
650
650
  var value = _ref.value,
651
651
  onChange = _ref.onChange,
652
+ onRemove = _ref.onRemove,
652
653
  beforeUpload = _ref.beforeUpload,
653
654
  uploadButton = _ref.uploadButton,
654
655
  maxCount = _ref.maxCount,
@@ -744,7 +745,7 @@ function Index$1(_ref, ref) {
744
745
  }
745
746
 
746
747
  _context.next = 4;
747
- return fetchMethod ? fetchMethod(file.originFileObj) : getBase64(file.originFileObj);
748
+ return fetchMethod ? fetchMethod(file.originFileObj) : file.originFileObj ? getBase64(file.originFileObj) : Promise.resolve(file.url);
748
749
 
749
750
  case 4:
750
751
  url = _context.sent;
@@ -773,6 +774,15 @@ function Index$1(_ref, ref) {
773
774
  };
774
775
  }();
775
776
 
777
+ var handleronRemove = function handleronRemove(file) {
778
+ var index = fileList.indexOf(file);
779
+ onRemove && onRemove(file, function () {
780
+ var newFileList = fileList.slice();
781
+ newFileList.splice(index, 1);
782
+ setFileList(newFileList);
783
+ });
784
+ };
785
+
776
786
  var handlePreview = /*#__PURE__*/function () {
777
787
  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
778
788
  return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -823,7 +833,8 @@ function Index$1(_ref, ref) {
823
833
  listType: "picture-card",
824
834
  beforeUpload: beforeUploadIn,
825
835
  onPreview: handlePreview,
826
- onChange: handleChange
836
+ onChange: handleChange,
837
+ onRemove: handleronRemove
827
838
  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], {
828
839
  visible: previewVisible,
829
840
  title: previewTitle,
@@ -890,7 +901,7 @@ Index$4.Group = _Checkbox__default['default'].Group;
890
901
  /*
891
902
  * @Author: lijin
892
903
  * @Date: 2021-10-27 22:18:49
893
- * @LastEditTime: 2022-08-09 09:35:23
904
+ * @LastEditTime: 2022-08-11 10:57:14
894
905
  * @LastEditors: lijin
895
906
  * @Description:
896
907
  * @FilePath: \wargerm-components\src\utils\index.ts
@@ -964,10 +975,26 @@ function deepCopy(target) {
964
975
  var result = Array.isArray(target) ? [] : {}; // eslint-disable-next-line no-restricted-syntax
965
976
 
966
977
  for (var key in target) {
967
- var _target$key;
978
+ if (_typeof(target[key]) === 'object') {
979
+ if (Object.prototype.toString.call(target).slice(8, -1) == 'Object') {
980
+ var _target$key, _target$key2;
981
+
982
+ if (((_target$key = target[key]) === null || _target$key === void 0 ? void 0 : _target$key['$$typeof']) || ((_target$key2 = target[key]) === null || _target$key2 === void 0 ? void 0 : _target$key2['_isAMomentObject'])) {
983
+ result[key] = target[key];
984
+ } else {
985
+ result[key] = deepCopy(target[key]);
986
+ }
987
+ } else if (Object.prototype.toString.call(target).slice(8, -1) == 'Array') {
988
+ var _target$key3, _target$key4;
968
989
 
969
- if (Object.prototype.toString.call(target).slice(8, -1) == 'Object' && !((_target$key = target[key]) === null || _target$key === void 0 ? void 0 : _target$key['$$typeof'])) {
970
- result[key] = deepCopy(target[key]);
990
+ if (((_target$key3 = target[key]) === null || _target$key3 === void 0 ? void 0 : _target$key3['$$typeof']) || ((_target$key4 = target[key]) === null || _target$key4 === void 0 ? void 0 : _target$key4['_isAMomentObject'])) {
991
+ result[key] = target[key];
992
+ } else {
993
+ result[key] = deepCopy(target[key]);
994
+ }
995
+ } else {
996
+ result[key] = target[key];
997
+ }
971
998
  } else {
972
999
  result[key] = target[key];
973
1000
  }
@@ -11101,6 +11128,8 @@ var TabelCard = function TabelCard(props, ref) {
11101
11128
  formSearch = _useState6[0],
11102
11129
  setFormSearch = _useState6[1];
11103
11130
 
11131
+ var modalFormColumn = deepCopy(columns) || [];
11132
+ var formSearchColumn = deepCopy(columns) || [];
11104
11133
  React.useImperativeHandle(ref, function () {
11105
11134
  return {
11106
11135
  actionRef: actionRef.current,
@@ -11452,8 +11481,6 @@ var TabelCard = function TabelCard(props, ref) {
11452
11481
  setFormSearch(obj);
11453
11482
  }
11454
11483
  }, [columns]);
11455
- var modalFormColumn = deepCopy(columns) || [];
11456
- var formSearchColumn = columns || [];
11457
11484
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
11458
11485
  ref: modalFormRef,
11459
11486
  title: modalFormConfig.type || '新增',
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.5.12",
4
+ "version": "0.5.13",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",