@ccs-ui/rc-pro 2.3.6-alpha-21 → 2.3.6-alpha-23

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onClose" | "auth" | "request" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/layout-keep-alive/index.d.ts

@@ -6,9 +6,9 @@ import { MenuType } from '../ccs';
 import './index.less';
 export type CacheRouter = {
     key: string;
+    menuKey: string;
     label: string;
     urlAuthList: string[];
-    timestamp: number;
     outlet: ReactElement<any, string | JSXElementConstructor<any>> | null;
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
     breadcrumb: BreadcrumbProps['items'];

package/es/layout-keep-alive/index.js

@@ -16,11 +16,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { MoreOutlined } from '@ant-design/icons';
 import CcsUtils from '@ccs-ui/utils';
-import { useUpdate, useUpdateEffect } from 'ahooks';
+import { useMemoizedFn, useUpdate, useUpdateEffect } from 'ahooks';
 import { Button, Dropdown, Tabs } from 'antd';
 import classnames from 'classnames';
 import updateHelper from 'immutability-helper';
-import { useMemo, useRef } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import { CcsResult, useAppConfig } from '..';
@@ -151,11 +151,10 @@ function KeepAliveTabs(_ref) {
   useUpdateEffect(function () {
     routers.current.forEach(function (router) {
       var _menu$btnAuth;
-      var menu = findMenuById(menuItems, router.key);
+      var menu = findMenuById(menuItems, router.menuKey);
       router.urlAuthList = (menu === null || menu === void 0 || (_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
         return b.code;
       })) || [];
-      router.timestamp = new Date().getTime();
     });
     update();
   }, [menuItems]);
@@ -266,7 +265,6 @@ function KeepAliveTabs(_ref) {
     routers.current = updateHelper(routers.current, {
       $push: [{
         key: location.key,
-        timestamp: new Date().getTime(),
         label: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.label) || '未知',
         outlet: isMenu ? outlet : /*#__PURE__*/_jsx(CcsResult.Page404, {
           title: "\u672A\u77E5\u9875\u9762"
@@ -275,13 +273,14 @@ function KeepAliveTabs(_ref) {
           return b.code;
         }),
         breadcrumb: isMenu ? breadcrumb : [],
-        pageLocation: location
+        pageLocation: location,
+        menuKey: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.key) || ''
       }]
     });
   }
 
   // tab路由切换,携带search，state参数
-  var onHistory = function onHistory(key) {
+  var onHistory = useCallback(function (key) {
     var tab = routers.current.find(function (c) {
       return c.key === key;
     });
@@ -292,10 +291,10 @@ function KeepAliveTabs(_ref) {
         search = _tab$pageLocation.search;
       history.push("".concat(_pathname).concat(search), state);
     }
-  };
+  }, []);
 
   // 页面主动销毁或关闭tab
-  var onDestroy = function onDestroy(key) {
+  var onDestroy = useMemoizedFn(function (key) {
     var index = routers.current.findIndex(function (c) {
       return c.key === key;
     });
@@ -327,10 +326,10 @@ function KeepAliveTabs(_ref) {
       // 显示后一个
       onHistory(routers.current[index].key);
     }
-  };
+  });
 
   // 扩展操作
-  var onCloseTab = function onCloseTab(key) {
+  var onCloseTab = useCallback(function (key) {
     // 关闭其他标签
     if (key === '1') {
       routers.current = routers.current.filter(function (c) {
@@ -341,7 +340,7 @@ function KeepAliveTabs(_ref) {
       routers.current = [];
       history.push('/');
     }
-  };
+  }, []);
   var tabBarExtraContent = /*#__PURE__*/_jsx(Dropdown, {
     menu: {
       items: extraItems,
@@ -381,7 +380,6 @@ function KeepAliveTabs(_ref) {
     }), routers.current.map(function (_ref4) {
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
-        timestamp = _ref4.timestamp,
         outlet = _ref4.outlet,
         breadcrumb = _ref4.breadcrumb,
         pageLocation = _ref4.pageLocation;
@@ -390,7 +388,6 @@ function KeepAliveTabs(_ref) {
         location: pageLocation,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
-        timestamp: timestamp,
         breadcrumb: breadcrumb,
         children: outlet
       }, key);

package/es/layout-keep-alive/page.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { Location } from 'react-router';
 import { CacheRouter } from '.';
-export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
+export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
@@ -9,5 +9,6 @@ export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'c
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };
-declare const _default: import("react").MemoExoticComponent<(props: CachePageProps) => import("react/jsx-runtime").JSX.Element>;
+declare function CachePage(props: CachePageProps): import("react/jsx-runtime").JSX.Element;
+declare const _default: import("react").MemoExoticComponent<typeof CachePage>;
 export default _default;

package/es/layout-keep-alive/page.js

@@ -6,7 +6,7 @@ import { PageContext } from "../context";
 import { DialogElementsHolder } from "../dialog/hook";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export default /*#__PURE__*/memo(function (props) {
+function CachePage(props) {
   var children = props.children,
     active = props.active,
     urlAuthList = props.urlAuthList,
@@ -47,6 +47,7 @@ export default /*#__PURE__*/memo(function (props) {
       })
     })
   });
-}, function (l, n) {
-  return l.active === n.active && l.timestamp === n.timestamp;
+}
+export default /*#__PURE__*/memo(CachePage, function (l, n) {
+  return l.active === n.active && l.urlAuthList.join(',') === n.urlAuthList.join(',');
 });

package/es/layout-single-page/index.js

@@ -46,6 +46,7 @@ function SinglePage(_ref) {
       menu: menu
     };
   }, [pathname, menuItems]);
+  console.log('page index ', menuInfo);
   return /*#__PURE__*/_jsx("div", {
     className: classnames(className, "ccs-single-page"),
     children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {

package/es/layout-single-page/page.js

@@ -13,6 +13,7 @@ export default /*#__PURE__*/memo(function (props) {
     _props$breadcrumb = props.breadcrumb,
     breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb;
   var dialogHolderRef = useRef(null);
+  console.log('page urlAuthList', urlAuthList);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
       id: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-21",
+  "version": "2.3.6-alpha-23",
   "description": "",
   "license": "MIT",
   "author": {