@zat-design/sisyphus-react 4.4.3-beta.2 → 4.5.0-beta.1

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

@@ -0,0 +1,86 @@
+import type { FormInstance } from 'antd';
+import type { NamePath } from 'antd/es/form/interface';
+/**
+ * 单元格规则装配 + 全量数据真实校验（脱离 DOM）。
+ *
+ * 背景：antd6 虚拟表格滚动时视口外的行会被卸载，其 Form.Item 字段未注册，
+ *       form.validateFields 无法覆盖；本模块用 form store 里的全量数据 + 真实规则
+ *       逐行逐列离屏校验，解决「统一校验」缺口，并产出可常驻的真实报错文案。
+ */
+interface BuildCellRulesParams {
+    column: any;
+    rowData: any;
+    index: number;
+    form: FormInstance;
+    name: (string | number)[];
+    config: any;
+}
+interface BuiltCellRule {
+    /** 单元格 Form.Item 的 namePath（用于定位/messageVariables） */
+    namePath: (string | number)[];
+    /** 列在行内的稳定标识（与 transformColumns 的 dataIndex/key 一致），用于错误存储归集 */
+    cellKey: string;
+    /** 待校验值（names 列为组合数组） */
+    value: any;
+    /** 真实规则集合 */
+    rules: any[];
+    /** 字段 label，供 ${label} 文案插值 */
+    label: string;
+}
+/**
+ * 为单行单列装配真实校验规则与取值。
+ * 当该单元格处于查看/禁用态、或无任何规则时返回 null（跳过校验）。
+ */
+export declare const buildCellRules: ({ column, rowData, index, form, name, config, }: BuildCellRulesParams) => BuiltCellRule | null;
+interface ValidateAllParams {
+    form: FormInstance;
+    name: NamePath;
+    columns: any[];
+    config: any;
+}
+export interface ValidateAllResult {
+    hasError: boolean;
+    /** rowKey -> { cellKey -> 错误文案数组 } */
+    errorMap: Record<string, Record<string, string[]>>;
+    /** 首个错误单元格的 namePath（用于滚动定位），无错误为 null */
+    firstErrorPath: (string | number)[] | null;
+    /** 首个错误行的 rowKey（用于横向滚动时定位错误行 DOM），无错误为 null */
+    firstErrorRowKey: string | null;
+}
+/**
+ * 对 form store 中 name 路径下的全量数组数据，逐行逐列用真实规则校验（脱离 DOM）。
+ */
+export declare const validateAllRows: ({ form, name, columns, config, }: ValidateAllParams) => Promise<ValidateAllResult>;
+/**
+ * 外部错误存储：以 rowKey + cellKey 为键持久化真实报错文案。
+ * 它是「报错常驻」的真实来源——脱离 antd Field 实体生命周期，
+ * 行卸载后仍保留，重新挂载时回填显示。
+ */
+export interface ErrorStore {
+    /** 读取某单元格错误文案 */
+    get(rowKey: string | number, cellKey: string): string[] | undefined;
+    /** 读取整行错误 */
+    getRow(rowKey: string | number): Record<string, string[]> | undefined;
+    /** 全量替换（来自一次完整校验） */
+    setAll(errorMap: Record<string, Record<string, string[]>>): void;
+    /** 清理某单元格（用户修正后调用），整行清空时移除该行 */
+    clearCell(rowKey: string | number, cellKey: string): void;
+    /** 清空所有 */
+    clearAll(): void;
+    /** 是否为空 */
+    isEmpty(): boolean;
+}
+export declare const createErrorStore: () => ErrorStore;
+interface RunUnifiedParams extends ValidateAllParams {
+    errorStore: ErrorStore;
+}
+/**
+ * 统一校验入口：对全量数据跑真实规则，写入 errorStore，返回是否有错与首个错误行索引。
+ * 供隐藏聚合校验字段在 form.validateFields() 时调用，从而覆盖视口外未挂载的行。
+ */
+export declare const runUnifiedValidation: ({ form, name, columns, config, errorStore, }: RunUnifiedParams) => Promise<{
+    hasError: boolean;
+    firstErrorIndex: number | null;
+    firstErrorRowKey: string | null;
+}>;
+export {};

