@ccs-ui/rc-pro 2.0.5 → 2.0.6

package/es/dialog/DialogRequestButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "onCancel" | "auth" | "request" | "extraBtn" | "onRequestBefore"> & {
+declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "request" | "auth" | "onCancel" | "extraBtn" | "onRequestBefore"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/DialogSelfOkButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "onCancel" | "auth" | "onOk" | "extraBtn"> & {
+declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onOk" | "onCancel" | "extraBtn"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/full-screen/index.d.ts

@@ -1,5 +1 @@
-type PropsType = {
-    onFullScreen?: (isFull: boolean) => void;
-};
-declare const _default: ({ onFullScreen }: PropsType) => import("react/jsx-runtime").JSX.Element;
-export default _default;
+export default function FullScreen(): import("react/jsx-runtime").JSX.Element;

package/es/full-screen/index.js

@@ -9,8 +9,7 @@ import { Button, Tooltip } from 'antd';
 import { useState } from 'react';
 import { classPrefix } from "../pro-table/table";
 import { jsx as _jsx } from "react/jsx-runtime";
-export default (function (_ref) {
-  var onFullScreen = _ref.onFullScreen;
+export default function FullScreen() {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFull = _useState2[0],
@@ -28,7 +27,6 @@ export default (function (_ref) {
     }
     var inf = !isFull;
     setIsFull(inf);
-    if (onFullScreen) onFullScreen(inf);
   };
   return /*#__PURE__*/_jsx(Tooltip, {
     title: isFull ? '取消全屏' : '全屏',
@@ -57,4 +55,4 @@ export default (function (_ref) {
       className: "ccs-pl-fullbtn"
     })
   });
-});
+}

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

@@ -1,5 +1,17 @@
+import { JSXElementConstructor, ReactElement } from 'react';
 import CCS from '..';
+import { MenuType } from '../ccs';
 import './index.less';
+export type CacheComponent = {
+    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: MenuType['breadcrumb'];
+};
 type PropsType = {
     maxLen?: number;
     appName: string;

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

@@ -136,7 +136,9 @@ export default function KeepAliveTabs(_ref) {
   if (!component) {
     var _ref3 = curMenu || {},
       _ref3$urlAuthList = _ref3.urlAuthList,
-      urlAuthList = _ref3$urlAuthList === void 0 ? [] : _ref3$urlAuthList;
+      urlAuthList = _ref3$urlAuthList === void 0 ? [] : _ref3$urlAuthList,
+      _ref3$breadcrumb = _ref3.breadcrumb,
+      breadcrumb = _ref3$breadcrumb === void 0 ? [] : _ref3$breadcrumb;
     components.current = [].concat(_toConsumableArray(components.current), [{
       locationKey: locationKey,
       key: pathname,
@@ -145,7 +147,8 @@ export default function KeepAliveTabs(_ref) {
       outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
         description: "\u672A\u77E5\u9875\u9762"
       }),
-      urlAuthList: urlAuthList
+      urlAuthList: urlAuthList,
+      breadcrumb: breadcrumb
     }]);
   }
 
@@ -224,13 +227,15 @@ export default function KeepAliveTabs(_ref) {
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
         timestamp = _ref4.timestamp,
-        outlet = _ref4.outlet;
+        outlet = _ref4.outlet,
+        breadcrumb = _ref4.breadcrumb;
       return /*#__PURE__*/_jsx(Page, {
         active: key === pathname,
         location: location,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
         timestamp: timestamp,
+        breadcrumb: breadcrumb,
         children: outlet
       }, key);
     })]

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

@@ -1,16 +1,11 @@
-import { JSXElementConstructor, ReactElement } from 'react';
+/// <reference types="react" />
 import { Location } from 'react-router';
-export type CachePageProps = {
+import { CacheComponent } from '.';
+export type CachePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
     location: Location;
-    /** 时间戳 */
-    timestamp: number;
-    /** 按钮权限列表 */
-    urlAuthList: string[];
-    /** children */
-    children: ReactElement<any, string | JSXElementConstructor<any>> | null;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };

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

@@ -1,14 +1,17 @@
+import { Breadcrumb } from 'antd';
 import classNames from 'classnames';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { PageContext } from "../context";
 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;
+    onDestroy = props.onDestroy,
+    breadcrumb = props.breadcrumb;
   var id = "_tab_content_".concat(locationRef.current.key);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
@@ -27,12 +30,15 @@ export default /*#__PURE__*/memo(function (props) {
       },
       className: "ccs-tab-item",
       "data-display": active,
-      children: /*#__PURE__*/_jsx(Scrollbars, {
+      children: /*#__PURE__*/_jsxs(Scrollbars, {
         autoHide: true,
         className: classNames('ccs-table-item-scroll', {
           'route-avtive': active
         }),
-        children: children
+        children: [/*#__PURE__*/_jsx(Breadcrumb, {
+          items: breadcrumb,
+          className: "ccs-breadcrumb"
+        }), children]
       })
     })
   });

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

