@zat-design/sisyphus-react 3.11.14-beta.11 → 3.11.14-beta.12

package/es/ProEditTable/utils/tools.d.ts

@@ -1,32 +1,67 @@
+import { Key } from 'react';
+import { FormInstance } from 'antd/es/form';
+import { NamePath } from 'antd/es/form/interface';
+/**
+ * 生成随机字符串
+ * @returns 随机字符串
+ */
 export declare const getRandom: () => string;
-export declare const difference: (object: any, base: any) => unknown;
-export declare const customValidate: (validateKeys: any, form: any, rowName: any) => any;
+/**
+ * 深层次对比两个对象且取出来差异值
+ * @param object 比较对象
+ * @param base 基准对象
+ * @returns 差异对象
+ */
+export declare const difference: <T extends Record<string, any>, U extends Record<string, any>>(object: T, base: U) => Record<string, any>;
+/**
+ * 数组字段循环校验，解决validateFields无法批量校验的问题
+ * @param validateKeys 校验键数组
+ * @param form 表单实例
+ * @param rowName 行名称路径
+ * @returns 校验结果Promise
+ */
+export declare const customValidate: (validateKeys: string[], form: FormInstance, rowName: NamePath) => Promise<any>;
 /**
  * 拆解数组names
- * @param names [][]
- * @returns string
+ * @param names 名称数组
+ * @returns 拆解后的字符串
  */
-export declare const splitNames: (names: any[]) => any;
-export declare const getNamePath: (name: any, virtualKey: any) => any[];
-export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
-    name: any;
-    form: any;
-    virtualKey: any;
-    selectedRowKeys: any;
+export declare const splitNames: (names: any[]) => string;
+/**
+ * 获取中间formItem的name
+ * @param name 名称路径
+ * @param virtualKey 虚拟键
+ * @returns 完整名称路径数组
+ */
+export declare const getNamePath: (name: NamePath, virtualKey?: string) => (string | number)[];
+/**
+ * 删除操作
+ * @param params 删除参数
+ */
+export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys, }: {
+    name: NamePath;
+    form: FormInstance;
+    virtualKey?: string;
+    selectedRowKeys: Key[];
 }) => void;
-/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+/**
+ * 获取最终的disabled, 两张模式【子级优先，全局优先
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
- * @param globalControl 全局控制
- * @param formDisabled 表单的disabled
- * @param column 当前列
- * @param tabledDisabled 表格的disabled
- * @param columnFieldProps 当前列的fieldProps
- * @param params 当前列的参数
- * @param rowDisabled 行禁用参数
+ * @param params 禁用参数
+ * @returns 是否禁用
  */
-export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: any) => any;
-/** 表格自动滚动到报错位置
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: {
+    globalControl: boolean;
+    formDisabled?: boolean | ((record: any) => boolean);
+    column: any;
+    tabledDisabled?: boolean;
+    columnFieldProps?: any;
+    params: any[];
+    rowDisabled?: any;
+}) => boolean;
+/**
+ * 表格自动滚动到报错位置
  */
 export declare const handleScrollToError: () => void;
 /**
@@ -34,7 +69,7 @@ export declare const handleScrollToError: () => void;
  * @param value 需要深拷贝的对象
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
-export declare function cloneDeepFilterNode(value: any): any;
+export declare function cloneDeepFilterNode<T>(value: T): T;
 /**
  * 分页校验
  */

package/es/ProEditTable/utils/tools.js

@@ -7,32 +7,47 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import React from 'react';
 import { tools, validate } from '@zat-design/utils';
 import { cloneDeep, cloneDeepWith, isString, isObject, isEqual, transform, isFunction, isBoolean, get } from 'lodash';
+/**
+ * 生成随机字符串
+ * @returns 随机字符串
+ */
 export var getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