package/es/ProEditTable/utils/validateAll.js

@@ -0,0 +1,319 @@
+import _isString from "lodash/isString";
+import _isFunction from "lodash/isFunction";
+import _isBoolean from "lodash/isBoolean";
+import _get from "lodash/get";
+// 复用 antd 内部（@rc-component/form）的真实校验内核：与每个 Form.Item 字段走的是同一套
+// async-validator 流程，保证脱离 DOM 校验时的文案/异步 validator 行为与渲染态完全一致。
+import { validateRules } from '@rc-component/form/es/utils/validateUtil';
+import { rulesCreator } from "../../ProForm/utils/rulesCreator";
+import { isSelect, isNullArray, isNotFullArray } from "../../ProForm/utils";
+import { getDisabled, splitNames } from "./tools";
+import locale from "../../locale";
+
+/**
+ * 单元格规则装配 + 全量数据真实校验（脱离 DOM）。
+ *
+ * 背景：antd6 虚拟表格滚动时视口外的行会被卸载，其 Form.Item 字段未注册，
+ *       form.validateFields 无法覆盖；本模块用 form store 里的全量数据 + 真实规则
+ *       逐行逐列离屏校验，解决「统一校验」缺口，并产出可常驻的真实报错文案。
+ */
+
+/**
+ * 纯函数版规则装配，镜像 ProForm/hooks/useRules（去掉 hook 外壳）+ 复用 rulesCreator，
+ * 确保与渲染态生成的 rules 完全一致，无文案漂移。
+ */
+const composeRules = ({
+  rules,
+  required,
+  isSelectField,
+  label,
+  names,
+  labelRequired
+}) => {
+  const _label = _isString(label) ? label : '';
+  const requiredRule = Array.isArray(rules) && rules.find(rule => rule?.required === true);
+  const allRequired = required === true || Array.isArray(required) && required.every(item => item === true);
+  let resultRules = rules || [];
+  if (allRequired) {
+    if (!requiredRule) {
+      const message = isSelectField ? `${locale.ProForm.selectPlaceHolder}${_label}` : `${locale.ProForm.inputPlaceholder}${_label}`;
+      const rule = {
+        required: allRequired,
+        message
+      };
+      // names 字段的必填校验（与 useRules 保持一致）
+      if (names?.length) {
+        rule.validator = (_, value) => {
+          if (!value || isNullArray(value)) {
+            return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
+          }
+          return Promise.resolve();
+        };
+      }
+      resultRules = Array.isArray(rules) ? [...rules, rule] : [rule];
+    }
+  } else if (requiredRule && names?.length) {
+    // 不可变：克隆并替换 requiredRule 的 validator，避免污染外部 column.rules
+    resultRules = rules.map(rule => rule === requiredRule ? {
+      ...rule,
+      validator: (_, value) => {
+        if (!value || isNullArray(value)) {
+          return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
+        }
+        return Promise.resolve();
+      }
+    } : rule);
+  }
+
+  // type → 内置 rules（直接复用 rulesCreator 纯函数）
+  let finalRules = rulesCreator({
+    rules: resultRules,
+    label: _label,
+    isSelect: isSelectField,
+    names,
+    required
+  });
+
+  // 完整性校验（镜像 useRules 的 useEffect 分支）
+  if (names && !_isBoolean(labelRequired)) {
+    const customRequired = {
+      validator: (_rules, value) => {
+        if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
+          return Promise.reject(new Error(`${locale.ProForm.completeText}${_label}`));
+        }
+        return Promise.resolve();
+      }
+    };
+    finalRules = [customRequired, ...finalRules];
+  }
+  return finalRules;
+};
+
+/**
+ * 为单行单列装配真实校验规则与取值。
+ * 当该单元格处于查看/禁用态、或无任何规则时返回 null（跳过校验）。
+ */
+export const buildCellRules = ({
+  column,
+  rowData,
+  index,
+  form,
+  name,
+  config
+}) => {
+  // 整表查看模式：不校验
+  if (config?.isView) {
+    return null;
+  }
+  const reactiveParams = {
+    form,
+    index,
+    namePath: [...name, index]
+  };
+
+  // 动态 required / rules / isEditable 按行求值
+  let lastRequired = column?.required ?? false;
+  if (_isFunction(column?.required)) {
+    lastRequired = column.required(rowData, reactiveParams);
+  }
+  let lastRules = column?.rules ?? [];
+  if (_isFunction(column?.rules)) {
+    lastRules = column.rules(rowData, reactiveParams);
+  }
+  let lastFieldProps = column?.fieldProps ?? {};
+  if (_isFunction(column?.fieldProps)) {
+    lastFieldProps = column.fieldProps(rowData, reactiveParams);
+  }
+  let isEditable = column?.isEditable ?? true;
+  if (_isFunction(column?.isEditable)) {
+    isEditable = column.isEditable(rowData, reactiveParams);
+  }
+
+  // 与 RenderField 一致的 type 首字母大写
+  const type = column?.type?.replace?.(column.type[0], column.type[0].toUpperCase());
+
+  // 查看/禁用单元格跳过（镜像 RenderField.isView 的核心判定）
+  const disabled = getDisabled({
+    globalControl: config?.otherProps?.globalControl,
+    formDisabled: config?.otherProps?.formDisabled,
+    column,
+    tabledDisabled: config?.disabled,
+    columnFieldProps: lastFieldProps,
+    params: [rowData, reactiveParams],
+    rowDisabled: config?.rowDisabled || 'empty'
+  });
+  if (!isEditable || rowData?.['is-view'] || disabled) {
+    return null;
+  }
+  const names = column?.names;
+  const columnName = column?.name || column?.dataIndex || column?.key;
+  const isSelectField = !!isSelect({
+    dataSource: lastFieldProps?.dataSource,
+    type
+  });
+  const rules = composeRules({
+    rules: lastRules,
+    required: lastRequired,
+    isSelectField,
+    label: column?.label,
+    names,
+    labelRequired: column?.labelRequired
+  });
+
+  // 无实际约束（仅 [{ required: false }] 兜底）时跳过
+  const hasRealRule = rules.some(rule => rule?.required === true || rule?.validator || rule?.type || rule?.pattern);
+  if (!hasRealRule) {
+    return null;
+  }
+
+  // 取值与 cellKey：names 列取组合数组，cellKey 用 splitNames（与 transformColumns 对齐）
+  let value;
+  let cellKey;
+  if (names?.length) {
+    value = names.map(key => _get(rowData, key));
+    cellKey = splitNames(names);
+  } else {
+    const path = Array.isArray(columnName) ? columnName : [columnName];
+    value = _get(rowData, path);
+    cellKey = String(columnName);
+  }
+  return {
+    namePath: [...name, index, ...(Array.isArray(columnName) ? columnName : [columnName])],
+    cellKey,
+    value,
+    rules,
+    label: _isString(column?.label) ? column.label : ''
+  };
+};
+/**
+ * 对 form store 中 name 路径下的全量数组数据，逐行逐列用真实规则校验（脱离 DOM）。
+ */
+export const validateAllRows = async ({
+  form,
+  name,
+  columns,
+  config
+}) => {
+  const namePath = Array.isArray(name) ? name : [name];
+  const list = form.getFieldValue(namePath) || [];
+  const errorMap = {};
+  let firstErrorPath = null;
+  let firstErrorRowKey = null;
+  for (let index = 0; index < list.length; index += 1) {
+    const rowData = list[index];
+    // 行可能为空位（单行编辑增删残留），跳过
+    if (!rowData) {
+      continue;
+    }
+    const rowKey = String(rowData.rowKey ?? index);
+    for (const column of columns) {
+      const built = buildCellRules({
+        column,
+        rowData,
+        index,
+        form,
+        name: namePath,
+        config
+      });
+      if (!built) {
+        continue;
+      }
+
+      // validateFirst=true：成功 resolve([])，首个失败 reject([{ errors, rule }])
+      // eslint-disable-next-line no-await-in-loop
+      const ruleErrors = await validateRules(built.namePath, built.value, built.rules, {
+        validateMessages: config?.validateMessages
+      }, true, {
+        label: built.label
+      }).then(() => [], err => Array.isArray(err) ? err : []);
+      const messages = [];
+      ruleErrors.forEach(({
+        errors = [],
+        rule
+      }) => {
+        // warningOnly 仅警告，不计入阻断性错误
+        if (!rule?.warningOnly) {
+          messages.push(...errors);
+        }
+      });
+      if (messages.length) {
+        if (!errorMap[rowKey]) {
+          errorMap[rowKey] = {};
+        }
+        errorMap[rowKey][built.cellKey] = messages;
+        if (!firstErrorPath) {
+          firstErrorPath = built.namePath;
+          firstErrorRowKey = rowKey;
+        }
+      }
+    }
+  }
+  return {
+    hasError: !!firstErrorPath,
+    errorMap,
+    firstErrorPath,
+    firstErrorRowKey
+  };
+};
+
+/**
+ * 外部错误存储：以 rowKey + cellKey 为键持久化真实报错文案。
+ * 它是「报错常驻」的真实来源——脱离 antd Field 实体生命周期，
+ * 行卸载后仍保留，重新挂载时回填显示。
+ */
+
+export const createErrorStore = () => {
+  const map = new Map();
+  return {
+    get: (rowKey, cellKey) => map.get(String(rowKey))?.[cellKey],
+    getRow: rowKey => map.get(String(rowKey)),
+    setAll: errorMap => {
+      map.clear();
+      Object.keys(errorMap || {}).forEach(rowKey => {
+        map.set(rowKey, errorMap[rowKey]);
+      });
+    },
+    clearCell: (rowKey, cellKey) => {
+      const row = map.get(String(rowKey));
+      if (row && cellKey in row) {
+        delete row[cellKey];
+        if (Object.keys(row).length === 0) {
+          map.delete(String(rowKey));
+        }
+      }
+    },
+    clearAll: () => map.clear(),
+    isEmpty: () => map.size === 0
+  };
+};
+/**
+ * 统一校验入口：对全量数据跑真实规则，写入 errorStore，返回是否有错与首个错误行索引。
+ * 供隐藏聚合校验字段在 form.validateFields() 时调用，从而覆盖视口外未挂载的行。
+ */
+export const runUnifiedValidation = async ({
+  form,
+  name,
+  columns,
+  config,
+  errorStore
+}) => {
+  const {
+    hasError,
+    errorMap,
+    firstErrorPath,
+    firstErrorRowKey
+  } = await validateAllRows({
+    form,
+    name,
+    columns,
+    config
+  });
+  errorStore.setAll(errorMap);
+  const namePath = Array.isArray(name) ? name : [name];
+  const firstErrorIndex = firstErrorPath && firstErrorPath.length > namePath.length ? Number(firstErrorPath[namePath.length]) : null;
+  return {
+    hasError,
+    firstErrorIndex,
+    firstErrorRowKey
+  };
+};

