wargerm 0.5.11 → 0.5.14

package/dist/index.esm.js

@@ -584,11 +584,12 @@ var Index = WInput;
 Index.TextArea = _Input.TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "splitStr", "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,
@@ -684,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;
@@ -713,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) {
@@ -763,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,
@@ -830,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
@@ -904,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];
       }
@@ -962,7 +989,8 @@ function FrameBox(_ref) {
 }
 
 var _excluded$3 = ["request", "valueEnum", "onLoad", "children", "params"],
-    _excluded2 = ["children"];
+    _excluded2 = ["value", "label"],
+    _excluded3 = ["children"];
 
 var WSelect = function WSelect(props) {
   var request = props.request,
@@ -1017,11 +1045,15 @@ var WSelect = function WSelect(props) {
             case 6:
               setResList(res);
               onLoad && onLoad(res);
-              node = res === null || res === void 0 ? void 0 : res.map(function (item) {
-                return /*#__PURE__*/React.createElement(_Select.Option, {
-                  key: item.value,
-                  value: item.value
-                }, item.label) || /*#__PURE__*/React.createElement(React.Fragment, null);
+              node = res === null || res === void 0 ? void 0 : res.map(function (_ref2) {
+                var value = _ref2.value,
+                    label = _ref2.label,
+                    extraProps = _objectWithoutProperties(_ref2, _excluded2);
+
+                return /*#__PURE__*/React.createElement(_Select.Option, _objectSpread2({
+                  key: value,
+                  value: value
+                }, extraProps), label) || /*#__PURE__*/React.createElement(React.Fragment, null);
               });
               setChildrenNode(node);
 
@@ -1077,7 +1109,7 @@ WSelect.defaultProps = {};
 
 var Option = function Option(props) {
   var children = props.children,
-      extraProps = _objectWithoutProperties(props, _excluded2);
+      extraProps = _objectWithoutProperties(props, _excluded3);
 
   return /*#__PURE__*/React.createElement(_Select.Option, _objectSpread2({}, extraProps), children);
 };
@@ -10851,7 +10883,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,
@@ -10859,6 +10891,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,
@@ -10903,7 +10936,8 @@ var ModalForm = function ModalForm(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       formRef: formRef.current,
-      onSubmit: onSubmit
+      onSubmit: onSubmit,
+      modalFormvisible: visible
     };
   });
 
@@ -10974,6 +11008,7 @@ var ModalForm = function ModalForm(props, ref) {
     if (visible) {
       resetFields();
       setFieldsValue(record);
+      modalFormOpend && modalFormOpend(record);
     }
   }, [visible, record]);
   return /*#__PURE__*/React.createElement(_Modal, _objectSpread2(_objectSpread2({
@@ -11038,6 +11073,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,
@@ -11389,7 +11426,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 || '新增',
@@ -11430,7 +11466,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,11 +644,12 @@ var Index = WInput;
 Index.TextArea = _Input__default['default'].TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "splitStr", "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,
@@ -744,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;
@@ -773,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) {
@@ -823,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,
@@ -890,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
@@ -964,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];
       }
@@ -1022,7 +1049,8 @@ function FrameBox(_ref) {
 }
 
 var _excluded$3 = ["request", "valueEnum", "onLoad", "children", "params"],
-    _excluded2 = ["children"];
+    _excluded2 = ["value", "label"],
+    _excluded3 = ["children"];
 
 var WSelect = function WSelect(props) {
   var request = props.request,
@@ -1077,11 +1105,15 @@ var WSelect = function WSelect(props) {
             case 6:
               setResList(res);
               onLoad && onLoad(res);
-              node = res === null || res === void 0 ? void 0 : res.map(function (item) {
-                return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
-                  key: item.value,
-                  value: item.value
-                }, item.label) || /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+              node = res === null || res === void 0 ? void 0 : res.map(function (_ref2) {
+                var value = _ref2.value,
+                    label = _ref2.label,
+                    extraProps = _objectWithoutProperties(_ref2, _excluded2);
+
+                return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, _objectSpread2({
+                  key: value,
+                  value: value
+                }, extraProps), label) || /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
               });
               setChildrenNode(node);
 
@@ -1137,7 +1169,7 @@ WSelect.defaultProps = {};
 
 var Option = function Option(props) {
   var children = props.children,
-      extraProps = _objectWithoutProperties(props, _excluded2);
+      extraProps = _objectWithoutProperties(props, _excluded3);
 
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, _objectSpread2({}, extraProps), children);
 };
@@ -10911,7 +10943,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,
@@ -10919,6 +10951,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,
@@ -10963,7 +10996,8 @@ var ModalForm = function ModalForm(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       formRef: formRef.current,
-      onSubmit: onSubmit
+      onSubmit: onSubmit,
+      modalFormvisible: visible
     };
   });
 
@@ -11034,6 +11068,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({
@@ -11098,6 +11133,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,
@@ -11449,7 +11486,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 || '新增',
@@ -11490,7 +11526,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,88 +1,88 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.5.11",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-form": "^1.49.3",
-    "@ant-design/pro-table": "^2.58.1",
-    "animate.css": "^4.1.1",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "swiper": "^6.7.0",
-    "xgplayer": "^2.31.6",
-    "xgplayer-flv": "^2.5.1",
-    "xgplayer-flv.js": "^2.3.0",
-    "xgplayer-hls": "^2.5.2",
-    "xgplayer-hls.js": "^2.6.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash": ">=4.0.0",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash": "^4.14.173",
-    "@types/react-dom": "^17.0.11",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.16.13",
-    "babel-plugin-import": "^1.13.3",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.5.14",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-form": "^1.49.3",
+    "@ant-design/pro-table": "^2.58.1",
+    "animate.css": "^4.1.1",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "swiper": "^6.7.0",
+    "xgplayer": "^2.31.6",
+    "xgplayer-flv": "^2.5.1",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls": "^2.5.2",
+    "xgplayer-hls.js": "^2.6.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash": ">=4.0.0",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash": "^4.14.173",
+    "@types/react-dom": "^17.0.11",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.16.13",
+    "babel-plugin-import": "^1.13.3",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
+}