@teamias/pro-layout 0.0.16 → 0.0.18

package/dist/pro-layout/components/KeepAlive/KeepAliveClass.js

@@ -166,38 +166,72 @@ export var KeepAliveClass = /*#__PURE__*/function () {
      *  如需修改为独立组件，需要通过 props 显式传入这些依赖，这里为了简化内部实现，
      *  保留为类属性组件的实现方式是有意为之。
      */
-    _defineProperty(this, "AutoRefreshKeepAliveItem", function () {
+    _defineProperty(this, "AutoRefreshKeepAliveItem", function (_ref) {
+      var children = _ref.children;
       var _useAccessRouter2 = useAccessRouter(),
         location = _useAccessRouter2.location;
-      var ref = useRef(location);
-      var count = useRef(0);
+      var _useState3 = useState({}),
+        _useState4 = _slicedToArray(_useState3, 2),
+        update = _useState4[1];
+      var _useRef2 = useRef({
+          divId: "auto-refresh-keep-alive-item-".concat(Date.now(), "-").concat(Math.random().toString(36).substring(2)),
+          div: document.createElement('div'),
+          portal: null,
+          show: true,
+          count: 0,
+          location: location
+        }),
+        cache = _useRef2.current;
       // 计数器大于该阈值才生效，避免初次加载时触发自动刷新
       var ACTIVATION_COUNT_THRESHOLD = 2;
-      ref.current = location;
+      cache.location = location;
       _this.useLifeCycle(function (type) {
         // 计数器大于2次才生效，避免初次加载时候触发
-        if (type === ELifeCycleType.ACTIVATED && count.current > ACTIVATION_COUNT_THRESHOLD) {
-          var _ref$current$state;
+        if (type === ELifeCycleType.ACTIVATED && cache.count > ACTIVATION_COUNT_THRESHOLD) {
+          var _cache$location$state;
           // console.log('ACTIVATED', ref.current);
-          if (!((_ref$current$state = ref.current.state) !== null && _ref$current$state !== void 0 && _ref$current$state.disabledReload)) {
+          if (!((_cache$location$state = cache.location.state) !== null && _cache$location$state !== void 0 && _cache$location$state.disabledReload)) {
             // debugger;
-            _this.refreshPage(ref.current.pathname);
+            _this.refreshPage(cache.location.pathname);
+          } else {
+            cache.show = true;
+            update({});
           }
+        } else if (type === ELifeCycleType.DEACTIVATED) {
+          // console.log('DEACTIVATED', location);
+          cache.show = false;
+          update({});
         }
-        count.current += 1;
+        cache.count += 1;
+      });
+      useEffect(function () {
+        cache.portal = cache.portal || /*#__PURE__*/createPortal(children, cache.div);
+        // update({});
+        if (cache.show) {
+          var _document$getElementB;
+          // debugger;
+          (_document$getElementB = document.getElementById(cache.divId)) === null || _document$getElementB === void 0 || (_document$getElementB = _document$getElementB.parentElement) === null || _document$getElementB === void 0 || _document$getElementB.appendChild(cache.div);
+        } else {
+          cache.div.remove();
+        }
+        update({});
+      }, [cache.show]);
+      return /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx("div", {
+          id: cache.divId
+        }), cache.portal]
       });
-      return /*#__PURE__*/_jsx(_Fragment, {});
     });
     /** 页面挂载组件 */
-    _defineProperty(this, "KeepAliveItem", function (_ref) {
-      var activate = _ref.activate,
-        idKey = _ref.idKey;
+    _defineProperty(this, "KeepAliveItem", function (_ref2) {
+      var activate = _ref2.activate,
+        idKey = _ref2.idKey;
       var _useAccessRouter3 = useAccessRouter(),
         page = _useAccessRouter3.page;
-      var _useState3 = useState({}),
-        _useState4 = _slicedToArray(_useState3, 2),
-        update = _useState4[1];
-      var _useRef2 = useRef({
+      var _useState5 = useState({}),
+        _useState6 = _slicedToArray(_useState5, 2),
+        update = _useState6[1];
+      var _useRef3 = useRef({
           div: document.createElement('div'),
           portal: null,
           /** 是否挂载 */
@@ -207,7 +241,7 @@ export var KeepAliveClass = /*#__PURE__*/function () {
           /** 开启生命周期回调 */
           useLifeCycle: false
         }),
-        cache = _useRef2.current;
+        cache = _useRef3.current;
       var lifeCycle = _this.keepAliveData.pageLifeCycle[idKey] = _this.keepAliveData.pageLifeCycle[idKey] || {
         callbacks: [],
         notification: function notification() {
@@ -227,9 +261,9 @@ export var KeepAliveClass = /*#__PURE__*/function () {
 
       useEffect(function () {
         if (activate && _this.contentDom) {
-          cache.portal = cache.portal || /*#__PURE__*/createPortal( /*#__PURE__*/_jsxs(ErrorBoundary, {
-            fallbackRender: function fallbackRender(_ref2) {
-              var error = _ref2.error;
+          cache.portal = cache.portal || /*#__PURE__*/createPortal( /*#__PURE__*/_jsx(ErrorBoundary, {
+            fallbackRender: function fallbackRender(_ref3) {
+              var error = _ref3.error;
               return /*#__PURE__*/_jsx(_Fragment, {
                 children: /*#__PURE__*/_jsx(Result, {
                   status: "error",
@@ -245,7 +279,9 @@ export var KeepAliveClass = /*#__PURE__*/function () {
                 })
               });
             },
-            children: [(page === null || page === void 0 ? void 0 : page.element) || /*#__PURE__*/_jsx(NoFoundPage, {}), /*#__PURE__*/_jsx(_this.AutoRefreshKeepAliveItem, {})]
+            children: /*#__PURE__*/_jsx(_this.AutoRefreshKeepAliveItem, {
+              children: (page === null || page === void 0 ? void 0 : page.element) || /*#__PURE__*/_jsx(NoFoundPage, {})
+            })
           }), cache.div);
           _this.contentDom.appendChild(cache.div);
           cache.mount = true;
@@ -413,7 +449,7 @@ export var KeepAliveClass = /*#__PURE__*/function () {
         setTimeout(function () {
           _this3.updateCurrentPage(index);
           rel();
-        }, 0);
+        }, 160);
       });
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/pro-layout",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",