wargerm 0.4.5 → 0.4.6

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { SelectProps, OptionProps } from 'antd/lib/Select';
 export interface IOptionProps extends OptionProps {
 }
@@ -7,6 +7,7 @@ export interface ISelect extends SelectProps<any> {
     valueEnum?: Record<string, any>;
     params?: Record<string, any>;
     onLoad?: (options: Record<string, any>[]) => void;
+    children?: ReactNode;
 }
 export declare type IWSelectComponent = React.FC<ISelect> & {
     Option?: React.FC<IOptionProps>;

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import 'antd/es/dropdown/style';
 import _Dropdown from 'antd/es/dropdown';
 import 'antd/es/menu/style';
 import _Menu from 'antd/es/menu';
-import React, { useState, useEffect, useMemo, useImperativeHandle, useRef } from 'react';
+import React, { memo, useState, useEffect, useMemo, useImperativeHandle, useRef } from 'react';
 import { createFromIconfontCN, SearchOutlined, ReloadOutlined, CloseCircleOutlined, PlusOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import 'antd/es/input/style';
 import _Input from 'antd/es/input';
@@ -640,24 +640,6 @@ 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"];
 
@@ -684,7 +666,9 @@ var WSelect = function WSelect(props) {
       resList = _useState6[0],
       setResList = _useState6[1];
 
-  usePreventUnmountEffect(function () {
+  useEffect(function () {
+    var isUnmount = false;
+
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -692,7 +676,7 @@ var WSelect = function WSelect(props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
 
@@ -701,6 +685,15 @@ var WSelect = function WSelect(props) {
 
             case 3:
               res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               setResList(res);
               onLoad && onLoad(res);
               node = res.map(function (item) {
@@ -711,7 +704,7 @@ var WSelect = function WSelect(props) {
               });
               setChildrenNode(node);
 
-            case 8:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -747,6 +740,9 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params || {})]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({
     showSearch: true,
@@ -767,7 +763,7 @@ var Option = function Option(props) {
 
 var Index$4 = WSelect;
 Index$4.Option = Option;
-var Select = /*#__PURE__*/React.memo(Index$4);
+var Select = /*#__PURE__*/memo(Index$4);
 
 //! moment.js
 //! version : 2.29.1
@@ -6613,7 +6609,9 @@ var TreeSelect = function TreeSelect(_ref) {
       treeData = _useState2[0],
       setTreeData = _useState2[1];
 
-  usePreventUnmountEffect(function () {
+  useEffect(function () {
+    var isUnmount = false;
+
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6621,7 +6619,7 @@ var TreeSelect = function TreeSelect(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
 
@@ -6630,21 +6628,34 @@ var TreeSelect = function TreeSelect(_ref) {
 
             case 3:
               res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               onLoad && onLoad(res);
               setTreeData(res);
-              _context.next = 9;
+              _context.next = 11;
               break;
 
-            case 8:
+            case 10:
               setTreeData(treePropsData || []);
 
-            case 9:
+            case 11:
             case "end":
               return _context.stop();
           }
         }
       }, _callee);
     }))();
+
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params)]);
   return /*#__PURE__*/React.createElement(_TreeSelect, _objectSpread2({
     showSearch: true,
@@ -6672,33 +6683,55 @@ var WCascader = function WCascader(props) {
       resList = _useState2[0],
       setResList = _useState2[1];
 
-  usePreventUnmountEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var res;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!request) {
-                _context.next = 6;
-                break;
-              }
+  useEffect(function () {
+    var isUnmount = false;
 
-              _context.next = 3;
-              return request();
+    var fetch = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var res;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!request) {
+                  _context.next = 8;
+                  break;
+                }
 
-            case 3:
-              res = _context.sent;
-              setResList(res);
-              onLoad && onLoad(res);
+                _context.next = 3;
+                return request();
 
-            case 6:
-            case "end":
-              return _context.stop();
+              case 3:
+                res = _context.sent;
+
+                if (!isUnmount) {
+                  _context.next = 6;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 6:
+                setResList(res);
+                onLoad && onLoad(res);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }))();
+        }, _callee);
+      }));
+
+      return function fetch() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
+    fetch();
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params)]);
   return /*#__PURE__*/React.createElement(_Cascader, _objectSpread2({
     value: typeof value === 'string' ? [value] : value,

package/dist/index.js

@@ -675,24 +675,6 @@ 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"];
 
@@ -719,7 +701,9 @@ var WSelect = function WSelect(props) {
       resList = _useState6[0],
       setResList = _useState6[1];
 
-  usePreventUnmountEffect(function () {
+  React.useEffect(function () {
+    var isUnmount = false;
+
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -727,7 +711,7 @@ var WSelect = function WSelect(props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
 
@@ -736,6 +720,15 @@ var WSelect = function WSelect(props) {
 
             case 3:
               res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               setResList(res);
               onLoad && onLoad(res);
               node = res.map(function (item) {
@@ -746,7 +739,7 @@ var WSelect = function WSelect(props) {
               });
               setChildrenNode(node);
 
-            case 8:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -782,6 +775,9 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params || {})]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({
     showSearch: true,
@@ -802,7 +798,7 @@ var Option = function Option(props) {
 
 var Index$4 = WSelect;
 Index$4.Option = Option;
-var Select = /*#__PURE__*/React__default['default'].memo(Index$4);
+var Select = /*#__PURE__*/React.memo(Index$4);
 
 //! moment.js
 //! version : 2.29.1
@@ -6648,7 +6644,9 @@ var TreeSelect = function TreeSelect(_ref) {
       treeData = _useState2[0],
       setTreeData = _useState2[1];
 
-  usePreventUnmountEffect(function () {
+  React.useEffect(function () {
+    var isUnmount = false;
+
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6656,7 +6654,7 @@ var TreeSelect = function TreeSelect(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
 
@@ -6665,21 +6663,34 @@ var TreeSelect = function TreeSelect(_ref) {
 
             case 3:
               res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               onLoad && onLoad(res);
               setTreeData(res);
-              _context.next = 9;
+              _context.next = 11;
               break;
 
-            case 8:
+            case 10:
               setTreeData(treePropsData || []);
 
-            case 9:
+            case 11:
             case "end":
               return _context.stop();
           }
         }
       }, _callee);
     }))();
+
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params)]);
   return /*#__PURE__*/React__default['default'].createElement(_TreeSelect__default['default'], _objectSpread2({
     showSearch: true,
@@ -6707,33 +6718,55 @@ var WCascader = function WCascader(props) {
       resList = _useState2[0],
       setResList = _useState2[1];
 
-  usePreventUnmountEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var res;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!request) {
-                _context.next = 6;
-                break;
-              }
+  React.useEffect(function () {
+    var isUnmount = false;
 
-              _context.next = 3;
-              return request();
+    var fetch = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var res;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!request) {
+                  _context.next = 8;
+                  break;
+                }
 
-            case 3:
-              res = _context.sent;
-              setResList(res);
-              onLoad && onLoad(res);
+                _context.next = 3;
+                return request();
 
-            case 6:
-            case "end":
-              return _context.stop();
+              case 3:
+                res = _context.sent;
+
+                if (!isUnmount) {
+                  _context.next = 6;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 6:
+                setResList(res);
+                onLoad && onLoad(res);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }))();
+        }, _callee);
+      }));
+
+      return function fetch() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
+    fetch();
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params)]);
   return /*#__PURE__*/React__default['default'].createElement(_Cascader__default['default'], _objectSpread2({
     value: typeof value === 'string' ? [value] : value,

package/package.json

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

package/dist/hooks/index.d.ts

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