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

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -1,155 +1,107 @@
-import _omit from "lodash/omit";
-import _isFunction from "lodash/isFunction";
-import { Space, Button } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import React, { useMemo } from 'react';
+import { Fragment, jsx } from "react/jsx-runtime";
+import { Space, Button } from "antd";
+import { PlusOutlined } from "@ant-design/icons";
+import isFunction from "lodash/isFunction";
+import omit from "lodash/omit";
+import { useMemo } from "react";
 import locale from "../../../../../locale";
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 const actions = {
   add: {
-    onClick: (value, {
-      operation
-    }) => {
+    onClick: (value, { operation }) => {
       operation.add({});
     },
     label: `${locale.ProForm.formListActions[5]}`,
     // 新增一行
-    icon: /*#__PURE__*/_jsx(PlusOutlined, {})
+    icon: /* @__PURE__ */ jsx(PlusOutlined, {})
   }
 };
-const defaultActionProps = [{
-  type: 'add'
-}];
-const filterKeys = ['actionType', 'addIndex'];
-const ToolbarButton = props => {
-  const {
-    namePath,
-    form,
-    operation,
-    length,
-    fields,
-    min,
-    max,
-    disabled,
-    isView
-  } = props;
-
-  // 默认显示一个delete
+const defaultActionProps = [{ type: "add" }];
+const filterKeys = ["actionType", "addIndex", "show"];
+const ToolbarButton = (props) => {
+  const { namePath, form, operation, length, fields, min, max, disabled, isView } = props;
   const toolbarProps = useMemo(() => {
-    // 兼容 actionType 和 type
-    const _toolbarProps = props.toolbarProps?.map(item => {
+    var _a;
+    const _toolbarProps = (_a = props.toolbarProps) == null ? void 0 : _a.map((item) => {
       return {
         ...item,
         type: item.actionType || item.type
       };
     });
-    if (!_toolbarProps?.find(item => item.type === 'add')) {
+    if (!(_toolbarProps == null ? void 0 : _toolbarProps.find((item) => item.type === "add"))) {
       return _toolbarProps ? [..._toolbarProps, ...defaultActionProps] : defaultActionProps;
     }
     return _toolbarProps;
   }, [props.toolbarProps]);
   const handleClick = async (defaultCallback, callback, item) => {
     const value = form.getFieldValue(namePath);
-    const data = await callback?.(value, {
-      operation,
-      form,
-      namePath,
-      index: value?.length || 0
-    });
+    const data = await (callback == null ? void 0 : callback(value, { operation, form, namePath, index: (value == null ? void 0 : value.length) || 0 }));
     if (!callback || data === true) {
-      if (item?.type === 'add') {
-        // 如果有 addIndex 配置，使用它计算插入位置
-        if (item.addIndex) {
-          const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
-            namePath,
-            form,
-            operation,
-            index: value?.length || 0
-          }) : item.addIndex;
+      if ((item == null ? void 0 : item.type) === "add") {
+        if (item.addIndex !== void 0) {
+          const insertIndex = typeof item.addIndex === "function" ? item.addIndex(value, { namePath, form, operation, index: (value == null ? void 0 : value.length) || 0 }) : item.addIndex;
           operation.add(data, insertIndex);
         } else {
-          operation.add(data); // 默认插入到末尾
+          operation.add(data);
         }
       } else {
-        defaultCallback?.(value, {
-          operation,
-          form,
-          namePath,
-          index: value?.length || 0
-        });
+        defaultCallback == null ? void 0 : defaultCallback(value, { operation, form, namePath, index: (value == null ? void 0 : value.length) || 0 });
       }
       return;
     }
-    if (item?.type === 'add' && data) {
-      // 如果有 addIndex 配置，使用它计算插入位置
-      if (item.addIndex) {
-        const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
-          namePath,
-          form,
-          operation,
-          index: value?.length || 0
-        }) : item.addIndex;
+    if ((item == null ? void 0 : item.type) === "add" && data) {
+      if (item.addIndex !== void 0) {
+        const insertIndex = typeof item.addIndex === "function" ? item.addIndex(value, { namePath, form, operation, index: (value == null ? void 0 : value.length) || 0 }) : item.addIndex;
         operation.add(data, insertIndex);
       } else {
-        operation.add(data); // 默认插入到末尾
+        operation.add(data);
       }
     }
   };
   const customClick = (callback, item) => {
     const value = form.getFieldValue(namePath);
-    callback?.(value, {
-      operation,
-      form,
-      namePath,
-      index: 0
-    });
+    callback == null ? void 0 : callback(value, { operation, form, namePath, index: 0 });
   };
-  return /*#__PURE__*/_jsx(Space, {
-    align: "start",
-    className: "pro-form-list-toolbar",
-    children: toolbarProps?.map(item => {
-      if (item.show === false) return /*#__PURE__*/_jsx(_Fragment, {});
-      if (_isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
-        namePath,
-        form
-      })) {
-        return /*#__PURE__*/_jsx(_Fragment, {});
+  return /* @__PURE__ */ jsx(Space, { align: "start", className: "pro-form-list-toolbar", children: toolbarProps == null ? void 0 : toolbarProps.map((item) => {
+    if (item.show === false)
+      return /* @__PURE__ */ jsx(Fragment, {});
+    if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), { namePath, form })) {
+      return /* @__PURE__ */ jsx(Fragment, {});
+    }
+    const { label, onClick, onHandle, type, ...rest } = item;
+    const toolbarKey = `${namePath.join(".")}-${type ?? "custom"}-${label ?? ""}`;
+    const _onClick = onClick || onHandle;
+    if (type === "add") {
+      if (disabled || isView)
+        return /* @__PURE__ */ jsx(Fragment, {});
+      const { onClick: internalOnClick, label: defaultLabel, ...defaultRest } = actions[type];
+      if (max && max <= fields.length && type === "add") {
+        return false;
       }
-      const {
-        label,
-        onClick,
-        onHandle,
-        type,
-        ...rest
-      } = item;
-      const toolbarKey = `${namePath.join('.')}-${type ?? 'custom'}-${label ?? ''}`;
-      const _onClick = onClick || onHandle;
-      if (type === 'add') {
-        if (disabled || isView) return /*#__PURE__*/_jsx(_Fragment, {});
-        const {
-          onClick: internalOnClick,
-          label: defaultLabel,
-          ...defaultRest
-        } = actions[type];
-        // 大于等于max不可新增
-        if (max && max <= fields.length && type === 'add') {
-          return false;
-        }
-        return /*#__PURE__*/_jsx(Button, {
+      return /* @__PURE__ */ jsx(
+        Button,
+        {
           ...actions[type],
-          ..._omit(rest, filterKeys),
+          ...omit(rest, filterKeys),
           type: "link",
           onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
-        }, toolbarKey);
-      }
-      return /*#__PURE__*/_jsx(Button, {
-        ..._omit(rest, filterKeys),
+        },
+        toolbarKey
+      );
+    }
+    return /* @__PURE__ */ jsx(
+      Button,
+      {
+        ...omit(rest, filterKeys),
         type: "link",
         onClick: () => customClick(onClick, item),
         children: label
-      }, toolbarKey);
-    })
-  });
+      },
+      toolbarKey
+    );
+  }) });
+};
+var ToolbarButton_default = ToolbarButton;
+export {
+  ToolbarButton_default as default
 };
-export default ToolbarButton;

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

@@ -1,8 +1,9 @@
-import _get from "lodash/get";
-import React, { forwardRef, useCallback, useImperativeHandle } from 'react';
-import { Form } from 'antd';
-import { DndContext } from '@dnd-kit/core';
-import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { forwardRef, useCallback, useImperativeHandle } from "react";
+import { Form } from "antd";
+import { DndContext } from "@dnd-kit/core";
+import get from "lodash/get";
+import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { toArray } from "../../../utils";
 import { namesPathTransform, isLegacyMode } from "./utils";
 import ToolbarButton from "./components/ToolbarButton";
@@ -11,7 +12,6 @@ import LineFields from "./components/LineFields";
 import Empty from "./components/Empty";
 import ProForm from "../../../../ProForm";
 import { useProConfig } from "../../../../ProConfigProvider";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const FormList = (props, ref) => {
   const {
     columns,
@@ -20,7 +20,7 @@ const FormList = (props, ref) => {
     toolbarProps,
     fields,
     operation,
-    mode = 'line',
+    mode = "line",
     meta,
     span = 8,
     disabled,
@@ -29,175 +29,165 @@ const FormList = (props, ref) => {
     titlePosition,
     className
   } = props;
-  const _fields = fields.map(item => ({
-    ...item,
-    key: String(item.key)
-  }));
-  const {
-    form,
-    name,
-    isView,
-    diffConfig,
-    namePath,
-    source
-  } = ProForm.useFieldProps() || {};
-  const {
-    isDiffAll
-  } = useProConfig('ProForm');
-  const {
-    errors
-  } = meta;
-
-  // 当 FormList 作为 ProEditTable 的列时，otherProps 中的 name 是完整绝对路径（如 ['bindClauseCategoryList', 0, 'test']）
-  // 此时直接使用 toArray(name) 作为 _namePath，避免公式拼接导致前缀重复
-  const _namePath = source === 'ProEditTable' ? toArray(name) : namePath ? [...namePath.slice(0, -1), ...toArray(name)] : toArray(name);
-  const orgValues = _get(diffConfig?.originalValues, name);
+  const _fields = fields.map((item) => ({ ...item, key: String(item.key) }));
+  const { form, name, isView, diffConfig, namePath, source } = ProForm.useFieldProps() || {};
+  const { isDiffAll } = useProConfig("ProForm");
+  const { errors } = meta;
+  const _namePath = source === "ProEditTable" ? toArray(name) : namePath ? [...namePath.slice(0, -1), ...toArray(name)] : toArray(name);
+  const orgValues = get(diffConfig == null ? void 0 : diffConfig.originalValues, name);
   const _diffConfig = {
     ...diffConfig,
-    originalValues: diffConfig?.originalValues && isDiffAll ? orgValues || [] : orgValues
+    originalValues: (diffConfig == null ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
   };
-  const processColumns = useCallback((fieldName, namePath) => {
-    return columns.map(item => {
-      // 如果是灵活模式的 Group，需要给 children 添加参数
-      if (!isLegacyMode(item) && item?.type === 'Group') {
-        const fieldProps = item?.fieldProps;
-        const children = fieldProps?.children;
-        if (children) {
-          const childrenArray = Array.isArray(children) ? children : [children];
-          // 给每个 child 添加 index、name、namePath、listName 参数
-          const processedChildren = childrenArray.map(child => {
-            const childName = child?.name;
-            return {
-              ...child,
+  const processColumns = useCallback(
+    (fieldName, namePath2) => {
+      return columns.map((item) => {
+        if (!isLegacyMode(item) && (item == null ? void 0 : item.type) === "Group") {
+          const fieldProps = item == null ? void 0 : item.fieldProps;
+          const children = fieldProps == null ? void 0 : fieldProps.children;
+          if (children) {
+            const childrenArray = Array.isArray(children) ? children : [children];
+            const processedChildren = childrenArray.map((child) => {
+              const childName = child == null ? void 0 : child.name;
+              return {
+                ...child,
+                index: fieldName,
+                name: [fieldName, ...toArray(childName)],
+                namePath: namePath2,
+                listName: childName ? [...namePath2, ...toArray(childName)] : void 0,
+                source: "FormList"
+              };
+            });
+            const newFieldProps = {
+              ...fieldProps,
+              children: Array.isArray(children) ? processedChildren : processedChildren[0]
+            };
+            const column2 = {
+              ...item,
+              fieldProps: newFieldProps,
               index: fieldName,
-              name: [fieldName, ...toArray(childName)],
-              namePath,
-              listName: childName ? [...namePath, ...toArray(childName)] : undefined,
-              source: 'FormList'
+              label: mode === "less" ? void 0 : item.label
             };
-          });
-
-          // 创建新的 fieldProps，包含处理后的 children
-          const newFieldProps = {
-            ...fieldProps,
-            children: Array.isArray(children) ? processedChildren : processedChildren[0]
-          };
-
-          // 创建新的 column，使用新的 fieldProps
-          const column = {
-            ...item,
-            fieldProps: newFieldProps,
-            index: fieldName,
-            label: mode === 'less' ? undefined : item.label
-          };
-          return column;
+            return column2;
+          }
         }
-      }
-
-      // names的name处理
-      const _name = Array.isArray(item?.names) ? [fieldName, namesPathTransform({
-        names: item?.names,
-        prefixNamePath: namePath,
-        type: item.type
-      })] : [fieldName, ...toArray(item.name)];
-      const column = {
-        ...item,
-        name: _name,
-        names: item?.names ? item.names.map(nameItem => {
-          // 传给Group的names会被渲染成真实FormItem 不能传完整name
-          return [...namePath, ...toArray(nameItem)];
-        }) : item.names,
-        index: fieldName,
-        namePath,
-        listName: item.name ? [...namePath, ...toArray(item.name)] : undefined,
-        label: mode === 'less' ? undefined : item.label
-      };
-      return column;
-    });
-  }, [columns, mode]);
+        const _name = Array.isArray(item == null ? void 0 : item.names) ? [
+          fieldName,
+          namesPathTransform({
+            names: item == null ? void 0 : item.names,
+            prefixNamePath: namePath2,
+            type: item.type
+          })
+        ] : [fieldName, ...toArray(item.name)];
+        const column = {
+          ...item,
+          name: _name,
+          names: (item == null ? void 0 : item.names) ? item.names.map((nameItem) => {
+            return [...namePath2, ...toArray(nameItem)];
+          }) : item.names,
+          index: fieldName,
+          namePath: namePath2,
+          listName: item.name ? [...namePath2, ...toArray(item.name)] : void 0,
+          label: mode === "less" ? void 0 : item.label
+        };
+        return column;
+      });
+    },
+    [columns, mode]
+  );
   useImperativeHandle(ref, () => {
     return {
       operation
     };
   });
-  const handleDragEnd = drag => {
-    const {
-      active,
-      over
-    } = drag;
+  const handleDragEnd = (drag) => {
+    const { active, over } = drag;
     if (_fields.length > 1 && active.id !== over.id) {
-      const activeIndex = _fields.findIndex(item => item.key === active.id);
-      const overIndex = _fields.findIndex(item => item.key === over.id);
+      const activeIndex = _fields.findIndex((item) => item.key === active.id);
+      const overIndex = _fields.findIndex((item) => item.key === over.id);
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return /*#__PURE__*/_jsx("div", {
-    className: className,
-    children: /*#__PURE__*/_jsx(DndContext, {
-      onDragEnd: handleDragEnd,
-      children: /*#__PURE__*/_jsxs(SortableContext, {
-        items: _fields.map(item => ({
-          id: item.key
-        })),
-        strategy: verticalListSortingStrategy,
-        children: [_fields.map((field, index) => {
-          const namePath = [..._namePath, field.name];
-          const _columns = processColumns(index, namePath);
-          return mode === 'block' ? /*#__PURE__*/_jsx(BlockFields, {
-            ...props,
-            columns: _columns,
-            disabled: disabled,
-            isView: isView,
-            namePath: namePath,
-            index: index,
-            field: field,
-            colProps: {
-              span
+  return /* @__PURE__ */ jsx("div", { className, children: /* @__PURE__ */ jsx(DndContext, { onDragEnd: handleDragEnd, children: /* @__PURE__ */ jsxs(
+    SortableContext,
+    {
+      items: _fields.map((item) => ({
+        id: item.key
+      })),
+      strategy: verticalListSortingStrategy,
+      children: [
+        _fields.map((field, index) => {
+          const namePath2 = [..._namePath, field.name];
+          const _columns = processColumns(index, namePath2);
+          return mode === "block" ? /* @__PURE__ */ jsx(
+            BlockFields,
+            {
+              ...props,
+              columns: _columns,
+              disabled,
+              isView,
+              namePath: namePath2,
+              index,
+              field,
+              colProps: { span },
+              form,
+              diffConfig: _diffConfig,
+              hideStartEndActionProps,
+              titlePosition
             },
-            form: form,
-            diffConfig: _diffConfig,
-            hideStartEndActionProps: hideStartEndActionProps,
-            titlePosition: titlePosition
-          }, field.key) : /*#__PURE__*/_jsx(LineFields, {
-            className: _fields.length === index + 1 ? 'pro-form-list-last' : '',
-            ...props,
-            mode: mode,
-            columns: _columns,
-            disabled: disabled,
-            isView: isView,
-            namePath: namePath,
-            index: index,
-            field: field,
-            colProps: {
-              span: mode === 'less' ? 24 : span
+            field.key
+          ) : /* @__PURE__ */ jsx(
+            LineFields,
+            {
+              className: _fields.length === index + 1 ? "pro-form-list-last" : "",
+              ...props,
+              mode,
+              columns: _columns,
+              disabled,
+              isView,
+              namePath: namePath2,
+              index,
+              field,
+              colProps: { span: mode === "less" ? 24 : span },
+              form,
+              diffConfig: _diffConfig,
+              hideStartEndActionProps
             },
-            form: form,
-            diffConfig: _diffConfig,
-            hideStartEndActionProps: hideStartEndActionProps
-          }, field.key);
-        }), _fields.length === 0 && /*#__PURE__*/_jsx(Empty, {
-          disabled: disabled,
-          toolbarProps: toolbarProps,
-          operation: operation,
-          form: form,
-          namePath: _namePath,
-          emptyBtnText: emptyBtnText
-        }), /*#__PURE__*/_jsx(Form.ErrorList, {
-          errors: errors
-        }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
-          disabled: disabled,
-          isView: isView,
-          min: min,
-          max: max,
-          length: fields.length,
-          operation: operation,
-          namePath: _namePath,
-          form: form,
-          fields: fields,
-          toolbarProps: toolbarProps
-        })]
-      })
-    })
-  });
+            field.key
+          );
+        }),
+        _fields.length === 0 && /* @__PURE__ */ jsx(
+          Empty,
+          {
+            disabled,
+            toolbarProps,
+            operation,
+            form,
+            namePath: _namePath,
+            emptyBtnText
+          }
+        ),
+        /* @__PURE__ */ jsx(Form.ErrorList, { errors }),
+        toolbarProps !== false && _fields.length > 0 && /* @__PURE__ */ jsx(
+          ToolbarButton,
+          {
+            disabled,
+            isView,
+            min,
+            max,
+            length: fields.length,
+            operation,
+            namePath: _namePath,
+            form,
+            fields,
+            toolbarProps
+          }
+        )
+      ]
+    }
+  ) }) });
+};
+var FormList_default = forwardRef(FormList);
+export {
+  FormList_default as default
 };
-export default /*#__PURE__*/forwardRef(FormList);

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

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

package/es/ProForm/components/combination/FormList/style/index.less

@@ -158,6 +158,12 @@
     }
   }
 
+  .pro-form-list-left-action-right {
+    .@{ant-prefix}-collapse-extra {
+      margin-inline-start: auto;
+    }
+  }
+
   // 移动端响应式
   @media (max-width: 768px) {
     .pro-form-list-left-title-wrapper {

package/es/ProForm/components/combination/FormList/utils.js

@@ -1,51 +1,35 @@
-import _isEqualWith from "lodash/isEqualWith";
-import React from 'react';
-
-/**
- * 判断 Group 组件是否为传统模式（LegacyMode）
- * @param item column 配置项
- * @returns true 表示传统模式，false 表示灵活模式
- */
-export const isLegacyMode = item => {
-  if (item?.type !== 'Group') {
-    return true; // 非 Group 类型，不需要特殊处理，返回 true 表示按原样处理
+import isEqualWith from "lodash/isEqualWith";
+import React from "react";
+const isLegacyMode = (item) => {
+  var _a;
+  if ((item == null ? void 0 : item.type) !== "Group") {
+    return true;
   }
-  // names 可能在 item.names 或 item.otherProps.names 中（参考 Group/index.tsx 的实现）
-  const names = item?.names || item?.otherProps?.names;
-  // 传统模式：有 names 属性且为非空数组
-  // 灵活模式：无 names 属性或 names 为空
+  const names = (item == null ? void 0 : item.names) || ((_a = item == null ? void 0 : item.otherProps) == null ? void 0 : _a.names);
   return Array.isArray(names) && names.length > 0;
 };
-
-/**
- * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
- * @param names  name的集合
- * @param prefixNamePath formList的name前缀
- * @returns list_0_min-list_0_max
- */
-export const namesPathTransform = ({
+const namesPathTransform = ({
   names,
   prefixNamePath,
   type
 }) => {
   if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
-    return '';
+    return "";
   }
-  const newNamePath = names.map(val => prefixNamePath.concat(val));
-  return newNamePath?.map(name => {
-    return Array.isArray(name) ? name.join('_') : name;
-  }).join('-');
+  const newNamePath = names.map((val) => prefixNamePath.concat(val));
+  return newNamePath == null ? void 0 : newNamePath.map((name) => {
+    return Array.isArray(name) ? name.join("_") : name;
+  }).join("-");
 };
-
-// 比较memo
-export const memoWith = (pre, next) => {
-  return _isEqualWith(pre, next, (objValue, othValue) => {
-    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+const memoWith = (pre, next) => {
+  return isEqualWith(pre, next, (objValue, othValue) => {
+    if (React.isValidElement(objValue) && React.isValidElement(othValue)) {
       return true;
     }
-    // 移除解决formlist函数里不更新问题
-    // if (isFunction(objValue) && isFunction(othValue)) {
-    //   return true;
-    // }
   });
-};
+};
+export {
+  isLegacyMode,
+  memoWith,
+  namesPathTransform
+};