@ccs-ui/rc-pro 2.3.5 → 2.3.6-alpha-2

package/es/hooks/use-selection.d.ts

@@ -0,0 +1,28 @@
+import { RowSelectMethod } from 'antd/es/table/interface';
+import React from 'react';
+interface PropsType<T> {
+    /** 表单受控 value */
+    value?: any[];
+    /** 默认选择行数据,一般用于回显数据 */
+    defaultRows?: T[];
+    /** 是否多选 */
+    multiple?: boolean;
+    /** 字段配置,默认 { key: 'key'; label: 'label' } */
+    keyField: string;
+    /** 表单受控 onChange*/
+    onChange?: (value: any) => void;
+    /** 设置选项 */
+    onChangeRows?: (options: any[]) => void;
+}
+export default function useTableSelection<T = any>(props: PropsType<T>): {
+    onChange: (keys: React.Key[], rows: T[], info: {
+        type: RowSelectMethod;
+    }) => void;
+    onClear: (key?: React.Key) => void;
+    selectedRowKeys?: React.Key[] | undefined;
+    selectedRows?: T[] | undefined;
+    info: {
+        type: RowSelectMethod;
+    };
+};
+export {};

package/es/hooks/use-selection.js

@@ -0,0 +1,148 @@
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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; }
+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 { useMemoizedFn, useUpdateEffect } from 'ahooks';
+import { useEffect, useRef, useState } from 'react';
+// 判断相对
+function isEq(obj1, obj2) {
+  var o1 = obj1 !== null && obj1 !== void 0 ? obj1 : [];
+  var o2 = obj2 !== null && obj2 !== void 0 ? obj2 : [];
+  if (!Array.isArray(o1)) {
+    o1 = [o1];
+  }
+  return JSON.stringify(o1) !== JSON.stringify(o2);
+}
+export default function useTableSelection(props) {
+  var _ref = props || {},
+    value = _ref.value,
+    defaultRows = _ref.defaultRows,
+    _ref$keyField = _ref.keyField,
+    keyField = _ref$keyField === void 0 ? 'key' : _ref$keyField,
+    multiple = _ref.multiple,
+    onChangeValue = _ref.onChange,
+    onChangeRows = _ref.onChangeRows;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    setUpdate = _useState2[1];
+  var selectionRef = useRef({
+    selectedRowKeys: ['number', 'string'].includes(_typeof(value)) ? [value] : value,
+    selectedRows: defaultRows,
+    info: {
+      type: 'none'
+    }
+  });
+  var handleOnChange = useMemoizedFn(function () {
+    var _selectionRef$current = selectionRef.current,
+      _selectionRef$current2 = _selectionRef$current.selectedRowKeys,
+      selectedRowKeys = _selectionRef$current2 === void 0 ? [] : _selectionRef$current2,
+      selectedRows = _selectionRef$current.selectedRows;
+    if (multiple) {
+      // 受控调用onChange
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys);
+    } else {
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys[0]);
+    }
+    onChangeRows === null || onChangeRows === void 0 || onChangeRows(selectedRows || []);
+    if (!onChangeValue) setUpdate({});
+  });
+
+  // 生成默认选中数据
+  useEffect(function () {
+    if (defaultRows && !selectionRef.current.selectedRows) {
+      selectionRef.current.selectedRows = defaultRows;
+
+      // 生成选项
+      if (onChangeRows) onChangeRows(defaultRows);
+      setUpdate({});
+    }
+  }, [defaultRows]);
+
+  // value 变更,与当前选中数据不匹配
+  useUpdateEffect(function () {
+    if (isEq(value, selectionRef.current.selectedRowKeys)) {
+      var _selectionRef$current3;
+      var rows = (_selectionRef$current3 = selectionRef.current.selectedRows) === null || _selectionRef$current3 === void 0 ? void 0 : _selectionRef$current3.filter(function () {
+        var _ref2;
+        var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        return (_ref2 = value || []) === null || _ref2 === void 0 ? void 0 : _ref2.includes(row[keyField]);
+      });
+      selectionRef.current = {
+        selectedRowKeys: value,
+        selectedRows: rows,
+        info: {
+          type: 'none'
+        }
+      };
+      setUpdate({});
+    }
+  }, [value]);
+
+  // 选中改变
+  var onChange = useMemoizedFn(function (keys, rows, info) {
+    selectionRef.current = {
+      selectedRowKeys: keys,
+      selectedRows: rows,
+      info: info
+    };
+    // 未知选中数据，在初始化传入数据中匹配
+    if (defaultRows && defaultRows.length > 0) {
+      rows.forEach(function (row, index) {
+        if (!row) {
+          var defaultRow = defaultRows.find(function (r) {
+            return r[keyField] === keys[index];
+          });
+          if (defaultRow) rows[index] = defaultRow;
+        }
+      });
+    }
+    handleOnChange();
+  });
+
+  // 删除
+  var onClear = useMemoizedFn(function (key) {
+    // 未传入key，删除全部
+    if (!key) {
+      selectionRef.current = {
+        selectedRowKeys: undefined,
+        selectedRows: undefined,
+        info: {
+          type: 'none'
+        }
+      };
+    } else {
+      var _selectionRef$current4 = selectionRef.current,
+        _selectionRef$current5 = _selectionRef$current4.selectedRowKeys,
+        selectedRowKeys = _selectionRef$current5 === void 0 ? [] : _selectionRef$current5,
+        _selectionRef$current6 = _selectionRef$current4.selectedRows,
+        selectedRows = _selectionRef$current6 === void 0 ? [] : _selectionRef$current6;
+      var newRows = selectedRows.filter(function () {
+        var r = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        return r[keyField] !== key;
+      });
+      var newKey = selectedRowKeys.filter(function (k) {
+        return k !== key;
+      });
+      selectionRef.current = {
+        selectedRowKeys: newKey,
+        selectedRows: newRows,
+        info: {
+          type: 'none'
+        }
+      };
+    }
+    handleOnChange();
+  });
+  return _objectSpread(_objectSpread({}, selectionRef.current), {}, {
+    onChange: onChange,
+    onClear: onClear
+  });
+}

