@ccs-ui/rc-pro 2.5.1 → 2.5.3-alpha.1

package/es/editor/lexical/base/toolbar/index.js

@@ -12,7 +12,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  *
  */
 import { AlignCenterOutlined, AlignLeftOutlined, AlignRightOutlined, BgColorsOutlined, BoldOutlined, DisconnectOutlined, FileImageOutlined, FontColorsOutlined, ItalicOutlined, LinkOutlined, MenuOutlined, RedoOutlined, StrikethroughOutlined, UnderlineOutlined, UndoOutlined } from '@ant-design/icons';
-import { $onGenerateHTML } from "../../../rich/export";
 import { $generateNodesFromDOM } from '@lexical/html';
 import { $isLinkNode as $isLinkNodeHelper, TOGGLE_LINK_COMMAND } from '@lexical/link'; // 别名避免冲突
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
@@ -25,6 +24,7 @@ import { EditorRichContext } from '..';
 import { CcsAtom } from "../../../../";
 import CcsColorPicker from "../../../../color-picker";
 import { useInsertCss } from "../../../../hooks/use-insert-css";
+import { $onGenerateHTML } from "../../../rich/export";
 import CodeEdit from "./code";
 import UploadModal from "./upload";
 import { jsx as _jsx } from "react/jsx-runtime";

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

@@ -7,8 +7,6 @@ export type MenuType = {
     icon?: string;
     /** url地址 */
     url?: string;
-    /** 是否隐藏面包屑 @default false */
-    hideBreadcrumb?: boolean;
     /** 页签模式下是否可关闭 @default true */
     canClose?: boolean;
     /** 菜单权限编码 */
@@ -37,6 +35,19 @@ export type KeepAliveTabsProps = Omit<SinglePageProps, 'children'> & {
     /** 默认页面,默认页面固定在第一个，不能被关闭 */
     defaultPage?: DefaultPage;
 };
+export type LocalRouterProps = {
+    /** 路由路径 */
+    path: string;
+    /** 路由组件 */
+    component: string;
+    /** 路由元数据 */
+    meta?: {
+        /** 是否隐藏面包屑 */
+        hideBreadcrumb?: boolean;
+        /** 是否自定义布局,如果设置为true,将不会使用默认布局 */
+        isCustomLayout?: boolean;
+    };
+};
 export interface SinglePageProps {
     /** 应用名称 */
     appName: string;
@@ -50,5 +61,7 @@ export interface SinglePageProps {
     children?: ReactNode;
     /** 基础路径 */
     basePath?: string;
+    /** umi中使用useRouteProps，获取路由元数据hideBreadcrumb，根据路由配置判断是否隐藏面包屑 */
+    useRouteProps?: () => LocalRouterProps;
 }
 export {};

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

@@ -14,7 +14,7 @@ export type CacheRouter = {
     closeIcon?: ReactNode;
 };
 export declare function findMenusByUrl(tree: MenuType | MenuType[], targetUrl: string, parents?: MenuType[]): MenuType[] | null;
-declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, hideBreadcrumb, defaultPage, basePath, }: KeepAliveTabsProps): import("react/jsx-runtime").JSX.Element;
+declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, hideBreadcrumb, defaultPage, basePath, useRouteProps, breadcrumbStyle, }: KeepAliveTabsProps): import("react/jsx-runtime").JSX.Element;
 declare namespace KeepAliveTabs {
     var displayName: string;
 }

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

@@ -17,7 +17,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { MoreOutlined } from '@ant-design/icons';
 import CcsUtils from '@ccs-ui/utils';
 import { useMemoizedFn, useUpdate, useUpdateEffect } from 'ahooks';
-import { Button, Dropdown, Tabs } from 'antd';
+import { Breadcrumb, Button, Dropdown, Tabs } from 'antd';
 import classnames from 'classnames';
 import updateHelper from 'immutability-helper';
 import { useCallback, useMemo, useRef } from 'react';
