wargerm 0.5.9 → 0.5.12

package/dist/index.esm.js

@@ -45,7 +45,6 @@ import 'antd/es/tree-select/style';
 import _TreeSelect from 'antd/es/tree-select';
 import 'antd/es/cascader/style';
 import _Cascader from 'antd/es/cascader';
-import cloneDeep$1 from 'lodash/cloneDeep';
 import CountUp from 'react-countup';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import SwiperCore, { Pagination, Navigation, Autoplay, Virtual } from 'swiper';
@@ -585,7 +584,7 @@ var Index = WInput;
 Index.TextArea = _Input.TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "fetchMethod", "getFileList"];
+var _excluded$1 = ["value", "onChange", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
@@ -593,6 +592,8 @@ function Index$1(_ref, ref) {
       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);
@@ -603,7 +604,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: '',
@@ -695,7 +696,7 @@ function Index$1(_ref, ref) {
             case 6:
               urls = newFileList.map(function (file) {
                 return file.url;
-              }).join(',');
+              }).join(splitStr);
               onChange && onChange(urls);
               setFileList(newFileList);
 
@@ -896,6 +897,27 @@ var calcWidth = function calcWidth(width) {
 var calcHeight = function calcHeight(height) {
   return document.body.clientHeight / 2160 * height;
 };
+/* eslint-disable no-param-reassign */
+
+function deepCopy(target) {
+  if (Object.prototype.toString.call({}).slice(8, -1) == 'Object') {
+    var result = Array.isArray(target) ? [] : {}; // eslint-disable-next-line no-restricted-syntax
+
+    for (var key in target) {
+      var _target$key;
+
+      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]);
+      } else {
+        result[key] = target[key];
+      }
+    }
+
+    return result;
+  }
+
+  return target;
+}
 
 var _excluded$2 = ["className", "frameStyle", "style", "direction", "children"];
 function FrameBox(_ref) {
@@ -7074,12 +7096,12 @@ var WForm = function WForm(props, ref) {
       columnsFields = _useState4[0],
       setColumnsFields = _useState4[1];
 
-  var filterFormColumns = cloneDeep$1(columns).filter(function (c) {
+  var filterFormColumns = deepCopy(columns).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-  var filterExtraFormColumns = cloneDeep$1(extraColumns || []).filter(function (c) {
+  var filterExtraFormColumns = deepCopy(extraColumns || []).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
@@ -10829,7 +10851,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,
@@ -10837,6 +10859,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,
@@ -10881,7 +10904,8 @@ var ModalForm = function ModalForm(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       formRef: formRef.current,
-      onSubmit: onSubmit
+      onSubmit: onSubmit,
+      modalFormvisible: visible
     };
   });
 
@@ -10952,6 +10976,7 @@ var ModalForm = function ModalForm(props, ref) {
     if (visible) {
       resetFields();
       setFieldsValue(record);
+      modalFormOpend && modalFormOpend(record);
     }
   }, [visible, record]);
   return /*#__PURE__*/React.createElement(_Modal, _objectSpread2(_objectSpread2({
@@ -11367,6 +11392,7 @@ var TabelCard = function TabelCard(props, ref) {
       setFormSearch(obj);
     }
   }, [columns]);
+  var modalFormColumn = deepCopy(columns) || [];
   var formSearchColumn = columns || [];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: modalFormRef,
@@ -11408,7 +11434,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

@@ -49,7 +49,6 @@ require('antd/es/tree-select/style');
 var _TreeSelect = require('antd/es/tree-select');
 require('antd/es/cascader/style');
 var _Cascader = require('antd/es/cascader');
-var cloneDeep = require('lodash/cloneDeep');
 var CountUp = require('react-countup');
 var react = require('swiper/react');
 var SwiperCore = require('swiper');
@@ -112,7 +111,6 @@ var _Select__default = /*#__PURE__*/_interopDefaultLegacy(_Select);
 var _Switch__default = /*#__PURE__*/_interopDefaultLegacy(_Switch);
 var _TreeSelect__default = /*#__PURE__*/_interopDefaultLegacy(_TreeSelect);
 var _Cascader__default = /*#__PURE__*/_interopDefaultLegacy(_Cascader);
-var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var CountUp__default = /*#__PURE__*/_interopDefaultLegacy(CountUp);
 var SwiperCore__default = /*#__PURE__*/_interopDefaultLegacy(SwiperCore);
 var _Breadcrumb__default = /*#__PURE__*/_interopDefaultLegacy(_Breadcrumb);
@@ -646,7 +644,7 @@ 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", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
@@ -654,6 +652,8 @@ function Index$1(_ref, ref) {
       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);
@@ -664,7 +664,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: '',
@@ -756,7 +756,7 @@ function Index$1(_ref, ref) {
             case 6:
               urls = newFileList.map(function (file) {
                 return file.url;
-              }).join(',');
+              }).join(splitStr);
               onChange && onChange(urls);
               setFileList(newFileList);
 
@@ -957,6 +957,27 @@ var calcWidth = function calcWidth(width) {
 var calcHeight = function calcHeight(height) {
   return document.body.clientHeight / 2160 * height;
 };
+/* eslint-disable no-param-reassign */
+
+function deepCopy(target) {
+  if (Object.prototype.toString.call({}).slice(8, -1) == 'Object') {
+    var result = Array.isArray(target) ? [] : {}; // eslint-disable-next-line no-restricted-syntax
+
+    for (var key in target) {
+      var _target$key;
+
+      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]);
+      } else {
+        result[key] = target[key];
+      }
+    }
+
+    return result;
+  }
+
+  return target;
+}
 
 var _excluded$2 = ["className", "frameStyle", "style", "direction", "children"];
 function FrameBox(_ref) {
@@ -7135,12 +7156,12 @@ var WForm = function WForm(props, ref) {
       columnsFields = _useState4[0],
       setColumnsFields = _useState4[1];
 
-  var filterFormColumns = cloneDeep__default['default'](columns).filter(function (c) {
+  var filterFormColumns = deepCopy(columns).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-  var filterExtraFormColumns = cloneDeep__default['default'](extraColumns || []).filter(function (c) {
+  var filterExtraFormColumns = deepCopy(extraColumns || []).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
@@ -10890,7 +10911,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,
@@ -10898,6 +10919,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,
@@ -10942,7 +10964,8 @@ var ModalForm = function ModalForm(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       formRef: formRef.current,
-      onSubmit: onSubmit
+      onSubmit: onSubmit,
+      modalFormvisible: visible
     };
   });
 
@@ -11013,6 +11036,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({
@@ -11428,6 +11452,7 @@ var TabelCard = function TabelCard(props, ref) {
       setFormSearch(obj);
     }
   }, [columns]);
+  var modalFormColumn = deepCopy(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,
@@ -11469,7 +11494,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.9",
+  "version": "0.5.12",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",