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

package/es/ProForm/components/render/Render.js

@@ -1,11 +1,12 @@
-import _debounce from "lodash/debounce";
-import _set from "lodash/set";
-import _omit from "lodash/omit";
-import _isString from "lodash/isString";
-import { Col, Form, Input, Space } from 'antd';
-import React, { useMemo, useRef, useEffect } from 'react';
-import classNames from 'classnames';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Col, Form, Input, Space } from "antd";
+import React, { useMemo, useRef, useEffect } from "react";
+import classNames from "classnames";
+import { QuestionCircleOutlined } from "@ant-design/icons";
+import isString from "lodash/isString";
+import omit from "lodash/omit";
+import set from "lodash/set";
+import debounce from "lodash/debounce";
 import useShouldUpdate from "../../hooks/useShouldUpdate";
 import { findOptionByValue, parseNamePath } from "../../utils/index";
 import { buildFormItemProps } from "../../utils/buildFormItemProps";
@@ -14,18 +15,24 @@ import useRules from "../../hooks/useRules";
 import ConfirmWrapper from "./ConfirmWrapper";
 import ChangedWrapper from "./ChangedWrapper";
 import CustomComponentViewWrapper from "./CustomComponentViewWrapper";
-
-/** 隐藏 FormItem 占位用的兜底 name，保证 shouldUpdate 监听有 FormItem 承载 */
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-const HIDDEN_FORM_ITEM_NAME = 'proFormItemHidden';
-/** Group 默认校验延时（ms），等待 setFieldValue 同步最新值后再校验 */
+const HIDDEN_FORM_ITEM_NAME = "proFormItemHidden";
 const GROUP_VALIDATE_DELAY = 60;
