@ccs-ui/rc-pro 2.3.6-beta-13 → 2.3.6-beta-15

package/es/button/group.js

@@ -1,7 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["onDisabled", "onHidden"],
+var _excluded = ["onDisabled", "onHidden", "auth"],
   _excluded2 = ["key", "label", "auth", "confirm", "showRowsCount", "onDisabled", "onHidden"],
-  _excluded3 = ["key", "label", "disabled", "auth", "confirm", "showRowsCount", "onDisabled", "onHidden"];
+  _excluded3 = ["key", "label", "disabled", "auth", "confirm", "showRowsCount"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -33,35 +33,35 @@ export default function CssButtonGroup(_ref) {
   var modalRef = useRef(null);
   var _ref3 = useContext(TableSelectionContext) || {},
     selectedRows = _ref3.selectedRows;
+
+  // 有权限的按钮
   var authButtons = [];
 
-  // 过滤隐藏按钮
-  authButtons = items.filter(function (item) {
-    return !item.hidden && !(item.onHidden && item.onHidden(selectedRows || []));
-  });
+  // 变量按钮
+  items.forEach(function (_ref4) {
+    var onDisabled = _ref4.onDisabled,
+      onHidden = _ref4.onHidden,
+      auth = _ref4.auth,
+      item = _objectWithoutProperties(_ref4, _excluded);
+    // 权限校验
+    if (onAuth && auth && !onAuth(auth)) {
+      return;
+    }
 
-  // link按钮删除无用参数
-  if (isLink) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    authButtons = authButtons.map(function (_ref4) {
-      var onDisabled = _ref4.onDisabled,
-        onHidden = _ref4.onHidden,
-        b = _objectWithoutProperties(_ref4, _excluded);
-      return _objectSpread({}, b);
-    });
-  }
+    // 隐藏按钮
+    if (onHidden && onHidden(selectedRows || [])) {
+      return;
+    }
 
-  // 需要判断权限
-  if (onAuth) {
-    authButtons = authButtons.filter(function (b) {
-      if (b.auth) return onAuth(b.auth);
-      return true;
-    });
-  }
-  if (!items || items.length === 0) return null;
+    // 禁用按钮
+    if (onDisabled && onDisabled(selectedRows || [])) {
+      item.disabled = true;
+    }
+    authButtons.push(item);
+  });
+  if (!authButtons || items.length === 0) return null;
 
-  // 当前菜单下查找按钮权限
-  var showBtns = authButtons.splice(0, showCount || items.length);
+  // 按钮点击
   var handleOnClick = function handleOnClick(key) {
     if (!onClick) return;
     var item = items.find(function (i) {
@@ -84,6 +84,10 @@ export default function CssButtonGroup(_ref) {
     }
     onClick(key, selectedRows);
   };
+
+  // 显示的按钮
+  var showBtns = authButtons.splice(0, showCount || items.length);
+
   // link类型按钮
   if (isLink) {
     return /*#__PURE__*/_jsxs(_Fragment, {
@@ -146,12 +150,7 @@ export default function CssButtonGroup(_ref) {
           auth = _ref6.auth,
           confirm = _ref6.confirm,
           showRowsCount = _ref6.showRowsCount,
-          onDisabled = _ref6.onDisabled,
-          onHidden = _ref6.onHidden,
           restProps = _objectWithoutProperties(_ref6, _excluded3);
-        // 按钮禁用
-        var isDisabled = disabled || onDisabled && onDisabled(selectedRows || []);
-
         // 更多按钮
         if (index === showBtns.length - 1 && authButtons.length > 0) {
           return /*#__PURE__*/_jsxs(Space.Compact, {
@@ -160,7 +159,7 @@ export default function CssButtonGroup(_ref) {
               onClick: function onClick() {
                 return handleOnClick(key);
               },
-              disabled: isDisabled,
+              disabled: disabled,
               children: [label, showRowsCount && selectedRows !== null && selectedRows !== void 0 && selectedRows.length ? "(".concat(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length, ")") : '']
             })), /*#__PURE__*/_jsx(Dropdown, {
               menu: {
@@ -178,7 +177,7 @@ export default function CssButtonGroup(_ref) {
         }
         return /*#__PURE__*/_jsxs(Button, _objectSpread(_objectSpread({}, restProps), {}, {
           size: size,
-          disabled: isDisabled,
+          disabled: disabled,
           onClick: function onClick() {
             return handleOnClick(key);
           },

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>, "auth" | "request" | "onClose" | "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" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/ellipsis/useResizeEffect.js

@@ -1,5 +1,7 @@
 import { useIsomorphicLayoutEffect, useMemoizedFn } from 'ahooks';
+import { useRef } from 'react';
 export function useResizeEffect(effect, targetRef) {
+  var ref = useRef(0);
   var fn = useMemoizedFn(effect);
   useIsomorphicLayoutEffect(function () {
     var target = targetRef.current;
@@ -7,9 +9,12 @@ export function useResizeEffect(effect, targetRef) {
     if (window.ResizeObserver) {
       var animationFrame;
       var observer = new ResizeObserver(function () {
+        // 隐藏了，为0不处理
+        if (target.clientWidth === 0 || (target === null || target === void 0 ? void 0 : target.clientWidth) === ref.current) return;
         animationFrame = window.requestAnimationFrame(function () {
           return fn(target);
         });
+        ref.current = target === null || target === void 0 ? void 0 : target.clientWidth;
       });
       observer.observe(target);
       return function () {

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

@@ -1,17 +1,18 @@
 import { BreadcrumbProps } from 'antd';
 import { JSXElementConstructor, ReactElement } from 'react';
+import { Location } from 'react-router';
 import CCS from '..';
 import { MenuType } from '../ccs';
 import './index.less';
-export type CacheComponent = {
+export type CacheRouter = {
     key: string;
     label: string;
-    locationKey: string;
     urlAuthList: string[];
     timestamp: number;
     outlet: ReactElement<any, string | JSXElementConstructor<any>> | null;
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
     breadcrumb: BreadcrumbProps['items'];
+    pageLocation: Location;
 };
 type PropsType = {
     maxLen?: number;

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

@@ -19,6 +19,7 @@ import CcsUtils from '@ccs-ui/utils';
 import { useUpdate, useUpdateEffect } from 'ahooks';
 import { Button, Dropdown, Empty, Tabs } from 'antd';
 import classnames from 'classnames';
+import updateHelper from 'immutability-helper';
 import { useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
@@ -131,10 +132,9 @@ export default function KeepAliveTabs(_ref) {
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
     className = _ref.className;
-  var components = useRef([]);
+  var routers = useRef([]);
   var location = useLocation();
-  var pathname = location.pathname,
-    locationKey = location.key;
+  var pathname = location.pathname;
   var outlet = useOutlet();
   var update = useUpdate();
   var _useAppConfig = useAppConfig(),
@@ -143,19 +143,19 @@ export default function KeepAliveTabs(_ref) {
   var isColorful = theme === 'colorful';
 
   // 超过缓存数量，删除第一个
-  if (components.current.length >= maxLen) {
-    components.current = components.current.slice(1);
+  if (routers.current.length >= maxLen) {
+    routers.current = routers.current.slice(1);
   }
 
   // 菜单改变，更新用户权限信息
   useUpdateEffect(function () {
-    components.current.forEach(function (component) {
+    routers.current.forEach(function (router) {
       var _menu$btnAuth;
-      var menu = findMenuById(menuItems, component.key);
-      component.urlAuthList = (menu === null || menu === void 0 || (_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
+      var menu = findMenuById(menuItems, router.key);
+      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;
       })) || [];
-      component.timestamp = new Date().getTime();
+      router.timestamp = new Date().getTime();
     });
     update();
   }, [menuItems]);
@@ -234,68 +234,110 @@ export default function KeepAliveTabs(_ref) {
       breadcrumb: breadcrumb
     });
   }, [pathname]);
-  var component = components.current.find(function (c) {
-    return c.key === pathname;
+  var activeKey = location.key;
+  // 路由数据
+  var routerIndex = routers.current.findIndex(function (c) {
+    return c.pageLocation.pathname === pathname;
   });
-  if (!component) {
+  if (routerIndex > -1) {
+    // 路由已存在、判断search，state是否改变，如改变则更新路由数据
+    var router = routers.current[routerIndex];
+    if (router.pageLocation.search !== location.search || CcsUtils.jsonStringify(router.pageLocation.state) !== CcsUtils.jsonStringify(location.state)) {
+      // 更新路由数据，变更key，路由将重新加载
+      routers.current = updateHelper(routers.current, _defineProperty({}, routerIndex, {
+        key: {
+          $set: location.key
+        },
+        pageLocation: {
+          $set: location
+        }
+      }));
+    } else {
+      activeKey = router.pageLocation.key;
+    }
+  } else {
+    // 路由不存在，保存路由数据
     var _ref3 = curMenu || {},
       _ref3$btnAuth = _ref3.btnAuth,
       btnAuth = _ref3$btnAuth === void 0 ? [] : _ref3$btnAuth,
       _ref3$breadcrumb = _ref3.breadcrumb,
       breadcrumb = _ref3$breadcrumb === void 0 ? [] : _ref3$breadcrumb;
-    components.current = [].concat(_toConsumableArray(components.current), [{
-      locationKey: locationKey,
-      key: pathname,
-      timestamp: new Date().getTime(),
-      label: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.label) || '未知',
-      outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
-        description: "\u672A\u77E5\u9875\u9762"
-      }),
-      urlAuthList: btnAuth.map(function (b) {
-        return b.code;
-      }),
-      breadcrumb: breadcrumb
-    }]);
+    routers.current = updateHelper(routers.current, {
+      $push: [{
+        key: location.key,
+        timestamp: new Date().getTime(),
+        label: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.label) || '未知',
+        outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
+          description: "\u672A\u77E5\u9875\u9762"
+        }),
+        urlAuthList: btnAuth.map(function (b) {
+          return b.code;
+        }),
+        breadcrumb: breadcrumb,
+        pageLocation: location
+      }]
+    });
   }
 
+  // tab路由切换,携带search，state参数
+  var onHistory = function onHistory(key) {
+    var tab = routers.current.find(function (c) {
+      return c.key === key;
+    });
+    if (tab) {
+      var _tab$pageLocation = tab.pageLocation,
+        _pathname = _tab$pageLocation.pathname,
+        state = _tab$pageLocation.state,
+        search = _tab$pageLocation.search;
+      history.push("".concat(_pathname).concat(search), state);
+    }
+  };
+
   // 页面主动销毁或关闭tab
-  var onDestroy = function onDestroy(path) {
-    var index = components.current.findIndex(function (c) {
-      return c.key === path;
+  var onDestroy = function onDestroy(key) {
+    var index = routers.current.findIndex(function (c) {
+      return c.key === key;
     });
+    // 删除的路由
+    var delRouter = routers.current[index];
     if (index >= 0) {
-      components.current.splice(index, 1);
-      components.current = _toConsumableArray(components.current);
-      if (path !== pathname) {
+      routers.current = updateHelper(routers.current, {
+        $splice: [[index, 1]]
+      });
+
+      // 不是删的自己
+      if (delRouter.key !== key) {
         update();
         return;
       }
 
       // 显示首页
-      if (components.current.length === 0) {
+      if (routers.current.length === 0) {
         history.push('/');
         return;
       }
 
       // 显示前一个
-      if (index === components.current.length) {
-        history.push(components.current[index - 1].key);
+      if (index === routers.current.length) {
+        onHistory(routers.current[index - 1].key);
         return;
       }
 
       // 显示后一个
-      history.push(components.current[index].key);
+      onHistory(routers.current[index].key);
     }
   };
+
+  // 扩展操作
   var onCloseTab = function onCloseTab(key) {
     // 关闭其他标签
     if (key === '1') {
-      components.current = components.current.filter(function (c) {
+      routers.current = routers.current.filter(function (c) {
         return c.key === pathname;
       });
       update();
     } else {
-      components.current = [];
+      routers.current = [];
       history.push('/');
     }
   };
@@ -318,26 +360,25 @@ export default function KeepAliveTabs(_ref) {
       id: "keep-alive-tabs",
       hideAdd: true,
       size: "small",
-      onChange: function onChange(e) {
-        history.push(e);
-      },
+      onChange: onHistory,
       className: classnames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-keep-alive-tabs', !isColorful), 'dark', isDark), 'ccs-keep-alive-tabs-colorful', isColorful)),
-      activeKey: pathname,
+      activeKey: activeKey,
       type: "editable-card",
       onEdit: function onEdit(e) {
         return onDestroy(e);
       },
-      items: components.current,
-      tabBarExtraContent: components.current.length > 2 ? tabBarExtraContent : null
-    }), components.current.map(function (_ref4) {
+      items: routers.current,
+      tabBarExtraContent: routers.current.length > 2 ? tabBarExtraContent : null
+    }), routers.current.map(function (_ref4) {
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
         timestamp = _ref4.timestamp,
         outlet = _ref4.outlet,
-        breadcrumb = _ref4.breadcrumb;
+        breadcrumb = _ref4.breadcrumb,
+        pageLocation = _ref4.pageLocation;
       return /*#__PURE__*/_jsx(Page, {
-        active: key === pathname,
-        location: location,
+        active: pageLocation.pathname === pathname,
+        location: pageLocation,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
         timestamp: timestamp,

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { Location } from 'react-router';
-import { CacheComponent } from '.';
-export type CachePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
+import { CacheRouter } from '.';
+export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */

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

@@ -7,20 +7,20 @@ 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) {
-  var locationRef = useRef(props.location);
   var children = props.children,
     active = props.active,
     urlAuthList = props.urlAuthList,
     onDestroy = props.onDestroy,
-    breadcrumb = props.breadcrumb;
-  var id = "_tab_content_".concat(locationRef.current.key);
+    breadcrumb = props.breadcrumb,
+    location = props.location;
+  var id = "_tab_content_".concat(location.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
       id: id,
       dialogHolderRef: dialogHolderRef,
       isActive: active,
-      location: locationRef.current,
+      location: location,
       onDestroy: onDestroy,
       onAuth: function onAuth(e) {
         return urlAuthList.includes(e);

package/es/layout-single-page/page.d.ts

@@ -1,7 +1,7 @@
 import { JSXElementConstructor, ReactElement } from 'react';
 import { Location } from 'react-router';
-import { CacheComponent } from '../layout-keep-alive';
-export type SinglePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList'> & {
+import { CacheRouter } from '../layout-keep-alive';
+export type SinglePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList'> & {
     /** router location */
     location: Location;
     /** children */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-beta-13",
+  "version": "2.3.6-beta-15",
   "description": "",
   "license": "MIT",
   "author": {