@@ -126,7 +126,7 @@ export function findMenusByUrl(tree, targetUrl) {
   return null;
 }
 function KeepAliveTabs(_ref) {
-  var _defaultPage$menu;
+  var _defaultPage$menu, _routeProps$meta;
   var _ref$maxLen = _ref.maxLen,
     maxLen = _ref$maxLen === void 0 ? 10 : _ref$maxLen,
     appName = _ref.appName,
@@ -136,8 +136,11 @@ function KeepAliveTabs(_ref) {
     className = _ref.className,
     hideBreadcrumb = _ref.hideBreadcrumb,
     defaultPage = _ref.defaultPage,
-    basePath = _ref.basePath;
+    basePath = _ref.basePath,
+    useRouteProps = _ref.useRouteProps,
+    breadcrumbStyle = _ref.breadcrumbStyle;
   var location = useLocation();
+  var routeProps = (useRouteProps === null || useRouteProps === void 0 ? void 0 : useRouteProps()) || {};
 
   // 路由集合、添加默认页
   var routers = useRef(defaultPage ? [{
@@ -148,7 +151,7 @@ function KeepAliveTabs(_ref) {
     urlAuthList: ((_defaultPage$menu = defaultPage.menu) === null || _defaultPage$menu === void 0 || (_defaultPage$menu = _defaultPage$menu.btnAuth) === null || _defaultPage$menu === void 0 ? void 0 : _defaultPage$menu.map(function (b) {
       return b.code;
     })) || [],
-    breadcrumb: hideBreadcrumb || defaultPage.menu.hideBreadcrumb ? [] : [{
+    breadcrumb: hideBreadcrumb || (_routeProps$meta = routeProps.meta) !== null && _routeProps$meta !== void 0 && _routeProps$meta.hideBreadcrumb ? [] : [{
       key: '-1',
       title: '首页',
       href: basePath || undefined
@@ -196,6 +199,7 @@ function KeepAliveTabs(_ref) {
 
   // 当前菜单
   var curMenu = useMemo(function () {
+    var _routeProps$meta2;
     // 上下级菜单
     var menus = findMenusByUrl(menuItems, pathname) || [];
     // 当前菜单
@@ -253,7 +257,7 @@ function KeepAliveTabs(_ref) {
     }();
     if (menu) saveHistory();
     var breadcrumb = [];
-    if (!hideBreadcrumb && !(menu !== null && menu !== void 0 && menu.hideBreadcrumb)) {
+    if (!hideBreadcrumb && !((_routeProps$meta2 = routeProps.meta) !== null && _routeProps$meta2 !== void 0 && _routeProps$meta2.hideBreadcrumb)) {
       // 面包屑数据
       breadcrumb = menus.map(function (m) {
         return {
@@ -417,17 +421,26 @@ function KeepAliveTabs(_ref) {
         }));
       }
     }), routers.current.map(function (_ref4) {
+      var _routeProps$meta3;
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
         outlet = _ref4.outlet,
-        breadcrumb = _ref4.breadcrumb,
+        _ref4$breadcrumb = _ref4.breadcrumb,
+        breadcrumb = _ref4$breadcrumb === void 0 ? [] : _ref4$breadcrumb,
         pageLocation = _ref4.pageLocation;
       return /*#__PURE__*/_jsx(Page, {
         active: pageLocation.pathname === pathname,
         location: pageLocation,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
-        breadcrumb: breadcrumb,
+        isCustomLayout: (_routeProps$meta3 = routeProps.meta) === null || _routeProps$meta3 === void 0 ? void 0 : _routeProps$meta3.isCustomLayout,
+        breadcrumb: breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
+          items: breadcrumb,
+          className: "ccs-breadcrumb",
+          style: _objectSpread({
+            marginTop: -6
+          }, breadcrumbStyle)
+        }),
         children: outlet
       }, key);
     })]

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

@@ -1,13 +1,15 @@
-import { CSSProperties } from 'react';
+import { ReactNode } from 'react';
 import { Location } from 'react-router';
 import { CacheRouter } from '.';
-export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children'> & {
+export type CachePageProps = Pick<CacheRouter, 'urlAuthList' | 'children'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
     location: Location;
-    /** 语义化style */
-    breadcrumbStyle?: CSSProperties;
+    /** 面包屑 */
+    breadcrumb?: ReactNode;
+    /** 是否自定义布局 */
+    isCustomLayout?: boolean;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };

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

@@ -1,4 +1,9 @@
-import { Breadcrumb } from 'antd';
+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 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); }
 import classNames from 'classnames';
 import { memo, useRef } from 'react';
 import { PageContext } from "../../context";
@@ -13,7 +18,7 @@ function CachePage(props) {
     _props$breadcrumb = props.breadcrumb,
     breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb,
     location = props.location,
-    breadcrumbStyle = props.breadcrumbStyle;
+    isCustomLayout = props.isCustomLayout;
   var id = "_tab_content_".concat(location.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
@@ -22,7 +27,6 @@ function CachePage(props) {
       dialogHolderRef: dialogHolderRef,
       isActive: active,
       location: location,
-      breadcrumb: breadcrumb,
       onDestroy: onDestroy,
       onAuth: function onAuth(e) {
         return urlAuthList.includes(e);
@@ -30,24 +34,23 @@ function CachePage(props) {
     },
     children: /*#__PURE__*/_jsx("div", {
       id: id,
-      style: {
+      style: _objectSpread({
         display: active ? 'block' : 'none'
-      },
+      }, isCustomLayout ? {
+        padding: 0,
+        overflow: 'hidden'
+      } : {}),
       className: "ccs-tab-item",
       "data-display": active,
       children: /*#__PURE__*/_jsxs("div", {
         className: classNames('ccs-layout-page', {
           'page-avtive': active
         }),
-        children: [/*#__PURE__*/_jsx("div", {
-          className: breadcrumb && breadcrumb.length ? 'page-top-10' : 'page-top-16'
-        }), breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
-          items: breadcrumb,
-          className: "ccs-breadcrumb",
-          style: breadcrumbStyle
-        }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+        children: [!isCustomLayout && /*#__PURE__*/_jsx("div", {
+          className: "page-top-16"
+        }), breadcrumb, children, /*#__PURE__*/_jsx(DialogElementsHolder, {
           ref: dialogHolderRef
-        }, "modal-drawer-holder"), /*#__PURE__*/_jsx("div", {
+        }, "modal-drawer-holder"), !isCustomLayout && /*#__PURE__*/_jsx("div", {
           className: "page-bottom"
         })]
       })

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

@@ -1,5 +1,5 @@
 import { SinglePageProps } from '../_api';
-declare function SinglePage({ appName, menuItems, breadcrumbStyle, hideBreadcrumb, children, basePath, }: SinglePageProps): import("react/jsx-runtime").JSX.Element;
+declare function SinglePage({ appName, menuItems, breadcrumbStyle, hideBreadcrumb, children, basePath, useRouteProps, }: SinglePageProps): import("react/jsx-runtime").JSX.Element;
 declare namespace SinglePage {
     var displayName: string;
 }

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

@@ -1,27 +1,43 @@
+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 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); }
+import { Breadcrumb } from 'antd';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
+import { useInsertCss } from "../../hooks/use-insert-css";
 import CcsResult from "../../result";
 import { findMenusByUrl } from "../keep-alive";
 import Page from "./page";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
 function SinglePage(_ref) {
+  var _routeProps$meta2;
   var appName = _ref.appName,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
     breadcrumbStyle = _ref.breadcrumbStyle,
     hideBreadcrumb = _ref.hideBreadcrumb,
     children = _ref.children,
-    basePath = _ref.basePath;
+    basePath = _ref.basePath,
+    useRouteProps = _ref.useRouteProps;
   var location = useLocation();
   var pathname = location.pathname;
   var outlet = useOutlet();
+  var routeProps = (useRouteProps === null || useRouteProps === void 0 ? void 0 : useRouteProps()) || {};
+
+  // 添加额外样式
+  useInsertCss('single-page', function (prefixCls) {
+    return [".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%;}")];
+  });
 
   // 当前菜单
   var menuInfo = useMemo(function () {
-    var _menu$btnAuth;
+    var _routeProps$meta, _menu$btnAuth;
     var menus = findMenusByUrl(menuItems, pathname) || [];
     var menu = menus === null || menus === void 0 ? void 0 : menus.at(-1);
     if (!menu) return undefined;
@@ -31,7 +47,7 @@ function SinglePage(_ref) {
       document.title = "".concat((menu === null || menu === void 0 ? void 0 : menu.label) || (menu === null || menu === void 0 ? void 0 : menu.url), " - ").concat(appName);
     }, 10);
     var breadcrumb = [];
-    if (!hideBreadcrumb && !(menu !== null && menu !== void 0 && menu.hideBreadcrumb)) {
+    if (!hideBreadcrumb && !((_routeProps$meta = routeProps.meta) !== null && _routeProps$meta !== void 0 && _routeProps$meta.hideBreadcrumb)) {
       breadcrumb = menus.map(function (m) {
         return {
           key: m.key,
@@ -56,8 +72,14 @@ function SinglePage(_ref) {
     children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
       location: location,
       urlAuthList: menuInfo.auth,
-      breadcrumb: menuInfo.breadcrumb,
-      breadcrumbStyle: breadcrumbStyle,
+      breadcrumb: menuInfo.breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
+        items: menuInfo.breadcrumb,
+        className: "ccs-breadcrumb",
+        style: _objectSpread({
+          marginTop: -6
+        }, breadcrumbStyle)
+      }),
+      isCustomLayout: (_routeProps$meta2 = routeProps.meta) === null || _routeProps$meta2 === void 0 ? void 0 : _routeProps$meta2.isCustomLayout,
       children: /*#__PURE__*/_jsxs(_Fragment, {
         children: [outlet, children]
       })

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

@@ -1,13 +1,15 @@
-import { CSSProperties, JSXElementConstructor, ReactElement } from 'react';
+import { JSXElementConstructor, ReactElement, ReactNode } from 'react';
 import { Location } from 'react-router';
 import { CacheRouter } from '../keep-alive';
-export type PageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList'> & {
+export type PageProps = Pick<CacheRouter, 'urlAuthList'> & {
     /** router location */
     location: Location;
+    /** 面包屑 */
+    breadcrumb?: ReactNode;
+    /** 是否自定义布局 */
+    isCustomLayout?: boolean;
     /** children */
     children: ReactElement<any, string | JSXElementConstructor<any>> | null;
-    /** 语义化style */
-    breadcrumbStyle?: CSSProperties;
 };
 declare const _default: import("react").MemoExoticComponent<(props: PageProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -1,4 +1,9 @@
-import { Breadcrumb } from 'antd';
+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 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); }
 import { memo, useRef } from 'react';
 import { PageContext } from "../../context";
 import { DialogElementsHolder } from "../../dialog/hook";
@@ -10,7 +15,9 @@ export default /*#__PURE__*/memo(function (props) {
     _props$urlAuthList = props.urlAuthList,
     urlAuthList = _props$urlAuthList === void 0 ? [] : _props$urlAuthList,
     _props$breadcrumb = props.breadcrumb,
-    breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb;
+    breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb,
+    _props$isCustomLayout = props.isCustomLayout,
+    isCustomLayout = _props$isCustomLayout === void 0 ? false : _props$isCustomLayout;
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
@@ -27,15 +34,15 @@ export default /*#__PURE__*/memo(function (props) {
     },
     children: /*#__PURE__*/_jsxs("div", {
       className: "ccs-layout-page single-page",
-      children: [/*#__PURE__*/_jsx("div", {
-        className: breadcrumb.length ? 'page-top-10' : 'page-top-16'
-      }), breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
-        items: breadcrumb,
-        className: "ccs-breadcrumb",
-        style: props.breadcrumbStyle
-      }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+      style: _objectSpread({}, isCustomLayout ? {
+        padding: 0,
+        overflow: 'hidden'
+      } : {}),
+      children: [!isCustomLayout && /*#__PURE__*/_jsx("div", {
+        className: "page-top-16"
+      }), breadcrumb, children, /*#__PURE__*/_jsx(DialogElementsHolder, {
         ref: dialogHolderRef
-      }, "modal-drawer-holder"), /*#__PURE__*/_jsx("div", {
+      }, "modal-drawer-holder"), !isCustomLayout && /*#__PURE__*/_jsx("div", {
         className: "page-bottom"
       })]
     })

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

@@ -19,12 +19,15 @@ export interface TableProps<T> extends Omit<AntdTableProps<T>, 'columns' | 'summ
     requestParam?: Record<string, any>;
     /** request 方法 */
     request?: (params: any) => Promise<any>;
+    /** 查询条件改变触发接口调用 */
+    requestByFilterChange?: boolean;
     /** class name */
     className?: string;
     /** style */
     style?: CSSProperties;
     /**
      * 隐藏操作工具栏：刷新，列设置，密度设置，全屏
+     * @deprecated 请使用 ProTableProps 中的 hideOperation 属性
      * @default false
      **/
     hideOperation?: boolean;
@@ -36,7 +39,7 @@ export interface TableProps<T> extends Omit<AntdTableProps<T>, 'columns' | 'summ
 /** 异步树叶子节点标识字段或函数判断 */
 export type LeafVerify<RecordType> = string | ((record: RecordType) => boolean);
 /** CcsProTable 组件属性 */
-export interface ProTableProps<RecordType = any> extends Pick<PropsWithCss, 'className'>, PropsWithNodeChildren, Pick<AtomPageRequestProps<RecordType>, 'auth' | 'onEvent'>, Pick<AtomFilterProps, 'formItems' | 'formInitValues' | 'formItemLabelWidth' | 'expandForm'> {
+export interface ProTableProps<RecordType = any> extends Pick<PropsWithCss, 'className'>, PropsWithNodeChildren, Pick<AtomPageRequestProps<RecordType>, 'auth' | 'onEvent'>, Pick<AtomFilterProps, 'formItems' | 'formInitValues' | 'formItemLabelWidth' | 'expandForm' | 'formLayout'> {
     /** 是否初始查询 @default true */
     init?: boolean;
     /** 标题 */
@@ -62,6 +65,13 @@ export interface ProTableProps<RecordType = any> extends Pick<PropsWithCss, 'cla
     proRef?: TableInstanceRef<RecordType>;
     /** 显示序号 @default false */
     showNumber?: boolean;
+    /**
+     * 隐藏操作工具栏：刷新，列设置，密度设置，全屏
+     * @default false
+     **/
+    hideOperation?: boolean;
+    /** 隐藏查询按钮 @default false */
+    hideSearchBtn?: boolean;
 }
 export type TableFormItems = AtomFormItems;
 /** table 数据 */

package/es/pro-table/table.js

@@ -87,13 +87,19 @@ var InternalProTable = function InternalProTable(props) {
     parentFieldName = props.parentFieldName,
     _props$formInitValues = props.formInitValues,
     formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
+    hideOperation = props.hideOperation,
+    hideSearchBtn = props.hideSearchBtn,
+    formLayout = props.formLayout,
     onEvent = props.onEvent;
   // antd config
   var config = useContext(ConfigContext);
+  // antd theme token
+  var _antTheme$useToken = antTheme.useToken(),
+    token = _antTheme$useToken.token;
 
   // 添加额外样式
   useInsertCss('table', function (prefixCls) {
-    return [".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} ")];
+    return [".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} "), ".ccs-pl .ant-table .ant-table-container .ant-table-body {scrollbar-width: thin;scrollbar-color: ".concat(token.colorBorder, " transparent;scrollbar-gutter: stable;} ")];
   });
 
   // table 参数
@@ -131,9 +137,6 @@ var InternalProTable = function InternalProTable(props) {
   // CCS 组件上下文配置
   var _useAppConfig = useAppConfig(),
     theme = _useAppConfig.theme;
-  // antd theme token
-  var _antTheme$useToken = antTheme.useToken(),
-    token = _antTheme$useToken.token;
   var _usePageRequest = usePageRequest({
       auth: auth,
       rowKey: rowKey,
@@ -169,7 +172,9 @@ var InternalProTable = function InternalProTable(props) {
     var treeNode = getDataById(data.dataSource || [], rowKey, id);
     // 没有查找到、全部刷新
     if (!treeNode) {
-      onRequest(DataEvent.Search);
+      onRequest({
+        eventType: DataEvent.Search
+      });
       return;
     }
     // 获取所有下级ID
@@ -204,7 +209,9 @@ var InternalProTable = function InternalProTable(props) {
   // 初始查询
   useEffect(function () {
     if (init !== false && httpRequest) {
-      onRequest(DataEvent.InitSearch);
+      onRequest({
+        eventType: DataEvent.InitSearch
+      });
     }
   }, [Object.keys(requestParam || {}).toString(), Object.values(requestParam || {}).toString()]);
 
@@ -212,7 +219,9 @@ var InternalProTable = function InternalProTable(props) {
   var onSearch = function onSearch() {
     // @ts-ignore
     // table?.rowSelection?.onClearByProTable?.();
-    onRequest(DataEvent.Search);
+    onRequest({
+      eventType: DataEvent.Search
+    });
   };
 
   // 重置
@@ -233,7 +242,9 @@ var InternalProTable = function InternalProTable(props) {
     });
     // 清空filter请求值
     filterOrderRef.current = defaultColumnValues;
-    onRequest(DataEvent.Reset);
+    onRequest({
+      eventType: DataEvent.Reset
+    });
   };
 
   // 刷新
@@ -241,7 +252,11 @@ var InternalProTable = function InternalProTable(props) {
     var _table$rowSelection2, _table$rowSelection2$;
     // @ts-ignore
     table === null || table === void 0 || (_table$rowSelection2 = table.rowSelection) === null || _table$rowSelection2 === void 0 || (_table$rowSelection2$ = _table$rowSelection2.onClearByProTable) === null || _table$rowSelection2$ === void 0 || _table$rowSelection2$.call(_table$rowSelection2);
-    onRequest(DataEvent.Reload, data.current, data.pageSize);
+    onRequest({
+      eventType: DataEvent.Reload,
+      pageNo: data.current,
+      pageSize: data.pageSize
+    });
   };
 
   // form 数据 查询，重载，重置方法
@@ -316,7 +331,11 @@ var InternalProTable = function InternalProTable(props) {
         orderProps: orderProps
       });
     }
-    onRequest(DataEvent.ChangePage, paginationTable.current || 0, paginationTable.pageSize || 10);
+    onRequest({
+      eventType: DataEvent.ChangePage,
+      pageNo: paginationTable.current || 0,
+      pageSize: paginationTable.pageSize || 10
+    });
   };
   var renderTable = function renderTable() {
     if (!table) return null;
@@ -435,7 +454,7 @@ var InternalProTable = function InternalProTable(props) {
   });
 
   // table 操作按钮
-  var renderTableOperation = table !== null && table !== void 0 && table.hideOperation ? /*#__PURE__*/_jsx(CcsAtom.Operation, {
+  var renderTableOperation = hideOperation || table !== null && table !== void 0 && table.hideOperation ? /*#__PURE__*/_jsx(CcsAtom.Operation, {
     extraLeft: toolbar
   }) : /*#__PURE__*/_jsx(CcsAtom.Operation, {
     extraLeft: toolbar,
@@ -469,8 +488,11 @@ var InternalProTable = function InternalProTable(props) {
         expandForm: expandForm,
         formInitValues: formInitValues,
         formItemLabelWidth: props.formItemLabelWidth,
+        formLayout: formLayout,
         onSearch: onSearch,
-        requestParam: table === null || table === void 0 ? void 0 : table.requestParam
+        requestParam: table === null || table === void 0 ? void 0 : table.requestParam,
+        onValuesChange: table !== null && table !== void 0 && table.requestByFilterChange ? onSearch : undefined,
+        hideSearchBtn: hideSearchBtn
       }), toolbar && renderTableOperation, /*#__PURE__*/_jsxs("div", {
         className: "".concat(classPrefix, "-table-content"),
         style: newStyles.table,

package/es/table/index.js

@@ -94,18 +94,18 @@ var CustomTable = function CustomTable(props) {
             if (node.classList.contains("".concat(prefixCls, "-table-body"))) {
               antTablebody = node;
             } else {
-              childHeights.push(node.clientHeight || 0);
+              childHeights.push(node.offsetHeight || 0);
             }
           });
         } else {
-          childHeights.push(e.clientHeight || 0);
+          childHeights.push(e.offsetHeight || 0);
         }
       });
 
       // 分页高度
       var pagination = tableTarget.getElementsByClassName("".concat(prefixCls, "-pagination"));
       if (pagination && pagination.length > 0) {
-        childHeights.push(pagination[0].clientHeight);
+        childHeights.push(pagination[0].offsetHeight);
       }
 
       // 计算body滚动高度
@@ -230,7 +230,7 @@ var CustomTable = function CustomTable(props) {
         simple: restProps.size === 'small',
         className: 'ccs-table-pagination',
         style: {
-          borderTop: "1px solid ".concat(token.colorBorderSecondary)
+          boxShadow: "0 -1px 0 ".concat(token.colorBorderSecondary)
         }
       }, pagination),
       rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {

package/es/upload/_api.d.ts

@@ -1,4 +1,16 @@
 import { UploadProps as AntUploadProps, UploadChangeParam, UploadFile } from 'antd/es/upload';
+/**
+ * 上传请求
+ * @param {File} file - 文件
+ * @param {Record<string, any>} options - 上传参数
+ *
+ * // 返回值信息可通过全局字段参数RcProFieldNames.base设置，默认为：success，data，msg
+ * @returns { Promise<{
+ *  success: boolean, - 成功标识
+ *  data: string,     - 返回文件id
+ *  msg?: string}.    - 异常消息
+ *  >} - 上传结果
+ */
 export type UploadRequest = (file: File, options?: Record<string, any>) => Promise<{
     /** 成功标识 */
     success: boolean;
@@ -17,6 +29,7 @@ export type FileValue = Pick<UploadFile, 'uid' | 'name' | 'url'> & {
     /** @deprecated 文件ID, 请使用uid */
     fileId?: string;
 };
+type FileValueType = string | string[] | FileValue | Array<FileValue>;
 export type UploadProps = AntUploadProps & {
     /** 最大文件数 */
     maxFileSize?: number;
@@ -29,7 +42,7 @@ export type UploadProps = AntUploadProps & {
      * 3. 当value为FileValue时，为单个文件属性
      * 4. 当value为FileValue数组时，每个元素为文件属性
      */
-    value?: string | string[] | FileValue | Array<FileValue>;
+    value?: FileValueType;
     /**
      * 格式化返回值类型，默认返回value值为string数组，@default 'arrayId'
      * 1. 当valueType为id时，返回文件ID字符串
@@ -41,6 +54,8 @@ export type UploadProps = AntUploadProps & {
     onChange?: (value: any) => void;
     /** 上传请求 */
     uploadRequest?: UploadRequest;
+    /** 初始化时，将value值转成FileValue数组的自定义方法 */
+    onFormatFiles?: (file: any) => Array<FileValue>;
 };
 export type FileUploadList = UploadChangeParam['fileList'][0];
 export interface ImageInfo {
@@ -58,3 +73,4 @@ export type UploadImageProps = UploadProps & {
     /** 获取base64数据 */
     onImageInfo?: (info: ImageInfo) => void;
 };
+export {};

package/es/upload/index.d.ts

@@ -1,6 +1,6 @@
 import { UploadProps } from './_api';
 import { ImageUpload } from './upload-image';
-declare function CustomUpload({ value, uploadText, valueFormat, maxCount, maxFileSize, uploadRequest, onChange, ...props }: UploadProps): import("react/jsx-runtime").JSX.Element;
+declare function CustomUpload({ value, uploadText, valueFormat, maxCount, maxFileSize, uploadRequest, onChange, onFormatFiles, ...props }: UploadProps): import("react/jsx-runtime").JSX.Element;
 declare namespace CustomUpload {
     var Image: typeof ImageUpload;
     var displayName: string;