-/** 移除多余的组件属性，group 保留 onFieldChange */
-const LAST_COMPONENT_PROPS_FILTER = ['onFieldChange', 'disabledStrictly'];
-/** 需要从透传给 Form.Item 的属性中过滤掉的 key */
-const FILTER_FORM_ITEM_KEYS = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName', 'fixed'];
-// 这个组件只管渲染, 参数的整理在外部处理
-const Render = props => {
+const LAST_COMPONENT_PROPS_FILTER = ["onFieldChange", "disabledStrictly"];
+const FILTER_FORM_ITEM_KEYS = [
+  "onFieldChange",
+  "shouldUpdate",
+  "namePath",
+  "isView",
+  "parentNames",
+  "space",
+  "before",
+  "after",
+  "globalControl",
+  "listName",
+  "fixed"
+];
+const Render = (props) => {
+  var _a, _b;
   const {
     component,
     originComponent,
@@ -42,20 +49,8 @@ const Render = props => {
     viewRender,
     desensitization
   } = props;
-
-  // 以下字段统一从 otherProps（Context）读取，避免与独立 prop 重复传递
-  const {
-    form,
-    formDisabled,
-    type,
-    colProps,
-    globalControl,
-    diffConfig,
-    shouldUpdateDebounce
-  } = otherProps || {};
+  const { form, formDisabled, type, colProps, globalControl, diffConfig, shouldUpdateDebounce } = otherProps || {};
   const proConfig = useProConfig();
-
-  // 剔除一些不是FormItem的属性, 防止控制台报warning
   const {
     labelWidth,
     hiddenNames,
@@ -69,8 +64,6 @@ const Render = props => {
     validateFirst = true,
     ...otherFormItemProps
   } = formItemProps;
-
-  // 更新show & disabled & rules
   const {
     shouldUpdate,
     show: resolvedShow,
@@ -94,24 +87,19 @@ const Render = props => {
     desensitization,
     shouldUpdateDebounce
   });
-
-  // 以不可变方式补上 shouldUpdate，作为后续整理的基础对象
-  const baseFormItemProps = {
-    ...otherFormItemProps,
-    shouldUpdate
-  };
+  const baseFormItemProps = { ...otherFormItemProps, shouldUpdate };
   const namesStr = useMemo(() => {
-    if (!Array.isArray(otherProps?.names)) {
-      return '';
+    var _a2;
+    if (!Array.isArray(otherProps == null ? void 0 : otherProps.names)) {
+      return "";
     }
-    // formList场景 name为数组
-    if (Array.isArray(otherProps?.name)) {
-      return otherProps?.name;
+    if (Array.isArray(otherProps == null ? void 0 : otherProps.name)) {
+      return otherProps == null ? void 0 : otherProps.name;
     }
-    return otherProps.names?.map(name => {
-      return Array.isArray(name) ? name.join('_') : name;
-    }).join('-');
-  }, [otherProps?.names]);
+    return (_a2 = otherProps.names) == null ? void 0 : _a2.map((name) => {
+      return Array.isArray(name) ? name.join("_") : name;
+    }).join("-");
+  }, [otherProps == null ? void 0 : otherProps.names]);
   const internalRule = useRules({
     names: otherProps.names,
     label: baseFormItemProps.label,
@@ -121,15 +109,7 @@ const Render = props => {
     isSelect,
     type
   });
-
-  /**
-   * globalControl 全局控制优先
-   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
-   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
-   */
-  const lastDisabled = globalControl ? formDisabled ?? resolvedDisabled ?? resolvedFieldProps?.disabled ?? componentProps?.disabled : resolvedDisabled ?? resolvedFieldProps?.disabled ?? componentProps?.disabled ?? formDisabled;
-
-  // formItem 参数整理（纯函数，不可变合并，避免原地 mutate）
+  const lastDisabled = globalControl ? formDisabled ?? resolvedDisabled ?? (resolvedFieldProps == null ? void 0 : resolvedFieldProps.disabled) ?? (componentProps == null ? void 0 : componentProps.disabled) : resolvedDisabled ?? (resolvedFieldProps == null ? void 0 : resolvedFieldProps.disabled) ?? (componentProps == null ? void 0 : componentProps.disabled) ?? formDisabled;
   const lastFormItemProps = buildFormItemProps({
     baseFormItemProps,
     otherProps,
@@ -148,19 +128,11 @@ const Render = props => {
     lastDisabled,
     labelWidth
   });
-
-  /**
-   * 最新fieldProps: 更新后的组件Props
-   */
-  // 灵活模式：当存在 flexibleGroupProps 时，从 resolvedFieldProps.style 中移除 width，避免透传到组件
-  const flexibleGroupProps = otherProps?.flexibleGroupProps;
-  const adjustedFieldProps = flexibleGroupProps && resolvedFieldProps?.style?.width ? {
+  const flexibleGroupProps = otherProps == null ? void 0 : otherProps.flexibleGroupProps;
+  const adjustedFieldProps = flexibleGroupProps && ((_a = resolvedFieldProps == null ? void 0 : resolvedFieldProps.style) == null ? void 0 : _a.width) ? {
     ...resolvedFieldProps,
     style: (() => {
-      const {
-        width,
-        ...restStyle
-      } = resolvedFieldProps.style;
+      const { width, ...restStyle } = resolvedFieldProps.style;
       return restStyle;
     })()
   } : resolvedFieldProps;
@@ -170,64 +142,58 @@ const Render = props => {
     disabled: lastDisabled,
     desensitization: resolvedDesensitization
   };
-
-  // 防抖记忆化：handlerRef 始终指向最新 handler，debounce 仅按 debounceWait 重建，避免每次渲染重置定时器导致防抖失效
-  const debounceWait = lastComponentProps?.debounceWait;
-  const handlerRef = useRef(undefined);
-  const debouncedHandleChange = useMemo(() => _debounce((...args) => handlerRef.current?.(...args), debounceWait), [debounceWait]);
+  const debounceWait = lastComponentProps == null ? void 0 : lastComponentProps.debounceWait;
+  const handlerRef = useRef(void 0);
+  const debouncedHandleChange = useMemo(
+    () => debounce((...args) => {
+      var _a2;
+      return (_a2 = handlerRef.current) == null ? void 0 : _a2.call(handlerRef, ...args);
+    }, debounceWait),
+    [debounceWait]
+  );
   useEffect(() => () => debouncedHandleChange.cancel(), [debouncedHandleChange]);
   const itemClassName = classNames({
     [className]: className,
-    'pro-form-item-width-auto': ['Switch'].includes(type)
+    "pro-form-item-width-auto": ["Switch"].includes(type)
   });
   if (formItemProps.hidden === true || resolvedShow === false) {
-    // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return /*#__PURE__*/_jsx(Form.Item, {
-      name: lastFormItemProps.name || HIDDEN_FORM_ITEM_NAME,
-      shouldUpdate: lastFormItemProps.shouldUpdate,
-      className: itemClassName,
-      noStyle: true,
-      hidden: true,
-      rules: [{
-        required: false
-      }],
-      children: /*#__PURE__*/_jsx(Input, {})
-    });
+    return /* @__PURE__ */ jsx(
+      Form.Item,
+      {
+        name: lastFormItemProps.name || HIDDEN_FORM_ITEM_NAME,
+        shouldUpdate: lastFormItemProps.shouldUpdate,
+        className: itemClassName,
+        noStyle: true,
+        hidden: true,
+        rules: [{ required: false }],
+        children: /* @__PURE__ */ jsx(Input, {})
+      }
+    );
   }
-
-  /**
-   * 函数新参数组装
-   */
-  const functionArgs = args => {
+  const functionArgs = (args) => {
+    var _a2, _b2;
     const nextArgs = [...args];
-    const {
-      valueType
-    } = otherProps || {};
+    const { valueType } = otherProps || {};
     nextArgs[1] = form.getFieldsValue();
     nextArgs[2] = {
       form
     };
-    // 优先处理FormList场景
-    if (Array.isArray(lastFormItemProps.namePath) && lastFormItemProps?.namePath?.length) {
+    if (Array.isArray(lastFormItemProps.namePath) && ((_a2 = lastFormItemProps == null ? void 0 : lastFormItemProps.namePath) == null ? void 0 : _a2.length)) {
       nextArgs[1] = form.getFieldValue(lastFormItemProps.namePath);
       nextArgs[2].namePath = lastFormItemProps.namePath;
-      nextArgs[2].index = lastFormItemProps.namePath[lastFormItemProps?.namePath?.length - 1];
+      nextArgs[2].index = lastFormItemProps.namePath[((_b2 = lastFormItemProps == null ? void 0 : lastFormItemProps.namePath) == null ? void 0 : _b2.length) - 1];
     }
-
-    // 返回表单元素默认值
     nextArgs[2].extra = args;
-
-    // 当设置valueType后返回转换后的值
     if (valueType) {
-      nextArgs[2].transformValue = form.getFieldValue(lastFormItemProps?.name) || undefined;
+      nextArgs[2].transformValue = form.getFieldValue(lastFormItemProps == null ? void 0 : lastFormItemProps.name) || void 0;
     }
     nextArgs[2].option = args[1];
     switch (type) {
-      case 'ProCascader':
+      case "ProCascader":
         nextArgs[2].selectedOptions = args[1];
         break;
-      case 'DatePicker':
-      case 'RangePicker':
+      case "DatePicker":
+      case "RangePicker":
         nextArgs[2].dateString = args[1];
         break;
       default:
@@ -235,57 +201,47 @@ const Render = props => {
     }
     return nextArgs;
   };
-
-  /**
-   * onChange参数重置 (value, record, { form, index, namePath, option }) => void
-   */
   const defaultHandleChange = (...args) => {
+    var _a2, _b2, _c, _d, _e, _f;
     let nextArgs = [...args];
-
-    // 优先使用onFieldChange
-    const changeKey = Object.keys(lastComponentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
-    if (changeKey === 'onChange') {
+    const changeKey = Object.keys(lastComponentProps).includes("onFieldChange") ? "onFieldChange" : "onChange";
+    if (changeKey === "onChange") {
       nextArgs[2] = form;
     }
-    if (changeKey === 'onFieldChange') {
+    if (changeKey === "onFieldChange") {
       nextArgs = functionArgs([...args]);
     }
-    const inList = lastFormItemProps?.namePath?.length;
-    if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
-      (AutoComponent?.props)[changeKey]?.(...nextArgs) || lastComponentProps[changeKey]?.(...nextArgs);
+    const inList = (_a2 = lastFormItemProps == null ? void 0 : lastFormItemProps.namePath) == null ? void 0 : _a2.length;
+    if (React.isValidElement(AutoComponent)) {
+      ((_c = (_b2 = AutoComponent == null ? void 0 : AutoComponent.props)[changeKey]) == null ? void 0 : _c.call(_b2, ...nextArgs)) || ((_d = lastComponentProps[changeKey]) == null ? void 0 : _d.call(lastComponentProps, ...nextArgs));
       return false;
     }
-
-    // FormList 和 Group场景 对比值改变的话, 回显到表单上
-    if (inList && changeKey === 'onFieldChange') {
+    if (inList && changeKey === "onFieldChange") {
       const values = form.getFieldsValue();
-      const newValues = _set(values, lastFormItemProps.namePath, nextArgs[1]);
+      const newValues = set(values, lastFormItemProps.namePath, nextArgs[1]);
       form.setFieldsValue(newValues);
     }
-
-    // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
-    if (formItemProps?.parentNames) {
+    if (formItemProps == null ? void 0 : formItemProps.parentNames) {
       setTimeout(() => {
-        const namePath = parseNamePath(formItemProps?.parentNames);
-        form.setFieldValue(formItemProps?.parentNames, form.getFieldValue(namePath));
+        const namePath = parseNamePath(formItemProps == null ? void 0 : formItemProps.parentNames);
+        form.setFieldValue(formItemProps == null ? void 0 : formItemProps.parentNames, form.getFieldValue(namePath));
         form.validateFields(namePath);
       }, GROUP_VALIDATE_DELAY);
     }
-
-    // ProTreeSelect返回option
-    if (['ProTree'].includes(type) && !nextArgs[2].option) {
-      nextArgs[2].option = findOptionByValue(lastComponentProps?.dataSource, nextArgs?.[0]?.[0], lastComponentProps?.fieldNames || {});
+    if (["ProTree"].includes(type) && !nextArgs[2].option) {
+      nextArgs[2].option = findOptionByValue(
+        lastComponentProps == null ? void 0 : lastComponentProps.dataSource,
+        (_e = nextArgs == null ? void 0 : nextArgs[0]) == null ? void 0 : _e[0],
+        (lastComponentProps == null ? void 0 : lastComponentProps.fieldNames) || {}
+      );
     }
-    lastComponentProps[changeKey]?.(...nextArgs);
+    (_f = lastComponentProps[changeKey]) == null ? void 0 : _f.call(lastComponentProps, ...nextArgs);
   };
-
-  // 更新 ref 到最新 handler，使记忆化的防抖函数始终调用最新闭包
   handlerRef.current = defaultHandleChange;
   const handleChange = (...args) => {
     const nextArgs = [...args];
-    if (lastComponentProps?.debounceWait) {
-      // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
-      if (['Input', 'TextArea'].includes(type)) {
+    if (lastComponentProps == null ? void 0 : lastComponentProps.debounceWait) {
+      if (["Input", "TextArea"].includes(type)) {
         nextArgs[0] = {
           target: {
             value: nextArgs[0].target.value
@@ -297,237 +253,175 @@ const Render = props => {
       defaultHandleChange(...nextArgs);
     }
   };
-
-  /**
-   * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
-   */
   const handleBlur = async (...args) => {
     const nextArgs = functionArgs([...args]);
-    lastComponentProps?.onBlur && (await lastComponentProps?.onBlur(...nextArgs));
+    (lastComponentProps == null ? void 0 : lastComponentProps.onBlur) && await (lastComponentProps == null ? void 0 : lastComponentProps.onBlur(...nextArgs));
   };
-
-  // colProps 一次派生：FormList / 容器组件需要覆盖 span
   const lastColProps = (() => {
-    if (type === 'FormList') {
-      const lessMode = lastComponentProps.mode === 'less';
-      return {
-        ...colProps,
-        span: lessMode ? colProps?.span : 24
-      }; // 默认占一行
+    if (type === "FormList") {
+      const lessMode = lastComponentProps.mode === "less";
+      return { ...colProps, span: lessMode ? colProps == null ? void 0 : colProps.span : 24 };
     }
-    if (['ProCollapse', 'Container'].includes(type)) {
-      return {
-        ...colProps,
-        span: 24
-      }; // 默认占一行
+    if (["ProCollapse", "Container"].includes(type)) {
+      return { ...colProps, span: 24 };
     }
     return colProps;
   })();
   const renderItem = () => {
-    // 表单渲染 start
+    var _a2, _b2, _c;
     const childProps = {
-      ...AutoComponent?.props,
-      ..._omit(lastComponentProps, LAST_COMPONENT_PROPS_FILTER),
+      ...AutoComponent == null ? void 0 : AutoComponent.props,
+      ...omit(lastComponentProps, LAST_COMPONENT_PROPS_FILTER),
       otherProps,
       onChange: handleChange,
       onBlur: handleBlur
     };
-
-    /**
-     * formItem前后值添加
-     */
     const internalItemRender = {
-      mark: 'pro_table_render',
-      render: (inputProps, doms) => /*#__PURE__*/_jsxs(_Fragment, {
-        children: [/*#__PURE__*/_jsx(Space, {
-          size: 0,
-          style: {
-            marginTop: 8
-          },
-          children: formItemProps.above
-        }), /*#__PURE__*/_jsxs("div", {
-          style: {
-            display: 'flex',
-            alignItems: 'center'
-          },
-          children: [formItemProps?.before ? /*#__PURE__*/_jsx("div", {
+      mark: "pro_table_render",
+      render: (inputProps, doms) => /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Space, { size: 0, style: { marginTop: 8 }, children: formItemProps.above }),
+        /* @__PURE__ */ jsxs(
+          "div",
+          {
             style: {
-              marginInlineEnd: 8
+              display: "flex",
+              alignItems: "center"
             },
-            children: formItemProps?.before
-          }) : null, doms.input, formItemProps?.after ? /*#__PURE__*/_jsx("div", {
-            style: {
-              marginInlineStart: 8
-            },
-            children: formItemProps?.after
-          }) : null]
-        }), /*#__PURE__*/_jsx(Space, {
-          size: 0,
-          style: {
-            marginTop: 8
-          },
-          children: formItemProps.extra
-        }), doms.errorList ? /*#__PURE__*/_jsx("div", {
-          className: "ant-form-item-additional",
-          style: {
-            minHeight: '16px'
-          },
-          children: doms.errorList
-        }) : null]
-      })
+            children: [
+              (formItemProps == null ? void 0 : formItemProps.before) ? /* @__PURE__ */ jsx("div", { style: { marginInlineEnd: 8 }, children: formItemProps == null ? void 0 : formItemProps.before }) : null,
+              doms.input,
+              (formItemProps == null ? void 0 : formItemProps.after) ? /* @__PURE__ */ jsx("div", { style: { marginInlineStart: 8 }, children: formItemProps == null ? void 0 : formItemProps.after }) : null
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsx(Space, { size: 0, style: { marginTop: 8 }, children: formItemProps.extra }),
+        doms.errorList ? /* @__PURE__ */ jsx("div", { className: "ant-form-item-additional", style: { minHeight: "16px" }, children: doms.errorList }) : null
+      ] })
     };
-    // 自定义组件移除otherProps参数
     if (originComponent) {
       delete childProps.otherProps;
     }
-
-    // 正常渲染逻辑
-    let child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/_jsx(AutoComponent, {
-      ..._omit(lastComponentProps, [...LAST_COMPONENT_PROPS_FILTER, 'debounceWait']),
-      otherProps: {
-        ...otherProps,
-        show,
-        disabled: lastDisabled,
-        required
-      },
-      onChange: handleChange,
-      onBlur: handleBlur
-    });
+    let child = React.isValidElement(AutoComponent) ? React.cloneElement(AutoComponent, childProps) : /* @__PURE__ */ jsx(
+      AutoComponent,
+      {
+        ...omit(lastComponentProps, [...LAST_COMPONENT_PROPS_FILTER, "debounceWait"]),
+        otherProps: { ...otherProps, show, disabled: lastDisabled, required },
+        onChange: handleChange,
+        onBlur: handleBlur
+      }
+    );
     if (confirm) {
-      child = /*#__PURE__*/_jsx(ConfirmWrapper, {
-        confirm: confirm,
-        ...childProps,
-        children: child
-      });
+      child = /* @__PURE__ */ jsx(ConfirmWrapper, { confirm, ...childProps, children: child });
     }
-
-    // 表单提示
-
     if (tooltip) {
-      lastFormItemProps.tooltip = _isString(tooltip) ? {
-        title: tooltip,
-        icon: /*#__PURE__*/_jsx(QuestionCircleOutlined, {
-          className: "pro-icon-tip"
-        })
-      } : {
-        icon: /*#__PURE__*/_jsx(QuestionCircleOutlined, {
-          className: "pro-icon-tip"
-        }),
+      lastFormItemProps.tooltip = isString(tooltip) ? { title: tooltip, icon: /* @__PURE__ */ jsx(QuestionCircleOutlined, { className: "pro-icon-tip" }) } : {
+        icon: /* @__PURE__ */ jsx(QuestionCircleOutlined, { className: "pro-icon-tip" }),
         ...tooltip
       };
     }
-    if (type === 'FormList') {
+    if (type === "FormList") {
       lastComponentProps.disabled = lastDisabled;
-      return /*#__PURE__*/_jsx(Form.Item, {
-        ..._omit(lastFormItemProps, FILTER_FORM_ITEM_KEYS),
-        // @ts-ignore _internalItemRender 为 antd Form.Item 内部属性，未导出公开类型，无法去除
-        _internalItemRender: internalItemRender,
-        className: itemClassName,
-        children: /*#__PURE__*/_jsx(Form.List, {
-          name: lastFormItemProps.name,
-          ..._omit(lastFormItemProps, ['rules']),
-          children: (fields, operation, meta) => {
-            return /*#__PURE__*/_jsx(AutoComponent, {
-              ..._omit(lastComponentProps, LAST_COMPONENT_PROPS_FILTER),
-              otherProps: otherProps,
-              fields: fields,
-              operation: operation,
-              meta: meta
-            });
-          }
-        })
-      });
+      return /* @__PURE__ */ jsx(
+        Form.Item,
+        {
+          ...omit(lastFormItemProps, FILTER_FORM_ITEM_KEYS),
+          _internalItemRender: internalItemRender,
+          className: itemClassName,
+          children: /* @__PURE__ */ jsx(Form.List, { name: lastFormItemProps.name, ...omit(lastFormItemProps, ["rules"]), children: (fields, operation, meta) => {
+            return /* @__PURE__ */ jsx(
+              AutoComponent,
+              {
+                ...omit(lastComponentProps, LAST_COMPONENT_PROPS_FILTER),
+                otherProps,
+                fields,
+                operation,
+                meta
+              }
+            );
+          } })
+        }
+      );
     }
-    if (diffConfig?.originalValues) {
+    if (diffConfig == null ? void 0 : diffConfig.originalValues) {
       let nextNames = otherProps.names;
-      // FormList中的names字段需要去除前缀
-      if (otherProps?.namePath?.length && otherProps.names?.length) {
-        const prefixLength = otherProps?.namePath?.length - 1;
-        nextNames = otherProps.names.map(name => name.slice(prefixLength));
+      if (((_a2 = otherProps == null ? void 0 : otherProps.namePath) == null ? void 0 : _a2.length) && ((_b2 = otherProps.names) == null ? void 0 : _b2.length)) {
+        const prefixLength = ((_c = otherProps == null ? void 0 : otherProps.namePath) == null ? void 0 : _c.length) - 1;
+        nextNames = otherProps.names.map((name) => name.slice(prefixLength));
       }
-      child = /*#__PURE__*/_jsx(ChangedWrapper, {
-        name: formItemProps.name,
-        names: nextNames,
-        namesStr: namesStr,
-        diffConfig: diffConfig,
-        form: form,
-        onDiff: onDiff,
-        type: type,
-        onChange: handleChange,
-        onBlur: handleBlur,
-        valuePropName: lastFormItemProps.valuePropName,
-        normalize: lastFormItemProps.normalize,
-        getValueProps: lastFormItemProps.getValueProps,
-        viewRender: viewRender,
-        children: child
-      });
+      child = /* @__PURE__ */ jsx(
+        ChangedWrapper,
+        {
+          name: formItemProps.name,
+          names: nextNames,
+          namesStr,
+          diffConfig,
+          form,
+          onDiff,
+          type,
+          onChange: handleChange,
+          onBlur: handleBlur,
+          valuePropName: lastFormItemProps.valuePropName,
+          normalize: lastFormItemProps.normalize,
+          getValueProps: lastFormItemProps.getValueProps,
+          viewRender,
+          children: child
+        }
+      );
     }
-
-    // 灵活模式样式处理：从 flexibleGroupProps 获取样式
-    const finalClassName = flexibleGroupProps?.className ? classNames(itemClassName, flexibleGroupProps.className) : itemClassName;
-    const finalStyle = flexibleGroupProps?.style;
-
-    // 判断是否应该使用自定义组件视图包装器
-    const shouldUseCustomViewWrapper = otherProps?.isView && (props.viewRender || viewRender) && (props.originComponent || originComponent) && (typeof component === 'function' && ! /*#__PURE__*/React.isValidElement(component) || typeof AutoComponent === 'function' && ! /*#__PURE__*/React.isValidElement(AutoComponent));
-
-    // 如果应该使用自定义组件视图包装器，直接返回
+    const finalClassName = (flexibleGroupProps == null ? void 0 : flexibleGroupProps.className) ? classNames(itemClassName, flexibleGroupProps.className) : itemClassName;
+    const finalStyle = flexibleGroupProps == null ? void 0 : flexibleGroupProps.style;
+    const shouldUseCustomViewWrapper = (otherProps == null ? void 0 : otherProps.isView) && (props.viewRender || viewRender) && (props.originComponent || originComponent) && (typeof component === "function" && !React.isValidElement(component) || typeof AutoComponent === "function" && !React.isValidElement(AutoComponent));
     if (shouldUseCustomViewWrapper) {
-      return /*#__PURE__*/_jsx(CustomComponentViewWrapper, {
-        formItemProps: lastFormItemProps,
-        internalItemRender: internalItemRender,
+      return /* @__PURE__ */ jsx(
+        CustomComponentViewWrapper,
+        {
+          formItemProps: lastFormItemProps,
+          internalItemRender,
+          className: finalClassName,
+          style: finalStyle,
+          filterFormItemKey: FILTER_FORM_ITEM_KEYS,
+          form,
+          name: lastFormItemProps.name,
+          isView: otherProps == null ? void 0 : otherProps.isView,
+          viewRender: props.viewRender || viewRender,
+          originComponent: props.originComponent || originComponent,
+          viewEmpty: otherProps == null ? void 0 : otherProps.viewEmpty,
+          otherProps,
+          component,
+          AutoComponent,
+          children: child
+        }
+      );
+    }
+    return /* @__PURE__ */ jsx(
+      Form.Item,
+      {
+        ...omit(lastFormItemProps, FILTER_FORM_ITEM_KEYS),
+        _internalItemRender: internalItemRender,
         className: finalClassName,
         style: finalStyle,
-        filterFormItemKey: FILTER_FORM_ITEM_KEYS,
-        form: form,
-        name: lastFormItemProps.name,
-        isView: otherProps?.isView,
-        viewRender: props.viewRender || viewRender,
-        originComponent: props.originComponent || originComponent,
-        viewEmpty: otherProps?.viewEmpty,
-        otherProps: otherProps,
-        component: component,
-        AutoComponent: AutoComponent,
         children: child
-      });
-    }
-
-    // 正常情况：使用标准的 Form.Item
-    return /*#__PURE__*/_jsx(Form.Item, {
-      ..._omit(lastFormItemProps, FILTER_FORM_ITEM_KEYS),
-      // @ts-ignore _internalItemRender 为 antd Form.Item 内部属性，未导出公开类型，无法去除
-      _internalItemRender: internalItemRender,
-      className: finalClassName,
-      style: finalStyle,
-      children: child
-    });
+      }
+    );
   };
-  const FormItem = /*#__PURE__*/_jsxs(_Fragment, {
-    children: [lastFormItemProps.shouldUpdate ?
-    /*#__PURE__*/
-    // 空标签防止气泡不显示
-    _jsx(Form.Item, {
-      shouldUpdate: lastFormItemProps.shouldUpdate,
-      noStyle: true,
-      children: () => renderItem()
-    }) : renderItem(), otherProps?.names?.length ? otherProps.names.map(name => {
-      return /*#__PURE__*/_jsx(Form.Item, {
-        hidden: true,
-        name: name,
-        children: /*#__PURE__*/_jsx(Input, {})
-      }, name);
-    }) : null]
-  });
-
-  // 灵活模式：当存在 flexibleGroupProps 时，不包裹 Col，直接返回 FormItem
-  if (otherProps?.flexibleGroupProps) {
+  const FormItem = /* @__PURE__ */ jsxs(Fragment, { children: [
+    lastFormItemProps.shouldUpdate ? (
+      // 空标签防止气泡不显示
+      /* @__PURE__ */ jsx(Form.Item, { shouldUpdate: lastFormItemProps.shouldUpdate, noStyle: true, children: () => renderItem() })
+    ) : renderItem(),
+    ((_b = otherProps == null ? void 0 : otherProps.names) == null ? void 0 : _b.length) ? otherProps.names.map((name) => {
+      return /* @__PURE__ */ jsx(Form.Item, { hidden: true, name, children: /* @__PURE__ */ jsx(Input, {}) }, name);
+    }) : null
+  ] });
+  if (otherProps == null ? void 0 : otherProps.flexibleGroupProps) {
     return FormItem;
   }
-  if (formItemProps?.parentNames) {
+  if (formItemProps == null ? void 0 : formItemProps.parentNames) {
     return FormItem;
   }
-  return /*#__PURE__*/_jsx(Col, {
-    ...lastColProps,
-    children: FormItem
-  });
+  return /* @__PURE__ */ jsx(Col, { ...lastColProps, children: FormItem });
+};
+var Render_default = Render;
+export {
+  Render_default as default
 };
-export default Render;