@@ -1,42 +1,19 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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 { useUpdate, useUpdateEffect } from 'ahooks';
-import { Breadcrumb } from 'antd';
 import classnames from 'classnames';
-import { useMemo, useRef } from 'react';
+import { useMemo } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import CcsResult from "../result";
 import "./index.less";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function SinglePage(_ref) {
   var appName = _ref.appName,
     _ref$menus = _ref.menus,
     menus = _ref$menus === void 0 ? [] : _ref$menus,
     className = _ref.className;
-  var components = useRef([]);
   var location = useLocation();
   var pathname = location.pathname;
   var outlet = useOutlet();
-  var update = useUpdate();
-
-  // 菜单改变，更新用户权限信息
-  useUpdateEffect(function () {
-    components.current.forEach(function (component) {
-      var menu = menus.find(function (m) {
-        return m.menuUrl === component.key;
-      });
-      component.urlAuthList = (menu === null || menu === void 0 ? void 0 : menu.urlAuthList) || [];
-      component.timestamp = new Date().getTime();
-    });
-    update();
-  }, [menus]);
 
   // 当前菜单
   var menuInfo = useMemo(function () {
@@ -55,32 +32,22 @@ export default function SinglePage(_ref) {
     }, 10);
     return {
       auth: menu.urlAuthList || [],
-      breadcrumbs: menu.breadcrumb,
+      breadcrumb: menu.breadcrumb,
       menu: menu
     };
   }, [pathname, menus]);
-  return /*#__PURE__*/_jsxs("div", {
+  return /*#__PURE__*/_jsx("div", {
     className: classnames(className, "ccs-single-page"),
-    children: [/*#__PURE__*/_jsx("div", {
-      className: "page-breadcrumb",
-      children: /*#__PURE__*/_jsx("div", {
-        className: "breadcrumb-name",
-        children: menuInfo !== null && menuInfo !== void 0 && menuInfo.breadcrumbs ? /*#__PURE__*/_jsx(Breadcrumb, {
-          items: _toConsumableArray(menuInfo === null || menuInfo === void 0 ? void 0 : menuInfo.breadcrumbs)
-        }) : '未知页面'
-      })
-    }), /*#__PURE__*/_jsx("div", {
-      className: "page-content",
-      children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
-        location: location,
-        urlAuthList: menuInfo.auth,
-        children: outlet
-      }) : /*#__PURE__*/_jsx(CcsResult.NotFound, {
-        style: {
-          marginTop: 100
-        },
-        iconWidth: 200
-      })
-    })]
+    children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
+      location: location,
+      urlAuthList: menuInfo.auth,
+      breadcrumb: menuInfo.breadcrumb,
+      children: outlet
+    }) : /*#__PURE__*/_jsx(CcsResult.NotFound, {
+      style: {
+        marginTop: 100
+      },
+      iconWidth: 200
+    })
   });
 }

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

@@ -3,37 +3,10 @@
   display: flex;
   flex-direction: column;
 
-  .page-breadcrumb {
-    position: relative;
-    flex: 0 0 34px;
-    line-height: 34px;
-
-    &::after {
-      content: '';
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0;
-      bottom: 0;
-    }
-  }
-
-  .breadcrumb-name {
-    padding: 6px 16px;
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    z-index: 11;
-  }
-
-  .page-content {
-    flex: 1 1 auto;
-  }
-
   .ccs-table-item-scroll > div {
     display: flex;
+    flex-direction: column;
+    padding: 16px;
   }
 }
 
@@ -41,39 +14,8 @@
   .page-content {
     background-color: #fff;
   }
