@zat-design/sisyphus-react 4.6.0 → 4.6.1-beta.2

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

@@ -44,9 +44,8 @@ const useTransformColumns = (params) => {
             if (names) {
               form.resetFields([columnName]);
             }
-            if (!names && (value == null ? void 0 : value.length)) {
-              value[index] = null;
-              form.setFieldValue(columnName, [...value]);
+            if (!names && (value == null ? void 0 : value.length) && value[index] !== void 0 && value[index] !== null) {
+              internalChange == null ? void 0 : internalChange(null, void 0, index);
             }
           }, 200);
         } else {

package/es/ProForm/components/combination/Group/index.d.ts

@@ -3,7 +3,8 @@ import type { GroupType } from './propsType';
 /**
  * Group组件 - 支持传统模式和灵活模式
  * - 有names属性 → 传统数组模式（保持向后兼容）
- * - 无names属性 → 新的灵活模式（子组件必须配置name）
+ * - 有外层name且子组件未配置name → 传统单字段数组模式
+ * - 其他情况 → 新的灵活模式（子组件必须配置name）
  */
 declare const Group: React.FC<GroupType>;
 export default Group;

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

@@ -10,9 +10,9 @@ import ProForm from "../../../../ProForm";
 import ComRender from "./component/ComRender";
 import FlexibleGroup from "./component/FlexibleGroup";
 const LegacyGroup = (props) => {
-  var _a;
+  var _a, _b;
   const {
-    children,
+    children: propsChildren,
     className,
     space: propsSpace = {
       size: 12
@@ -27,8 +27,9 @@ const LegacyGroup = (props) => {
     split
     // 弃用属性，保持向后兼容
   } = props;
+  const children = propsChildren || ((_a = props.fieldProps) == null ? void 0 : _a.children) || [];
   const finalSeparator = separator ?? split ?? "/";
-  const fieldPropsSpace = (_a = props.fieldProps) == null ? void 0 : _a.space;
+  const fieldPropsSpace = (_b = props.fieldProps) == null ? void 0 : _b.space;
   const space = fieldPropsSpace || propsSpace;
   const contextProps = ProForm.useFieldProps() || {};
   const { names, name, form, namePath, index, isView } = contextProps;
@@ -57,8 +58,8 @@ const LegacyGroup = (props) => {
     "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;
+      var _a2, _b2;
+      return (_b2 = (_a2 = item == null ? void 0 : item.fieldProps) == null ? void 0 : _a2.style) == null ? void 0 : _b2.width;
     }),
     "pro-group-width-auto": columns.some((item) => {
       return ["Radio", "Checkbox", "Switch"].includes(item.type);
@@ -72,8 +73,8 @@ const LegacyGroup = (props) => {
   const renderCompactFormItems = () => {
     const elements = [];
     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;
+      var _a2, _b2, _c;
+      const childWidth = (_b2 = (_a2 = column == null ? void 0 : column.fieldProps) == null ? void 0 : _a2.style) == null ? void 0 : _b2.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 };
@@ -147,9 +148,14 @@ const LegacyGroup = (props) => {
   ) });
 };
 const Group = (props) => {
+  var _a;
   const { children, names, otherProps } = props;
+  const { name: outerName } = ProForm.useFieldProps() || {};
   const actualNames = names || (otherProps == null ? void 0 : otherProps.names);
-  const isLegacyMode = Array.isArray(actualNames) && actualNames.length > 0;
+  const actualChildren = children || ((_a = props.fieldProps) == null ? void 0 : _a.children) || [];
+  const hasOuterName = outerName !== void 0 && outerName !== null && (!Array.isArray(outerName) || outerName.length > 0);
+  const hasNamelessChild = Array.isArray(actualChildren) && actualChildren.some((child) => !(child == null ? void 0 : child.name));
+  const isLegacyMode = Array.isArray(actualNames) && actualNames.length > 0 || hasOuterName && hasNamelessChild;
   if (isLegacyMode) {
     return /* @__PURE__ */ jsx(LegacyGroup, { ...props, names: actualNames });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.6.0",
+  "version": "4.6.1-beta.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public",