wargerm 0.5.10 → 0.5.13

package/dist/index.esm.js

@@ -584,14 +584,17 @@ var Index = WInput;
 Index.TextArea = _Input.TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "fetchMethod", "getFileList"];
+var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
       onChange = _ref.onChange,
+      onRemove = _ref.onRemove,
       beforeUpload = _ref.beforeUpload,
       uploadButton = _ref.uploadButton,
       maxCount = _ref.maxCount,
+      _ref$splitStr = _ref.splitStr,
+      splitStr = _ref$splitStr === void 0 ? ',' : _ref$splitStr,
       fetchMethod = _ref.fetchMethod,
       getFileList = _ref.getFileList,
       props = _objectWithoutProperties(_ref, _excluded$1);
@@ -602,7 +605,7 @@ function Index$1(_ref, ref) {
       setFileList = _useState2[1];
 
   useEffect(function () {
-    setFileList(value ? value.split(',').map(function (url) {
+    setFileList(value ? value.split(splitStr).map(function (url) {
       return {
         uid: Math.random().toString(36).slice(2, 36),
         name: '',
@@ -682,7 +685,7 @@ function Index$1(_ref, ref) {
               }
 
               _context.next = 4;
-              return fetchMethod ? fetchMethod(file.originFileObj) : getBase64(file.originFileObj);
+              return fetchMethod ? fetchMethod(file.originFileObj) : file.originFileObj ? getBase64(file.originFileObj) : Promise.resolve(file.url);
 
             case 4:
               url = _context.sent;
@@ -694,7 +697,7 @@ function Index$1(_ref, ref) {
             case 6:
               urls = newFileList.map(function (file) {
                 return file.url;
-              }).join(',');
+              }).join(splitStr);
               onChange && onChange(urls);
               setFileList(newFileList);
 
@@ -711,6 +714,15 @@ function Index$1(_ref, ref) {
     };
   }();
 
+  var handleronRemove = function handleronRemove(file) {
+    var index = fileList.indexOf(file);
+    onRemove && onRemove(file, function () {
+      var newFileList = fileList.slice();
+      newFileList.splice(index, 1);
+      setFileList(newFileList);
+    });
+  };
+
   var handlePreview = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -761,7 +773,8 @@ function Index$1(_ref, ref) {
     listType: "picture-card",
     beforeUpload: beforeUploadIn,
     onPreview: handlePreview,
-    onChange: handleChange
+    onChange: handleChange,
+    onRemove: handleronRemove
   }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(_Modal, {
     visible: previewVisible,
     title: previewTitle,
@@ -828,7 +841,7 @@ Index$4.Group = _Checkbox.Group;
 /*
  * @Author: lijin
  * @Date: 2021-10-27 22:18:49
- * @LastEditTime: 2022-08-09 09:35:23
+ * @LastEditTime: 2022-08-11 10:57:14
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm-components\src\utils\index.ts
@@ -902,10 +915,26 @@ function deepCopy(target) {
     var result = Array.isArray(target) ? [] : {}; // eslint-disable-next-line no-restricted-syntax
 
     for (var key in target) {
-      var _target$key;
+      if (_typeof(target[key]) === 'object') {
+        if (Object.prototype.toString.call(target).slice(8, -1) == 'Object') {
+          var _target$key, _target$key2;
+
+          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'])) {
+            result[key] = target[key];
+          } else {
+            result[key] = deepCopy(target[key]);
+          }
+        } else if (Object.prototype.toString.call(target).slice(8, -1) == 'Array') {
+          var _target$key3, _target$key4;
 
-      if (Object.prototype.toString.call(target).slice(8, -1) == 'Object' && !((_target$key = target[key]) === null || _target$key === void 0 ? void 0 : _target$key['$$typeof'])) {
-        result[key] = deepCopy(target[key]);
+          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'])) {
+            result[key] = target[key];
+          } else {
+            result[key] = deepCopy(target[key]);
+          }
+        } else {
+          result[key] = target[key];
+        }
       } else {
         result[key] = target[key];
       }
@@ -10849,7 +10878,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
+var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10857,6 +10886,7 @@ var ModalForm = function ModalForm(props, ref) {
       search = props.search,
       visible = props.visible,
       setVisible = props.setVisible,
+      modalFormOpend = props.modalFormOpend,
       disabled = props.disabled,
       submitMethod = props.submitMethod,
       onSubmitSuccess = props.onSubmitSuccess,
@@ -10901,7 +10931,8 @@ var ModalForm = function ModalForm(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       formRef: formRef.current,
-      onSubmit: onSubmit
+      onSubmit: onSubmit,
+      modalFormvisible: visible
     };
   });
 
@@ -10972,6 +11003,7 @@ var ModalForm = function ModalForm(props, ref) {
     if (visible) {
       resetFields();
       setFieldsValue(record);
+      modalFormOpend && modalFormOpend(record);
     }
   }, [visible, record]);
   return /*#__PURE__*/React.createElement(_Modal, _objectSpread2(_objectSpread2({
@@ -11036,6 +11068,8 @@ var TabelCard = function TabelCard(props, ref) {
       formSearch = _useState6[0],
       setFormSearch = _useState6[1];
 
+  var modalFormColumn = deepCopy(columns) || [];
+  var formSearchColumn = deepCopy(columns) || [];
   useImperativeHandle(ref, function () {
     return {
       actionRef: actionRef.current,
@@ -11387,7 +11421,6 @@ var TabelCard = function TabelCard(props, ref) {
       setFormSearch(obj);
     }
   }, [columns]);
-  var formSearchColumn = columns || [];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: modalFormRef,
     title: modalFormConfig.type || '新增',
@@ -11428,7 +11461,7 @@ var TabelCard = function TabelCard(props, ref) {
   }, modalConfig), {}, {
     onFormChange: onFormChange,
     extraColumns: extraColumns || [],
-    columns: (columns || []).filter(function (item) {
+    columns: (modalFormColumn || []).filter(function (item) {
       if (item.hiddenInModalForm) {
         return false;
       }

package/dist/index.js

@@ -644,14 +644,17 @@ var Index = WInput;
 Index.TextArea = _Input__default['default'].TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "fetchMethod", "getFileList"];
+var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
       onChange = _ref.onChange,
+      onRemove = _ref.onRemove,
       beforeUpload = _ref.beforeUpload,
       uploadButton = _ref.uploadButton,
       maxCount = _ref.maxCount,
+      _ref$splitStr = _ref.splitStr,
+      splitStr = _ref$splitStr === void 0 ? ',' : _ref$splitStr,
       fetchMethod = _ref.fetchMethod,
       getFileList = _ref.getFileList,
       props = _objectWithoutProperties(_ref, _excluded$1);
@@ -662,7 +665,7 @@ function Index$1(_ref, ref) {
       setFileList = _useState2[1];
 
   React.useEffect(function () {
-    setFileList(value ? value.split(',').map(function (url) {
+    setFileList(value ? value.split(splitStr).map(function (url) {
       return {
         uid: Math.random().toString(36).slice(2, 36),
         name: '',
@@ -742,7 +745,7 @@ function Index$1(_ref, ref) {
               }
 
               _context.next = 4;
-              return fetchMethod ? fetchMethod(file.originFileObj) : getBase64(file.originFileObj);
+              return fetchMethod ? fetchMethod(file.originFileObj) : file.originFileObj ? getBase64(file.originFileObj) : Promise.resolve(file.url);
 
             case 4:
               url = _context.sent;
@@ -754,7 +757,7 @@ function Index$1(_ref, ref) {
             case 6:
               urls = newFileList.map(function (file) {
                 return file.url;
-              }).join(',');
+              }).join(splitStr);
               onChange && onChange(urls);
               setFileList(newFileList);
 
@@ -771,6 +774,15 @@ function Index$1(_ref, ref) {
     };
   }();
 
+  var handleronRemove = function handleronRemove(file) {
+    var index = fileList.indexOf(file);
+    onRemove && onRemove(file, function () {
+      var newFileList = fileList.slice();
+      newFileList.splice(index, 1);
+      setFileList(newFileList);
+    });
+  };
+
   var handlePreview = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -821,7 +833,8 @@ function Index$1(_ref, ref) {
     listType: "picture-card",
     beforeUpload: beforeUploadIn,
     onPreview: handlePreview,
-    onChange: handleChange
+    onChange: handleChange,
+    onRemove: handleronRemove
   }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], {
     visible: previewVisible,
     title: previewTitle,
@@ -888,7 +901,7 @@ Index$4.Group = _Checkbox__default['default'].Group;
 /*
  * @Author: lijin
  * @Date: 2021-10-27 22:18:49
- * @LastEditTime: 2022-08-09 09:35:23
+ * @LastEditTime: 2022-08-11 10:57:14
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm-components\src\utils\index.ts
@@ -962,10 +975,26 @@ function deepCopy(target) {
     var result = Array.isArray(target) ? [] : {}; // eslint-disable-next-line no-restricted-syntax
 
     for (var key in target) {
-      var _target$key;
+      if (_typeof(target[key]) === 'object') {
+        if (Object.prototype.toString.call(target).slice(8, -1) == 'Object') {
+          var _target$key, _target$key2;
+
+          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'])) {
+            result[key] = target[key];
+          } else {
+            result[key] = deepCopy(target[key]);
+          }
+        } else if (Object.prototype.toString.call(target).slice(8, -1) == 'Array') {
+          var _target$key3, _target$key4;
 
-      if (Object.prototype.toString.call(target).slice(8, -1) == 'Object' && !((_target$key = target[key]) === null || _target$key === void 0 ? void 0 : _target$key['$$typeof'])) {
-        result[key] = deepCopy(target[key]);
+          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'])) {
+            result[key] = target[key];
+          } else {
+            result[key] = deepCopy(target[key]);
+          }
+        } else {
+          result[key] = target[key];
+        }
       } else {
         result[key] = target[key];
       }
@@ -10909,7 +10938,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
 }
 
-var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
+var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10917,6 +10946,7 @@ var ModalForm = function ModalForm(props, ref) {
       search = props.search,
       visible = props.visible,
       setVisible = props.setVisible,
+      modalFormOpend = props.modalFormOpend,
       disabled = props.disabled,
       submitMethod = props.submitMethod,
       onSubmitSuccess = props.onSubmitSuccess,
@@ -10961,7 +10991,8 @@ var ModalForm = function ModalForm(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       formRef: formRef.current,
-      onSubmit: onSubmit
+      onSubmit: onSubmit,
+      modalFormvisible: visible
     };
   });
 
@@ -11032,6 +11063,7 @@ var ModalForm = function ModalForm(props, ref) {
     if (visible) {
       resetFields();
       setFieldsValue(record);
+      modalFormOpend && modalFormOpend(record);
     }
   }, [visible, record]);
   return /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], _objectSpread2(_objectSpread2({
@@ -11096,6 +11128,8 @@ var TabelCard = function TabelCard(props, ref) {
       formSearch = _useState6[0],
       setFormSearch = _useState6[1];
 
+  var modalFormColumn = deepCopy(columns) || [];
+  var formSearchColumn = deepCopy(columns) || [];
   React.useImperativeHandle(ref, function () {
     return {
       actionRef: actionRef.current,
@@ -11447,7 +11481,6 @@ var TabelCard = function TabelCard(props, ref) {
       setFormSearch(obj);
     }
   }, [columns]);
-  var formSearchColumn = columns || [];
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: modalFormRef,
     title: modalFormConfig.type || '新增',
@@ -11488,7 +11521,7 @@ var TabelCard = function TabelCard(props, ref) {
   }, modalConfig), {}, {
     onFormChange: onFormChange,
     extraColumns: extraColumns || [],
-    columns: (columns || []).filter(function (item) {
+    columns: (modalFormColumn || []).filter(function (item) {
       if (item.hiddenInModalForm) {
         return false;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.5.10",
+  "version": "0.5.13",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",