-// 深层次对比两个对象且取出来差异值
+/**
+ * 深层次对比两个对象且取出来差异值
+ * @param object 比较对象
+ * @param base 基准对象
+ * @returns 差异对象
+ */
 export var difference = function difference(object, base) {
   var _changes = function changes(object, base) {
     return transform(object, function (result, value, key) {
-      if (!isEqual(value, base[key])) {
-        result[key] = isObject(value) && isObject(base[key]) ? _changes(value, base[key]) : value;
+      if (!isEqual(value, base === null || base === void 0 ? void 0 : base[key])) {
+        result[key] = isObject(value) && isObject(base === null || base === void 0 ? void 0 : base[key]) ? _changes(value, base === null || base === void 0 ? void 0 : base[key]) : value;
       }
     });
   };
   return _changes(object, base);
 };
-// 数组字段循环校验，解决validateFields无法批量校验的问题
+/**
+ * 数组字段循环校验，解决validateFields无法批量校验的问题
+ * @param validateKeys 校验键数组
+ * @param form 表单实例
+ * @param rowName 行名称路径
+ * @returns 校验结果Promise
+ */
 export var customValidate = function customValidate(validateKeys, form, rowName) {
   var array = [];
   validateKeys.forEach(function (key) {
-    array.push(rowName.concat(key));
+    array.push([].concat(_toConsumableArray(Array.isArray(rowName) ? rowName : [rowName]), [key]));
   });
   return form.validateFields(array);
 };
 /**
  * 拆解数组names
- * @param names [][]
- * @returns string
+ * @param names 名称数组
+ * @returns 拆解后的字符串
  */
 export var splitNames = function splitNames(names) {
   var result;
@@ -49,14 +64,23 @@ export var splitNames = function splitNames(names) {
   result = resultArray.join('-');
   return result;
 };
-// 获取中间formItem的name
+/**
+ * 获取中间formItem的name
+ * @param name 名称路径
+ * @param virtualKey 虚拟键
+ * @returns 完整名称路径数组
+ */
 export var getNamePath = function getNamePath(name, virtualKey) {
   var nextName = cloneDeep(Array.isArray(name) ? name : [name]);
-  var lastValue = nextName[nextName.length - 1];
-  nextName[nextName.length - 1] = "".concat(lastValue).concat(virtualKey ? "-".concat(virtualKey) : '');
+  var lastIndex = nextName.length - 1;
+  // 确保最后一个元素是字符串类型
+  nextName[lastIndex] = "".concat(nextName[lastIndex]).concat(virtualKey ? "-".concat(virtualKey) : '');
   return nextName;
 };
-// 删除操作
+/**
+ * 删除操作
+ * @param params 删除参数
+ */
 export var onDelete = function onDelete(_ref) {
   var name = _ref.name,
     form = _ref.form,
@@ -81,16 +105,12 @@ export var onDelete = function onDelete(_ref) {
     }
   }
 };
-/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+/**
+ * 获取最终的disabled, 两张模式【子级优先，全局优先
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
- * @param globalControl 全局控制
- * @param formDisabled 表单的disabled
- * @param column 当前列
- * @param tabledDisabled 表格的disabled
- * @param columnFieldProps 当前列的fieldProps
- * @param params 当前列的参数
- * @param rowDisabled 行禁用参数
+ * @param params 禁用参数
+ * @returns 是否禁用
  */
 export var getDisabled = function getDisabled(_ref2) {
   var _ref3, _column$disabled;
@@ -103,7 +123,7 @@ export var getDisabled = function getDisabled(_ref2) {
     rowDisabled = _ref2.rowDisabled;
   var convertToBoolean = function convertToBoolean(value) {
     if (Array.isArray(value)) {
-      return value;
+      return Boolean(value.length);
     }
     if (value === null || value === undefined || value === '') {
       return false;
@@ -157,7 +177,8 @@ export var getDisabled = function getDisabled(_ref2) {
   }
   return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
 };
-/** 表格自动滚动到报错位置
+/**
+ * 表格自动滚动到报错位置
  */
 export var handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
@@ -217,6 +238,11 @@ export function cloneDeepFilterNode(value) {
     }
   });
 }
+/**
+ * 判断值是否为空
+ * @param value 需要判断的值
+ * @returns 是否为空
+ */
 var _isNull = function isNull(value) {
   if (Array.isArray(value) && value.length) {
     return value.some(function (item) {

package/es/ProEnum/propsType.d.ts

@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react';
 import { RadioProps, CheckboxProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-import type { ProFormOtherType } from '../index';
+import type { ProFormOtherType } from '../ProForm/propsType';
 import type { PropSelectProps } from '../ProSelect/propsType';
 /**
  * @description 数据选项类型

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { FormItemProps, ModalFuncProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/lib/form/interface';
-import type { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
+import type { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../render/propsType';
 export interface SpaceType extends SpaceProps {
     /**
      * 是否紧凑合并

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

@@ -92,10 +92,10 @@ interface ProModalPropsType {
 /** 模态框选择器属性类型（结合Select和Input属性） */
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 /** 配置选项类型 */
-export type ConfigOptionType = ConfigOption;
+export type ProModalSelectConfigType = ConfigOption;
 /** 模态框属性类型 */
 export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
-    configOption: ConfigOptionType;
+    configOption: ProModalSelectConfigType;
 };
 /** 模态框选择器类型（结合Select和Input属性） */
 export type ProModalSelectType = SelectProps & InputProps & ProModalType;

package/es/ProForm/components/render/propsType.d.ts

@@ -1,9 +1,8 @@
-import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
+import type { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
 import type { NamePath } from 'antd/es/form/interface';
 import React from 'react';
 import { validate, regExp } from '@zat-design/utils';
 import type { RuleObject } from 'antd/es/form';
-import * as componentMap from '../index';
 import type { Props as InputProps } from '../base/Input/propsType';
 import type { Props as InputNumberProps } from '../base/InputNumber';
 import type { Props as RadioProps } from '../base/Radio';
@@ -32,14 +31,12 @@ import type { GroupType as GroupCopyProps } from '../combination/Group/propsType
 import type { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
 import type { DistributiveOmit, DiffConfigType } from '../../propsType';
 import type { DiffOriginalParams } from '../../utils/diffOriginal';
-export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
-interface ExtendType extends Omit<RuleObject, 'type'> {
+export interface ProRule extends Omit<RuleObject, 'type'> {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */
@@ -292,6 +289,6 @@ export type ProEnumTableProps<Values> = ProEnumTableType<Values>;
 export type ProEnumFieldProps<Values, TT> = ProEnumFieldType<Values, TT>;
 export type FieldProps<T extends ControlProps, Values, TT> = FieldType<T, Values, TT>;
 export type ColumnPropsMap<Values = any, T = 'ProForm'> = ColumnTypeMap<Values, T>;
-export type ProFormColumnProps<Values = any> = ProFormColumnType<Values>;
+export type ProColumnProps<Values = any> = ProFormColumnType<Values>;
 export type RenderProps<Values = any> = RenderType<Values>;
 export {};

package/es/ProForm/propsType.d.ts

@@ -4,8 +4,8 @@ import { NamePath } from 'antd/es/form/interface';
 import { StoreValue, Store } from 'rc-field-form/es/interface.d';
 import { ShouldUpdate } from 'rc-field-form/es/Field.d';
 import React, { ReactNode } from 'react';
-import type { ComponentMap, ProFormColumnType, ViewType } from './components/render/propsType';
-export * from './components/render/propsType';
+import type { ProFormColumnType, ViewType } from './components/render/propsType';
+import type { ProFormComponentType } from './components/index.d';
 export interface ButtonType extends ButtonProps {
     children?: any;
 }
@@ -33,7 +33,7 @@ export interface ProFormOtherType {
     name?: NamePath;
     names?: NamePath[];
     form?: FormInstance;
-    type?: ComponentMap;
+    type?: ProFormComponentType;
     hiddenNames?: string[] | any[];
     colProps: ColProps;
     disabled: boolean;
@@ -111,3 +111,5 @@ export type FooterButtonProps = FooterButtonType;
 export type ProFormOtherProps = ProFormOtherType;
 export type DiffConfigProps = DiffConfigType;
 export type Transform = TransformType;
+export type { ProFormColumnType } from './components/render/propsType';
+export type { ProColumnProps } from './components/render/propsType';

package/es/ProForm/propsType.js

@@ -1,2 +1 @@
-export * from './components/render/propsType';
 export var otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];

package/es/ProForm/utils/useForm.d.ts

@@ -13,4 +13,4 @@ export interface FormInstanceOption {
     optimize?: boolean;
     formKey?: string;
 }
-export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
+export declare const useForm: <T>(originForm?: ModifiedFormInstance<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstance<T>];

package/es/ProForm/utils/useRules.d.ts

@@ -1,5 +1,5 @@
 import type { InternalNamePath } from 'antd/lib/form/interface';
-import type { ProRule } from '../propsType';
+import type { ProRule } from '../components/render/propsType';
 interface Props {
     rules?: ProRule[];
     required?: boolean;

package/es/ProIcon/propsTypes.d.ts

@@ -172,9 +172,5 @@ export interface ProIconType {
      */
     buttonIcon?: boolean;
 }
-export type ModeType = ProIconModeType;
 export type ProIconProps = ProIconType;
-export type iconMap = ProIconMapType;
-export type themeMap = ProIconThemeMapType;
-export type actionMap = ProIconActionMapType;
 export {};

package/es/ProStep/components/Anchor/index.d.ts

@@ -1,2 +1,3 @@
-export declare const MenuItem: (props: any) => import("react/jsx-runtime").JSX.Element;
+import { MenuItemProps } from '../../propsType';
+export declare const MenuItem: (props: MenuItemProps) => JSX.Element;
 export default MenuItem;

package/es/ProStep/components/Item/index.d.ts

@@ -1,3 +1,3 @@
 import { ProStepItemType } from '../../propsType';
-declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, ...restProps }: ProStepItemType) => import("react/jsx-runtime").JSX.Element;
+declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: ProStepItemType) => JSX.Element;
 export default ProStepItem;

package/es/ProStep/components/Item/index.js

@@ -1,12 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id", "title", "collapse", "children", "lazyLoad"];
+var _excluded = ["id", "title", "collapse", "children", "lazyLoad", "order"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import LazyLoad, { forceCheck } from 'react-lazyload';
 import { isBoolean } from 'lodash';
 import { useStep } from '../../index';
 import ProCollapse from '../../../ProLayout/components/ProCollapse';
+// 默认的懒加载配置
 var defaultLazyLoadConfig = {
   height: 200,
   offset: 100,
@@ -19,6 +20,8 @@ var ProStepItem = function ProStepItem(_ref) {
     collapseItem = _ref$collapse === void 0 ? true : _ref$collapse,
     children = _ref.children,
     stepLazyLoad = _ref.lazyLoad,
+    _ref$order = _ref.order,
+    order = _ref$order === void 0 ? 0 : _ref$order,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
     register = _useStep.register,
@@ -31,13 +34,14 @@ var ProStepItem = function ProStepItem(_ref) {
       register === null || register === void 0 ? void 0 : register(_objectSpread({
         id: id,
         title: title,
+        order: order,
         lazyLoad: lazyLoad
       }, restProps));
     }, 0);
     return function () {
       clearTimeout(timeoutId);
     };
-  }, [id, title, lazyLoad, restProps, register]);
+  }, [id, title, order, lazyLoad, restProps, register]);
   var renderChildren = function renderChildren() {
     if (lazyLoad) {
       var lazyLoadProps = isBoolean(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;

package/es/ProStep/components/Listener/index.d.ts

@@ -1,3 +1,4 @@
-import React from 'react';
-declare const _default: ({ children, delayTime, excludes, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
-export default _default;
+import { ReactElement } from 'react';
+import type { ListenerProps } from '../../propsType';
+declare const Listener: ({ children, delayTime, excludes, ...props }: ListenerProps) => ReactElement;
+export default Listener;

package/es/ProStep/components/Listener/index.js

@@ -8,6 +8,11 @@ import React from 'react';
 import { forceVisible } from 'react-lazyload';
 import { useStep } from '../../index';
 import { getLoadedMap } from '../../utils';
+/**
+ * 检查错误列表并返回第一个错误项
+ * @param arr DOM元素数组
+ * @returns 错误元素信息
+ */
 var checkErrorList = function checkErrorList(arr) {
   for (var i = 0; i < arr.length; i++) {
     if (arr[i].className.includes('errored')) {
@@ -19,8 +24,12 @@ var checkErrorList = function checkErrorList(arr) {
   }
   return null;
 };
+/**
+ * 查找第一个错误的DOM元素
+ * @returns 错误元素信息
+ */
 var findFirstErrorDom = function findFirstErrorDom() {
-  var errorList = document.querySelectorAll('.pro-step-com-menu-item') || [];
+  var errorList = document.querySelectorAll('.pro-step-com-menu-item');
   var hasErrorItem = document.querySelectorAll('.pro-step-com-menu-item .errored');
   var hasFormError = document.querySelector('.ant-form-item-explain-error');
   if ((hasErrorItem === null || hasErrorItem === void 0 ? void 0 : hasErrorItem.length) && !hasFormError) {
@@ -28,13 +37,17 @@ var findFirstErrorDom = function findFirstErrorDom() {
   }
   return null;
 };
-// Function to check if all modules are loaded
+/**
+ * 检查所有模块是否已加载完成
+ * @param data 模块加载数据
+ * @returns 是否所有模块都已加载
+ */
 var areAllModulesLoaded = function areAllModulesLoaded(data) {
   return data.every(function (item) {
     return (item === null || item === void 0 ? void 0 : item.loaded) === true;
   });
 };
-export default (function (_ref) {
+var Listener = function Listener(_ref) {
   var children = _ref.children,
     delayTime = _ref.delayTime,
     excludes = _ref.excludes,
@@ -88,4 +101,5 @@ export default (function (_ref) {
       }, _callee);
     })), 3000)
   }));
-});
+};
+export default Listener;

package/es/ProStep/index.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-import { ProStepType } from './propsType';
+import { ProStepType, ProStepContextType } from './propsType';
 import './style/index.less';
-export declare const ProStepContext: import("react").Context<any>;
-export declare const useStep: () => any;
+export declare const ProStepContext: import("react").Context<ProStepContextType>;
+export declare const useStep: () => Partial<ProStepContextType>;
 declare const ProStep: {
-    ({ children, ...resetProps }: ProStepType): import("react/jsx-runtime").JSX.Element;
-    useStep: () => any;
-    Item: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, ...restProps }: import("./propsType").ProStepItemPropsType) => import("react/jsx-runtime").JSX.Element;
-    Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
+    ({ children, ...resetProps }: ProStepType): JSX.Element;
+    useStep: () => Partial<ProStepContextType>;
+    Item: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: import("./propsType").ProStepItemPropsType) => JSX.Element;
+    Listener: ({ children, delayTime, excludes, ...props }: import("./propsType").ListenerProps) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 };
 export default ProStep;

package/es/ProStep/index.js

@@ -3,7 +3,8 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["children"];
+var _excluded = ["children"],
+  _excluded2 = ["id", "form", "title", "validator", "order", "disabled", "lazyLoad"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react';
 import { debounce } from 'lodash';
@@ -13,6 +14,7 @@ import Step from './components/Step';
 import Item from './components/Item';
 import Listener from './components/Listener';
 import './style/index.less';
+// 创建上下文并提供类型
 export var ProStepContext = /*#__PURE__*/createContext(null);
 export var useStep = function useStep() {
   return useContext(ProStepContext) || {};
@@ -75,7 +77,9 @@ var ProStep = function ProStep(_ref) {
       title = _ref4.title,
       validator = _ref4.validator,
       order = _ref4.order,
-      disabled = _ref4.disabled;
+      disabled = _ref4.disabled,
+      lazyLoad = _ref4.lazyLoad,
+      rest = _objectWithoutProperties(_ref4, _excluded2);
     var record = {};
     record.id = id;
     record.title = title;
@@ -85,7 +89,7 @@ var ProStep = function ProStep(_ref) {
     }
     if (disabled) {
       registerMap.current[id] = record;
-      return null;
+      return;
     }
     var subEvent = /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {