@zat-design/sisyphus-react 3.3.4 → 3.4.0-beta.2

package/dist/index.esm.css

@@ -682,7 +682,7 @@
   -webkit-align-items: center !important;
       -ms-flex-align: center !important;
           align-items: center !important;
-  padding: 12px var(--zaui-space-size-md, 16px) !important;
+  padding: 10px var(--zaui-space-size-md, 16px) !important;
   background: var(--zaui-area, #fafafa);
 }
 .pro-collapse .ant-collapse-header-text {
@@ -702,6 +702,7 @@
 }
 .pro-collapse .ant-collapse-content-box .pro-collapse-content {
   padding: var(--zaui-space-size-md, 16px);
+  padding-top: var(--zaui-space-size-sm, 8px);
   padding-bottom: 0;
   background: var(--zaui-base-bg, #ffffff);
 }
@@ -710,13 +711,12 @@
   background: var(--zaui-base-bg, #ffffff);
 }
 .pro-collapse.pro-collapse-level2 .ant-collapse-header {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
   padding: 0 !important;
   background: var(--zaui-base-bg, #ffffff);
 }
 .pro-collapse.pro-collapse-level2 .ant-collapse-header .ant-collapse-header-text {
   position: relative;
-  padding-left: var(--zaui-space-size-sm, 8px);
+  padding-left: 12px;
   font-size: var(--zaui-font-size, 14px);
 }
 .pro-collapse.pro-collapse-level2 .ant-collapse-header .ant-collapse-header-text::before {
@@ -734,6 +734,17 @@
 .pro-collapse.pro-collapse-level2 .ant-collapse-header .ant-collapse-extra .extra-info {
   margin-right: var(--zaui-space-size-sm, 8px);
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-content {
+  padding-top: var(--zaui-space-size-sm, 8px) !important;
+}
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-header {
+  padding: 0 8px 6px !important;
+  border-bottom: 2px solid #dee0e3;
+  margin: 0 -8px;
+}
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-header .ant-collapse-arrow {
+  right: 8px;
+}
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-extra .extra-info {
   margin-right: var(--zaui-space-size-lg, 32px);
 }
@@ -759,7 +770,7 @@
 }
 .pro-collapse.pro-collapse-list .ant-descriptions-row > th,
 .pro-collapse.pro-collapse-list .ant-descriptions-row > td {
-  padding: var(--zaui-space-size-md, 16px) 0;
+  padding: var(--zaui-space-size-sm, 8px) 0;
   background: #fafafa;
 }
 .pro-collapse.pro-collapse-list .ant-descriptions-row > th.ant-descriptions-item,
@@ -787,9 +798,6 @@
   font-weight: 500 !important;
   font-size: var(--zaui-font-size, 14px);
 }
-.pro-collapse.pro-collapse-list .ant-descriptions {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
-}
 .pro-footer {
   position: fixed;
   right: 0;
@@ -819,8 +827,8 @@
   background: var(--zaui-disabled-bg);
 }
 .pro-header {
-  background-color: var(--zaui-base-bg, #ffffff);
   padding: 16px 0 0 0 !important;
+  background-color: var(--zaui-base-bg, #ffffff);
 }
 .pro-header.pro-header-no-back.pro-header-has-describe .pro-header-top {
   padding-left: var(--zaui-space-size-md, 16px);
@@ -832,24 +840,22 @@
   margin-left: 0 !important;
 }
 .pro-header.pro-header-no-describe {
+  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
   -webkit-box-shadow: none;
           box-shadow: none;
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
 }
 .pro-header.pro-header-no-describe .pro-header-title,
 .pro-header.pro-header-no-describe .pro-header-top {
-  padding: 0;
   margin: 0;
+  padding: 0;
 }
 .pro-header.pro-header-fixed.pro-header-no-describe .pro-header-top {
   padding-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1) - var(--zaui-space-size-xs, 4px) * var(--zaui-size, 1));
 }
 .pro-header .pro-header-describe a {
-  color: var(--zaui-link, #006AFF);
+  color: var(--zaui-link, #006aff);
 }
 .pro-header .pro-header-copy {
-  margin-bottom: 0;
-  width: 14px;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -858,12 +864,14 @@
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
+  width: 16px;
+  margin-bottom: 0;
 }
 .pro-header .pro-header-copy .ant-typography-copy-success svg {
-  width: 14px;
-  height: 14px;
-  fill: var(--zaui-success, #00AE4D);
   display: inline-block;
+  width: 16px;
+  height: 16px;
+  fill: var(--zaui-success, #00ae4d);
 }
 .pro-header .pro-header-copy .drag-icon div {
   display: -webkit-box;
@@ -872,26 +880,26 @@
   display: flex;
 }
 .pro-header .pro-header-copy .drag-icon svg {
-  width: 14px;
-  height: 14px;
-  fill: #3F3F3F;
   display: inline-block;
+  width: 16px;
+  height: 16px;
+  fill: var(--zaui-brand, #006aff);
 }
 .pro-header .pro-header-tag {
-  background: var(--ant-primary-1, #e6f4ff);
-  color: var(--zaui-brand, #006AFF);
+  display: inline-block;
   padding: 4px 8px;
-  border-radius: var(--zaui-border-radius-card, 2px);
-  font-size: var(--zaui-font-size-sm, 12px);
+  color: var(--zaui-brand, #006aff);
   font-weight: normal;
+  font-size: var(--zaui-font-size-sm, 12px);
   line-height: 16px;
-  display: inline-block;
   white-space: pre;
+  background: var(--ant-primary-1, #e6f4ff);
+  border-radius: var(--zaui-border-radius-card, 2px);
 }
 .pro-header .pro-header-title {
+  padding: 0 var(--zaui-space-size-md, 16px);
   font-weight: 500;
   font-size: var(--zaui-font-size-xl, 18px);
-  padding: 0 var(--zaui-space-size-md, 16px);
   line-height: 22px;
 }
 .pro-header.pro-header-fixed {
@@ -906,35 +914,35 @@
           box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
 }
 .pro-header .ant-breadcrumb li {
+  color: #1d2129;
   font-weight: 500;
-  color: #1D2129;
 }
 .pro-header .ant-breadcrumb .ant-breadcrumb-link {
-  font-size: var(--zaui-font-size-xl, 18px);
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
   display: inline-flex;
+  font-size: var(--zaui-font-size-xl, 18px);
 }
 .pro-header .ant-breadcrumb .ant-breadcrumb-separator {
+  margin: 0 var(--zaui-space-size-xs, 4px);
+  color: #1d2129;
   font-weight: 500;
-  color: #1D2129;
   font-size: var(--zaui-font-size-xl, 18px);
-  margin: 0 var(--zaui-space-size-xs, 4px);
 }
 .pro-header .pro-header-top {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
   -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
   margin-bottom: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
   padding: 0 var(--zaui-space-size-md, 16px);
 }
@@ -963,13 +971,13 @@
           align-items: center;
 }
 .pro-header .pro-header-top .pro-header-left ul li {
-  color: #1D2129;
-  font-size: var(--zaui-font-size-xl, 18px);
-  font-weight: 500;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  color: #1d2129;
+  font-weight: 500;
+  font-size: var(--zaui-font-size-xl, 18px);
 }
 .pro-header .pro-header-top .pro-header-left ul li .breadcrumb-value {
   display: inline-block;
@@ -996,14 +1004,14 @@
   margin-bottom: 0;
 }
 .pro-header .pro-header-top .pro-header-left ul li.version {
-  background: var(--ant-primary-1, #e6f4ff);
-  border-radius: var(--zaui-border-radius, 4px);
-  color: var(--zaui-brand, #006AFF);
-  font-style: initial;
+  height: 24px;
   padding: 0 var(--zaui-space-size-sm, 8px);
+  color: var(--zaui-brand, #006aff);
   font-size: var(--zaui-font-size-sm, 12px);
-  height: 24px;
+  font-style: initial;
   line-height: 24px;
+  background: var(--ant-primary-1, #e6f4ff);
+  border-radius: var(--zaui-border-radius, 4px);
 }
 .pro-header .pro-header-top .pro-header-left ul li.hidden {
   display: none;
@@ -1021,13 +1029,13 @@
   margin: 0;
 }
 .pro-header .pro-header-nav {
+  position: relative;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  background: #F7F9FC;
-  border-top: 1px solid #F2F2F2;
-  position: relative;
+  background: #f7f9fc;
+  border-top: 1px solid #f2f2f2;
 }
 .pro-header .pro-header-nav.pro-header-nav-open .pro-header-fold .pro-header-fold-bg {
   -webkit-transform: rotate(180deg);
@@ -1050,31 +1058,31 @@
   cursor: pointer;
 }
 .pro-header .pro-header-nav .pro-header-fold .pro-header-fold-bg {
-  background: #fff;
   position: relative;
   z-index: 2;
   height: 26px;
+  background: #fff;
   -webkit-transform: rotate(0deg);
           transform: rotate(0deg);
   -webkit-transform-origin: center;
           transform-origin: center;
 }
 .pro-header .pro-header-nav .pro-header-fold::before {
-  content: '';
-  z-index: 1;
   position: absolute;
   bottom: 13px;
   left: 50%;
-  -webkit-transform: translateX(-50%);
-          transform: translateX(-50%);
+  z-index: 1;
   width: 140px;
   height: 1px;
-  background: -webkit-gradient(linear, left top, right top, from(rgba(238, 238, 238, 0)), color-stop(37%, var(--zaui-brand, #006AFF)), color-stop(57%, var(--zaui-brand, #006AFF)), to(rgba(216, 216, 216, 0)));
-  background: -webkit-linear-gradient(left, rgba(238, 238, 238, 0) 0%, var(--zaui-brand, #006AFF) 37%, var(--zaui-brand, #006AFF) 57%, rgba(216, 216, 216, 0) 100%);
-  background: linear-gradient(90deg, rgba(238, 238, 238, 0) 0%, var(--zaui-brand, #006AFF) 37%, var(--zaui-brand, #006AFF) 57%, rgba(216, 216, 216, 0) 100%);
+  background: -webkit-gradient(linear, left top, right top, from(rgba(238, 238, 238, 0)), color-stop(37%, var(--zaui-brand, #006aff)), color-stop(57%, var(--zaui-brand, #006aff)), to(rgba(216, 216, 216, 0)));
+  background: -webkit-linear-gradient(left, rgba(238, 238, 238, 0) 0%, var(--zaui-brand, #006aff) 37%, var(--zaui-brand, #006aff) 57%, rgba(216, 216, 216, 0) 100%);
+  background: linear-gradient(90deg, rgba(238, 238, 238, 0) 0%, var(--zaui-brand, #006aff) 37%, var(--zaui-brand, #006aff) 57%, rgba(216, 216, 216, 0) 100%);
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
+  content: '';
 }
 .pro-header .pro-header-nav .pro-header-fold svg {
-  fill: var(--zaui-brand, #006AFF);
+  fill: var(--zaui-brand, #006aff);
 }
 .pro-header .pro-header-nav ul {
   display: -webkit-box;
@@ -1084,15 +1092,15 @@
   -webkit-flex-wrap: wrap;
       -ms-flex-wrap: wrap;
           flex-wrap: wrap;
+  height: 60px;
   padding: 0 16px;
+  overflow: hidden;
   -webkit-transition: height 0.2s ease-in-out;
   transition: height 0.2s ease-in-out;
-  height: 60px;
-  overflow: hidden;
 }
 .pro-header .pro-header-nav ul li {
-  margin-right: 52px;
   margin-top: 4px;
+  margin-right: 52px;
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
 }
 .pro-header .pro-header-nav ul li:last-child {
@@ -1125,9 +1133,9 @@
   -webkit-flex-wrap: wrap;
       -ms-flex-wrap: wrap;
           flex-wrap: wrap;
-  font-size: var(--zaui-font-size, 14px);
   padding: 0 var(--zaui-space-size-md, 16px);
   padding-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1) - var(--zaui-space-size-xs, 4px) * var(--zaui-size, 1));
+  font-size: var(--zaui-font-size, 14px);
 }
 .pro-header .pro-header-describe li {
   margin-left: var(--zaui-space-card, 32px);
@@ -1142,15 +1150,15 @@
   margin-left: 0;
 }
 .pro-header .pro-header-describe li span {
+  color: #0a0a0a;
   font-weight: 400;
-  color: #0A0A0A;
 }
 .pro-header .pro-header-describe li span:first-child {
   margin-right: 12px;
 }
 .pro-header .pro-header-describe li span:last-child {
-  font-weight: 600;
   display: inline-grid;
+  font-weight: 600;
 }
 .pro-header .pro-header-describe li span:last-child .pro-header-tag {
   margin-left: 4px;
@@ -2072,11 +2080,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: 2px;
 }
 .pro-number-range .range-split {
-  width: 40px !important;
-  border-left: 0px;
+  width: 32px !important;
+  text-align: center !important;
   border-right: 0px;
+  border-left: 0px;
   pointer-events: none;
-  text-align: center !important;
+}
+.pro-number-range .range-split.ant-input[disabled] {
+  background: #fff !important;
 }
 .pro-number-range .ant-input-status-error.range-split {
   border-color: var(--zaui-danger, #ff5050);

package/es/ProEnum/index.js

@@ -175,13 +175,27 @@ var ProEnum = function ProEnum(props) {
         return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
           options: list,
           value: value,
-          onChange: onChange
+          onChange: onChange,
+          children: list.map(function (item) {
+            return _jsx(_Radio, {
+              value: item[fieldValue],
+              disabled: !!item.disabled,
+              children: item[label]
+            }, item[fieldValue]);
+          })
         }));
       case 'Checkbox':
         return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
           options: list,
           value: value,
-          onChange: onChange
+          onChange: onChange,
+          children: list.map(function (item) {
+            return _jsx(_Checkbox, {
+              value: item[fieldValue],
+              disabled: !!item.disabled,
+              children: item[label]
+            }, item[fieldValue]);
+          })
         }));
       case 'Tag':
         return _jsx(ProEnumTag, {

package/es/ProEnum/style/index.less

@@ -12,7 +12,7 @@
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-     margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
+    margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);
@@ -23,4 +23,8 @@
     color: #fff;
     background-color: var(--zaui-brand);
   }
+  &-tag-item-disabled {
+    background-color: #f5f5f5;
+    pointer-events: none;
+  }
 }

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

@@ -2,13 +2,16 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-number-range {
-
   .range-split {
-    width         : 40px !important;
-    border-left   : 0px;
-    border-right  : 0px;
+    width: 32px !important;
+    text-align: center !important;
+
+    border-right: 0px;
+    border-left: 0px;
     pointer-events: none;
-    text-align    : center !important;
+    &.ant-input[disabled] {
+      background: #fff !important;
+    }
   }
 
   .@{ant-prefix}-input-status-error {
@@ -17,8 +20,6 @@
     }
   }
 
-
-
   & .@{ant-prefix}-input-rtl.range-right {
     border-right-width: 0;
   }
@@ -34,7 +35,7 @@
 
   .range-left,
   .range-right {
-    width     : calc(50% - 20px);
+    width: calc(50% - 20px);
     text-align: center;
   }
 
@@ -50,32 +51,32 @@
     }
 
     .range-right {
-      width                    : 100%;
-      border-top-left-radius   : 0;
+      width: 100%;
+      border-top-left-radius: 0;
       border-bottom-left-radius: 0;
     }
   }
 
-  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact>*:not(:last-child) {
+  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
     margin-right: 0;
   }
 
-  >*:first-child {
-    border-top-right-radius   : 0 !important;
+  > *:first-child {
+    border-top-right-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
 
-    >.@{ant-prefix}-select-selector {
-      border-top-right-radius   : 0 !important;
+    > .@{ant-prefix}-select-selector {
+      border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
     }
   }
 
-  >*:last-child {
-    border-top-left-radius   : 0 !important;
+  > *:last-child {
+    border-top-left-radius: 0 !important;
     border-bottom-left-radius: 0 !important;
 
-    >.@{ant-prefix}-select-selector {
-      border-top-left-radius   : 0 !important;
+    > .@{ant-prefix}-select-selector {
+      border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
     }
   }

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

@@ -44,7 +44,8 @@ var Render = function Render(props) {
     show = _props$show === void 0 ? true : _props$show,
     fieldProps = props.fieldProps,
     form = props.form,
-    formDisabled = props.disabled,
+    disabled = props.disabled,
+    formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
     originalValues = props.originalValues,
@@ -68,7 +69,7 @@ var Render = function Render(props) {
       show: show,
       formItemProps: formItemProps,
       form: form,
-      disabled: componentProps.disabled,
+      disabled: disabled,
       rules: rules,
       required: required,
       fieldProps: fieldProps,
@@ -163,8 +164,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先取组件上的disabled, 最后取formDisabled（全局
-  var lastDisabled = componentProps.disabledStrictly ? (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled : false;
+  // 优先级 column.disabled > fieldProps.disabled > formDisabled
+  var lastDisabled = (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -255,7 +256,7 @@ var Render = function Render(props) {
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
         form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
-        form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
+        form.validateFields();
       }, 60);
     }
     // ProTreeSelect返回option

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -44,7 +44,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    var _ref, _formItemProps$disabl;
+    var _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -67,7 +67,6 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -123,8 +122,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = (_ref = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : disabled;
-    var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
+    var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
       dataSource: dataSource,
@@ -141,10 +139,9 @@ var RenderFields = function RenderFields(props) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = _objectSpread(_objectSpread({
-      disabledStrictly: true,
       placeholder: placeholderHandle()
     }, _fieldProps), {}, {
-      disabled: _disabled
+      disabled: comDisabled
     });
     // 容器组件，额外处理show的问题
     if (['ProCollapse', 'Container'].includes(_type)) {
@@ -168,7 +165,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: _disabled,
+      disabled: comDisabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
@@ -189,8 +186,9 @@ var RenderFields = function RenderFields(props) {
       value: otherProps,
       children: _jsx(Render, {
         show: show,
-        disabled: Boolean(formDisabled),
         form: form,
+        disabled: column.disabled,
+        formDisabled: formDisabled,
         type: _type,
         originComponent: component,
         component: TargetComponent,

package/es/ProForm/components/render/propsType.d.ts

@@ -230,6 +230,7 @@ export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T,
  * 表单渲染类型
  */
 export interface RenderProps<Values = any> {
+    formDisabled?: boolean;
     component: any;
     formItemProps: FormItemProps<Values> & {
         labelWidth?: string | number;

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

@@ -18,7 +18,7 @@
 
   .@{ant-prefix}-collapse-header {
     align-items: center !important;
-    padding: 12px var(--zaui-space-size-md, 16px) !important;
+    padding: 10px var(--zaui-space-size-md, 16px) !important;
     background: var(--zaui-area, #fafafa);
   }
 
@@ -45,6 +45,7 @@
 
     .pro-collapse-content {
       padding: var(--zaui-space-size-md, 16px);
+      padding-top: var(--zaui-space-size-sm, 8px);
       padding-bottom: 0;
       background: var(--zaui-base-bg, #ffffff);
     }
@@ -55,13 +56,12 @@
     background: var(--zaui-base-bg, #ffffff);
 
     .@{ant-prefix}-collapse-header {
-      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
       padding: 0 !important;
       background: var(--zaui-base-bg, #ffffff);
 
       .@{ant-prefix}-collapse-header-text {
         position: relative;
-        padding-left: var(--zaui-space-size-sm, 8px);
+        padding-left: 12px;
         font-size: var(--zaui-font-size, 14px);
 
         &::before {
@@ -84,7 +84,20 @@
       }
     }
 
+    .pro-collapse-content {
+      padding-top: var(--zaui-space-size-sm, 8px) !important;
+    }
+
     .pro-collapse-level2-collapse {
+      .@{ant-prefix}-collapse-header {
+        padding: 0 8px 6px !important;
+        border-bottom: 2px solid #dee0e3;
+        margin: 0 -8px;
+        .@{ant-prefix}-collapse-arrow{
+          right: 8px;
+        }
+      }
+
       .@{ant-prefix}-collapse-extra {
         .extra-info {
           margin-right: var(--zaui-space-size-lg, 32px);
@@ -131,7 +144,7 @@
   &.pro-collapse-list {
     .@{ant-prefix}-descriptions-row > th,
     .@{ant-prefix}-descriptions-row > td {
-      padding: var(--zaui-space-size-md, 16px) 0;
+      padding: var(--zaui-space-size-sm, 8px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
@@ -166,8 +179,5 @@
       }
     }
 
-    .@{ant-prefix}-descriptions {
-      margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-    }
   }
 }