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

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -1,13 +1,11 @@
-import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
-import _cloneDeep from "lodash/cloneDeep";
-/* eslint-disable no-lonely-if */
-import { useRef, useEffect } from 'react';
+import { useRef, useEffect } from "react";
+import cloneDeep from "lodash/cloneDeep";
+import isEqual from "lodash/isEqual";
+import isFunction from "lodash/isFunction";
 import { useDeepCompareMemo } from "../../../../hooks/useDeepCompareMemo";
 import { difference } from "../../../../../ProEditTable/utils/tools";
 import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from "../utils";
-/** 转换columns */
-export const useTransformColumns = params => {
+const useTransformColumns = (params) => {
   const {
     form,
     columns,
@@ -20,7 +18,7 @@ export const useTransformColumns = params => {
     groupProps
   } = params;
   const timerRef = useRef([]);
-  return columns?.flatMap((column, index) => {
+  return columns == null ? void 0 : columns.flatMap((column, index) => {
     const {
       type,
       valueType,
@@ -35,25 +33,18 @@ export const useTransformColumns = params => {
       clearNotShow,
       desensitization
     } = column;
-    const {
-      mode,
-      onChange,
-      disabled: comDisabled
-    } = fieldProps || {};
+    const { mode, onChange, disabled: comDisabled } = fieldProps || {};
     const _disabled = disabled || comDisabled;
     const columnName = names ? names[index] : [].concat(name, index);
-
-    // 响应式字段改变后的回调
     const changedCallback = (lastDependency, current) => {
-      // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (names || value)) {
-        if (current?.show === false) {
+        if ((current == null ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(() => {
             if (names) {
               form.resetFields([columnName]);
             }
-            if (!names && value?.length) {
+            if (!names && (value == null ? void 0 : value.length)) {
               value[index] = null;
               form.setFieldValue(columnName, [...value]);
             }
@@ -63,28 +54,25 @@ export const useTransformColumns = params => {
         }
       }
     };
-
-    // 响应式字段
-    const reactiveProps = useDeepCompareMemo(() => {
-      return getReactiveProps({
-        form,
-        index,
-        type,
-        namePath,
-        disabled: _disabled,
-        show,
-        component,
-        fieldProps,
-        name: columnName,
-        desensitization
-      });
-    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
-
-    // 从处理后的fieldProps中获取事件处理器
-    const {
-      onFieldChange,
-      onBlur
-    } = reactiveProps.fieldProps || {};
+    const reactiveProps = useDeepCompareMemo(
+      () => {
+        return getReactiveProps({
+          form,
+          index,
+          type,
+          namePath,
+          disabled: _disabled,
+          show,
+          component,
+          fieldProps,
+          name: columnName,
+          desensitization
+        });
+      },
+      changedCallback,
+      [value, show, fieldProps, _disabled, columnName, type]
+    );
+    const { onFieldChange, onBlur } = reactiveProps.fieldProps || {};
     if (reactiveProps.show === false) {
       return [];
     }
@@ -98,39 +86,33 @@ export const useTransformColumns = params => {
     });
     let newValue;
     const handleChange = (...args) => {
+      var _a, _b, _c;
       newValue = valueFromEventWrapper(column, args);
-      if (transform?.normalize) {
-        newValue = transform?.normalize?.(newValue);
+      if (transform == null ? void 0 : transform.normalize) {
+        newValue = (_a = transform == null ? void 0 : transform.normalize) == null ? void 0 : _a.call(transform, newValue);
       } else if (normalize) {
-        // @ts-ignore
-        newValue = normalize?.(newValue);
+        newValue = normalize == null ? void 0 : normalize(newValue);
       }
-
-      // 根据模式选择值管理方式
       if (names) {
-        // 独立字段模式：设置单个字段值 + 触发整体校验
         form.setFieldValue(columnName, newValue);
-        // 确保触发Group整体的校验
-        internalChange?.(newValue, args[1], index);
+        internalChange == null ? void 0 : internalChange(newValue, args[1], index);
       } else {
-        // 数组值模式
-        internalChange?.(newValue, args[1], index);
+        internalChange == null ? void 0 : internalChange(newValue, args[1], index);
       }
       const values = form.getFieldValue(namePath);
-      const originRow = namePath?.length ? _cloneDeep(values) : undefined;
-      onChange?.(...args);
-      onFieldChange?.(newValue, values, {
+      const originRow = (namePath == null ? void 0 : namePath.length) ? cloneDeep(values) : void 0;
+      onChange == null ? void 0 : onChange(...args);
+      onFieldChange == null ? void 0 : onFieldChange(newValue, values, {
         index: outerIndex,
         namePath,
         form,
-        option: args?.[1]
+        option: args == null ? void 0 : args[1]
       });
-      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if (namePath?.length && !_isEqual(originRow, values)) {
+      if ((namePath == null ? void 0 : namePath.length) && !isEqual(originRow, values)) {
         form.setFieldValue(namePath, values);
         const diff = difference(originRow, values) || {};
-        const validateFieldKeys = Object.keys(diff)?.map?.(key => [...namePath, key]);
-        if (validateFieldKeys?.length) {
+        const validateFieldKeys = (_c = (_b = Object.keys(diff)) == null ? void 0 : _b.map) == null ? void 0 : _c.call(_b, (key) => [...namePath, key]);
+        if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
           setTimeout(() => {
             form.validateFields([name, ...validateFieldKeys]);
           }, 100);
@@ -138,17 +120,16 @@ export const useTransformColumns = params => {
       }
     };
     const handleBlur = (...args) => {
-      if (!onBlur) return;
+      if (!onBlur)
+        return;
       const values = form.getFieldValue(namePath);
-      onBlur?.(args[0], values, {
+      onBlur == null ? void 0 : onBlur(args[0], values, {
         index: outerIndex,
         namePath,
         form,
-        option: args?.[1]
+        option: args == null ? void 0 : args[1]
       });
     };
-
-    // 内外一个为true则为true
     const getLastDisabled = () => {
       if (Array.isArray(groupProps.disabled)) {
         return reactiveProps.disabled || groupProps.disabled[index];
@@ -160,97 +141,55 @@ export const useTransformColumns = params => {
       name: columnName,
       ...reactiveProps,
       disabled: getLastDisabled(),
-      getValueProps: transform?.getValueProps,
+      getValueProps: transform == null ? void 0 : transform.getValueProps,
       fieldProps: {
-        ...column?.fieldProps,
-        ...reactiveProps?.fieldProps,
+        ...column == null ? void 0 : column.fieldProps,
+        ...reactiveProps == null ? void 0 : reactiveProps.fieldProps,
         onChange: handleChange,
         onBlur: handleBlur,
-        value: value?.[index]
+        value: value == null ? void 0 : value[index]
       }
     };
   });
 };
-
-/**
- * 检查子项是否应该显示（纯函数，不执行副作用）
- */
-export const checkShouldShow = (child, form, namePath, index) => {
-  const {
-    show
-  } = child;
-
-  // 如果没有配置 show，默认显示
-  if (show === undefined || show === true) {
+const checkShouldShow = (child, form, namePath, index) => {
+  const { show } = child;
+  if (show === void 0 || show === true) {
     return true;
   }
-
-  // 如果 show 是 false，不显示
   if (show === false) {
     return false;
   }
-
-  // 如果 show 是函数，需要获取表单值来评估
-  if (_isFunction(show)) {
+  if (isFunction(show)) {
     let values = {};
     if (namePath) {
-      // FormList 场景：取当前行数据
       values = form.getFieldValue(namePath) || {};
     } else {
-      // 普通场景：取整个表单值
       values = form.getFieldsValue(true);
     }
-    return Boolean(show(values, {
-      form,
-      index,
-      namePath
-    }));
+    return Boolean(show(values, { form, index, namePath }));
   }
   return true;
 };
-/**
- * ProEditTable 场景下，当字段的 show 从 true 变为 false 时，自动重置字段值
- * 使用 useEffect 在副作用中执行重置，避免在渲染过程中调用 setState
- */
-export const useResetProEditTable = params => {
-  const {
-    children,
-    form,
-    namePath,
-    source
-  } = params;
-
-  // 用于跟踪每个子项的显示状态
-  const showStateRef = useRef(new Map());
-  // 用于存储重置定时器
-  const resetTimersRef = useRef(new Map());
+const useResetProEditTable = (params) => {
+  const { children, form, namePath, source } = params;
+  const showStateRef = useRef(/* @__PURE__ */ new Map());
+  const resetTimersRef = useRef(/* @__PURE__ */ new Map());
   useEffect(() => {
-    // 只在 ProEditTable 场景下执行重置逻辑
-    if (source !== 'ProEditTable') {
+    if (source !== "ProEditTable") {
       return;
     }
-
-    // 检查每个子项的显示状态
-    children.forEach(child => {
+    children.forEach((child) => {
       const childNamePath = child.namePath || namePath;
       const childIndex = child.index;
-
-      // 生成唯一 key 用于跟踪状态
       const childKey = child.name ? Array.isArray(child.name) ? `${JSON.stringify(childNamePath)}-${JSON.stringify(child.name)}` : `${JSON.stringify(childNamePath)}-${child.name}` : `child-${children.indexOf(child)}`;
-
-      // 计算当前显示状态
       const currentShow = checkShouldShow(child, form, childNamePath, childIndex);
       const previousShow = showStateRef.current.get(childKey);
-
-      // 如果状态发生变化，且从显示变为隐藏，执行重置
-      if (previousShow !== undefined && previousShow === true && currentShow === false) {
-        // 清除之前的定时器
+      if (previousShow !== void 0 && previousShow === true && currentShow === false) {
         const existingTimer = resetTimersRef.current.get(childKey);
         if (existingTimer) {
           clearTimeout(existingTimer);
         }
-
-        // 延迟执行重置，避免在渲染过程中调用
         const timer = setTimeout(() => {
           if (Array.isArray(child.name)) {
             form.resetFields([[...childNamePath, ...child.name]]);
@@ -261,17 +200,18 @@ export const useResetProEditTable = params => {
         }, 300);
         resetTimersRef.current.set(childKey, timer);
       }
-
-      // 更新显示状态
       showStateRef.current.set(childKey, currentShow);
     });
-
-    // 清理函数：组件卸载时清除所有定时器
     return () => {
-      resetTimersRef.current.forEach(timer => {
+      resetTimersRef.current.forEach((timer) => {
         clearTimeout(timer);
       });
       resetTimersRef.current.clear();
     };
   }, [children, namePath, source, form]);
-};
+};
+export {
+  checkShouldShow,
+  useResetProEditTable,
+  useTransformColumns
+};

package/es/ProForm/components/combination/Group/index.js

@@ -1,19 +1,16 @@
-import _omit from "lodash/omit";
-import _isEmpty from "lodash/isEmpty";
-import { Space } from 'antd';
-import React from 'react';
-import classnames from 'classnames';
+import { jsx } from "react/jsx-runtime";
+import { Space } from "antd";
+import React from "react";
+import isEmpty from "lodash/isEmpty";
+import omit from "lodash/omit";
+import classnames from "classnames";
 import { insertSeparator } from "./utils";
 import { useTransformColumns } from "./hooks";
 import ProForm from "../../../../ProForm";
 import ComRender from "./component/ComRender";
 import FlexibleGroup from "./component/FlexibleGroup";
-
-/**
- * 传统数组模式Group组件（保持向后兼容）
- */
-import { jsx as _jsx } from "react/jsx-runtime";
-const LegacyGroup = props => {
+const LegacyGroup = (props) => {
+  var _a;
   const {
     children,
     className,
@@ -27,32 +24,20 @@ const LegacyGroup = props => {
     isView: isParentView,
     disabled: formDisabled,
     separator,
-    split // 弃用属性，保持向后兼容
+    split
+    // 弃用属性，保持向后兼容
   } = props;
-
-  // 向后兼容处理：优先使用 separator，如果没有则使用 split，最后使用默认值
-  const finalSeparator = separator ?? split ?? '/';
-
-  // 支持从 fieldProps.space 获取 space 配置
-  const fieldPropsSpace = props.fieldProps?.space;
+  const finalSeparator = separator ?? split ?? "/";
+  const fieldPropsSpace = (_a = props.fieldProps) == null ? void 0 : _a.space;
   const space = fieldPropsSpace || propsSpace;
   const contextProps = ProForm.useFieldProps() || {};
-  const {
-    names,
-    name,
-    form,
-    namePath,
-    index,
-    isView
-  } = contextProps;
+  const { names, name, form, namePath, index, isView } = contextProps;
   const nextOption = React.useRef([]);
   const nextIsView = isParentView || isView || otherProps.isView;
-
-  // 组合onChange
-  const handleChange = (value, option, index) => {
+  const handleChange = (value2, option, index2) => {
     const nextValue = props.value ? [...props.value] : [];
-    nextValue[index] = value;
-    nextOption.current[index] = option;
+    nextValue[index2] = value2;
+    nextOption.current[index2] = option;
     onChange(nextValue, nextOption.current);
   };
   const columnsProps = useTransformColumns({
@@ -69,132 +54,108 @@ const LegacyGroup = props => {
   });
   const columns = insertSeparator(columnsProps, space);
   const nextClassName = classnames({
-    'pro-group': true,
-    'pro-group-unflexible': true,
-    'pro-group-diy-width': columns.some(item => item?.fieldProps?.style?.width),
-    'pro-group-width-auto': columns.some(item => {
-      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
+    "pro-group": true,
+    "pro-group-unflexible": true,
+    "pro-group-diy-width": columns.some((item) => {
+      var _a2, _b;
+      return (_b = (_a2 = item == null ? void 0 : item.fieldProps) == null ? void 0 : _a2.style) == null ? void 0 : _b.width;
+    }),
+    "pro-group-width-auto": columns.some((item) => {
+      return ["Radio", "Checkbox", "Switch"].includes(item.type);
     }),
-    'pro-group-view': nextIsView,
+    "pro-group-view": nextIsView,
     [`${className}`]: className
   });
-  if (nextIsView && _isEmpty(value)) {
-    return otherProps?.viewEmpty || '-';
+  if (nextIsView && isEmpty(value)) {
+    return (otherProps == null ? void 0 : otherProps.viewEmpty) || "-";
   }
-
-  // compact模式专用：为每个字段创建可见的Form.Item，并应用宽度样式
   const renderCompactFormItems = () => {
     const elements = [];
-    columns.forEach((column, index) => {
-      // 检测是否有自定义宽度
-      const childWidth = column?.fieldProps?.style?.width;
-      const formItemStyle = childWidth ? {
-        width: childWidth
-      } : undefined;
-      const formItemClassName = childWidth ? 'pro-group-form-item pro-group-form-item-has-width' : 'pro-group-form-item';
-
-      // 创建新的 column 对象，避免直接修改原对象
-      const newColumn = {
-        ...column
-      };
+    columns.forEach((column, index2) => {
+      var _a2, _b, _c;
+      const childWidth = (_b = (_a2 = column == null ? void 0 : column.fieldProps) == null ? void 0 : _a2.style) == null ? void 0 : _b.width;
+      const formItemStyle = childWidth ? { width: childWidth } : void 0;
+      const formItemClassName = childWidth ? "pro-group-form-item pro-group-form-item-has-width" : "pro-group-form-item";
+      const newColumn = { ...column };
       newColumn.otherProps = otherProps;
-
-      // 如果子组件有自定义宽度，将子组件的宽度改为 100%，让它填充 Form.Item
       if (childWidth) {
         newColumn.fieldProps = {
           ...newColumn.fieldProps,
           style: {
-            ...newColumn.fieldProps?.style,
-            width: '100%'
+            ...(_c = newColumn.fieldProps) == null ? void 0 : _c.style,
+            width: "100%"
           }
         };
       }
-
-      // 自定义间隔移除对应参数
-      if (newColumn?.separator) {
+      if (newColumn == null ? void 0 : newColumn.separator) {
         delete newColumn.separator;
         delete newColumn.otherProps;
       }
-
-      // 传统模式 compact 模式：将 Form.Item 相关的 props 传递给 ComRender
-      // ComRender 内部会处理 Form.Item 的渲染，避免嵌套
-      const dependencies = names && names.length > 0 ? names.filter(n => n !== newColumn.name) : undefined;
-      const formElement = /*#__PURE__*/_jsx(ComRender, {
-        contextProps: contextProps,
-        isView: nextIsView,
-        formItemClassName: formItemClassName,
-        formItemStyle: formItemStyle,
-        dependencies: dependencies,
-        ...newColumn
-      }, newColumn.name || index);
+      const dependencies = names && names.length > 0 ? names.filter((n) => n !== newColumn.name) : void 0;
+      const formElement = /* @__PURE__ */ jsx(
+        ComRender,
+        {
+          contextProps,
+          isView: nextIsView,
+          formItemClassName,
+          formItemStyle,
+          dependencies,
+          ...newColumn
+        },
+        newColumn.name || index2
+      );
       elements.push(formElement);
-
-      // 添加分隔符
-      if (newColumn?.separator && index < columns.length - 1) {
-        elements.push( /*#__PURE__*/_jsx("span", {
-          className: "pro-group-separator-compact",
-          children: newColumn.separator
-        }, `separator-${String(newColumn.name ?? index)}`));
+      if ((newColumn == null ? void 0 : newColumn.separator) && index2 < columns.length - 1) {
+        elements.push(
+          /* @__PURE__ */ jsx(
+            "span",
+            {
+              className: "pro-group-separator-compact",
+              children: newColumn.separator
+            },
+            `separator-${String(newColumn.name ?? index2)}`
+          )
+        );
       }
     });
-    return /*#__PURE__*/_jsx("div", {
-      className: "ant-space ant-space-horizontal ant-space-compact pro-group-compact-container",
-      children: elements
-    });
+    return /* @__PURE__ */ jsx("div", { className: "ant-space ant-space-horizontal ant-space-compact pro-group-compact-container", children: elements });
   };
-  return /*#__PURE__*/_jsx("div", {
-    className: nextClassName,
-    id: id,
-    children: (space.compact || space?.separator) && !nextIsView ? renderCompactFormItems() : /*#__PURE__*/_jsx(Space, {
+  return /* @__PURE__ */ jsx("div", { className: nextClassName, id, children: (space.compact || (space == null ? void 0 : space.separator)) && !nextIsView ? renderCompactFormItems() : /* @__PURE__ */ jsx(
+    Space,
+    {
       align: "start",
-      ..._omit(space, ['separator', 'compact']),
+      ...omit(space, ["separator", "compact"]),
       separator: nextIsView ? finalSeparator : null,
       size: nextIsView ? 0 : space.size,
-      children: columns.map((column, index) => {
+      children: columns.map((column, index2) => {
         column.otherProps = otherProps;
-        if (column?.separator) {
+        if (column == null ? void 0 : column.separator) {
           delete column.separator;
           delete column.otherProps;
         }
-        return /*#__PURE__*/_jsx(ComRender, {
-          contextProps: contextProps,
-          isView: nextIsView,
-          ...column
-        }, column.name || index);
+        return /* @__PURE__ */ jsx(
+          ComRender,
+          {
+            contextProps,
+            isView: nextIsView,
+            ...column
+          },
+          column.name || index2
+        );
       })
-    })
-  });
+    }
+  ) });
 };
-
-/**
- * Group组件 - 支持传统模式和灵活模式
- * - 有names属性 → 传统数组模式（保持向后兼容）
- * - 无names属性 → 新的灵活模式（子组件必须配置name）
- */
-const Group = props => {
-  const {
-    children,
-    names,
-    otherProps
-  } = props;
-
-  // names可能在props.names或props.otherProps.names中（来自ProForm的传递）
-  const actualNames = names || otherProps?.names;
-
-  // 模式检测：基于names属性判断使用哪种模式
-  // 传统模式：有names属性且为非空数组
-  // 灵活模式：无names属性或names为空，children中的子项必须配置name
+const Group = (props) => {
+  const { children, names, otherProps } = props;
+  const actualNames = names || (otherProps == null ? void 0 : otherProps.names);
   const isLegacyMode = Array.isArray(actualNames) && actualNames.length > 0;
   if (isLegacyMode) {
-    // 传统模式：使用names数组管理值，确保names被传递给LegacyGroup
-    return /*#__PURE__*/_jsx(LegacyGroup, {
-      ...props,
-      names: actualNames
-    });
+    return /* @__PURE__ */ jsx(LegacyGroup, { ...props, names: actualNames });
   }
-  // 灵活模式：子组件独立管理name和rules
-  return /*#__PURE__*/_jsx(FlexibleGroup, {
-    ...props
-  });
+  return /* @__PURE__ */ jsx(FlexibleGroup, { ...props });
+};
+var Group_default = Group;
+export {
+  Group_default as default
 };
-export default Group;

package/es/ProForm/components/combination/Group/propsType.js

@@ -1 +0,0 @@
-export {};