wargerm 0.4.2 → 0.4.5

package/dist/components/Cascader/index.d.ts

@@ -3,6 +3,7 @@ import { CascaderProps } from 'antd/lib/Cascader';
 export interface ICascader extends CascaderProps<any> {
     request?: () => Promise<any>;
     onLoad?: (options: Record<string, any>[]) => void;
+    params?: Record<string, any>;
 }
 declare const WCascader: FC<ICascader>;
 export default WCascader;

package/dist/components/TreeSelect/index.d.ts

@@ -6,6 +6,7 @@ interface TreeSelectProps<T> extends Props<T> {
     treeNodeChildrenProp?: string;
     request?: () => Promise<any>;
     onLoad?: (options: Record<string, any>[]) => void;
+    params?: Record<string, any>;
 }
 export declare type IndexComponent = React.FC<TreeSelectProps<any>> & {
     TreeNode?: React.FC<any>;

package/dist/components/WForm/index.d.ts

@@ -58,6 +58,7 @@ export interface WFormProps extends FormProps {
     onReset?: () => void;
     formRef?: MutableRefObject<FormInstance>;
     search?: Isearch | false;
+    disabledRuler?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<WFormProps & React.RefAttributes<unknown>>;
 export default _default;

package/dist/hooks/index.d.ts

@@ -0,0 +1 @@
+export declare const usePreventUnmountEffect: (callback: Function, deps: Array<any>) => void;

package/dist/index.esm.js

@@ -38,6 +38,7 @@ 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 from 'lodash/cloneDeep';
 import CountUp from 'react-countup';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import SwiperCore, { Pagination, Navigation, Autoplay } from 'swiper';
@@ -639,6 +640,24 @@ function FrameBox(_ref) {
   }), children);
 }
 
+var usePreventUnmountEffect = function usePreventUnmountEffect(callback, deps) {
+  // const isUnmountRef = useRef(false);
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isUnmount = _useState2[0],
+      setIsUnmount = _useState2[1];
+
+  useEffect(function () {
+    // !isUnmountRef.current && callback()
+    !isUnmount && callback();
+    return function () {
+      // isUnmountRef.current = true;
+      setIsUnmount(true);
+    };
+  }, // [isUnmountRef, ...deps],
+  [isUnmount].concat(_toConsumableArray(deps)));
+};
+
 var _excluded$2 = ["request", "valueEnum", "onLoad", "children", "params"],
     _excluded2 = ["children"];
 
