@ccs-ui/rc-pro 2.5.1-beta.3 → 2.5.1

package/es/atom/usePageRequest.js

@@ -103,21 +103,22 @@ export default function usePageRequest(_ref) {
             pageSize = _args.length > 2 && _args[2] !== undefined ? _args[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
             record = _args.length > 3 ? _args[3] : undefined;
             if (!(!isAuth || !httpRequest)) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
+            onEvent === null || onEvent === void 0 || onEvent(eventType);
             return _context.abrupt("return");
-          case 5:
-            _context.next = 7;
+          case 6:
+            _context.next = 8;
             return getFormValues === null || getFormValues === void 0 ? void 0 : getFormValues();
-          case 7:
+          case 8:
             _context.t0 = _context.sent;
             if (_context.t0) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
             _context.t0 = {};
-          case 10:
+          case 11:
             filterValues = _context.t0;
             // 接口字段指定
             fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), fieldNamesParams); // 请求字段
@@ -145,12 +146,12 @@ export default function usePageRequest(_ref) {
 
             // 异步树
             if (!onRequestCustom) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             onRequestCustom(eventType, params.query || params, record);
             return _context.abrupt("return");
-          case 22:
+          case 23:
             // 事件回调，请求中
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: true,
@@ -163,9 +164,9 @@ export default function usePageRequest(_ref) {
                 loading: true
               });
             });
-            _context.next = 26;
+            _context.next = 27;
             return httpRequest(params);
-          case 26:
+          case 27:
             requestResult = _context.sent;
             // 事件回调，请求完成
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
@@ -176,7 +177,7 @@ export default function usePageRequest(_ref) {
 
             // 请求结果
             if (!requestResult) {
-              _context.next = 38;
+              _context.next = 39;
               break;
             }
             // 获取table数据
@@ -187,7 +188,7 @@ export default function usePageRequest(_ref) {
             // 数据总数
             total = getDataByNamePath(requestResult, fieldNames.total);
             if (!(total === undefined || dataSource === undefined)) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
             newData = {
@@ -199,7 +200,7 @@ export default function usePageRequest(_ref) {
             };
             setData(newData);
             return _context.abrupt("return");
-          case 36:
+          case 37:
             // 当前页无数据，返回上一页
             if (!dataSource.length && pageNo !== 1) {
               onRequest(DataEvent.Reload, pageNo - 1);
@@ -213,13 +214,13 @@ export default function usePageRequest(_ref) {
               });
             }
             return _context.abrupt("return");
-          case 38:
+          case 39:
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: false
               });
             });
-          case 39:
+          case 40:
           case "end":
             return _context.stop();
         }

package/es/context/_api.d.ts

@@ -1,4 +1,4 @@
-import { ConfigProviderProps } from 'antd';
+import { BreadcrumbProps, ConfigProviderProps } from 'antd';
 import { Store } from 'antd/es/form/interface';
 import React from 'react';
 import { Location } from 'react-router';
