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

package/es/ProEditTable/components/RenderField/index.js

@@ -138,7 +138,8 @@ const RenderField = ({ text: value, record, index, column, config }) => {
     lastFieldProps = dynamicProps.fieldProps ?? fieldProps(rowData, reactiveParams);
   }
   if (isFunction(rules)) {
-    lastRules = dynamicProps.rules ?? rules(rowData, reactiveParams);
+    const canReuseDynamicRules = isRecordShallowEqual(dynamicProps.rowSnapshot, rowData);
+    lastRules = canReuseDynamicRules ? dynamicProps.rules ?? rules(rowData, reactiveParams) : rules(rowData, reactiveParams);
   }
   if (isFunction(valueType)) {
     lastValueType = dynamicProps.valueType ?? valueType(currentValue, rowData, {

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -43,8 +43,9 @@ const useShouldUpdateForTable = (props) => {
     }
     if (isFunction(column.rules)) {
       const newRules = column.rules(values, reactiveParams);
-      if (!isEqualWith(rulesRef.current, newRules, customEqualForFunction)) {
-        rulesRef.current = newRules;
+      const rulesChanged = !isEqualWith(rulesRef.current, newRules, customEqualForFunction);
+      rulesRef.current = newRules;
+      if (rulesChanged) {
         hasChange = true;
       }
     } else {

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

@@ -30,7 +30,8 @@ const LineFields = (props) => {
     className,
     id,
     diffConfig,
-    hideStartEndActionProps
+    hideStartEndActionProps,
+    actionAlign
   } = props;
   const isLess = mode === "less";
   const {
@@ -48,6 +49,7 @@ const LineFields = (props) => {
   const classnames = classNames({
     "pro-form-list": true,
     "pro-form-list-line": mode === "line",
+    [`pro-form-list-action-${actionAlign}`]: !!actionAlign,
     [className]: !!className
   });
   const style = {
@@ -66,7 +68,7 @@ const LineFields = (props) => {
         children: /* @__PURE__ */ jsx(ProIcon, { component: dragSvg, size: 20, color: "#949599" })
       }
     ),
-    /* @__PURE__ */ jsx(Row, { gutter: isLess ? 0 : 24, children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Row, { className: "pro-form-list-fields", gutter: isLess ? 0 : 24, children: /* @__PURE__ */ jsx(
       MemoRenderFields,
       {
         columns,

package/es/ProForm/components/combination/FormList/propsType.d.ts

@@ -62,6 +62,7 @@ export interface FormListType {
     emptyBtnText?: string;
     hideStartEndActionProps?: [boolean, boolean];
     titlePosition?: 'top' | 'left';
+    actionAlign?: 'top' | 'center' | 'bottom';
     className?: string;
 }
 export type TypeWithRef = FormListType & React.RefAttributes<FormListRefType>;

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

@@ -52,6 +52,11 @@
     padding-right: @zaui-space-size-sm;
     border: none;
   }
+
+  > .pro-form-list-fields {
+    flex: 1;
+    min-width: 0;
+  }
 }
 
 .pro-form-list-line {
@@ -63,6 +68,18 @@
   }
 }
 
+.pro-form-list-action-top > .pro-form-list-action {
+  align-self: flex-start;
+}
+
+.pro-form-list-action-center > .pro-form-list-action {
+  align-self: center;
+}
+
+.pro-form-list-action-bottom > .pro-form-list-action {
+  align-self: flex-end;
+}
+
 .pro-form-list-toolbar,
 .pro-form-list-action {
   .@{ant-prefix}-btn-link {

package/es/ProForm/style/index.less

@@ -11,6 +11,18 @@
 @import '../components/combination/Container/style/index.less';
 
 .pro-form {
+  // 跟随表单父节点渲染的浮层会受祖先堆叠上下文限制；仅在浮层打开时提升相关层级。
+  .@{ant-prefix}-form-item,
+  .@{ant-prefix}-space-compact-item,
+  .pro-group {
+    &:has(.pro-select-popup-open),
+    &:has(.@{ant-prefix}-select-open),
+    &:has(.@{ant-prefix}-picker-focused) {
+      position: relative;
+      z-index: 4 !important;
+    }
+  }
+
   .pro-container {
     .pro-collapse {
       .pro-collapse-panel {

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -36,6 +36,14 @@
     border-radius: 8px !important;
   }
 
+  .@{ant-prefix}-collapse-item-active {
+    &.pro-collapse-panel {
+      & > .@{ant-prefix}-collapse-header {
+        border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+      }
+    }
+  }
+
   .@{ant-prefix}-collapse-title {
     color: var(--zaui-text, #343434);
     font-weight: 500;
@@ -62,6 +70,7 @@
       padding-bottom: 0;
       background: var(--zaui-base-bg, #ffffff);
       border: 1px solid #ebecee;
+      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
     }
   }
 

package/es/ProSelect/style/index.less

@@ -9,10 +9,10 @@
 .pro-select {
   width: 100%;
 
-  // Ant Design Compact 控件的交互层级为 2；弹层打开时临时提升当前选择框。
+  // 高于 Ant Design Table 固定列的 z-index: 3，且仅在弹层打开时生效。
   &.pro-select-popup-open {
     position: relative;
-    z-index: 3;
+    z-index: 4;
   }
 
   > .ant-select {
@@ -29,5 +29,5 @@
 // scrollFollowParent 会让弹层受祖先堆叠上下文约束，需要同步提升嵌套 Form.Item。
 .ant-form-item:has(.pro-select-popup-open) {
   position: relative;
-  z-index: 3 !important;
+  z-index: 4 !important;
 }

package/package.json

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