@zat-design/sisyphus-react 3.11.14-beta.5 → 3.11.14-beta.7

package/es/ProEnum/propsType.d.ts

@@ -3,93 +3,282 @@ import { RadioProps, CheckboxProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 import { ProFormOtherProps } from '../index';
 import { PropSelectProps } from '../ProSelect/propsType';
-export interface DataOption {
+/**
+ * @description 数据选项类型
+ */
+export interface DataOptionType {
+    /**
+     * @description 展示标签
+     * @default -
+     */
     label?: string;
+    /**
+     * @description 选项值
+     * @default -
+     */
     value?: string;
+    /**
+     * @description 是否禁用
+     * @default false
+     */
     disabled?: boolean;
+    /**
+     * @description 允许扩展字段
+     */
     [key: string]: any;
 }
-export interface ProEnumConfig {
-    /** 是否枚举主入口 */
+/**
+ * @description ProEnum配置类型
+ */
+export interface ProEnumConfigType {
+    /**
+     * @description 是否枚举主入口
+     * @default false
+     */
     main?: boolean;
-    /** 是否使用主入口枚举 */
+    /**
+     * @description 是否使用主入口枚举
+     * @default false
+     */
     share?: boolean;
-    /** 是否开启调试 log */
+    /**
+     * @description 是否开启调试 log
+     * @default false
+     */
     debugger?: boolean;
-    /** 是否对数据进行清洗 */
+    /**
+     * @description 是否对数据进行清洗
+     * @default false
+     */
     clear?: boolean;
-    /** 字段别名 */
+    /**
+     * @description 字段别名
+     * @default { label: 'label', value: 'value', children: 'children' }
+     */
     fieldNames?: Record<'label' | 'value' | 'children', string>;
-    /** 缓存的key、默认 zat-design-pro-component-cacheKey */
+    /**
+     * @description 缓存的key、默认 zat-design-pro-component-cacheKey
+     * @default "zat-design-pro-component-cacheKey"
+     */
     cacheKey: string;
-    /** 刷新请求、设置后每次进入都会重新请求 */
+    /**
+     * @description 刷新请求、设置后每次进入都会重新请求
+     * @default false
+     */
     requestRefresh: boolean;
-    /** 存储位置、不设置、默认读取 globalConfig 里面的 */
+    /**
+     * @description 存储位置、不设置、默认读取 globalConfig 里面的
+     * @default "localStorage"
+     */
     storage: 'localStorage' | 'sessionStorage';
-    /** 默认静态枚举数据 */
-    dataSource: Record<string, DataOption[]>;
-    /** 对后台返回数据进行格式化 */
+    /**
+     * @description 默认静态枚举数据
+     * @default {}
+     */
+    dataSource: Record<string, DataOptionType[]>;
+    /**
+     * @description 对后台返回数据进行格式化
+     * @param data 后台返回的数据
+     * @returns 格式化后的枚举数据
+     * @default -
+     */
     transformResponse?: (data: {
-        data: Record<string, DataOption[]>;
-    }) => Record<string, DataOption[]> | Promise<Record<string, DataOption[]>>;
-    /** 批量请求枚举接口 */
+        data: Record<string, DataOptionType[]>;
+    }) => Record<string, DataOptionType[]> | Promise<Record<string, DataOptionType[]>>;
+    /**
+     * @description 批量请求枚举接口
+     * @default -
+     */
     useRequest?: {
+        /**
+         * @description 请求服务函数
+         */
         service: Service<any, any>;
+        /**
+         * @description 请求选项配置
+         */
         options?: Options<any, any> & {
+            /**
+             * @description 指定请求的枚举码
+             */
             codes?: string[];
+            /**
+             * @description 忽略的枚举码
+             */
             ignoreCodes?: string[];
         };
     };
-    dics: Record<string, DataOption[]>;
+    /**
+     * @description 字典数据
+     * @default {}
+     */
+    dics: Record<string, DataOptionType[]>;
 }
-type ProEnumType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag' | 'Group';
-export interface ProEnum {
-    /** 组件展示类型、默认 ProSelect */
-    type?: ProEnumType;
-    /** 用于自定义组件 */
+/**
+ * @description 枚举组件类型枚举
+ */
+type EnumComponentType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag' | 'Group';
+/**
+ * @description ProEnum基础属性类型
+ */
+export interface ProEnumBaseType {
+    /**
+     * @description 组件展示类型、默认 ProSelect
+     * @default "ProSelect"
+     */
+    type?: EnumComponentType;
+    /**
+     * @description 用于自定义组件
+     * @default -
+     */
     component?: ReactNode;
-    /** 用于提交 code */
+    /**
+     * @description 用于提交 code
+     * @default -
+     */
     code?: string | string[];
-    /** 字段别名 */
+    /**
+     * @description 字段别名
+     * @default -
+     */
     fieldNames?: Record<string, string>;
-    /** 是否查看模式 */
+    /**
+     * @description 是否查看模式
+     * @default false
+     */
     isView?: boolean;
-    /** 数据源 */
-    dataSource?: DataOption[];
+    /**
+     * @description 数据源
+     * @default -
+     */
+    dataSource?: DataOptionType[];
+    /**
+     * @description 当前值
+     * @default -
+     */
     value: any;
+    /**
+     * @description 值变化回调
+     * @default -
+     */
     onChange?: (value: any) => void;
-    /** 远程请求接口 */
+    /**
+     * @description 远程请求接口
+     * @default -
+     */
     useRequest?: {
+        /**
+         * @description 请求服务函数
+         */
         service: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
         options?: Options<any, any>;
     };
-    /** 对后台返回数据进行格式化 */
-    transformResponse?: (data: any) => DataOption[];
-    /** 时候合并 */
+    /**
+     * @description 对后台返回数据进行格式化
+     * @param data 后台返回的数据
+     * @returns 格式化后的选项数据
+     * @default -
+     */
+    transformResponse?: (data: any) => DataOptionType[];
+    /**
+     * @description 是否合并数据
+     * @default false
+     */
     merge?: boolean;
-    /** 查看模式下为空展示 */
+    /**
+     * @description 查看模式下为空展示
+     * @default "-"
+     */
     viewEmpty?: React.ReactNode;
+    /**
+     * @description 自定义选项渲染
+     * @default -
+     */
     optionRender?: any;
-    /** 显示 code-value 形式 */
+    /**
+     * @description 显示 code-value 形式
+     * @default false
+     */
     showCodeName?: boolean;
-    /** 支持 {label:xx, value: xx} */
+    /**
+     * @description 支持 {label:xx, value: xx} 形式
+     * @default false
+     */
     labelInValue?: boolean;
+    /**
+     * @description 其他表单属性
+     * @default -
+     */
     otherProps?: ProFormOtherProps;
+    /**
+     * @description 是否允许清除
+     * @default false
+     */
     allowClear?: boolean;
+    /**
+     * @description 组件ID
+     * @default -
+     */
     id?: string;
+    /**
+     * @description 默认值
+     * @default -
+     */
     defaultValue?: any;
 }
-export type PropProSelectsMap = {
+/**
+ * @description ProSelect类型映射
+ */
+export type PropProSelectsMapType = {
+    /**
+     * @description 类型为ProSelect
+     * @default "ProSelect"
+     */
     type?: 'ProSelect';
 } & PropSelectProps;
-export type PropRadioPropsMap = {
+/**
+ * @description Radio类型映射
+ */
+export type PropRadioPropsMapType = {
+    /**
+     * @description 类型为Radio
+     * @default "Radio"
+     */
     type?: 'Radio';
 } & RadioProps;
-export type CheckboxPropsMap = {
+/**
+ * @description Checkbox类型映射
+ */
+export type CheckboxPropsMapType = {
+    /**
+     * @description 类型为Checkbox
+     * @default "Checkbox"
+     */
     type?: 'Checkbox';
 } & CheckboxProps;
-export interface TagPropsMap {
+/**
+ * @description Tag类型映射
+ */
+export interface TagPropsMapType {
+    /**
+     * @description 类型为Tag或Group
+     * @default -
+     */
     type?: 'Tag' | 'Group';
 }
-export type ProEnumProps = Omit<ProEnum, 'type'> & (PropProSelectsMap | PropRadioPropsMap | CheckboxPropsMap | TagPropsMap);
+/**
+ * @description ProEnum组件属性类型
+ */
+export type ProEnumType = Omit<ProEnumBaseType, 'type'> & (PropProSelectsMapType | PropRadioPropsMapType | CheckboxPropsMapType | TagPropsMapType);
+export type DataOption = DataOptionType;
+export type ProEnumConfig = ProEnumConfigType;
+export type ProEnum = ProEnumBaseType;
+export type PropProSelectsMap = PropProSelectsMapType;
+export type PropRadioPropsMap = PropRadioPropsMapType;
+export type CheckboxPropsMap = CheckboxPropsMapType;
+export type TagPropsMap = TagPropsMapType;
+export type ProEnumProps = ProEnumBaseType;
 export {};

package/es/ProEnum/propsType.js

@@ -1,7 +1 @@
-var proEnum = {
-  code: '22',
-  showCodeName: true,
-  value: 1,
-  type: 'Group'
-};
 export {};

package/es/ProEnum/utils/index.d.ts

@@ -6,7 +6,7 @@ interface EnumRes {
 }
 export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
-export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
+export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): import("../propsType").DataOptionType[];
 export declare function isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;
 /**

package/es/ProForm/components/combination/ProCascader/index.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="react" />
-import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: import("./propsType").ProCascaderType) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -7,7 +7,7 @@ export interface fieldNamesProps {
     children?: string;
     [key: string]: string;
 }
-export interface ProCascaderProps {
+export interface ProCascaderType {
     className?: string;
     mode?: 'address' | 'default';
     isView?: boolean;
@@ -38,3 +38,4 @@ export interface ProCascaderProps {
     scrollFollowParent?: boolean;
     desensitization?: [number, number];
 }
+export type ProCascaderProps = ProCascaderType;

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -24,7 +24,7 @@ interface ConfigOption {
     };
     tableProps?: Record<string, any>;
 }
-interface ProModalPropsType {
+export interface ProModalSelectType {
     configOption: ConfigOption;
     onChange?: (value: number | string | undefined, option?: any) => void;
     title: ModalProps['title'];
@@ -45,5 +45,6 @@ interface ProModalPropsType {
     searchForm?: FormInstance;
     searchKey?: string;
 }
-export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalSelectType;
+export type ProModalSelectProps = ProModalSelectType;
 export {};

package/es/ProLayout/components/Layout/Header/index.d.ts

@@ -1,4 +1,4 @@
 import type { FC } from 'react';
-import type { ProLayoutProps } from '../../../propTypes';
-declare const Header: FC<ProLayoutProps>;
+import type { ProLayoutType } from '../../../propTypes';
+declare const Header: FC<ProLayoutType>;
 export default Header;

package/es/ProLayout/components/Layout/Menu/index.d.ts

@@ -1,4 +1,4 @@
 import type { FC } from 'react';
-import type { ProLayoutProps } from '../../../propTypes';
-declare const Menu: FC<ProLayoutProps>;
+import type { ProLayoutType } from '../../../propTypes';
+declare const Menu: FC<ProLayoutType>;
 export default Menu;

package/es/ProLayout/components/Layout/Notice/index.d.ts

@@ -1,4 +1,4 @@
 import type { FC } from 'react';
-import type { ProLayoutProps } from '../../../propTypes';
-declare const Notice: FC<ProLayoutProps>;
+import type { ProLayoutType } from '../../../propTypes';
+declare const Notice: FC<ProLayoutType>;
 export default Notice;

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -1,7 +1,7 @@
 import React, { CSSProperties } from 'react';
 import { CollapseProps, CollapsePanelProps } from 'antd/es/collapse';
 export type levelType = '1' | '2';
-export interface TitleListProps {
+export interface TitleListType {
     /**
     * @description       描述的标题
     * @default           -
@@ -13,7 +13,7 @@ export interface TitleListProps {
     */
     value: string | number | undefined | React.ReactNode;
 }
-export interface ProCollapseProps {
+export interface ProCollapseType {
     /**
     * @description       折叠头部标题
     * @default           -
@@ -91,3 +91,5 @@ export interface ProCollapseProps {
     collapsePanelProps?: CollapsePanelProps;
     [key: string]: any;
 }
+export type ProCollapseProps = ProCollapseType;
+export type TitleListProps = TitleListType;

package/es/ProLayout/components/ProCollapse/index.d.ts

@@ -1,3 +1,3 @@
-import { ProCollapseProps } from './PropTypes';
-declare const ProCollapse: (props: ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
+import type { ProCollapseType } from './PropTypes';
+declare const ProCollapse: (props: ProCollapseType) => import("react/jsx-runtime").JSX.Element;
 export default ProCollapse;

package/es/ProLayout/components/ProFooter/PropTypes.d.ts

@@ -2,7 +2,7 @@ export interface stateProps {
     width?: number;
     [key: string]: any;
 }
-export interface ProFooterProps {
+export interface ProFooterType {
     /**
      * @description 是否显示
      * @default true
@@ -25,3 +25,4 @@ export interface ProFooterProps {
     contentDom?: string;
     [key: string]: any;
 }
+export type ProFooterProps = ProFooterType;

package/es/ProLayout/components/ProFooter/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { ProFooterProps } from './PropTypes';
-declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
+import type { ProFooterType } from './PropTypes';
+declare const _default: import("react").MemoExoticComponent<(props: ProFooterType) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProLayout/components/ProHeader/PropTypes.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { ModalProps } from 'antd';
 export type BreadcrumbType = 'breadcrumb' | 'copy' | 'info' | 'version' | 'tag';
 export type NavType = 'money' | 'thousandth' | 'enumName' | 'enumCodeName' | 'date' | 'dateTime';
-export interface BreadcrumbColumnsProps {
+export interface BreadcrumbColumnType {
     /**
      * @description 类型
      * @default -
@@ -34,7 +34,7 @@ export interface BreadcrumbColumnsProps {
      */
     tag?: string | React.ReactNode | (string | React.ReactNode)[];
 }
-export interface SubDescribeColumnsProps {
+export interface SubDescribeColumnType {
     /**
      * @description 描述内容
      * @default -
@@ -71,7 +71,7 @@ export interface SubDescribeColumnsProps {
      */
     code?: string;
 }
-export interface DescribeColumnsProps {
+export interface DescribeColumnType {
     /**
      * @description 描述内容
      * @default -
@@ -118,7 +118,7 @@ export interface DescribeColumnsProps {
      */
     tag?: string | React.ReactNode | (string | React.ReactNode)[];
 }
-export interface ProHeaderProps {
+export interface ProHeaderType {
     /**
      * @description 标题
      * @default -
@@ -129,12 +129,12 @@ export interface ProHeaderProps {
      * @deprecated        将于下个版本 4.0.0 被弃用
      * @default           -
      */
-    breadcrumbList?: BreadcrumbColumnsProps[];
+    breadcrumbList?: BreadcrumbColumnType[];
     /**
    * @description      面包屑配置数据
    * @default           -
    */
-    breadcrumbColumns?: BreadcrumbColumnsProps[];
+    breadcrumbColumns?: BreadcrumbColumnType[];
     /**
      * @description 是否隐藏溢出
      * @default -
@@ -150,17 +150,17 @@ export interface ProHeaderProps {
     * @deprecated        将于下个版本 4.0.0 被弃用
     * @default           -
     */
-    describeList?: SubDescribeColumnsProps[];
+    describeList?: SubDescribeColumnType[];
     /**
     * @description      主要描述数据源配置
     * @default           -
     */
-    describeColumns?: DescribeColumnsProps[];
+    describeColumns?: DescribeColumnType[];
     /**
     * @description      次级描述数据源配置
     * @default           -
     */
-    subDescribeColumns?: SubDescribeColumnsProps[];
+    subDescribeColumns?: SubDescribeColumnType[];
     /**
     * @description      次级描述是否展开
     * @default           -
@@ -204,3 +204,7 @@ export interface ProHeaderProps {
     onBack?: () => void;
     [key: string]: any;
 }
+export type ProHeaderProps = ProHeaderType;
+export type BreadcrumbColumnsProps = BreadcrumbColumnType;
+export type SubDescribeColumnsProps = SubDescribeColumnType;
+export type DescribeColumnsProps = DescribeColumnType;

package/es/ProLayout/components/ProHeader/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import type { ProHeaderProps } from './PropTypes';
-declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
+import type { ProHeaderType } from './PropTypes';
+declare const _default: React.MemoExoticComponent<(props: ProHeaderType) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProLayout/index.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-import type { ProLayoutProps } from './propTypes';
+import type { ProLayoutType } from './propTypes';
 export declare const LayoutContext: import("react").Context<{
     selectedPath: string;
     onSelected: (params: any) => void;
     target: '_blank' | '_parent' | '_self' | '_top';
 }>;
 declare const ProLayout: {
-    (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;
+    (props: ProLayoutType): import("react/jsx-runtime").JSX.Element;
     defaultProps: {
         menus: any[];
         iconfontUrl: string;
@@ -18,8 +18,8 @@ declare const ProLayout: {
         headerHeight: number;
         contentStyle: {};
     };
-    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
-    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
-    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
+    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseType) => import("react/jsx-runtime").JSX.Element;
+    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterType) => import("react/jsx-runtime").JSX.Element>;
+    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderType) => import("react/jsx-runtime").JSX.Element>;
 };
 export default ProLayout;

package/es/ProLayout/index.js

@@ -56,8 +56,10 @@ var ProLayout = function ProLayout(props) {
       return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
     var userData = transformMenus(dataSource, pathPrefix);
+    // 确保 menus 始终是一个数组
+    var menuData = Array.isArray(userData) ? userData : (userData === null || userData === void 0 ? void 0 : userData.menus) || [];
     setState({
-      menus: userData
+      menus: menuData
     });
   }, [dataSource]);
   /**
@@ -88,7 +90,9 @@ var ProLayout = function ProLayout(props) {
     })), _jsxs("div", {
       className: contentCls,
       children: [_jsx(Menu, _objectSpread(_objectSpread({}, props), {}, {
-        dataSource: menus,
+        dataSource: Array.isArray(menus) ? {
+          menus: menus
+        } : menus,
         notice: notice,
         collapsed: collapsed,
         onToggle: function onToggle() {