wargerm 0.2.15 → 0.2.16

package/dist/index.esm.js

@@ -523,39 +523,48 @@ var WSelect = function WSelect(props) {
       valueEnumList = _useState4[0],
       setValueEnumList = _useState4[1];
 
-  useEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var res, node;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!request) {
-                _context.next = 7;
-                break;
-              }
-
-              _context.next = 3;
-              return request();
+  var _useState5 = useState(null),
+      _useState6 = _slicedToArray(_useState5, 2),
+      resList = _useState6[0],
+      setResList = _useState6[1];
 
-            case 3:
-              res = _context.sent;
-              onLoad && onLoad(res);
-              node = res.map(function (item) {
-                return /*#__PURE__*/React.createElement(_Select.Option, {
-                  key: item.value,
-                  value: item.value
-                }, item.label);
-              });
-              setChildrenNode(node);
+  useEffect(function () {
+    if (!resList) {
+      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var res, node;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!request) {
+                  _context.next = 9;
+                  break;
+                }
 
-            case 7:
-            case "end":
-              return _context.stop();
+                console.log('request');
+                _context.next = 4;
+                return request();
+
+              case 4:
+                res = _context.sent;
+                setResList(res);
+                onLoad && onLoad(res);
+                node = res.map(function (item) {
+                  return /*#__PURE__*/React.createElement(_Select.Option, {
+                    key: item.value,
+                    value: item.value
+                  }, item.label);
+                });
+                setChildrenNode(node);
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }))();
+        }, _callee);
+      }))();
+    }
 
     var valueEnumNode = [];
     var options = [];
@@ -585,7 +594,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, []);
+  }, [resList]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -8817,12 +8826,12 @@ var Index$7 = function Index(props) {
 Index$7.defaultProps = {};
 
 var _excluded$8 = ["list", "render", "partSize"];
-var autoScrollInterval = null;
 
 function AutoScroll(props) {
   var inner1 = useRef();
   var inner2 = useRef();
   var outer = useRef();
+  var timer = useRef(null);
   useImperativeHandle(props.cref, function () {
     return {
       tryScroll: tryScroll
@@ -8843,8 +8852,8 @@ function AutoScroll(props) {
 
 
   var startScroll = function startScroll() {
-    if (!autoScrollInterval) {
-      autoScrollInterval = setInterval(function () {
+    if (!timer.current) {
+      timer.current = setInterval(function () {
         // 如果已经滚动到inner1的底部，则重置滚动的位置到inner1的头部
         if (outer.current.scrollTop >= inner1.current.offsetHeight) {
           outer.current.scrollTop = 0; // 触发complete事件
@@ -8864,8 +8873,11 @@ function AutoScroll(props) {
 
 
   var stopScroll = function stopScroll() {
-    clearInterval(autoScrollInterval);
-    autoScrollInterval = null;
+    if (timer.current) {
+      clearInterval(timer.current);
+    }
+
+    timer.current = null;
   };
 
   useEffect(function () {
@@ -8876,7 +8888,7 @@ function AutoScroll(props) {
     return function () {
       stopScroll();
     };
-  }, []);
+  }, [timer]);
   return /*#__PURE__*/React.createElement("div", {
     className: "autoScroll-outer ".concat(props.className),
     ref: outer,

package/dist/index.js

@@ -556,39 +556,48 @@ var WSelect = function WSelect(props) {
       valueEnumList = _useState4[0],
       setValueEnumList = _useState4[1];
 
-  React.useEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var res, node;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!request) {
-                _context.next = 7;
-                break;
-              }
-
-              _context.next = 3;
-              return request();
+  var _useState5 = React.useState(null),
+      _useState6 = _slicedToArray(_useState5, 2),
+      resList = _useState6[0],
+      setResList = _useState6[1];
 
-            case 3:
-              res = _context.sent;
-              onLoad && onLoad(res);
-              node = res.map(function (item) {
-                return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
-                  key: item.value,
-                  value: item.value
-                }, item.label);
-              });
-              setChildrenNode(node);
+  React.useEffect(function () {
+    if (!resList) {
+      _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var res, node;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!request) {
+                  _context.next = 9;
+                  break;
+                }
 
-            case 7:
-            case "end":
-              return _context.stop();
+                console.log('request');
+                _context.next = 4;
+                return request();
+
+              case 4:
+                res = _context.sent;
+                setResList(res);
+                onLoad && onLoad(res);
+                node = res.map(function (item) {
+                  return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'].Option, {
+                    key: item.value,
+                    value: item.value
+                  }, item.label);
+                });
+                setChildrenNode(node);
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }))();
+        }, _callee);
+      }))();
+    }
 
     var valueEnumNode = [];
     var options = [];
@@ -618,7 +627,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, []);
+  }, [resList]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -8850,12 +8859,12 @@ var Index$7 = function Index(props) {
 Index$7.defaultProps = {};
 
 var _excluded$8 = ["list", "render", "partSize"];
-var autoScrollInterval = null;
 
 function AutoScroll(props) {
   var inner1 = React.useRef();
   var inner2 = React.useRef();
   var outer = React.useRef();
+  var timer = React.useRef(null);
   React.useImperativeHandle(props.cref, function () {
     return {
       tryScroll: tryScroll
@@ -8876,8 +8885,8 @@ function AutoScroll(props) {
 
 
   var startScroll = function startScroll() {
-    if (!autoScrollInterval) {
-      autoScrollInterval = setInterval(function () {
+    if (!timer.current) {
+      timer.current = setInterval(function () {
         // 如果已经滚动到inner1的底部，则重置滚动的位置到inner1的头部
         if (outer.current.scrollTop >= inner1.current.offsetHeight) {
           outer.current.scrollTop = 0; // 触发complete事件
@@ -8897,8 +8906,11 @@ function AutoScroll(props) {
 
 
   var stopScroll = function stopScroll() {
-    clearInterval(autoScrollInterval);
-    autoScrollInterval = null;
+    if (timer.current) {
+      clearInterval(timer.current);
+    }
+
+    timer.current = null;
   };
 
   React.useEffect(function () {
@@ -8909,7 +8921,7 @@ function AutoScroll(props) {
     return function () {
       stopScroll();
     };
-  }, []);
+  }, [timer]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "autoScroll-outer ".concat(props.className),
     ref: outer,

package/package.json

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