@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

package/es/ProForm/components/combination/Group/component/FlexibleGroup.js

@@ -1,15 +1,8 @@
-var _excluded = ["width"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _isFunction from "lodash/isFunction";
+import _isEmpty from "lodash/isEmpty";
 import React from 'react';
 import { Space, Form } from 'antd';
 import classnames from 'classnames';
-import { isEmpty, isFunction } from 'lodash';
 import { FieldProvider } from "../../../../utils/useFieldProps";
 import ProForm from "../../../../../ProForm";
 import Render from "../../../render/Render";
@@ -20,7 +13,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 错误提示组件
  */
-var ErrorTip = () => /*#__PURE__*/_jsx("div", {
+const ErrorTip = () => /*#__PURE__*/_jsx("div", {
   className: "pro-group-error-tip",
   children: "Group\u914D\u7F6E\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u63A7\u5236\u53F0\u8B66\u544A\u4FE1\u606F"
 });
@@ -28,66 +21,70 @@ var ErrorTip = () => /*#__PURE__*/_jsx("div", {
 /**
  * FlexibleGroup渲染组件
  */
-var FlexibleGroupRender = props => {
-  var _fieldProps, _ref;
-  var propsChildren = props.children,
-    _props$space = props.space,
-    space = _props$space === void 0 ? {
+const FlexibleGroupRender = props => {
+  const {
+    children: propsChildren,
+    space = {
       size: 12
-    } : _props$space,
-    className = props.className,
-    isParentView = props.isView,
-    separator = props.separator,
-    split = props.split,
-    groupDisabled = props.disabled,
-    otherProps = props.otherProps,
-    id = props.id;
+    },
+    className,
+    isView: isParentView,
+    separator,
+    split,
+    // 弃用属性，保持向后兼容
+    disabled: groupDisabled,
+    otherProps,
+    id
+  } = props;
 
   // children可能在props.children或props.fieldProps.children中
-  var children = propsChildren || ((_fieldProps = props.fieldProps) === null || _fieldProps === void 0 ? void 0 : _fieldProps.children) || [];
+  const children = propsChildren || props.fieldProps?.children || [];
 
   // 向后兼容处理：优先使用 separator，如果没有则使用 split，最后使用默认值
-  var finalSeparator = (_ref = separator !== null && separator !== void 0 ? separator : split) !== null && _ref !== void 0 ? _ref : '/';
-  var contextProps = ProForm.useFieldProps() || {};
-  var form = contextProps.form,
-    contextIsView = contextProps.isView;
-  var isView = isParentView || contextIsView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
+  const finalSeparator = separator ?? split ?? '/';
+  const contextProps = ProForm.useFieldProps() || {};
+  const {
+    form,
+    isView: contextIsView
+  } = contextProps;
+  const isView = isParentView || contextIsView || otherProps?.isView;
 
   // 使用 hook 处理 ProEditTable 场景下的字段重置逻辑
   useResetProEditTable({
     children,
     form,
     namePath: contextProps.namePath,
-    source: otherProps === null || otherProps === void 0 ? void 0 : otherProps.source
+    source: otherProps?.source
   });
-  var renderFormItem = (child, index) => {
-    var _child$fieldProps, _child$fieldProps2;
+  const renderFormItem = (child, index) => {
     // 计算样式（宽度处理）
-    var childWidth = (_child$fieldProps = child.fieldProps) === null || _child$fieldProps === void 0 || (_child$fieldProps = _child$fieldProps.style) === null || _child$fieldProps === void 0 ? void 0 : _child$fieldProps.width;
-    var formItemStyle = childWidth ? {
+    const childWidth = child.fieldProps?.style?.width;
+    const formItemStyle = childWidth ? {
       width: childWidth
     } : undefined;
-    var formItemClassName = childWidth ? 'pro-group-form-item pro-group-form-item-has-width' : 'pro-group-form-item';
+    const formItemClassName = childWidth ? 'pro-group-form-item pro-group-form-item-has-width' : 'pro-group-form-item';
 
     // 如果子组件有自定义宽度，从 fieldProps.style 中移除 width，让组件保持默认宽度
     // 宽度只应用到 Form.Item，不透传到组件本身
-    var adjustedFieldProps = childWidth && (_child$fieldProps2 = child.fieldProps) !== null && _child$fieldProps2 !== void 0 && _child$fieldProps2.style ? _objectSpread(_objectSpread({}, child.fieldProps), {}, {
+    const adjustedFieldProps = childWidth && child.fieldProps?.style ? {
+      ...child.fieldProps,
       style: (() => {
-        var _child$fieldProps$sty = child.fieldProps.style,
-          width = _child$fieldProps$sty.width,
-          restStyle = _objectWithoutProperties(_child$fieldProps$sty, _excluded);
+        const {
+          width,
+          ...restStyle
+        } = child.fieldProps.style;
         return restStyle;
       })()
-    }) : child.fieldProps;
+    } : child.fieldProps;
 
     // 检查 child 是否来自 FormList 的处理（已有处理过的参数）
-    var isFromFormList = (child === null || child === void 0 ? void 0 : child.source) === 'FormList';
-    var childNamePath = child.namePath || contextProps.namePath;
-    var childIndex = child.index;
-    var childListName = child.listName;
+    const isFromFormList = child?.source === 'FormList';
+    const childNamePath = child.namePath || contextProps.namePath;
+    const childIndex = child.index;
+    const childListName = child.listName;
 
     // 需要判断childNamePath来源是FormList还是ProEditTable
-    var fullName = (() => {
+    const fullName = (() => {
       if (isFromFormList) {
         return child.name;
       }
@@ -101,8 +98,8 @@ var FlexibleGroupRender = props => {
     })();
 
     // 处理依赖关系 - 支持相对路径和绝对路径
-    var safeDependencies = Array.isArray(child.dependencies) ? child.dependencies : [];
-    var processedDependencies = safeDependencies.map(dep => {
+    const safeDependencies = Array.isArray(child.dependencies) ? child.dependencies : [];
+    const processedDependencies = safeDependencies.map(dep => {
       if (typeof dep === 'string') {
         // 相对路径：同Group内的其他字段
         return childNamePath ? [...childNamePath, dep] : dep;
@@ -111,15 +108,15 @@ var FlexibleGroupRender = props => {
     });
 
     // 获取组件类型
-    var type = child.type || 'Input';
-    var TargetComponent = componentMap[type];
+    const type = child.type || 'Input';
+    const TargetComponent = componentMap[type];
 
     // 处理 disabled（可能是函数）
-    var childDisabled = typeof child.disabled === 'function' ? false : child.disabled;
-    var finalDisabled = groupDisabled || childDisabled;
+    const childDisabled = typeof child.disabled === 'function' ? false : child.disabled;
+    const finalDisabled = groupDisabled || childDisabled;
 
     // 构建 formItemProps - 在非编辑态时移除校验规则
-    var formItemProps = {
+    const formItemProps = {
       name: fullName,
       label: child.label,
       rules: isView ? undefined : child.rules,
@@ -149,14 +146,14 @@ var FlexibleGroupRender = props => {
     }
 
     // 在ProEditTable场景下，如果同组其他字段有值，则当前字段空值不显示 -
-    var childViewEmpty = otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty;
-    if (isView && (otherProps === null || otherProps === void 0 ? void 0 : otherProps.source) === 'ProEditTable' && form && children.length > 1) {
+    let childViewEmpty = otherProps?.viewEmpty;
+    if (isView && otherProps?.source === 'ProEditTable' && form && children.length > 1) {
       // 检查同组其他字段是否有值
-      var hasOtherValues = children.some(otherChild => {
+      const hasOtherValues = children.some(otherChild => {
         if (otherChild === child) return false; // 跳过当前字段
 
-        var otherChildNamePath = otherChild.namePath || contextProps.namePath;
-        var otherFullName = (() => {
+        const otherChildNamePath = otherChild.namePath || contextProps.namePath;
+        const otherFullName = (() => {
           if (otherChildNamePath && Array.isArray(otherChild.name) && otherChild.name.length > 1) {
             return [...otherChildNamePath, ...otherChild.name];
           }
@@ -165,7 +162,7 @@ var FlexibleGroupRender = props => {
           }
           return otherChild.name;
         })();
-        var value = form.getFieldValue(otherFullName);
+        const value = form.getFieldValue(otherFullName);
         return value !== undefined && value !== null && value !== '';
       });
 
@@ -176,7 +173,7 @@ var FlexibleGroupRender = props => {
     }
 
     // 构建 otherProps
-    var renderOtherProps = {
+    const renderOtherProps = {
       label: child.label,
       name: fullName,
       disabled: finalDisabled,
@@ -190,8 +187,8 @@ var FlexibleGroupRender = props => {
       },
       // 灵活模式不需要 Col，但需要传递 colProps
       namePath: childNamePath || contextProps.namePath,
-      formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
-      globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+      formDisabled: otherProps?.formDisabled,
+      globalControl: otherProps?.globalControl,
       // 灵活模式样式属性
       flexibleGroupProps: {
         className: formItemClassName,
@@ -209,7 +206,7 @@ var FlexibleGroupRender = props => {
         show: child.show,
         form: form,
         disabled: child.disabled,
-        formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+        formDisabled: otherProps?.formDisabled,
         type: type,
         originComponent: child.component,
         component: TargetComponent,
@@ -223,24 +220,24 @@ var FlexibleGroupRender = props => {
         fieldProps: child.fieldProps,
         isSelect: false // 由 Render 内部计算
         ,
-        diffConfig: otherProps === null || otherProps === void 0 ? void 0 : otherProps.diffConfig,
-        requiredOnView: otherProps === null || otherProps === void 0 ? void 0 : otherProps.requiredOnView,
-        globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+        diffConfig: otherProps?.diffConfig,
+        requiredOnView: otherProps?.requiredOnView,
+        globalControl: otherProps?.globalControl,
         viewRender: child.viewRender,
-        shouldUpdateDebounce: otherProps === null || otherProps === void 0 ? void 0 : otherProps.shouldUpdateDebounce
+        shouldUpdateDebounce: otherProps?.shouldUpdateDebounce
       })
     }, child.name || `item-${index}`);
   };
 
   // 非compact模式：正常的表单项渲染
-  var renderChildren = () => {
-    var elements = [];
-    var visibleChildren = [];
+  const renderChildren = () => {
+    const elements = [];
+    const visibleChildren = [];
 
     // 先过滤出可见的子项
     children.forEach(child => {
-      var childNamePath = child.namePath || contextProps.namePath;
-      var childIndex = child.index;
+      const childNamePath = child.namePath || contextProps.namePath;
+      const childIndex = child.index;
       if (checkShouldShow(child, form, childNamePath, childIndex)) {
         visibleChildren.push(child);
       }
@@ -249,16 +246,16 @@ var FlexibleGroupRender = props => {
     // 只渲染可见的子项
     visibleChildren.forEach((child, index) => {
       // 找到原始索引，用于获取正确的 child 对象和分隔符索引计算
-      var originalIndex = children.findIndex(c => c === child);
+      const originalIndex = children.findIndex(c => c === child);
 
       // 渲染表单项
-      var formElement = renderFormItem(child, originalIndex);
+      const formElement = renderFormItem(child, originalIndex);
       elements.push(formElement);
 
       // 添加分隔符（除最后一个元素外）
-      if (index < visibleChildren.length - 1 && space !== null && space !== void 0 && space.separator) {
+      if (index < visibleChildren.length - 1 && space?.separator) {
         // 检查是否在指定位置添加分隔符
-        var shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true; // 默认每个元素后都加分隔符
+        const shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true; // 默认每个元素后都加分隔符
 
         if (shouldAddSeparator) {
           elements.push( /*#__PURE__*/_jsx("span", {
@@ -272,14 +269,14 @@ var FlexibleGroupRender = props => {
   };
 
   // compact模式专用：为每个字段创建可见的Form.Item，并使用CSS实现compact视觉效果
-  var renderCompactFormItems = () => {
-    var elements = [];
-    var visibleChildren = [];
+  const renderCompactFormItems = () => {
+    const elements = [];
+    const visibleChildren = [];
 
     // 先过滤出可见的子项
     children.forEach(child => {
-      var childNamePath = child.namePath || contextProps.namePath;
-      var childIndex = child.index;
+      const childNamePath = child.namePath || contextProps.namePath;
+      const childIndex = child.index;
       if (checkShouldShow(child, form, childNamePath, childIndex)) {
         visibleChildren.push(child);
       }
@@ -288,20 +285,20 @@ var FlexibleGroupRender = props => {
     // 只渲染可见的子项
     visibleChildren.forEach((child, index) => {
       // 找到原始索引，用于获取正确的 child 对象和分隔符索引计算
-      var originalIndex = children.findIndex(c => c === child);
+      const originalIndex = children.findIndex(c => c === child);
 
       // 为每个字段创建独立的Form.Item，确保表单校验正常工作
-      var formElement = renderFormItem(child, originalIndex);
+      const formElement = renderFormItem(child, originalIndex);
       elements.push(formElement);
 
       // 添加分隔符
       // 查看模式下，如果没有配置separator，使用默认的 finalSeparator
-      var separatorToUse = isView ? (space === null || space === void 0 ? void 0 : space.separator) || finalSeparator : space === null || space === void 0 ? void 0 : space.separator;
+      const separatorToUse = isView ? space?.separator || finalSeparator : space?.separator;
       if (index < visibleChildren.length - 1 && separatorToUse) {
-        var shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
+        const shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
         if (shouldAddSeparator) {
           // 查看模式下使用不同的className，避免显示边框
-          var separatorClassName = isView ? 'pro-group-separator-compact pro-group-separator-view' : 'pro-group-separator-compact';
+          const separatorClassName = isView ? 'pro-group-separator-compact pro-group-separator-view' : 'pro-group-separator-compact';
           elements.push( /*#__PURE__*/_jsx("span", {
             className: separatorClassName,
             children: separatorToUse
@@ -314,31 +311,28 @@ var FlexibleGroupRender = props => {
       children: elements
     });
   };
-  var nextClassName = classnames({
+  const nextClassName = classnames({
     'pro-group': true,
     'pro-group-flexible': true,
-    'pro-group-diy-width': children.some(item => {
-      var _item$fieldProps;
-      return item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 || (_item$fieldProps = _item$fieldProps.style) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.width;
-    }),
+    'pro-group-diy-width': children.some(item => item?.fieldProps?.style?.width),
     'pro-group-width-auto': children.some(item => ['Radio', 'Checkbox', 'Switch'].includes(item.type)),
     'pro-group-view': isView,
     [`${className}`]: className
   });
 
   // 检查是否有子项包含 show 函数，如果有则需要响应式更新
-  var hasShowFunction = children.some(child => isFunction(child.show));
+  const hasShowFunction = children.some(child => _isFunction(child.show));
 
   // 查看模式下空值处理
-  if (isView && isEmpty(children)) {
-    return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+  if (isView && _isEmpty(children)) {
+    return otherProps?.viewEmpty || '-';
   }
 
   // 查看模式下，检查所有children的值是否都为空
   if (isView && form && children.length > 0) {
-    var allValuesEmpty = children.every(child => {
-      var childNamePath = child.namePath || contextProps.namePath;
-      var fullName = (() => {
+    const allValuesEmpty = children.every(child => {
+      const childNamePath = child.namePath || contextProps.namePath;
+      const fullName = (() => {
         if (childNamePath && Array.isArray(child.name) && child.name.length > 1) {
           return [...childNamePath, ...child.name];
         }
@@ -347,18 +341,18 @@ var FlexibleGroupRender = props => {
         }
         return child.name;
       })();
-      var value = form.getFieldValue(fullName);
+      const value = form.getFieldValue(fullName);
       return value === undefined || value === null || value === '';
     });
 
     // 如果所有值都为空，显示一个 -
     if (allValuesEmpty) {
-      return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+      return otherProps?.viewEmpty || '-';
     }
   }
 
   // 渲染内容
-  var renderContent = () => {
+  const renderContent = () => {
     return /*#__PURE__*/_jsx("div", {
       className: nextClassName,
       id: id,
@@ -387,19 +381,21 @@ var FlexibleGroupRender = props => {
 /**
  * FlexibleGroup主组件
  */
-var FlexibleGroup = props => {
-  var _fieldProps2;
-  var propsChildren = props.children;
+const FlexibleGroup = props => {
+  const {
+    children: propsChildren
+  } = props;
 
   // children可能在props.children或props.fieldProps.children中
-  var children = propsChildren || ((_fieldProps2 = props.fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.children) || [];
+  const children = propsChildren || props.fieldProps?.children || [];
 
   // 配置验证
   if (!utils.validateChildren(children)) {
     return /*#__PURE__*/_jsx(ErrorTip, {});
   }
-  return /*#__PURE__*/_jsx(FlexibleGroupRender, _objectSpread(_objectSpread({}, props), {}, {
+  return /*#__PURE__*/_jsx(FlexibleGroupRender, {
+    ...props,
     children: children
-  }));
+  });
 };
 export default FlexibleGroup;