@ccs-ui/rc-pro 2.3.6-alpha-20 → 2.3.6-alpha-22

package/es/config.js

@@ -83,7 +83,7 @@ function AppConfig(_ref) {
     return algorithms;
   };
   useEffect(function () {
-    var csss = [".ccs-dialog-drawer .".concat(prefixCls, "-drawer-footer{padding:0 !important;}"), ".ccs-tabs-auto-height > .".concat(prefixCls, "-tabs-content-holder,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content > div,\n      .ccs-tabs-auto-height> .").concat(prefixCls, "-tabs-content-holder> .").concat(prefixCls, "-tabs-content> div> .ccs-pl { height: 100%;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab {border: 0 !important;border-radius: 0 !important;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #f0f2f5 !important;}"), ".ccs-keep-alive .dark .ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #2b2c2c !important;} "), ".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} ")];
+    var csss = [".".concat(prefixCls, "-drawer .").concat(prefixCls, "-drawer-extra >.").concat(prefixCls, "-btn+.").concat(prefixCls, "-btn {margin-inline-start: 8px;}"), ".ccs-dialog-drawer .".concat(prefixCls, "-drawer-footer{padding:0 !important;}"), ".ccs-tabs-auto-height > .".concat(prefixCls, "-tabs-content-holder,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content > div,\n      .ccs-tabs-auto-height> .").concat(prefixCls, "-tabs-content-holder> .").concat(prefixCls, "-tabs-content> div> .ccs-pl { height: 100%;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab {border: 0 !important;border-radius: 0 !important;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #f0f2f5 !important;}"), ".ccs-keep-alive .dark .ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #2b2c2c !important;} "), ".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} ")];
     insertCss(csss.join(''));
   }, []);
 

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" | "onOk" | "onClose" | "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/dialog/button.js

@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { CcsButton } from "./..";
-import { Button, Form, Space } from 'antd';
+import { Button, Form } from 'antd';
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import CcsDialog from '.';
 import { useDialogFields } from "../hooks/use-app";
@@ -231,7 +231,7 @@ export default function CcsDialogButtons(_ref3) {
   useEffect(function () {
     var _buttonRef$current;
     if (!onOk && !children) return;
-    var btns = /*#__PURE__*/_jsxs(Space, {
+    var btns = /*#__PURE__*/_jsxs(_Fragment, {
       children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
         children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
           onClick: closeDialog,

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/select/ modal.d.ts

@@ -2,11 +2,9 @@ import { ModalProps, SelectProps } from 'antd';
 import { ReactElement, ReactNode } from 'react';
 import { SelectChildrenProps } from './customize';
 export interface ModalSelectProps extends Omit<SelectProps, 'children' | 'title'> {
-    /** 选择触发器宽度 */
-    width?: number;
     /** modal props */
     modal?: ModalProps;
     /** 自定义内容 */
-    children: ReactElement | ((props: SelectChildrenProps) => ReactNode);
+    children?: ReactElement | ((props: SelectChildrenProps) => ReactNode);
 }
-export default function ModalSelect({ width, style, mode, modal, value, children, labelInValue, onChange: onOkChange, ...otherProps }: ModalSelectProps): import("react/jsx-runtime").JSX.Element;
+export default function ModalSelect({ style, mode, modal, value, children, labelInValue, onChange: onOkChange, ...otherProps }: ModalSelectProps): import("react/jsx-runtime").JSX.Element;

package/es/select/ modal.js

@@ -1,4 +1,4 @@
-var _excluded = ["width", "style", "mode", "modal", "value", "children", "labelInValue", "onChange"];
+var _excluded = ["style", "mode", "modal", "value", "children", "labelInValue", "onChange"];
 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; }
@@ -20,8 +20,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function ModalSelect(_ref) {
-  var width = _ref.width,
-    style = _ref.style,
+  var style = _ref.style,
     mode = _ref.mode,
     modal = _ref.modal,
     value = _ref.value,
@@ -119,9 +118,7 @@ export default function ModalSelect(_ref) {
       placeholder: '请选择'
     }, otherProps), {}, {
       mode: !!labelText ? undefined : mode,
-      style: _objectSpread(_objectSpread({}, style), {}, {
-        width: width
-      }),
+      style: style,
       options: options,
       onChange: function onChange(e) {
         setValueState(e);
@@ -138,7 +135,7 @@ export default function ModalSelect(_ref) {
       forceRender: true,
       onOk: onModalOk
     }, modal), {}, {
-      children: typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps)
+      children: children && (typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps))
     }))]
   });
 }

package/es/select/customize.d.ts

@@ -11,17 +11,15 @@ export type SelectChildrenProps = Pick<SelectProps, 'value' | 'onChange' | 'mode
     onLoading?: (loading: boolean) => void;
 };
 export interface CustomizeSelectProps extends Omit<SelectProps, 'children'> {
-    /** 选择触发器宽度 */
-    width?: number;
     /** 内容宽度 */
     contentWidth?: number;
     /** 自定义内容 */
-    children: ReactElement | ((props: SelectChildrenProps) => ReactNode);
+    children?: ReactElement | ((props: SelectChildrenProps) => ReactNode);
 }
 /**
  *  自定义弹框
  * @param SelectCustomizeProps
  * @returns
  */
-declare function SelectIndex({ width, value, style, mode, children, contentWidth, labelInValue, onChange, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
+declare function SelectIndex({ value, style, mode, children, contentWidth, labelInValue, onChange, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
 export default SelectIndex;

package/es/select/customize.js

@@ -1,4 +1,4 @@
-var _excluded = ["width", "value", "style", "mode", "children", "contentWidth", "labelInValue", "onChange"];
+var _excluded = ["value", "style", "mode", "children", "contentWidth", "labelInValue", "onChange"];
 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; }
@@ -24,8 +24,7 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
  * @returns
  */
 function SelectIndex(_ref) {
-  var width = _ref.width,
-    value = _ref.value,
+  var value = _ref.value,
     style = _ref.style,
     mode = _ref.mode,
     children = _ref.children,
@@ -80,7 +79,7 @@ function SelectIndex(_ref) {
         display: 'none'
       },
       ref: ref,
-      children: typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps)
+      children: children && (typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps))
     });
   }, [value]);
   useEffect(function () {
@@ -131,9 +130,7 @@ function SelectIndex(_ref) {
       },
       mode: !!labelText ? undefined : mode,
       value: loading ? undefined : renderValueText(),
-      style: _objectSpread(_objectSpread({}, style), {}, {
-        width: width
-      }),
+      style: _objectSpread({}, style),
       onChange: _onChange,
       options: options
     }))

package/package.json

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