package/es/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,57 +75,57 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    toISOString?: boolean;
-    toCSTString?: boolean;
-    switchValue?: [any, any];
-    clearNotShow?: boolean;
+    isView?: boolean;
+    style?: React.CSSProperties;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    className?: string;
+    hidden?: boolean;
+    id?: string;
+    onReset?: () => void;
+    validateTrigger?: string | false | string[];
+    preserve?: boolean;
     trim?: boolean;
-    upperCase?: boolean;
     normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    colon?: boolean;
-    htmlFor?: string;
+    clearNotShow?: boolean;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
+    prefixCls?: string;
+    colon?: boolean;
+    layout?: import("antd/es/form/Form").FormItemLayout;
     labelCol?: import("antd").ColProps;
+    wrapperCol?: import("antd").ColProps;
+    rootClassName?: string;
+    status?: "" | "validating" | "warning" | "error" | "success";
     vertical?: boolean;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    htmlFor?: string;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
-    onReset?: () => void;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
-    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
-    prefixCls?: string;
     noStyle?: boolean;
-    style?: React.CSSProperties;
-    className?: string;
-    rootClassName?: string;
-    id?: string;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "warning" | "error" | "validating";
-    hidden?: boolean;
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    wrapperCol?: import("antd").ColProps;
-    status?: "" | "success" | "warning" | "error" | "validating";
+    validateStatus?: "" | "validating" | "warning" | "error" | "success";
     help?: React.ReactNode;
     fieldId?: string;
     valueType?: import("../../../render/propsType").ProFormValueType;