-
-  .page-breadcrumb {
-    position: relative;
-    flex: 0 0 34px;
-    line-height: 34px;
-
-    &::after {
-      background: #fff;
-      opacity: 0.1;
-    }
-  }
-
-  .breadcrumb-name {
-    .ant-breadcrumb,
-    .ant-breadcrumb-separator,
-    .ant-breadcrumb-link {
-      color: rgba(255, 255, 255, 85%);
-    }
-  }
 }
 
-.light-theme {
-  .page-breadcrumb {
-    &::after {
-      background-color: #fff;
-    }
-  }
-}
-
-.dark-theme {
-  .page-breadcrumb {
-    &::after {
-      background-color: #252525;
-    }
-  }
+.ccs-breadcrumb {
+  margin-bottom: 10px;
 }

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

@@ -1,10 +1,9 @@
 import { JSXElementConstructor, ReactElement } from 'react';
 import { Location } from 'react-router';
-export type SinglePageProps = {
+import { MenuType } from '../ccs';
+export type SinglePageProps = Pick<MenuType, 'breadcrumb' | 'urlAuthList'> & {
     /** router location */
     location: Location;
-    /** 按钮权限列表 */
-    urlAuthList: string[];
     /** children */
     children: ReactElement<any, string | JSXElementConstructor<any>> | null;
 };

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

@@ -1,11 +1,16 @@
+import { Breadcrumb } from 'antd';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { PageContext } from "../context";
 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,
-    urlAuthList = props.urlAuthList;
+    _props$urlAuthList = props.urlAuthList,
+    urlAuthList = _props$urlAuthList === void 0 ? [] : _props$urlAuthList,
+    _props$breadcrumb = props.breadcrumb,
+    breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb;
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
       id: '',
@@ -18,10 +23,13 @@ export default /*#__PURE__*/memo(function (props) {
         return urlAuthList.includes(e);
       }
     },
-    children: /*#__PURE__*/_jsx(Scrollbars, {
+    children: /*#__PURE__*/_jsxs(Scrollbars, {
       autoHide: true,
       className: "ccs-table-item-scroll",
-      children: children
+      children: [/*#__PURE__*/_jsx(Breadcrumb, {
+        items: breadcrumb,
+        className: "ccs-breadcrumb"
+      }), children]
     })
   });
 });

package/es/pro-table/operation.js

@@ -123,9 +123,6 @@ export default function TableOperation(_ref) {
       })]
     });
   };
-  var onFullScreen = function onFullScreen() {
-    // tableRef.current?.onFullScreen();
-  };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Tooltip, {
       title: "\u91CD\u7F6E",
@@ -190,8 +187,6 @@ export default function TableOperation(_ref) {
           }
         })
       })
-    }), !isInModalOrDrawer && /*#__PURE__*/_jsx(CcsFullScreenButton, {
-      onFullScreen: onFullScreen
-    })]
+    }), !isInModalOrDrawer && /*#__PURE__*/_jsx(CcsFullScreenButton, {})]
   });
 }

package/es/pro-table/table.js

