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

package/es/ProEditTable/utils/validateAll.js

@@ -1,27 +1,12 @@
-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 get from "lodash/get";
+import isBoolean from "lodash/isBoolean";
+import isFunction from "lodash/isFunction";
+import isString from "lodash/isString";
+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,
@@ -30,19 +15,15 @@ const composeRules = ({
   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);
+  const _label = isString(label) ? label : "";
+  const requiredRule = Array.isArray(rules) && rules.find((rule) => (rule == null ? void 0 : 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) {
+      const rule = { required: allRequired, message };
+      if (names == null ? void 0 : names.length) {
         rule.validator = (_, value) => {
           if (!value || isNullArray(value)) {
             return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
@@ -52,20 +33,19 @@ const composeRules = ({
       }
       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}`));
+  } else if (requiredRule && (names == null ? void 0 : names.length)) {
+    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();
         }
-        return Promise.resolve();
-      }
-    } : rule);
+      } : rule
+    );
   }
-
-  // type → 内置 rules（直接复用 rulesCreator 纯函数）
   let finalRules = rulesCreator({
     rules: resultRules,
     label: _label,
@@ -73,9 +53,7 @@ const composeRules = ({
     names,
     required
   });
-
-  // 完整性校验（镜像 useRules 的 useEffect 分支）
-  if (names && !_isBoolean(labelRequired)) {
+  if (names && !isBoolean(labelRequired)) {
     const customRequired = {
       validator: (_rules, value) => {
         if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
@@ -88,12 +66,7 @@ const composeRules = ({
   }
   return finalRules;
 };
-
-/**
- * 为单行单列装配真实校验规则与取值。
- * 当该单元格处于查看/禁用态、或无任何规则时返回 null（跳过校验）。
- */
-export const buildCellRules = ({
+const buildCellRules = ({
   column,
   rowData,
   index,
@@ -101,94 +74,76 @@ export const buildCellRules = ({
   name,
   config
 }) => {
-  // 整表查看模式：不校验
-  if (config?.isView) {
+  var _a, _b, _c, _d;
+  if (config == null ? void 0 : config.isView) {
     return null;
   }
-  const reactiveParams = {
-    form,
-    index,
-    namePath: [...name, index]
-  };
-
-  // 动态 required / rules / isEditable 按行求值
-  let lastRequired = column?.required ?? false;
-  if (_isFunction(column?.required)) {
+  const reactiveParams = { form, index, namePath: [...name, index] };
+  let lastRequired = (column == null ? void 0 : column.required) ?? false;
+  if (isFunction(column == null ? void 0 : column.required)) {
     lastRequired = column.required(rowData, reactiveParams);
   }
-  let lastRules = column?.rules ?? [];
-  if (_isFunction(column?.rules)) {
+  let lastRules = (column == null ? void 0 : column.rules) ?? [];
+  if (isFunction(column == null ? void 0 : column.rules)) {
     lastRules = column.rules(rowData, reactiveParams);
   }
-  let lastFieldProps = column?.fieldProps ?? {};
-  if (_isFunction(column?.fieldProps)) {
+  let lastFieldProps = (column == null ? void 0 : column.fieldProps) ?? {};
+  if (isFunction(column == null ? void 0 : column.fieldProps)) {
     lastFieldProps = column.fieldProps(rowData, reactiveParams);
   }
-  let isEditable = column?.isEditable ?? true;
-  if (_isFunction(column?.isEditable)) {
+  let isEditable = (column == null ? void 0 : column.isEditable) ?? true;
+  if (isFunction(column == null ? void 0 : column.isEditable)) {
     isEditable = column.isEditable(rowData, reactiveParams);
   }
-
-  // 与 RenderField 一致的 type 首字母大写
-  const type = column?.type?.replace?.(column.type[0], column.type[0].toUpperCase());
-
-  // 查看/禁用单元格跳过（镜像 RenderField.isView 的核心判定）
+  const type = (_b = (_a = column == null ? void 0 : column.type) == null ? void 0 : _a.replace) == null ? void 0 : _b.call(_a, column.type[0], column.type[0].toUpperCase());
   const disabled = getDisabled({
-    globalControl: config?.otherProps?.globalControl,
-    formDisabled: config?.otherProps?.formDisabled,
+    globalControl: (_c = config == null ? void 0 : config.otherProps) == null ? void 0 : _c.globalControl,
+    formDisabled: (_d = config == null ? void 0 : config.otherProps) == null ? void 0 : _d.formDisabled,
     column,
-    tabledDisabled: config?.disabled,
+    tabledDisabled: config == null ? void 0 : config.disabled,
     columnFieldProps: lastFieldProps,
     params: [rowData, reactiveParams],
-    rowDisabled: config?.rowDisabled || 'empty'
+    rowDisabled: (config == null ? void 0 : config.rowDisabled) || "empty"
   });
-  if (!isEditable || rowData?.['is-view'] || disabled) {
+  if (!isEditable || (rowData == null ? void 0 : 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 names = column == null ? void 0 : column.names;
+  const columnName = (column == null ? void 0 : column.name) || (column == null ? void 0 : column.dataIndex) || (column == null ? void 0 : column.key);
+  const isSelectField = !!isSelect({ dataSource: lastFieldProps == null ? void 0 : lastFieldProps.dataSource, type });
   const rules = composeRules({
     rules: lastRules,
     required: lastRequired,
     isSelectField,
-    label: column?.label,
+    label: column == null ? void 0 : column.label,
     names,
-    labelRequired: column?.labelRequired
+    labelRequired: column == null ? void 0 : column.labelRequired
   });
-
-  // 无实际约束（仅 [{ required: false }] 兜底）时跳过
-  const hasRealRule = rules.some(rule => rule?.required === true || rule?.validator || rule?.type || rule?.pattern);
+  const hasRealRule = rules.some(
+    (rule) => (rule == null ? void 0 : rule.required) === true || (rule == null ? void 0 : rule.validator) || (rule == null ? void 0 : rule.type) || (rule == null ? void 0 : 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));
+  if (names == null ? void 0 : names.length) {
+    value = names.map((key) => get(rowData, key));
     cellKey = splitNames(names);
   } else {
     const path = Array.isArray(columnName) ? columnName : [columnName];
-    value = _get(rowData, path);
+    value = get(rowData, path);
     cellKey = String(columnName);
   }
   return {
-    namePath: [...name, index, ...(Array.isArray(columnName) ? columnName : [columnName])],
+    namePath: [...name, index, ...Array.isArray(columnName) ? columnName : [columnName]],
     cellKey,
     value,
     rules,
-    label: _isString(column?.label) ? column.label : ''
+    label: isString(column == null ? void 0 : column.label) ? column.label : ""
   };
 };
-/**
- * 对 form store 中 name 路径下的全量数组数据，逐行逐列用真实规则校验（脱离 DOM）。
- */
-export const validateAllRows = async ({
+const validateAllRows = async ({
   form,
   name,
   columns,
@@ -202,38 +157,29 @@ export const validateAllRows = async ({
   let firstErrorColumnKey = 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
-      });
+      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 ruleErrors = await validateRules(
+        built.namePath,
+        built.value,
+        built.rules,
+        { validateMessages: config == null ? void 0 : config.validateMessages },
+        true,
+        { label: built.label }
+      ).then(
+        () => [],
+        (err) => Array.isArray(err) ? err : []
+      );
       const messages = [];
-      ruleErrors.forEach(({
-        errors = [],
-        rule
-      }) => {
-        // warningOnly 仅警告，不计入阻断性错误
-        if (!rule?.warningOnly) {
+      ruleErrors.forEach(({ errors = [], rule }) => {
+        if (!(rule == null ? void 0 : rule.warningOnly)) {
           messages.push(...errors);
         }
       });
@@ -258,21 +204,17 @@ export const validateAllRows = async ({
     firstErrorColumnKey
   };
 };
-
-/**
- * 外部错误存储：以 rowKey + cellKey 为键持久化真实报错文案。
- * 它是「报错常驻」的真实来源——脱离 antd Field 实体生命周期，
- * 行卸载后仍保留，重新挂载时回填显示。
- */
-
-export const createErrorStore = () => {
-  const map = new Map();
+const createErrorStore = () => {
+  const map = /* @__PURE__ */ new Map();
   return {
-    get: (rowKey, cellKey) => map.get(String(rowKey))?.[cellKey],
-    getRow: rowKey => map.get(String(rowKey)),
-    setAll: errorMap => {
+    get: (rowKey, cellKey) => {
+      var _a;
+      return (_a = map.get(String(rowKey))) == null ? void 0 : _a[cellKey];
+    },
+    getRow: (rowKey) => map.get(String(rowKey)),
+    setAll: (errorMap) => {
       map.clear();
-      Object.keys(errorMap || {}).forEach(rowKey => {
+      Object.keys(errorMap || {}).forEach((rowKey) => {
         map.set(rowKey, errorMap[rowKey]);
       });
     },
@@ -289,24 +231,14 @@ export const createErrorStore = () => {
     isEmpty: () => map.size === 0
   };
 };
-/**
- * 统一校验入口：对全量数据跑真实规则，写入 errorStore，返回是否有错与首个错误行索引。
- * 供隐藏聚合校验字段在 form.validateFields() 时调用，从而覆盖视口外未挂载的行。
- */
-export const runUnifiedValidation = async ({
+const runUnifiedValidation = async ({
   form,
   name,
   columns,
   config,
   errorStore
 }) => {
-  const {
-    hasError,
-    errorMap,
-    firstErrorPath,
-    firstErrorRowKey,
-    firstErrorColumnKey
-  } = await validateAllRows({
+  const { hasError, errorMap, firstErrorPath, firstErrorRowKey, firstErrorColumnKey } = await validateAllRows({
     form,
     name,
     columns,
@@ -315,10 +247,11 @@ export const runUnifiedValidation = async ({
   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,
-    firstErrorColumnKey
-  };
-};
+  return { hasError, firstErrorIndex, firstErrorRowKey, firstErrorColumnKey };
+};
+export {
+  buildCellRules,
+  createErrorStore,
+  runUnifiedValidation,
+  validateAllRows
+};

package/es/ProEnum/components/Group.js

@@ -1,7 +1,7 @@
-import classNames from 'classnames';
-import { useEffect, useRef, useState } from 'react';
-import { jsx as _jsx } from "react/jsx-runtime";
-const Group = props => {
+import { jsx } from "react/jsx-runtime";
+import classNames from "classnames";
+import { useEffect, useRef, useState } from "react";
+const Group = (props) => {
   const {
     value,
     onChange,
@@ -15,7 +15,7 @@ const Group = props => {
   const [refresh, setRefresh] = useState(false);
   const idx = useRef(-1);
   useEffect(() => {
-    const index = dataSource.findIndex(item => item[fieldValue] === value);
+    const index = dataSource.findIndex((item) => item[fieldValue] === value);
     idx.current = index;
     setRefresh(!refresh);
   }, [value]);
@@ -24,38 +24,46 @@ const Group = props => {
       if (!allowClear) {
         return false;
       }
-      onChange?.('');
+      onChange == null ? void 0 : onChange("");
       idx.current = -1;
     } else {
       idx.current = index;
-      onChange?.(val);
+      onChange == null ? void 0 : onChange(val);
     }
   };
   if (dataSource.length === 0) {
-    return /*#__PURE__*/_jsx("span", {
-      children: "-"
-    });
+    return /* @__PURE__ */ jsx("span", { children: "-" });
   }
-  return /*#__PURE__*/_jsx("div", {
-    id: id,
-    className: classNames({
-      'pro-enum-group-root': true,
-      'pro-enum-group-root-disabled': disabled
-    }),
-    children: dataSource.map((item, index) => /*#__PURE__*/_jsx("div", {
-      onClick: () => {
-        if (!item.disabled && !disabled) {
-          handleClick(item[fieldValue], index);
-        }
-      },
+  return /* @__PURE__ */ jsx(
+    "div",
+    {
+      id,
       className: classNames({
-        'pro-enum-group-item': true,
-        'pro-enum-group-item-selected': value === item[fieldValue],
-        'pro-enum-group-item-disabled-after': index === idx.current || index + 1 === idx.current,
-        'pro-enum-group-item-disabled': item.disabled
+        "pro-enum-group-root": true,
+        "pro-enum-group-root-disabled": disabled
       }),
-      children: item[fieldLabel]
-    }, item[fieldValue]))
-  });
+      children: dataSource.map((item, index) => /* @__PURE__ */ jsx(
+        "div",
+        {
+          onClick: () => {
+            if (!item.disabled && !disabled) {
+              handleClick(item[fieldValue], index);
+            }
+          },
+          className: classNames({
+            "pro-enum-group-item": true,
+            "pro-enum-group-item-selected": value === item[fieldValue],
+            "pro-enum-group-item-disabled-after": index === idx.current || index + 1 === idx.current,
+            "pro-enum-group-item-disabled": item.disabled
+          }),
+          children: item[fieldLabel]
+        },
+        item[fieldValue]
+      ))
+    }
+  );
+};
+var Group_default = Group;
+export {
+  Group_default as default
 };
-export default Group;

package/es/ProEnum/components/Tag.js

@@ -1,38 +1,34 @@
-import classNames from 'classnames';
-import { useEffect, useState } from 'react';
-import { jsx as _jsx } from "react/jsx-runtime";
-const ProEnumTag = props => {
-  const {
-    value,
-    onChange,
-    dataSource,
-    fieldValue,
-    fieldLabel,
-    id
-  } = props;
+import { jsx } from "react/jsx-runtime";
+import classNames from "classnames";
+import { useEffect, useState } from "react";
+const ProEnumTag = (props) => {
+  const { value, onChange, dataSource, fieldValue, fieldLabel, id } = props;
   const [checked, setValue] = useState();
   useEffect(() => {
     setValue(value);
   }, [value]);
-  const handleClick = val => {
+  const handleClick = (val) => {
     setValue(val);
-    onChange?.(val);
+    onChange == null ? void 0 : onChange(val);
   };
   if (dataSource.length === 0) {
-    return /*#__PURE__*/_jsx("span", {
-      children: "-"
-    });
+    return /* @__PURE__ */ jsx("span", { children: "-" });
   }
-  return /*#__PURE__*/_jsx("div", {
-    id: id,
-    className: "pro-enum-tag-root",
-    children: dataSource.map(item => /*#__PURE__*/_jsx("div", {
+  return /* @__PURE__ */ jsx("div", { id, className: "pro-enum-tag-root", children: dataSource.map((item) => /* @__PURE__ */ jsx(
+    "div",
+    {
       onClick: () => handleClick(item[fieldValue]),
-      className: classNames('pro-enum-tag-item', checked === item[fieldValue] ? 'pro-enum-tag-item-selected' : ''
-      // item.disabled ? 'pro-enum-tag-item-disabled' : '',
+      className: classNames(
+        "pro-enum-tag-item",
+        checked === item[fieldValue] ? "pro-enum-tag-item-selected" : ""
+        // item.disabled ? 'pro-enum-tag-item-disabled' : '',
       ),
       children: item[fieldLabel]
-    }, item[fieldValue]))
-  });
+    },
+    item[fieldValue]
+  )) });
+};
+var Tag_default = ProEnumTag;
+export {
+  Tag_default as default
 };
-export default ProEnumTag;