-    isView?: boolean;
+    switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
         form: FormInstance<any>;
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    upperCase?: boolean;
+    toISOString?: boolean;
+    toCSTString?: boolean;
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
+    componentProps: import("lodash").Omit<any, "clearNotShow" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProTree/components/ProTreeSelect/index.js

@@ -10,7 +10,7 @@ import locale from "../../../locale";
 import { useProConfig } from "../../../ProConfigProvider";
 import Container from "../../../ProForm/components/Container";
 import AdaptiveTooltip from "../AdaptiveTooltip";
-import { getFlatTreeData } from "../../utils";
+import { getFlatTreeData, restoreCodeNameLabel } from "../../utils";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const {
   SHOW_PARENT
@@ -629,7 +629,8 @@ export const ProTreeSelect = (props, ref) => {
     if (props?.labelInValue) {
       result = getLabelByValue(_selectList, newVal);
     }
-    const options = findTreeNode(_selectList, extra?.triggerValue);
+    // showCodeName 仅影响展示，回调返回的 option 需还原原始 label
+    const options = restoreCodeNameLabel(findTreeNode(_selectList, extra?.triggerValue), showCodeName);
     onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');

package/es/ProTree/utils.d.ts

@@ -35,6 +35,15 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  * @returns
  */
 export declare function getChildrenKeys(node: ProTreeDataType, childrenKeys: string[], fieldNames: ProTreeFieldNamesType, type: 'treeClose' | 'treeCheck'): void;
+/**
+ * 还原 showCodeName 合并到 label 上的 `${value}-` 前缀
+ * showCodeName 仅影响展示，回调返回的 option 应保持原始 label
+ * 注意：此处 option 已是标准格式（label, value）
+ * @param option 单个或数组形式的选项（标准格式）
+ * @param showCodeName 是否开启了 code-name 展示
+ * @returns 还原 label 后的新对象/数组（不可变）
+ */
+export declare function restoreCodeNameLabel<T extends Record<string, any>>(option: T | T[], showCodeName?: boolean): T | T[];
 /**
  * 如果默认全开展那么返回所有key，否则返回空[]
  * @param isExpand 是否全展开

package/es/ProTree/utils.js

@@ -160,6 +160,37 @@ export function getChildrenKeys(node, childrenKeys, fieldNames, type) {
   }
 }
 
+/**
+ * 还原 showCodeName 合并到 label 上的 `${value}-` 前缀
+ * showCodeName 仅影响展示，回调返回的 option 应保持原始 label
+ * 注意：此处 option 已是标准格式（label, value）
+ * @param option 单个或数组形式的选项（标准格式）
+ * @param showCodeName 是否开启了 code-name 展示
+ * @returns 还原 label 后的新对象/数组（不可变）
+ */
+export function restoreCodeNameLabel(option, showCodeName) {
+  if (!showCodeName || !option) {
+    return option;
+  }
+  const restore = node => {
+    const {
+      label,
+      value
+    } = node;
+    if (typeof label === 'string') {
+      const prefix = `${value}-`;
+      if (label.startsWith(prefix)) {
+        return {
+          ...node,
+          label: label.slice(prefix.length)
+        };
+      }
+    }
+    return node;
+  };
+  return Array.isArray(option) ? option.map(restore) : restore(option);
+}
+
 /**
  * 如果默认全开展那么返回所有key，否则返回空[]
  * @param isExpand 是否全展开

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.4.3-beta.2",
+  "version": "4.5.0-beta.1",
   "license": "MIT",
   "files": [
     "es",
@@ -163,7 +163,6 @@
     "husky": "^9.0.0",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
-    "mini-css-extract-plugin": "^2.9.4",
     "minimatch": "^9.0.5",
     "mockjs": "^1.0.0",
     "patch-package": "^8.0.1",