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

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

@@ -7,14 +7,12 @@
   &.pro-group-view {
     .pro-group-form-item {
       flex: 0 0 auto !important;
-   
     }
-    .@{ant-prefix}-space-compact .pro-group-separator-compact{
+    .@{ant-prefix}-space-compact .pro-group-separator-compact {
       color: #333 !important;
     }
   }
 
-
   &.pro-group-view {
     .@{ant-prefix}-space {
       gap: 0 !important;
@@ -75,7 +73,6 @@
       cursor: default;
       margin-inline-start: -2px;
       border-radius: 0;
-
     }
 
     .pro-modal-select {
@@ -271,7 +268,7 @@
     .pro-group-form-item {
       flex: 1;
       margin-left: 0 !important;
-      &.@{ant-prefix}-form-item-has-error{
+      &.@{ant-prefix}-form-item-has-error {
         margin-left: -1px !important;
       }
     }
@@ -324,7 +321,7 @@
         .@{ant-prefix}-select .@{ant-prefix}-select-selector,
         .@{ant-prefix}-input-number,
         .@{ant-prefix}-input-number-input,
-        .@{ant-prefix}-picker{
+        .@{ant-prefix}-picker {
           // 重置z-index确保正确的层级关系
           position: relative;
           // 重置圆角
@@ -348,7 +345,7 @@
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input,
-          .@{ant-prefix}-picker{
+          .@{ant-prefix}-picker {
             border-top-right-radius: 6px;
             border-bottom-right-radius: 6px;
           }
@@ -425,44 +422,43 @@
   }
 }
 
-
-.@{ant-prefix}-form-item-has-error{
+.@{ant-prefix}-form-item-has-error {
   &:not(.pro-group-flexible) {
-     // 错误状态：确保边框变红（优先级要高于上面的 border-left-width: 0）
+    // 错误状态：确保边框变红（优先级要高于上面的 border-left-width: 0）
+    .@{ant-prefix}-input,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-input-number,
+    .@{ant-prefix}-input-number-input {
+      border-color: #ff4d4f !important;
+    }
+
+    // 错误状态下，中间元素也需要恢复左边框并设置为红色
+    &:not(:first-child) {
       .@{ant-prefix}-input,
       .@{ant-prefix}-select .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-input-number,
-      .@{ant-prefix}-input-number-input {
-        border-color: #ff4d4f !important;
+      .@{ant-prefix}-input-number {
+        border-left-color: #ff4d4f !important;
+        border-left-width: 1px !important;
       }
 
-      // 错误状态下，中间元素也需要恢复左边框并设置为红色
-      &:not(:first-child) {
-        .@{ant-prefix}-input,
-        .@{ant-prefix}-select .@{ant-prefix}-select-selector,
-        .@{ant-prefix}-input-number {
-          border-left-color: #ff4d4f !important;
-          border-left-width: 1px !important;
-        }
-
-        .@{ant-prefix}-input-number-input {
-          border-left: 0 !important;
-        }
+      .@{ant-prefix}-input-number-input {
+        border-left: 0 !important;
       }
+    }
 
-      // 聚焦时保持红色边框
-      .@{ant-prefix}-input:focus,
-      .@{ant-prefix}-select:focus .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-input-number:focus,
-      .@{ant-prefix}-input-number:focus .@{ant-prefix}-input-number-input {
-        border-color: #ff4d4f !important;
-      }
+    // 聚焦时保持红色边框
+    .@{ant-prefix}-input:focus,
+    .@{ant-prefix}-select:focus .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-input-number:focus,
+    .@{ant-prefix}-input-number:focus .@{ant-prefix}-input-number-input {
+      border-color: #ff4d4f !important;
+    }
 
-      // Select 组件的错误状态处理
-      .@{ant-prefix}-select.@{ant-prefix}-select-status-error .@{ant-prefix}-select-selector {
-        border-color: #ff4d4f !important;
-      }
+    // Select 组件的错误状态处理
+    .@{ant-prefix}-select.@{ant-prefix}-select-status-error .@{ant-prefix}-select-selector {
+      border-color: #ff4d4f !important;
     }
+  }
 }
 
 // compact模式容器, 修复antd6定制模式下，Group组件内嵌套Form.Item时，表单样式问题
@@ -476,10 +472,10 @@
     .@{ant-prefix}-input,
     .@{ant-prefix}-select,
     .@{ant-prefix}-input-number {
-     margin-left: -1px;
+      margin-left: -1px;
     }
   }
-  .pro-group-separator-compact{
+  .pro-group-separator-compact {
     margin-left: -1px;
   }
 
@@ -492,12 +488,11 @@
     color: #999 !important;
   }
 
-
   /* 1. 处理第一个子元素：左上、左下圆角 */
-  > .pro-group-form-item:first-child{
-    .pro-select .@{ant-prefix}-select, 
-    .@{ant-prefix}-select, 
-    .@{ant-prefix}-input-number  {
+  > .pro-group-form-item:first-child {
+    .pro-select .@{ant-prefix}-select,
+    .@{ant-prefix}-select,
+    .@{ant-prefix}-input-number {
       border-top-left-radius: 6px;
       border-bottom-left-radius: 6px;
     }
@@ -505,21 +500,19 @@
 
   /* 2. 处理最后一个子元素：右上、右下圆角 */
   > .pro-group-form-item:last-child {
-    .pro-select .@{ant-prefix}-select, 
-    .@{ant-prefix}-select, 
-    .@{ant-prefix}-input-number  {
+    .pro-select .@{ant-prefix}-select,
+    .@{ant-prefix}-select,
+    .@{ant-prefix}-input-number {
       border-top-right-radius: 6px;
       border-bottom-right-radius: 6px;
     }
   }
 }
-.@{ant-prefix}-form-item-has-error  {
-  .pro-group-compact-container{
+.@{ant-prefix}-form-item-has-error {
+  .pro-group-compact-container {
     .@{ant-prefix}-select {
       border-color: var(--zaui-danger);
     }
   }
-  
 }
 // compact模式容器 结束
-

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

@@ -75,33 +75,45 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    status?: "" | "warning" | "error" | "success" | "validating";
+    isView?: boolean;
     id?: string;
+    prefixCls?: string;
     className?: string;
-    hidden?: boolean;
     style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    onReset?: () => void;
-    prefixCls?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
     rootClassName?: string;
-    isView?: boolean;
-    colon?: boolean;
-    htmlFor?: string;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    vertical?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
+    hidden?: boolean;
+    trigger?: string;
+    viewRender?: (value: any, record: any, { form, index, namePath, }: {
+        [key: string]: any;
+        form: FormInstance<any>;
+        index?: number;
+    }) => string | React.ReactElement<any, any>;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    onReset?: () => void;
+    viewType?: import("../../../render/propsType").ViewType;
+    validateTrigger?: string | false | string[];
+    preserve?: boolean;
+    clearNotShow?: boolean;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
+    colon?: boolean;
+    layout?: import("antd/es/form/Form").FormItemLayout;
     labelCol?: import("antd").ColProps;
-    vertical?: boolean;
+    wrapperCol?: import("antd").ColProps;
+    htmlFor?: string;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
-    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
@@ -109,24 +121,12 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
-    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number;
-    }) => string | React.ReactElement<any, any>;
-    viewType?: import("../../../render/propsType").ViewType;
-    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
-    clearNotShow?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "valueType" | "format" | "precision" | "clearNotShow" | "switchValue" | "dependNames" | "toISOString" | "toCSTString">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;