package/es/index.d.ts

@@ -7,11 +7,12 @@ export { default as CcsAppConfig } from './config';
 export { default as CcsDatePicker } from './date-picker';
 export { default as CcsDialog } from './dialog';
 export { default as CcsEditor } from './editor';
-export { default as CcsLinesEllipsis } from './ellipsis';
+export { default as CcsEllipsis } from './ellipsis';
 export { default as CcsFullScreenButton } from './full-screen';
 export { default as useAppConfig } from './hooks/use-app';
 export { default as useCcsOnceEvent } from './hooks/use-once-event';
 export { default as useCcsPage } from './hooks/use-page';
+export { default as useTableSelection } from './hooks/use-selection';
 export { default as useCcsTabs } from './hooks/use-tabs';
 export { default as useCcsWindow } from './hooks/use-window';
 export { default as CcsIntervalButton } from './interval-button';
@@ -23,7 +24,7 @@ export { default as CcsProTable } from './pro-table';
 export { default as CcsProTabs } from './pro-tabs';
 export { default as CcsResizeObserver } from './resize-observer';
 export { default as CcsResult } from './result';
-export { default as CcsApiSelect } from './select';
+export { default as CcsSelect } from './select';
 export { default as CcsStatusTag } from './status-tag';
 export { default as CcsTable } from './table';
 export { default as CcsTimePicker } from './time-picker';

package/es/index.js

@@ -7,11 +7,12 @@ export { default as CcsAppConfig } from "./config";
 export { default as CcsDatePicker } from "./date-picker";
 export { default as CcsDialog } from "./dialog";
 export { default as CcsEditor } from "./editor";
-export { default as CcsLinesEllipsis } from "./ellipsis";
+export { default as CcsEllipsis } from "./ellipsis";
 export { default as CcsFullScreenButton } from "./full-screen";
 export { default as useAppConfig } from "./hooks/use-app";
 export { default as useCcsOnceEvent } from "./hooks/use-once-event";
 export { default as useCcsPage } from "./hooks/use-page";
+export { default as useTableSelection } from "./hooks/use-selection";
 export { default as useCcsTabs } from "./hooks/use-tabs";
 export { default as useCcsWindow } from "./hooks/use-window";
 export { default as CcsIntervalButton } from "./interval-button";
@@ -23,7 +24,7 @@ export { default as CcsProTable } from "./pro-table";
 export { default as CcsProTabs } from "./pro-tabs";
 export { default as CcsResizeObserver } from "./resize-observer";
 export { default as CcsResult } from "./result";
-export { default as CcsApiSelect } from "./select";
+export { default as CcsSelect } from "./select";
 export { default as CcsStatusTag } from "./status-tag";
 export { default as CcsTable } from "./table";
 export { default as CcsTimePicker } from "./time-picker";

package/es/interval-button/index.js

@@ -122,4 +122,7 @@ function IntervalButton(_ref, ref) {
     children: disabled ? "".concat(count, "\u79D2").concat(disabledText) : "".concat(children)
   }));
 }