@@ -665,7 +684,7 @@ var WSelect = function WSelect(props) {
       resList = _useState6[0],
       setResList = _useState6[1];
 
-  useEffect(function () {
+  usePreventUnmountEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -728,7 +747,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList), JSON.stringify(request), JSON.stringify(params || {})]);
+  }, [JSON.stringify(params || {})]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({
     showSearch: true,
     filterOption: function filterOption(input, option) {
@@ -6564,7 +6583,7 @@ var NumericInput = /*#__PURE__*/function (_React$Component) {
   return NumericInput;
 }(React.Component);
 
-var _excluded$4 = ["treeNodeLabelProp", "treeNodeValueProp", "treeNodeChildrenProp", "request", "onLoad", "treeData"];
+var _excluded$4 = ["treeNodeLabelProp", "treeNodeValueProp", "treeNodeChildrenProp", "request", "onLoad", "params", "treeData"];
 
 var TreeSelect = function TreeSelect(_ref) {
   var _ref$treeNodeLabelPro = _ref.treeNodeLabelProp,
@@ -6575,6 +6594,7 @@ var TreeSelect = function TreeSelect(_ref) {
       treeNodeChildrenProp = _ref$treeNodeChildren === void 0 ? 'children' : _ref$treeNodeChildren,
       request = _ref.request,
       onLoad = _ref.onLoad,
+      params = _ref.params,
       treePropsData = _ref.treeData,
       props = _objectWithoutProperties(_ref, _excluded$4);
 
@@ -6593,7 +6613,7 @@ var TreeSelect = function TreeSelect(_ref) {
       treeData = _useState2[0],
       setTreeData = _useState2[1];
 
-  useEffect(function () {
+  usePreventUnmountEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6625,7 +6645,7 @@ var TreeSelect = function TreeSelect(_ref) {
         }
       }, _callee);
     }))();
-  }, []);
+  }, [JSON.stringify(params)]);
   return /*#__PURE__*/React.createElement(_TreeSelect, _objectSpread2({
     showSearch: true,
     treeNodeFilterProp: "title",
@@ -6636,7 +6656,7 @@ var TreeSelect = function TreeSelect(_ref) {
 var Index$6 = TreeSelect;
 Index$6.TreeNode = _TreeSelect.TreeNode;
 
-var _excluded$5 = ["request", "options", "onLoad", "value", "onChange"];
+var _excluded$5 = ["request", "options", "onLoad", "value", "onChange", "params"];
 
 var WCascader = function WCascader(props) {
   var request = props.request,
@@ -6644,6 +6664,7 @@ var WCascader = function WCascader(props) {
       onLoad = props.onLoad,
       value = props.value,
       _onChange = props.onChange,
+      params = props.params,
       extraProps = _objectWithoutProperties(props, _excluded$5);
 
   var _useState = useState(null),
@@ -6651,7 +6672,7 @@ var WCascader = function WCascader(props) {
       resList = _useState2[0],
       setResList = _useState2[1];
 
-  useEffect(function () {
+  usePreventUnmountEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6678,7 +6699,7 @@ var WCascader = function WCascader(props) {
         }
       }, _callee);
     }))();
-  }, [JSON.stringify(resList)]);
+  }, [JSON.stringify(params)]);
   return /*#__PURE__*/React.createElement(_Cascader, _objectSpread2({
     value: typeof value === 'string' ? [value] : value,
     onChange: function onChange(v, options) {
@@ -6689,7 +6710,7 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$6 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
+var _excluded$6 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset"];
 var RangePicker$2 = Index$5.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -6700,6 +6721,7 @@ var WForm = function WForm(props, ref) {
       search = props.search,
       disabled = props.disabled,
       disabledHideInSearch = props.disabledHideInSearch,
+      disabledRuler = props.disabledRuler,
       onFormChange = props.onFormChange,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
@@ -6719,20 +6741,22 @@ var WForm = function WForm(props, ref) {
       columnsFields = _useState4[0],
       setColumnsFields = _useState4[1];
 
-  var filterFormColumns = _toConsumableArray(columns).filter(function (c) {
+  var filterFormColumns = cloneDeep(columns).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-
-  var filterExtraFormColumns = _toConsumableArray(extraColumns || []).filter(function (c) {
+  var filterExtraFormColumns = cloneDeep(extraColumns || []).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-
   var filterForm = useMemo(function () {
     return filterFormColumns.map(function (c) {
+      if (disabledRuler && c.formItemProps) {
+        delete c.formItemProps.rules;
+      }
+
       var colProps = {};
 
       if (search && search.span) {
@@ -7230,9 +7254,14 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
+  ]);
   var filterExtraColumnsForm = useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
+      if (disabledRuler && c.formItemProps) {
+        delete c.formItemProps.rules;
+      }
+
       var colProps = {};
 
       if (search && search.span) {
@@ -10138,7 +10167,7 @@ var ModalForm = function ModalForm(props, ref) {
       resetFields();
       setFieldsValue(record);
     }
-  }, [visible, record]);
+  }, [visible, record, formRef === null || formRef === void 0 ? void 0 : formRef.current]);
   return /*#__PURE__*/React.createElement(_Modal, _objectSpread2(_objectSpread2({
     title: title,
     visible: visible
@@ -10585,6 +10614,7 @@ var TabelCard = function TabelCard(props, ref) {
     })
   })), /*#__PURE__*/React.createElement(WForm$1, {
     ref: searchFormRef,
+    disabledRuler: true,
     search: search == false ? {
       hideSubmit: true
     } : _objectSpread2(_objectSpread2({

package/dist/index.js

@@ -42,6 +42,7 @@ 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');
@@ -75,6 +76,7 @@ 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);
@@ -673,6 +675,24 @@ function FrameBox(_ref) {
   }), children);
 }
 
+var usePreventUnmountEffect = function usePreventUnmountEffect(callback, deps) {
+  // const isUnmountRef = useRef(false);
+  var _useState = React.useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isUnmount = _useState2[0],
+      setIsUnmount = _useState2[1];
+
+  React.useEffect(function () {
+    // !isUnmountRef.current && callback()
+    !isUnmount && callback();
+    return function () {
+      // isUnmountRef.current = true;
+      setIsUnmount(true);
+    };
+  }, // [isUnmountRef, ...deps],
+  [isUnmount].concat(_toConsumableArray(deps)));
+};
+
 var _excluded$2 = ["request", "valueEnum", "onLoad", "children", "params"],
     _excluded2 = ["children"];
 
@@ -699,7 +719,7 @@ var WSelect = function WSelect(props) {
       resList = _useState6[0],
       setResList = _useState6[1];
 
-  React.useEffect(function () {
+  usePreventUnmountEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -762,7 +782,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList), JSON.stringify(request), JSON.stringify(params || {})]);
+  }, [JSON.stringify(params || {})]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({
     showSearch: true,
     filterOption: function filterOption(input, option) {
@@ -6598,7 +6618,7 @@ var NumericInput = /*#__PURE__*/function (_React$Component) {
   return NumericInput;
 }(React__default['default'].Component);
 
-var _excluded$4 = ["treeNodeLabelProp", "treeNodeValueProp", "treeNodeChildrenProp", "request", "onLoad", "treeData"];
+var _excluded$4 = ["treeNodeLabelProp", "treeNodeValueProp", "treeNodeChildrenProp", "request", "onLoad", "params", "treeData"];
 
 var TreeSelect = function TreeSelect(_ref) {
   var _ref$treeNodeLabelPro = _ref.treeNodeLabelProp,
@@ -6609,6 +6629,7 @@ var TreeSelect = function TreeSelect(_ref) {
       treeNodeChildrenProp = _ref$treeNodeChildren === void 0 ? 'children' : _ref$treeNodeChildren,
       request = _ref.request,
       onLoad = _ref.onLoad,
+      params = _ref.params,
       treePropsData = _ref.treeData,
       props = _objectWithoutProperties(_ref, _excluded$4);
 
@@ -6627,7 +6648,7 @@ var TreeSelect = function TreeSelect(_ref) {
       treeData = _useState2[0],
       setTreeData = _useState2[1];
 
-  React.useEffect(function () {
+  usePreventUnmountEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6659,7 +6680,7 @@ var TreeSelect = function TreeSelect(_ref) {
         }
       }, _callee);
     }))();
-  }, []);
+  }, [JSON.stringify(params)]);
   return /*#__PURE__*/React__default['default'].createElement(_TreeSelect__default['default'], _objectSpread2({
     showSearch: true,
     treeNodeFilterProp: "title",
@@ -6670,7 +6691,7 @@ var TreeSelect = function TreeSelect(_ref) {
 var Index$6 = TreeSelect;
 Index$6.TreeNode = _TreeSelect__default['default'].TreeNode;
 
-var _excluded$5 = ["request", "options", "onLoad", "value", "onChange"];
+var _excluded$5 = ["request", "options", "onLoad", "value", "onChange", "params"];
 
 var WCascader = function WCascader(props) {
   var request = props.request,
@@ -6678,6 +6699,7 @@ var WCascader = function WCascader(props) {
       onLoad = props.onLoad,
       value = props.value,
       _onChange = props.onChange,
+      params = props.params,
       extraProps = _objectWithoutProperties(props, _excluded$5);
 
   var _useState = React.useState(null),
@@ -6685,7 +6707,7 @@ var WCascader = function WCascader(props) {
       resList = _useState2[0],
       setResList = _useState2[1];
 
-  React.useEffect(function () {
+  usePreventUnmountEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6712,7 +6734,7 @@ var WCascader = function WCascader(props) {
         }
       }, _callee);
     }))();
-  }, [JSON.stringify(resList)]);
+  }, [JSON.stringify(params)]);
   return /*#__PURE__*/React__default['default'].createElement(_Cascader__default['default'], _objectSpread2({
     value: typeof value === 'string' ? [value] : value,
     onChange: function onChange(v, options) {
@@ -6723,7 +6745,7 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$6 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
+var _excluded$6 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset"];
 var RangePicker$2 = Index$5.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -6734,6 +6756,7 @@ var WForm = function WForm(props, ref) {
       search = props.search,
       disabled = props.disabled,
       disabledHideInSearch = props.disabledHideInSearch,
+      disabledRuler = props.disabledRuler,
       onFormChange = props.onFormChange,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
@@ -6753,20 +6776,22 @@ var WForm = function WForm(props, ref) {
       columnsFields = _useState4[0],
       setColumnsFields = _useState4[1];
 
-  var filterFormColumns = _toConsumableArray(columns).filter(function (c) {
+  var filterFormColumns = cloneDeep__default['default'](columns).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-
-  var filterExtraFormColumns = _toConsumableArray(extraColumns || []).filter(function (c) {
+  var filterExtraFormColumns = cloneDeep__default['default'](extraColumns || []).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-
   var filterForm = React.useMemo(function () {
     return filterFormColumns.map(function (c) {
+      if (disabledRuler && c.formItemProps) {
+        delete c.formItemProps.rules;
+      }
+
       var colProps = {};
 
       if (search && search.span) {
@@ -7264,9 +7289,14 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
+  ]);
   var filterExtraColumnsForm = React.useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
+      if (disabledRuler && c.formItemProps) {
+        delete c.formItemProps.rules;
+      }
+
       var colProps = {};
 
       if (search && search.span) {
@@ -10172,7 +10202,7 @@ var ModalForm = function ModalForm(props, ref) {
       resetFields();
       setFieldsValue(record);
     }
-  }, [visible, record]);
+  }, [visible, record, formRef === null || formRef === void 0 ? void 0 : formRef.current]);
   return /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], _objectSpread2(_objectSpread2({
     title: title,
     visible: visible
@@ -10619,6 +10649,7 @@ var TabelCard = function TabelCard(props, ref) {
     })
   })), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
     ref: searchFormRef,
+    disabledRuler: true,
     search: search == false ? {
       hideSubmit: true
     } : _objectSpread2(_objectSpread2({

package/package.json

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