@ccs-ui/rc-pro 2.5.1-beta.4 → 2.5.2

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";
@@ -10,8 +15,10 @@ function CachePage(props) {
     active = props.active,
     urlAuthList = props.urlAuthList,
     onDestroy = props.onDestroy,
-    breadcrumb = props.breadcrumb,
-    location = props.location;
+    _props$breadcrumb = props.breadcrumb,
+    breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb,
+    location = props.location,
+    isCustomLayout = props.isCustomLayout;
   var id = "_tab_content_".concat(location.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
@@ -27,23 +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: "page-top"
-        }), /*#__PURE__*/_jsx(Breadcrumb, {
-          items: breadcrumb,
-          className: "ccs-breadcrumb"
-        }), 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, children, }: 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,25 +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 { useInsertCss } from "../../hooks/use-insert-css";
+import { Breadcrumb } from 'antd';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 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,
-    children = _ref.children;
+    hideBreadcrumb = _ref.hideBreadcrumb,
+    children = _ref.children,
+    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;
@@ -28,17 +46,20 @@ function SinglePage(_ref) {
     setTimeout(function () {
       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 = menus.map(function (m) {
-      return {
-        key: m.key,
-        title: m.label
-        // href: m.url,
-      };
-    });
-    breadcrumb.unshift({
-      key: '-1',
-      title: '首页'
-    });
+    var breadcrumb = [];
+    if (!hideBreadcrumb && !((_routeProps$meta = routeProps.meta) !== null && _routeProps$meta !== void 0 && _routeProps$meta.hideBreadcrumb)) {
+      breadcrumb = menus.map(function (m) {
+        return {
+          key: m.key,
+          title: m.label
+        };
+      });
+      breadcrumb.unshift({
+        key: '-1',
+        title: '首页',
+        href: basePath || undefined
+      });
+    }
     return {
       auth: ((_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
         return b.code;
@@ -51,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: "page-top"
-      }), /*#__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/table.js

@@ -90,10 +90,13 @@ var InternalProTable = function InternalProTable(props) {
     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 +134,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,

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,4 @@
-import { UploadProps as AntUploadProps, UploadChangeParam } from 'antd/es/upload';
+import { UploadProps as AntUploadProps, UploadChangeParam, UploadFile } from 'antd/es/upload';
 export type UploadRequest = (file: File, options?: Record<string, any>) => Promise<{
     /** 成功标识 */
     success: boolean;
@@ -7,31 +7,42 @@ export type UploadRequest = (file: File, options?: Record<string, any>) => Promi
     /** 异常消息 */
     msg?: string;
 }>;
-type FileValue = {
-    /** 文件ID */
-    fileId: string;
-    /** 文件名称 */
-    name: string;
-    /** 文件url */
-    url?: string;
+/**
+ * 上传文件属性
+ * @property {string} uid - 文件唯一标识，文件的value值
+ * @property {string} name - 文件名称
+ * @property {string} url - 文件链接
+ */
+export type FileValue = Pick<UploadFile, 'uid' | 'name' | 'url'> & {
+    /** @deprecated 文件ID, 请使用uid */
+    fileId?: string;
 };
-export type UploadProps = Pick<AntUploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'name' | 'headers' | 'itemRender' | 'listType' | 'disabled'> & {
+export type UploadProps = AntUploadProps & {
     /** 最大文件数 */
     maxFileSize?: number;
     /** 上传按钮文本 */
     uploadText?: string;
-    /** 文件id */
-    value?: string | string[] | FileValue[];
+    /**
+     * 在双向绑定组件组，value初始值的类型：当有默认值时需传入FileValue类型数据，才能显示已上传的文件列表
+     * 1. 当value为字符串时，为单个文件ID
+     * 2. 当value为字符串数组时，每个元素为文件ID
+     * 3. 当value为FileValue时，为单个文件属性
+     * 4. 当value为FileValue数组时，每个元素为文件属性
+     */
+    value?: string | string[] | FileValue | Array<FileValue>;
+    /**
+     * 格式化返回值类型，默认返回value值为string数组，@default 'arrayId'
+     * 1. 当valueType为id时，返回文件ID字符串
+     * 2. 当valueType为arrayId时，返回文件ID数组
+     * 3. 当valueType为uploadlist时，返回文件属性数组
+     */
+    valueFormat?: 'id' | 'arrayId' | 'fileList';
     /** 上传change事件 */
     onChange?: (value: any) => void;
     /** 上传请求 */
-    uploadRequest: UploadRequest;
-    /** 获取文件真实url */
-    onRealUrl?: (fileId: string) => string;
-};
-export type FileUploadList = UploadChangeParam['fileList'][0] & {
-    fileId?: string;
+    uploadRequest?: UploadRequest;
 };
+export type FileUploadList = UploadChangeParam['fileList'][0];
 export interface ImageInfo {
     /** 图片名称 */
     name: string;
@@ -47,4 +58,3 @@ export type UploadImageProps = UploadProps & {
     /** 获取base64数据 */
     onImageInfo?: (info: ImageInfo) => void;
 };
-export {};

package/es/upload/index.d.ts

@@ -1,8 +1,6 @@
-import { FileUploadList, UploadProps } from './_api';
+import { UploadProps } from './_api';
 import { ImageUpload } from './upload-image';
-/** 生成图片默认值 */
-export declare function uploadDefaultFlies(value: UploadProps['value'], onRealUrl?: UploadProps['onRealUrl']): FileUploadList[];
-declare function CustomUpload({ value, disabled, uploadText, onRealUrl, maxCount, maxFileSize, uploadRequest, onChange, ...otherProps }: UploadProps): import("react/jsx-runtime").JSX.Element;
+declare function CustomUpload({ value, uploadText, valueFormat, maxCount, maxFileSize, uploadRequest, onChange, ...props }: UploadProps): import("react/jsx-runtime").JSX.Element;
 declare namespace CustomUpload {
     var Image: typeof ImageUpload;
     var displayName: string;