@@ -123,8 +123,11 @@ var InternalProTable = function InternalProTable(props) {
   // 监听容器尺寸变化
   var size = useSize(containerRef);
   useEffect(function () {
-    var _table$scroll, _tableRef$current;
-    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto') (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
+    var _table$scroll, _tableContentRef$curr;
+    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto' && ((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) !== 0) {
+      var _tableRef$current;
+      (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
+    }
   }, [size === null || size === void 0 ? void 0 : size.height]);
 
   // 获取数据

package/es/table/index.d.ts

@@ -9,8 +9,6 @@ type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'requestParam' | 'title'
 export type TableRefType = {
     /** 列筛选 */
     onColumnFilter: (e: any) => void;
-    /** 全屏 */
-    onFullScreen: () => void;
     /** 计算固定表头宽度 */
     onFixedThead: () => void;
 };

package/es/table/index.js

@@ -11,7 +11,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { useDebounceFn, useUpdate } from 'ahooks';
 import { Table, Tooltip, theme } from 'antd';
 import classNames from 'classnames';
-import { useEffect, useImperativeHandle, useRef } from 'react';
+import { useEffect, useImperativeHandle } from 'react';
 import { Resizable } from 'react-resizable';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -57,9 +57,6 @@ var CustomTable = function CustomTable(props) {
     className = _props$className === void 0 ? '' : _props$className,
     tableContentRef = props.tableContentRef,
     restProps = _objectWithoutProperties(props, _excluded2);
-
-  // 固定表头获取table可视高度
-  var ref = useRef(null);
   var update = useUpdate();
   var _ref = data || DEFAULT_PAGE,
     totalNum = _ref.totalNum,
@@ -70,18 +67,20 @@ var CustomTable = function CustomTable(props) {
   // table 固定表头，内容滚动
   var _useDebounceFn = useDebounceFn(function () {
       if ((scroll === null || scroll === void 0 ? void 0 : scroll.y) === 'auto') {
-        var _ref$current, _ref$current2, _ref$current3, _tableContentRef$curr;
-        var tableBody = ref.current.getElementsByClassName('ant-table-body')[0];
+        var _tableContentRef$curr;
+        var tableTarget = tableContentRef === null || tableContentRef === void 0 ? void 0 : tableContentRef.current;
+        if (!tableTarget) return;
+        var tableBody = tableTarget.getElementsByClassName('ant-table-body')[0];
         if (!tableBody) return;
         var headerHeight = 0,
           pageHeight = 0,
           footerHeight = 0;
-        var _pagination = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.getElementsByClassName('ant-pagination');
+        var _pagination = tableTarget.getElementsByClassName('ant-pagination');
         if (_pagination && _pagination.length > 0) {
           pageHeight = _pagination[0].clientHeight;
         }
-        var header = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.getElementsByClassName('ant-table-header');
-        var footer = (_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.getElementsByClassName('ant-table-footer');
+        var header = tableTarget.getElementsByClassName('ant-table-header');
+        var footer = tableTarget.getElementsByClassName('ant-table-footer');
         if (footer && footer.length > 0) {
           footerHeight = footer[0].clientHeight;
         }
@@ -116,7 +115,6 @@ var CustomTable = function CustomTable(props) {
         });
         update();
       },
-      onFullScreen: onFixedThead,
       onFixedThead: onFixedThead
     };
   });
@@ -184,39 +182,36 @@ var CustomTable = function CustomTable(props) {
     style: _objectSpread(_objectSpread({}, style), {}, {
       background: token.colorBgContainer
     }),
-    children: /*#__PURE__*/_jsx("div", {
-      ref: ref,
-      children: /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
-        rowKey: rowKey,
-        dataSource: result,
-        pagination: pagination === false ? false : _objectSpread({
-          total: totalNum,
-          pageSize: pageSize,
-          current: pageNo,
-          showSizeChanger: true,
-          showQuickJumper: true,
-          showTotal: function showTotal() {
-            return "\u5171".concat(totalNum, "\u6761\u8BB0\u5F55");
-          },
-          pageSizeOptions: ['10', '20', '30', '50', '100'],
-          size: restProps.size === 'small' ? 'small' : 'default',
-          simple: restProps.size === 'small'
-        }, pagination),
-        rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {
-          columnWidth: 60
-        }) : undefined,
-        columns: filterColumns(),
-        components: {
-          header: {
-            cell: ResizableTitle
-          }
+    children: /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
+      rowKey: rowKey,
+      dataSource: result,
+      pagination: pagination === false ? false : _objectSpread({
+        total: totalNum,
+        pageSize: pageSize,
+        current: pageNo,
+        showSizeChanger: true,
+        showQuickJumper: true,
+        showTotal: function showTotal() {
+          return "\u5171".concat(totalNum, "\u6761\u8BB0\u5F55");
+        },
+        pageSizeOptions: ['10', '20', '30', '50', '100'],
+        size: restProps.size === 'small' ? 'small' : 'default',
+        simple: restProps.size === 'small'
+      }, pagination),
+      rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {
+        columnWidth: 60
+      }) : undefined,
+      columns: filterColumns(),
+      components: {
+        header: {
+          cell: ResizableTitle
         }
-      }, restProps), {}, {
-        size: restProps.size || 'middle',
-        className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !result || result.length === 0), 'ccs-table-wrapper', !rowSelection), "className", className)),
-        scroll: scroll
-      }))
-    })
+      }
+    }, restProps), {}, {
+      size: restProps.size || 'middle',
+      className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !result || result.length === 0), 'ccs-table-wrapper', !rowSelection), "className", className)),
+      scroll: scroll
+    }))
   });
 };
 export default CustomTable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "",
   "license": "MIT",
   "author": {