@@ -11,6 +11,8 @@ export type PageContextType = {
     location: Location;
     /** 当前页面是否选中 */
     isActive: boolean;
+    /** 面包屑 */
+    breadcrumb?: BreadcrumbProps['items'];
     /** dialog holder */
     dialogHolderRef: React.RefObject<ElementsHolderRef>;
     /** 销毁页面 */

package/es/dialog/button.d.ts

@@ -5,7 +5,7 @@ import { DialogFormRef } from './form';
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "request" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/editor/_api.d.ts

@@ -20,7 +20,7 @@ export type EditorCodeProps = PropsWithCss & Omit<ReactCodeMirrorProps, 'height'
     onChange?: (e: string) => void;
 };
 export type RichImageUpload = CCS.UploadImageProps & {
-    imageUrl?: string;
+    renderImg?: string | ((fileId: string) => string);
 };
 export type LexicalEditorBaseProps = Pick<InputProps, 'disabled' | 'variant' | 'placeholder' | 'size'> & {
     /** 富文本值 */

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

@@ -114,6 +114,7 @@ export default function UploadModal(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  console.log('imageProps.src', imageProps.src);
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(Modal, {
       open: true,
@@ -215,10 +216,11 @@ export default function UploadModal(_ref) {
             flex: '0 0 200px'
           },
           children: /*#__PURE__*/_jsx(CcsUpload.Image, _objectSpread(_objectSpread({
-            value: imageProps.src
+            value: imageProps.src,
+            valueFormat: "id"
           }, imageUpload), {}, {
             onImageInfo: function onImageInfo(info) {
-              var imageUrl = "".concat((imageUpload === null || imageUpload === void 0 ? void 0 : imageUpload.imageUrl) || '').concat(info.url);
+              var imageUrl = typeof (imageUpload === null || imageUpload === void 0 ? void 0 : imageUpload.renderImg) === 'function' ? imageUpload.renderImg(info.url) : "".concat((imageUpload === null || imageUpload === void 0 ? void 0 : imageUpload.renderImg) || '').concat(info.url);
               setImageInfo({
                 base64: info.base64,
                 url: imageUrl

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

@@ -7,6 +7,10 @@ export type MenuType = {
     icon?: string;
     /** url地址 */
     url?: string;
+    /** 是否隐藏面包屑 @default false */
+    hideBreadcrumb?: boolean;
+    /** 页签模式下是否可关闭 @default true */
+    canClose?: boolean;
     /** 菜单权限编码 */
     btnAuth?: {
         name: string;
@@ -15,16 +19,36 @@ export type MenuType = {
     /** 下级菜单 */
     children?: MenuType[];
 };
-export interface KeepAliveTabsProps {
+interface DefaultPage {
+    /** 默认页面菜单数据 */
+    menu: MenuType;
+    /** 默认页面内容 */
+    content: ReactNode;
+    /** 是否可关闭 @default true */
+    canClose?: boolean;
+}
+export type KeepAliveTabsProps = Omit<SinglePageProps, 'children'> & {
+    /** 缓存组件最大数量 */
     maxLen?: number;
-    appName: string;
-    menuItems: MenuType[];
+    /** 自定义类名 */
     className?: string;
+    /** umimax history */
     history: any;
-}
+    /** 默认页面,默认页面固定在第一个，不能被关闭 */
+    defaultPage?: DefaultPage;
+};
 export interface SinglePageProps {
+    /** 应用名称 */
     appName: string;
+    /** 菜单列表 */
     menuItems: MenuType[];
+    /** 面包屑样式 */
     breadcrumbStyle?: CSSProperties;
+    /** 是否隐藏面包屑 */
+    hideBreadcrumb?: boolean;
+    /** 子元素 */
     children?: ReactNode;
+    /** 基础路径 */
+    basePath?: string;
 }
+export {};

package/es/page-layout/index.less

@@ -49,12 +49,18 @@
     overflow: auto;
   }
 
-  .page-top {
+  .page-top-10 {
     height: 10px;
     background: transparent;
     flex: 0 0 10px;
   }
 
+  .page-top-16 {
+    height: 16px;
+    background: transparent;
+    flex: 0 0 16px;
+  }
+
   .page-bottom {
     height: 16px;
     background: transparent;

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

@@ -1,5 +1,5 @@
 import { BreadcrumbProps } from 'antd';
-import { JSXElementConstructor, ReactElement } from 'react';
+import { JSXElementConstructor, ReactElement, ReactNode } from 'react';
 import { Location } from 'react-router';
 import { KeepAliveTabsProps, MenuType } from '../_api';
 export type CacheRouter = {
@@ -11,9 +11,10 @@ export type CacheRouter = {
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
     breadcrumb: BreadcrumbProps['items'];
     pageLocation: Location;
+    closeIcon?: ReactNode;
 };
 export declare function findMenusByUrl(tree: MenuType | MenuType[], targetUrl: string, parents?: MenuType[]): MenuType[] | null;
-declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, }: KeepAliveTabsProps): import("react/jsx-runtime").JSX.Element;
+declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, hideBreadcrumb, defaultPage, basePath, }: KeepAliveTabsProps): import("react/jsx-runtime").JSX.Element;
 declare namespace KeepAliveTabs {
     var displayName: string;
 }

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

@@ -126,15 +126,45 @@ export function findMenusByUrl(tree, targetUrl) {
   return null;
 }
 function KeepAliveTabs(_ref) {
+  var _defaultPage$menu;
   var _ref$maxLen = _ref.maxLen,
     maxLen = _ref$maxLen === void 0 ? 10 : _ref$maxLen,
     appName = _ref.appName,
     history = _ref.history,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
-    className = _ref.className;
-  var routers = useRef([]);
+    className = _ref.className,
+    hideBreadcrumb = _ref.hideBreadcrumb,
+    defaultPage = _ref.defaultPage,
+    basePath = _ref.basePath;
   var location = useLocation();
+
+  // 路由集合、添加默认页
+  var routers = useRef(defaultPage ? [{
+    closeIcon: false,
+    key: defaultPage.menu.key,
+    label: (defaultPage === null || defaultPage === void 0 ? void 0 : defaultPage.menu.label) || '默认页',
+    outlet: defaultPage.content,
+    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 ? [] : [{
+      key: '-1',
+      title: '首页',
+      href: basePath || undefined
+    }, {
+      key: defaultPage.menu.key,
+      title: (defaultPage === null || defaultPage === void 0 ? void 0 : defaultPage.menu.label) || '默认页'
+    }],
+    pageLocation: {
+      pathname: defaultPage.menu.url || '',
+      key: defaultPage.menu.key,
+      state: {},
+      search: '',
+      hash: ''
+    },
+    menuKey: defaultPage.menu.key || ''
+  }] : []);
   var pathname = location.pathname;
   var outlet = useOutlet();
   var update = useUpdate();
@@ -222,18 +252,21 @@ function KeepAliveTabs(_ref) {
       };
     }();
     if (menu) saveHistory();
-
-    // 面包屑数据
-    var breadcrumb = menus.map(function (m) {
-      return {
-        key: m.key,
-        title: m.label
-      };
-    });
-    breadcrumb.unshift({
-      key: '-1',
-      title: '首页'
-    });
+    var breadcrumb = [];
+    if (!hideBreadcrumb && !(menu !== null && menu !== void 0 && menu.hideBreadcrumb)) {
+      // 面包屑数据
+      breadcrumb = menus.map(function (m) {
+        return {
+          key: m.key,
+          title: m.label
+        };
+      });
+      breadcrumb.unshift({
+        key: '-1',
+        title: '首页',
+        href: basePath || undefined
+      });
+    }
     return _objectSpread(_objectSpread({}, menu), {}, {
       breadcrumb: breadcrumb
     });
@@ -277,7 +310,8 @@ function KeepAliveTabs(_ref) {
         }),
         breadcrumb: isMenu ? breadcrumb : [],
         pageLocation: location,
-        menuKey: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.key) || ''
+        menuKey: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.key) || '',
+        closeIcon: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.canClose) === false ? null : undefined
       }]
     });
   }
@@ -316,7 +350,7 @@ function KeepAliveTabs(_ref) {
 
       // 显示首页
       if (routers.current.length === 0) {
-        history.push('/');
+        history.push(basePath || '/');
         return;
       }
 
@@ -333,15 +367,17 @@ function KeepAliveTabs(_ref) {
 
   // 扩展操作
   var onCloseTab = useCallback(function (key) {
-    // 关闭其他标签
+    // 关闭其他标签, 保留关闭图标为false的标签
     if (key === '1') {
       routers.current = routers.current.filter(function (c) {
-        return c.key === pathname;
+        return c.key === pathname || c.closeIcon === false;
       });
       update();
     } else {
-      routers.current = [];
-      history.push('/');
+      routers.current = routers.current.filter(function (c) {
+        return c.closeIcon === false;
+      });
+      history.push(basePath || '/');
     }
   }, []);
   var tabBarExtraContent = /*#__PURE__*/_jsx(Dropdown, {

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import { CSSProperties } from 'react';
 import { Location } from 'react-router';
 import { CacheRouter } from '.';
 export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children'> & {
@@ -6,6 +6,8 @@ export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'c
     active: boolean;
     /** router location */
     location: Location;
+    /** 语义化style */
+    breadcrumbStyle?: CSSProperties;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };

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

@@ -10,8 +10,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,
+    breadcrumbStyle = props.breadcrumbStyle;
   var id = "_tab_content_".concat(location.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
@@ -20,6 +22,7 @@ function CachePage(props) {
       dialogHolderRef: dialogHolderRef,
       isActive: active,
       location: location,
+      breadcrumb: breadcrumb,
       onDestroy: onDestroy,
       onAuth: function onAuth(e) {
         return urlAuthList.includes(e);
@@ -37,10 +40,11 @@ function CachePage(props) {
           'page-avtive': active
         }),
         children: [/*#__PURE__*/_jsx("div", {
-          className: "page-top"
-        }), /*#__PURE__*/_jsx(Breadcrumb, {
+          className: breadcrumb && breadcrumb.length ? 'page-top-10' : 'page-top-16'
+        }), breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
           items: breadcrumb,
-          className: "ccs-breadcrumb"
+          className: "ccs-breadcrumb",
+          style: breadcrumbStyle
         }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
           ref: dialogHolderRef
         }, "modal-drawer-holder"), /*#__PURE__*/_jsx("div", {

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, }: SinglePageProps): import("react/jsx-runtime").JSX.Element;
 declare namespace SinglePage {
     var displayName: string;
 }

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

@@ -12,7 +12,9 @@ function SinglePage(_ref) {
     _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;
   var location = useLocation();
   var pathname = location.pathname;
   var outlet = useOutlet();
@@ -28,17 +30,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 && !(menu !== null && menu !== void 0 && menu.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;

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

@@ -28,8 +28,8 @@ 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, {
+        className: breadcrumb.length ? 'page-top-10' : 'page-top-16'
+      }), breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
         items: breadcrumb,
         className: "ccs-breadcrumb",
         style: props.breadcrumbStyle

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,29 +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;
-};
-export type FileUploadList = UploadChangeParam['fileList'][0] & {
-    fileId?: string;
+    uploadRequest?: UploadRequest;
 };
+export type FileUploadList = UploadChangeParam['fileList'][0];
 export interface ImageInfo {
     /** 图片名称 */
     name: string;
@@ -45,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']): FileUploadList[];
-declare function CustomUpload({ value, disabled, uploadText, 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;