+if (process.env.NODE_ENV !== 'production') {
+  IntervalButton.displayName = 'CcsIntervalButton';
+}
 export default /*#__PURE__*/forwardRef(IntervalButton);

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;
@@ -21,5 +22,8 @@ type PropsType = {
     history: any;
 };
 export declare function findMenusByUrl(tree: MenuType | MenuType[], targetUrl: string, parents?: MenuType[]): MenuType[] | null;
-export default function KeepAliveTabs({ maxLen, appName, history, menuItems, className, }: PropsType): import("react/jsx-runtime").JSX.Element;
-export {};
+declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, }: PropsType): import("react/jsx-runtime").JSX.Element;
+declare namespace KeepAliveTabs {
+    var displayName: string;
+}
+export default KeepAliveTabs;

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';
@@ -123,7 +124,7 @@ export function findMenusByUrl(tree, targetUrl) {
   }
   return null;
 }
-export default function KeepAliveTabs(_ref) {
+function KeepAliveTabs(_ref) {
   var _ref$maxLen = _ref.maxLen,
     maxLen = _ref$maxLen === void 0 ? 10 : _ref$maxLen,
     appName = _ref.appName,
@@ -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,
@@ -346,4 +387,8 @@ export default function KeepAliveTabs(_ref) {
       }, key);
     })]
   });
-}
+}
+if (process.env.NODE_ENV !== 'production') {
+  KeepAliveTabs.displayName = 'CcsKeepAliveTabs';
+}
+export default KeepAliveTabs;

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

@@ -5,5 +5,8 @@ type PropsType = {
     menuItems: CCS.MenuType[];
     className?: string;
 };
-export default function SinglePage({ appName, menuItems, className, }: PropsType): import("react/jsx-runtime").JSX.Element;
-export {};
+declare function SinglePage({ appName, menuItems, className }: PropsType): import("react/jsx-runtime").JSX.Element;
+declare namespace SinglePage {
+    var displayName: string;
+}
+export default SinglePage;

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

@@ -7,7 +7,7 @@ import CcsResult from "../result";
 import "./index.less";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
-export default function SinglePage(_ref) {
+function SinglePage(_ref) {
   var appName = _ref.appName,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
@@ -53,11 +53,12 @@ export default function SinglePage(_ref) {
       urlAuthList: menuInfo.auth,
       breadcrumb: menuInfo.breadcrumb,
       children: outlet
-    }) : /*#__PURE__*/_jsx(CcsResult.NotFound, {
-      style: {
-        marginTop: 100
-      },
-      iconWidth: 200
+    }) : /*#__PURE__*/_jsx(CcsResult.Page404, {
+      subTitle: "\u9875\u9762\u4E0D\u5B58\u5728"
     })
   });
-}
+}
+if (process.env.NODE_ENV !== 'production') {
+  SinglePage.displayName = 'CcsSinglePage';
+}
+export default SinglePage;

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/es/loading/index.d.ts

@@ -7,5 +7,8 @@ type CcsLoadingProps = {
     /** loading 文字说明 */
     loadingTip?: string;
 };
-declare const Loading: ({ loading, loadingTip }: CcsLoadingProps) => import("react/jsx-runtime").JSX.Element | null;
+declare const Loading: {
+    ({ loading, loadingTip }: CcsLoadingProps): import("react/jsx-runtime").JSX.Element | null;
+    displayName: string;
+};
 export default Loading;

package/es/loading/index.js

@@ -11,7 +11,7 @@ var Loading = function Loading(_ref) {
       position: 'absolute',
       inset: 0,
       background: 'rgba(0, 0, 0, 0.1)',
-      zIndex: 1000
+      zIndex: 9999
     },
     children: /*#__PURE__*/_jsxs("div", {
       style: {
@@ -37,4 +37,7 @@ var Loading = function Loading(_ref) {
     })
   }) : null;
 };
+if (process.env.NODE_ENV !== 'production') {
+  Loading.displayName = 'CcsLoading';
+}
 export default Loading;

package/es/pro-table/head.d.ts

@@ -1,15 +1,16 @@
-import { FormInstance } from 'antd/lib/form';
-import { ReactElement } from 'react';
-import { PropsWithElementChildren } from '../ccs';
+import { FormInstance } from 'antd';
+import React, { ReactElement } from 'react';
 import { CcsProTableProps } from './table';
-type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & PropsWithElementChildren & {
+type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'formItemLabelWidth'> & {
     /** 更多查询条件 */
     hasMore?: boolean;
-    form: FormInstance<any>;
     /** table 操作栏 */
-    tableOperation: ReactElement;
+    tableOperation?: ReactElement;
+    /** 查询 */
     onSearch: () => void;
+    /** form */
+    formRef: React.RefObject<FormInstance<any>>;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
+declare function HeadComponent<T>({ toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;