@zat-design/sisyphus-react 3.4.2-beta.6 → 3.4.2-beta.8

package/dist/index.esm.css

@@ -398,9 +398,6 @@
 .pro-layout-open-menu .ant-menu-submenu:hover > .ant-menu-submenu-title > .ant-menu-submenu-expand-icon {
   color: #fff;
 }
-.pro-layout-open-menu .ant-menu-item-selected {
-  background: #000 !important;
-}
 .pro-layout-open-menu .ant-menu-item-selected .ant-menu-title-content h2 {
   font-weight: bold !important;
 }
@@ -447,11 +444,16 @@
   overflow-x: hidden;
   overflow-y: auto;
 }
+.pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-item-only-child .ant-menu-title-content .pro-layout-open-menu-lv1 h2 {
+  padding-right: 0;
+}
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-title-content div h2 {
-  color: var(--zaui-text);
   padding: 0;
+  padding-right: 12px;
+  color: var(--zaui-text);
 }
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-title-content .pro-layout-open-menu-lv1 h2 {
+  padding-right: 26px;
   color: var(--zaui-text);
   font-weight: 500;
 }
@@ -465,8 +467,8 @@
   margin-left: var(--zaui-space-size-md, 16px);
 }
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .pro-layout-icon {
-  fill: currentColor;
   color: var(--zaui-text, #343434) !important;
+  fill: currentColor;
 }
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu.ant-menu-sub {
   overflow: hidden;
@@ -474,8 +476,8 @@
 }
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-submenu-title:hover,
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-item:hover {
-  background-color: #f2f2f2;
   color: #fff;
+  background-color: #f2f2f2;
 }
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-item {
   margin: 0;
@@ -486,9 +488,9 @@
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu .ant-menu-submenu-title,
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu.ant-menu-root > .ant-menu-item-only-child,
 .pro-layout-sider-menu .pro-layout-open-menu.pro-layout-sider-menu-list .ant-menu.ant-menu-sub.ant-menu-inline > .ant-menu-item {
+  min-height: 40px;
   padding-top: 10px;
   padding-bottom: 10px;
-  min-height: 40px;
 }
 /** 侧边栏 + 内容区 */
 .pro-layout-row {
@@ -539,8 +541,8 @@
   display: inline-block;
   white-space: nowrap;
   opacity: 0;
-  -webkit-transition: opacity 0.5s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.5s;
-  transition: opacity 0.5s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.5s;
+  -webkit-transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.3s;
+  transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.3s;
 }
 .pro-layout-row.pro-layout-menu-collapsed .pro-layout-content {
   margin-left: 220px !important;
@@ -620,8 +622,8 @@
   width: 48px;
   height: 48px;
   background: #292f3b;
-  -webkit-transition: all 0.25s ease;
-  transition: all 0.25s ease;
+  -webkit-transition: all 0.3s ease;
+  transition: all 0.3s ease;
 }
 .pro-layout-row .pro-layout-menu .pro-layout-menu-collapsed:hover {
   background-color: rgba(185, 185, 189, 0.1);
@@ -673,22 +675,6 @@
   width: 12px;
   margin-right: 0;
 }
-.pro-collapse.pro-collapse-card {
-  border-radius: var(--zaui-border-radius, 8px);
-}
-.pro-collapse.pro-collapse-card.pro-collapse-no-title .pro-collapse-content {
-  border-radius: var(--zaui-border-radius, 8px) !important;
-}
-.pro-collapse.pro-collapse-card .ant-collapse-header {
-  border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
-}
-.pro-collapse.pro-collapse-card .pro-collapse-content {
-  border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
-  padding-bottom: var(--zaui-space-size-sm, 8px) !important;
-}
-.pro-collapse.pro-collapse-card .pro-collapse-panel .ant-collapse-header {
-  border-radius: var(--zaui-border-radius, 8px) !important;
-}
 .pro-collapse.pro-collapse-no-title .ant-collapse-header {
   display: none !important;
 }
@@ -709,7 +695,7 @@
   font-size: var(--zaui-font-size-lg, 16px);
 }
 .pro-collapse .ant-collapse-expand-icon {
-  color: #c5c7cd;
+  color: #999;
 }
 .pro-collapse.ant-collapse-borderless .ant-collapse-item > .ant-collapse-content > .ant-collapse-content-box {
   padding: 0;
@@ -724,9 +710,12 @@
   background: var(--zaui-base-bg, #ffffff);
 }
 .pro-collapse.pro-collapse-level2 {
-  margin-bottom: 0;
+  margin-top: var(--zaui-space-size-md, 16px);
   background: var(--zaui-base-bg, #ffffff);
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-panel {
+  margin-bottom: 0;
+}
 .pro-collapse.pro-collapse-level2 .ant-collapse-header {
   padding: 0 !important;
   background: var(--zaui-base-bg, #ffffff);
@@ -785,6 +774,9 @@
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }
+.pro-collapse.pro-collapse-list .ant-descriptions-view {
+  margin: 0 -8px;
+}
 .pro-collapse.pro-collapse-list .ant-descriptions-row > th,
 .pro-collapse.pro-collapse-list .ant-descriptions-row > td {
   padding: var(--zaui-space-size-sm, 8px) 0;
@@ -792,7 +784,7 @@
 }
 .pro-collapse.pro-collapse-list .ant-descriptions-row > th.ant-descriptions-item,
 .pro-collapse.pro-collapse-list .ant-descriptions-row > td.ant-descriptions-item {
-  padding-left: var(--zaui-space-size-md, 16px);
+  padding-left: 20px;
 }
 .pro-collapse.pro-collapse-list .ant-descriptions-row td:first-child {
   position: relative;
@@ -819,7 +811,7 @@
   position: fixed;
   right: 0;
   bottom: 0;
-  z-index: 101;
+  z-index: 98;
   width: 100%;
   padding: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1)) var(--zaui-space-size-lg, 32px);
   background: var(--zaui-base-bg, #ffffff);
@@ -846,6 +838,8 @@
 .pro-header {
   padding: 16px 0 0 0 !important;
   background-color: var(--zaui-base-bg, #ffffff);
+  -webkit-box-shadow: 2px 3px 8px 0px rgba(0, 55, 93, 0.1);
+          box-shadow: 2px 3px 8px 0px rgba(0, 55, 93, 0.1);
 }
 .pro-header.pro-header-no-back.pro-header-has-describe .pro-header-top {
   padding-left: var(--zaui-space-size-md, 16px);
@@ -1051,7 +1045,7 @@
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  background: #f7f9fc;
+  background: #fafafa;
   border-top: 1px solid #f2f2f2;
 }
 .pro-header .pro-header-nav.pro-header-nav-open .pro-header-fold .pro-header-fold-bg {
@@ -1201,6 +1195,55 @@
 .pro-layout .pro-layout-menu-open .pro-layout-open-menu-lv1 h2 {
   font-weight: bold;
 }
+.pro-layout.pro-layout-light .pro-collapse {
+  border-radius: var(--zaui-border-radius, 8px);
+}
+.pro-layout.pro-layout-light .pro-collapse.ant-collapse-borderless {
+  background: #fff;
+}
+.pro-layout.pro-layout-light .pro-collapse.pro-collapse-no-title .pro-collapse-content {
+  border-radius: var(--zaui-border-radius, 8px) !important;
+  padding: var(--zaui-space-size-md, 16px);
+}
+.pro-layout.pro-layout-light .pro-collapse.pro-collapse-no-title .pro-header-no-describe {
+  padding: 0 !important;
+}
+.pro-layout.pro-layout-light .pro-collapse .ant-collapse-item-active.pro-collapse-panel .ant-collapse-header {
+  border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+}
+.pro-layout.pro-layout-light .pro-collapse .pro-collapse-content {
+  border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+  padding: var(--zaui-space-size-md, 16px);
+}
+.pro-layout.pro-layout-light .pro-collapse .pro-collapse-content .pro-form {
+  margin-bottom: 0;
+}
+.pro-layout.pro-layout-light .pro-collapse.pro-collapse-level2 .pro-collapse-panel .ant-collapse-header {
+  background: #fff;
+}
+.pro-layout.pro-layout-light .pro-collapse.pro-collapse-level2 .pro-collapse-content {
+  padding-bottom: var(--zaui-border-radius, 8px);
+}
+.pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .ant-collapse-header {
+  border-radius: var(--zaui-border-radius, 8px) !important;
+  background: #E4F2FE;
+}
+.pro-layout.pro-layout-light .pro-header {
+  border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+}
+.pro-layout.pro-layout-light .pro-header.pro-header-no-describe {
+  padding: var(--zaui-space-size-md, 16px) !important;
+}
+.pro-layout.pro-layout-light .pro-header.pro-header-no-describe .pro-header-top {
+  padding-bottom: 0;
+}
+.pro-layout.pro-layout-light .pro-header.pro-header-has-describe .pro-header-nav-open {
+  border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+}
+.pro-layout.pro-layout-light .pro-layout-content {
+  padding: 0 var(--zaui-space-size-md, 16px);
+  background: #f3f5f8;
+}
 .pro-layout.pro-layout-light .pro-layout-menu-open,
 .pro-layout.pro-layout-light .pro-layout-menu {
   -webkit-box-shadow: 2px 0px 5px 0px rgba(0, 55, 93, 0.1);
@@ -1291,7 +1334,7 @@
   overflow-x: hidden !important;
 }
 .pro-layout.pro-layout-light .anticon-caret-down {
-  color: #cacaca !important;
+  color: #999 !important;
 }
 .pro-layout.pro-layout-light .pro-layout-row .pro-layout-menu {
   background: var(--zaui-base-bg, #ffffff);
@@ -1301,6 +1344,10 @@
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-title-content div h2 {
   color: var(--zaui-text, #343434);
+  padding-right: 26px;
+}
+.pro-layout.pro-layout-light .ant-menu-item-only-child .ant-menu-title-content div h2 {
+  padding-right: 0;
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item:hover,
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-submenu-title:hover {
@@ -1312,7 +1359,8 @@
   position: absolute;
   left: var(--zaui-space-size-sm, 8px);
   width: calc(100% - 16px);
-  height: 38px;
+  min-height: 38px;
+  height: 80%;
   background-color: var(--zaui-brand, #006aff);
   border-radius: var(--zaui-border-radius, 8px);
   opacity: 0.08;
@@ -1340,8 +1388,8 @@
   margin-top: 48px;
   margin-left: 48px;
   padding: 0 var(--zaui-space-size-lg, 32px);
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
+  -webkit-transition: all 0.24s ease;
+  transition: all 0.24s ease;
 }
 .pro-layout .pro-layout-content.pro-layout-has-notice {
   min-height: calc(100vh - 80px);

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

@@ -17,7 +17,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction, get } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference } from '../../utils/tools';
@@ -85,7 +85,7 @@ var RenderField = function RenderField(_ref) {
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = getNamePath(name, virtualKey);
-  var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || record || {};
+  var rowData = get(form.getFieldsValue(), [].concat(_toConsumableArray(namePath), [index])) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
   // 第三个参数
   var options = {

package/es/ProEditTable/utils/index.js

@@ -85,40 +85,54 @@ var getActionColumn = function getActionColumn(config) {
               index = tools.calc(firstIndex, '+', index);
               rowName = [].concat(_toConsumableArray(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 5;
+                _context.next = 12;
                 break;
               }
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return customValidate(validateKeys, form, rowName);
-            case 5:
+            case 6:
+              _context.next = 12;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
+              setTimeout(function () {
+                var errorDom = document.querySelector('.ant-form-item-has-error');
+                if (errorDom) {
+                  errorDom.scrollIntoViewIfNeeded(true);
+                }
+              }, 0);
+              return _context.abrupt("return", Promise.reject(_context.t0));
+            case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 9;
+              _context.next = 16;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 9:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 13;
+            case 16:
+              _context.t2 = _yield$onEvent = _context.sent;
+              _context.t1 = _context.t2 !== null;
+              if (!_context.t1) {
+                _context.next = 20;
                 break;
               }
-              _context.t0 = _yield$onEvent !== void 0;
-            case 13:
-              if (!_context.t0) {
-                _context.next = 17;
+              _context.t1 = _yield$onEvent !== void 0;
+            case 20:
+              if (!_context.t1) {
+                _context.next = 24;
                 break;
               }
-              _context.t2 = _yield$onEvent;
-              _context.next = 18;
+              _context.t3 = _yield$onEvent;
+              _context.next = 25;
               break;
-            case 17:
-              _context.t2 = true;
-            case 18:
-              result = _context.t2;
+            case 24:
+              _context.t3 = true;
+            case 25:
+              result = _context.t3;
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
@@ -128,11 +142,11 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 20:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 8]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);

package/es/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -162,7 +162,6 @@
   }
 
  .@{ant-prefix}-menu-item-selected{
-  background: #000 !important;
   .@{ant-prefix}-menu-title-content{
     h2{
       font-weight: bold !important;

package/es/ProLayout/components/Layout/Menu/SideMenu/style/index.less

@@ -2,18 +2,18 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-layout-sider-menu {
-  width     : 220px;
+  width: 220px;
   background: #fff;
 
   h2 {
     margin-bottom: 0;
-    padding      : 16px 16px 8px;
-    color        : var(--zaui-text, #343434);
-    color        : var(--zaui-text);
-    font-weight  : 500;
-    font-size    : var(--zaui-font-size-lg, 16px);
-    line-height  : inherit;
-    text-align   : left;
+    padding: 16px 16px 8px;
+    color: var(--zaui-text, #343434);
+    color: var(--zaui-text);
+    font-weight: 500;
+    font-size: var(--zaui-font-size-lg, 16px);
+    line-height: inherit;
+    text-align: left;
   }
 
   .pro-layout-open-menu {
@@ -33,15 +33,22 @@
       }
 
       .@{ant-prefix}-menu {
+        .@{ant-prefix}-menu-item-only-child{
+          .@{ant-prefix}-menu-title-content  .pro-layout-open-menu-lv1 h2{
+            padding-right: 0;
+          }
+        }
         .@{ant-prefix}-menu-title-content {
           div h2 {
-            color  : var(--zaui-text);
             padding: 0;
+            padding-right: 12px;
+            color: var(--zaui-text);
           }
 
           .pro-layout-open-menu-lv1 {
             h2 {
-              color      : var(--zaui-text);
+              padding-right: 26px;
+              color: var(--zaui-text);
               font-weight: 500;
             }
           }
@@ -53,19 +60,19 @@
           &.pro-layout-icon-empty {
             display: none;
 
-            &~h2 {
+            & ~ h2 {
               margin-left: var(--zaui-space-size-md, 16px);
             }
           }
         }
 
         .pro-layout-icon {
-          fill : currentColor;
           color: var(--zaui-text, #343434) !important;
+          fill: currentColor;
         }
 
         &.@{ant-prefix}-menu-sub {
-          overflow  : hidden;
+          overflow: hidden;
           background: #fff;
         }
 
@@ -74,8 +81,8 @@
 
         .@{ant-prefix}-menu-submenu-title:hover,
         .@{ant-prefix}-menu-item:hover {
+          color: #fff;
           background-color: #f2f2f2;
-          color           : #fff;
         }
 
         .@{ant-prefix}-menu-item {
@@ -87,15 +94,13 @@
         }
 
         .@{ant-prefix}-menu-submenu-title,
-        &.@{ant-prefix}-menu-root>.@{ant-prefix}-menu-item-only-child,
-        &.@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline>.@{ant-prefix}-menu-item {
-          padding-top   : 10px;
+        &.@{ant-prefix}-menu-root > .@{ant-prefix}-menu-item-only-child,
+        &.@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline > .@{ant-prefix}-menu-item {
+          min-height: 40px;
+          padding-top: 10px;
           padding-bottom: 10px;
-          min-height    : 40px;
         }
       }
     }
   }
-
-
 }

package/es/ProLayout/components/Layout/Menu/style/index.less

@@ -44,7 +44,7 @@
         display: inline-block;
         white-space: nowrap;
         opacity: 0;
-        transition: opacity 0.5s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.5s;
+        transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.3s;
       }
     }
   }
@@ -129,7 +129,7 @@
     width: 48px;
     height: 48px;
     background: #292f3b;
-    transition: all 0.25s ease;
+    transition: all 0.3s ease;
   }
 
   .pro-layout-menu .pro-layout-menu-collapsed:hover {

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -15,11 +15,6 @@ export interface TitleListProps {
 }
 export interface ProCollapseProps {
     /**
-   * @description       折叠头部模式
-   * @default           default
-   */
-    mode?: 'default' | 'card';
-    /**
     * @description       折叠头部标题
     * @default           -
     */

package/es/ProLayout/components/ProCollapse/index.js

@@ -26,13 +26,10 @@ var ProCollapse = function ProCollapse(props) {
     _props$folding = props.folding,
     folding = _props$folding === void 0 ? false : _props$folding,
     collapseProps = props.collapseProps,
-    _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'default' : _props$mode,
     collapsePanelProps = props.collapsePanelProps,
     className = props.className;
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
-    'pro-collapse-card': mode === 'card',
     'pro-collapse-level2': level === '2',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
     'pro-collapse-no-title': !title

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

@@ -2,29 +2,6 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-collapse {
-  
-  &.pro-collapse-card {
-    border-radius:  var(--zaui-border-radius, 8px);
-    &.pro-collapse-no-title{
-      .pro-collapse-content{
-        border-radius:  var(--zaui-border-radius, 8px) !important;
-      }
-    }
-    .@{ant-prefix}-collapse-header{
-      border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
-    }
-    .pro-collapse-content{
-      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
-      padding-bottom: var(--zaui-space-size-sm, 8px) !important;
-    }
-    .pro-collapse-panel{
-      .@{ant-prefix}-collapse-header{
-        border-radius: var(--zaui-border-radius, 8px) !important;
-      }
-   
-    }
-  }
-
 
   &.pro-collapse-no-title {
     .@{ant-prefix}-collapse-header {
@@ -51,7 +28,7 @@
   }
 
   .@{ant-prefix}-collapse-expand-icon {
-    color: #c5c7cd;
+    color: #999;
   }
 
   &.@{ant-prefix}-collapse-borderless
@@ -73,9 +50,11 @@
   }
 
   &.pro-collapse-level2 {
-    margin-bottom: 0;
+    margin-top: var(--zaui-space-size-md, 16px);
     background: var(--zaui-base-bg, #ffffff);
-
+    .pro-collapse-panel{
+      margin-bottom: 0;
+    }
     .@{ant-prefix}-collapse-header {
       padding: 0 !important;
       background: var(--zaui-base-bg, #ffffff);
@@ -163,13 +142,16 @@
   }
 
   &.pro-collapse-list {
+    .@{ant-prefix}-descriptions-view{
+      margin: 0 -8px;
+    }
     .@{ant-prefix}-descriptions-row > th,
     .@{ant-prefix}-descriptions-row > td {
       padding: var(--zaui-space-size-sm, 8px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
-        padding-left: var(--zaui-space-size-md, 16px);
+        padding-left: 20px;
       }
     }
 

package/es/ProLayout/components/ProFooter/index.js

@@ -12,7 +12,7 @@ var ProFooter = function ProFooter(props) {
     className = props.className,
     children = props.children,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 101 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 99 : _props$zIndex,
     _props$sideDom = props.sideDom,
     sideDom = _props$sideDom === void 0 ? '.pro-layout-sider-nav' : _props$sideDom,
     _props$contentDom = props.contentDom,

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

@@ -5,7 +5,7 @@
   position: fixed;
   right: 0;
   bottom: 0;
-  z-index: 101;
+  z-index: 98;
   width: 100%;
   padding: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
     var(--zaui-space-size-lg, 32px);

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

@@ -5,6 +5,7 @@
 .pro-header {
   padding: 16px 0 0 0 !important;
   background-color: var(--zaui-base-bg, #ffffff);
+  box-shadow: 2px 3px 8px 0px rgba(0, 55, 93, 0.1);
 
   &.pro-header-no-back.pro-header-has-describe {
     .pro-header-top {
@@ -216,7 +217,7 @@
   .pro-header-nav {
     position: relative;
     display: flex;
-    background: #f7f9fc;
+    background: #fafafa;
     border-top: 1px solid #f2f2f2;
 
     &.pro-header-nav-open {

package/es/ProLayout/style/index.less

@@ -21,7 +21,76 @@
 
   // light模式
   &.pro-layout-light {
-    .pro-layout-menu-collapsed {
+
+    // pro-collapse折叠调整
+    .pro-collapse {
+      border-radius:  var(--zaui-border-radius, 8px);
+      &.@{ant-prefix}-collapse-borderless{
+        background: #fff;
+      }
+      &.pro-collapse-no-title{
+        .pro-collapse-content{
+          border-radius:  var(--zaui-border-radius, 8px) !important;
+          padding: var(--zaui-space-size-md, 16px);
+        }
+        .pro-header-no-describe{
+          padding: 0 !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;
+          }
+        }
+      }
+    
+      .pro-collapse-content{
+        border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+        padding: var(--zaui-space-size-md, 16px);
+       
+        .pro-form{
+          margin-bottom: 0;
+        }
+      }
+      &.pro-collapse-level2{
+        .pro-collapse-panel  .@{ant-prefix}-collapse-header{
+          background: #fff;
+        }
+        .pro-collapse-content{
+          padding-bottom: var(--zaui-border-radius, 8px);
+        }
+      }
+      
+      .pro-collapse-panel{
+        .@{ant-prefix}-collapse-header{
+          border-radius: var(--zaui-border-radius, 8px) !important;
+          background: #E4F2FE;
+        }
+     
+      }
+    }
+
+    // pro-header调整
+    .pro-header{
+      &.pro-header-no-describe{
+        padding: var(--zaui-space-size-md, 16px) !important;
+        .pro-header-top{
+          padding-bottom: 0;
+        }
+      }
+      &.pro-header-has-describe{
+        .pro-header-nav-open{
+          border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+        }
+      }
+      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+    }
+
+
+    .pro-layout-content {
+      padding: 0 var(--zaui-space-size-md, 16px);
+      background: #f3f5f8;
     }
 
     .pro-layout-menu-open,
@@ -129,7 +198,7 @@
     }
 
     .anticon-caret-down {
-      color: #cacaca !important;
+      color: #999 !important;
     }
 
     .pro-layout-row .pro-layout-menu {
@@ -145,6 +214,12 @@
 
     .pro-layout-open-menu .@{ant-prefix}-menu-title-content div h2 {
       color: var(--zaui-text, #343434);
+      padding-right: 26px;
+    }
+    .@{ant-prefix}-menu-item-only-child{
+      .@{ant-prefix}-menu-title-content div h2{
+        padding-right: 0;
+      }
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item:hover,
@@ -156,7 +231,8 @@
         position: absolute;
         left: var(--zaui-space-size-sm, 8px);
         width: calc(100% - 16px);
-        height: 38px;
+        min-height: 38px;
+        height: 80%;
         background-color: var(--zaui-brand, #006aff);
         border-radius: var(--zaui-border-radius, 8px);
         opacity: 0.08;
@@ -192,7 +268,7 @@
     margin-top: 48px;
     margin-left: 48px;
     padding: 0 var(--zaui-space-size-lg, 32px);
-    transition: all 0.3s ease-in-out;
+    transition: all 0.24s ease;
 
     &.pro-layout-has-notice {
       min-height: calc(100vh - 80px);

package/es/style/theme/antd.less

@@ -673,7 +673,6 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      // background: #fff;
     }
   }
 }

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

@@ -88,7 +88,7 @@ var RenderField = function RenderField(_ref) {
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
-  var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
+  var rowData = (0, _lodash.get)(form.getFieldsValue(), [].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
   // 第三个参数
   var options = {

package/lib/ProEditTable/utils/index.js

@@ -89,40 +89,54 @@ var getActionColumn = function getActionColumn(config) {
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 5;
+                _context.next = 12;
                 break;
               }
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 5:
+            case 6:
+              _context.next = 12;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
+              setTimeout(function () {
+                var errorDom = document.querySelector('.ant-form-item-has-error');
+                if (errorDom) {
+                  errorDom.scrollIntoViewIfNeeded(true);
+                }
+              }, 0);
+              return _context.abrupt("return", Promise.reject(_context.t0));
+            case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 9;
+              _context.next = 16;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 9:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 13;
+            case 16:
+              _context.t2 = _yield$onEvent = _context.sent;
+              _context.t1 = _context.t2 !== null;
+              if (!_context.t1) {
+                _context.next = 20;
                 break;
               }
-              _context.t0 = _yield$onEvent !== void 0;
-            case 13:
-              if (!_context.t0) {
-                _context.next = 17;
+              _context.t1 = _yield$onEvent !== void 0;
+            case 20:
+              if (!_context.t1) {
+                _context.next = 24;
                 break;
               }
-              _context.t2 = _yield$onEvent;
-              _context.next = 18;
+              _context.t3 = _yield$onEvent;
+              _context.next = 25;
               break;
-            case 17:
-              _context.t2 = true;
-            case 18:
-              result = _context.t2;
+            case 24:
+              _context.t3 = true;
+            case 25:
+              result = _context.t3;
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -132,11 +146,11 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 20:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 8]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);

package/lib/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -162,7 +162,6 @@
   }
 
  .@{ant-prefix}-menu-item-selected{
-  background: #000 !important;
   .@{ant-prefix}-menu-title-content{
     h2{
       font-weight: bold !important;

package/lib/ProLayout/components/Layout/Menu/SideMenu/style/index.less

@@ -2,18 +2,18 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-layout-sider-menu {
-  width     : 220px;
+  width: 220px;
   background: #fff;
 
   h2 {
     margin-bottom: 0;
-    padding      : 16px 16px 8px;
-    color        : var(--zaui-text, #343434);
-    color        : var(--zaui-text);
-    font-weight  : 500;
-    font-size    : var(--zaui-font-size-lg, 16px);
-    line-height  : inherit;
-    text-align   : left;
+    padding: 16px 16px 8px;
+    color: var(--zaui-text, #343434);
+    color: var(--zaui-text);
+    font-weight: 500;
+    font-size: var(--zaui-font-size-lg, 16px);
+    line-height: inherit;
+    text-align: left;
   }
 
   .pro-layout-open-menu {
@@ -33,15 +33,22 @@
       }
 
       .@{ant-prefix}-menu {
+        .@{ant-prefix}-menu-item-only-child{
+          .@{ant-prefix}-menu-title-content  .pro-layout-open-menu-lv1 h2{
+            padding-right: 0;
+          }
+        }
         .@{ant-prefix}-menu-title-content {
           div h2 {
-            color  : var(--zaui-text);
             padding: 0;
+            padding-right: 12px;
+            color: var(--zaui-text);
           }
 
           .pro-layout-open-menu-lv1 {
             h2 {
-              color      : var(--zaui-text);
+              padding-right: 26px;
+              color: var(--zaui-text);
               font-weight: 500;
             }
           }
@@ -53,19 +60,19 @@
           &.pro-layout-icon-empty {
             display: none;
 
-            &~h2 {
+            & ~ h2 {
               margin-left: var(--zaui-space-size-md, 16px);
             }
           }
         }
 
         .pro-layout-icon {
-          fill : currentColor;
           color: var(--zaui-text, #343434) !important;
+          fill: currentColor;
         }
 
         &.@{ant-prefix}-menu-sub {
-          overflow  : hidden;
+          overflow: hidden;
           background: #fff;
         }
 
@@ -74,8 +81,8 @@
 
         .@{ant-prefix}-menu-submenu-title:hover,
         .@{ant-prefix}-menu-item:hover {
+          color: #fff;
           background-color: #f2f2f2;
-          color           : #fff;
         }
 
         .@{ant-prefix}-menu-item {
@@ -87,15 +94,13 @@
         }
 
         .@{ant-prefix}-menu-submenu-title,
-        &.@{ant-prefix}-menu-root>.@{ant-prefix}-menu-item-only-child,
-        &.@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline>.@{ant-prefix}-menu-item {
-          padding-top   : 10px;
+        &.@{ant-prefix}-menu-root > .@{ant-prefix}-menu-item-only-child,
+        &.@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline > .@{ant-prefix}-menu-item {
+          min-height: 40px;
+          padding-top: 10px;
           padding-bottom: 10px;
-          min-height    : 40px;
         }
       }
     }
   }
-
-
 }

package/lib/ProLayout/components/Layout/Menu/style/index.less

@@ -44,7 +44,7 @@
         display: inline-block;
         white-space: nowrap;
         opacity: 0;
-        transition: opacity 0.5s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.5s;
+        transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.3s;
       }
     }
   }
@@ -129,7 +129,7 @@
     width: 48px;
     height: 48px;
     background: #292f3b;
-    transition: all 0.25s ease;
+    transition: all 0.3s ease;
   }
 
   .pro-layout-menu .pro-layout-menu-collapsed:hover {

package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -15,11 +15,6 @@ export interface TitleListProps {
 }
 export interface ProCollapseProps {
     /**
-   * @description       折叠头部模式
-   * @default           default
-   */
-    mode?: 'default' | 'card';
-    /**
     * @description       折叠头部标题
     * @default           -
     */

package/lib/ProLayout/components/ProCollapse/index.js

@@ -30,13 +30,10 @@ var ProCollapse = function ProCollapse(props) {
     _props$folding = props.folding,
     folding = _props$folding === void 0 ? false : _props$folding,
     collapseProps = props.collapseProps,
-    _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'default' : _props$mode,
     collapsePanelProps = props.collapsePanelProps,
     className = props.className;
   var cls = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-collapse': true,
-    'pro-collapse-card': mode === 'card',
     'pro-collapse-level2': level === '2',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
     'pro-collapse-no-title': !title

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

@@ -2,29 +2,6 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-collapse {
-  
-  &.pro-collapse-card {
-    border-radius:  var(--zaui-border-radius, 8px);
-    &.pro-collapse-no-title{
-      .pro-collapse-content{
-        border-radius:  var(--zaui-border-radius, 8px) !important;
-      }
-    }
-    .@{ant-prefix}-collapse-header{
-      border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
-    }
-    .pro-collapse-content{
-      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
-      padding-bottom: var(--zaui-space-size-sm, 8px) !important;
-    }
-    .pro-collapse-panel{
-      .@{ant-prefix}-collapse-header{
-        border-radius: var(--zaui-border-radius, 8px) !important;
-      }
-   
-    }
-  }
-
 
   &.pro-collapse-no-title {
     .@{ant-prefix}-collapse-header {
@@ -51,7 +28,7 @@
   }
 
   .@{ant-prefix}-collapse-expand-icon {
-    color: #c5c7cd;
+    color: #999;
   }
 
   &.@{ant-prefix}-collapse-borderless
@@ -73,9 +50,11 @@
   }
 
   &.pro-collapse-level2 {
-    margin-bottom: 0;
+    margin-top: var(--zaui-space-size-md, 16px);
     background: var(--zaui-base-bg, #ffffff);
-
+    .pro-collapse-panel{
+      margin-bottom: 0;
+    }
     .@{ant-prefix}-collapse-header {
       padding: 0 !important;
       background: var(--zaui-base-bg, #ffffff);
@@ -163,13 +142,16 @@
   }
 
   &.pro-collapse-list {
+    .@{ant-prefix}-descriptions-view{
+      margin: 0 -8px;
+    }
     .@{ant-prefix}-descriptions-row > th,
     .@{ant-prefix}-descriptions-row > td {
       padding: var(--zaui-space-size-sm, 8px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
-        padding-left: var(--zaui-space-size-md, 16px);
+        padding-left: 20px;
       }
     }
 

package/lib/ProLayout/components/ProFooter/index.js

@@ -18,7 +18,7 @@ var ProFooter = function ProFooter(props) {
     className = props.className,
     children = props.children,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 101 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 99 : _props$zIndex,
     _props$sideDom = props.sideDom,
     sideDom = _props$sideDom === void 0 ? '.pro-layout-sider-nav' : _props$sideDom,
     _props$contentDom = props.contentDom,

package/lib/ProLayout/components/ProFooter/style/index.less

@@ -5,7 +5,7 @@
   position: fixed;
   right: 0;
   bottom: 0;
-  z-index: 101;
+  z-index: 98;
   width: 100%;
   padding: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
     var(--zaui-space-size-lg, 32px);

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -5,6 +5,7 @@
 .pro-header {
   padding: 16px 0 0 0 !important;
   background-color: var(--zaui-base-bg, #ffffff);
+  box-shadow: 2px 3px 8px 0px rgba(0, 55, 93, 0.1);
 
   &.pro-header-no-back.pro-header-has-describe {
     .pro-header-top {
@@ -216,7 +217,7 @@
   .pro-header-nav {
     position: relative;
     display: flex;
-    background: #f7f9fc;
+    background: #fafafa;
     border-top: 1px solid #f2f2f2;
 
     &.pro-header-nav-open {

package/lib/ProLayout/style/index.less

@@ -21,7 +21,76 @@
 
   // light模式
   &.pro-layout-light {
-    .pro-layout-menu-collapsed {
+
+    // pro-collapse折叠调整
+    .pro-collapse {
+      border-radius:  var(--zaui-border-radius, 8px);
+      &.@{ant-prefix}-collapse-borderless{
+        background: #fff;
+      }
+      &.pro-collapse-no-title{
+        .pro-collapse-content{
+          border-radius:  var(--zaui-border-radius, 8px) !important;
+          padding: var(--zaui-space-size-md, 16px);
+        }
+        .pro-header-no-describe{
+          padding: 0 !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;
+          }
+        }
+      }
+    
+      .pro-collapse-content{
+        border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+        padding: var(--zaui-space-size-md, 16px);
+       
+        .pro-form{
+          margin-bottom: 0;
+        }
+      }
+      &.pro-collapse-level2{
+        .pro-collapse-panel  .@{ant-prefix}-collapse-header{
+          background: #fff;
+        }
+        .pro-collapse-content{
+          padding-bottom: var(--zaui-border-radius, 8px);
+        }
+      }
+      
+      .pro-collapse-panel{
+        .@{ant-prefix}-collapse-header{
+          border-radius: var(--zaui-border-radius, 8px) !important;
+          background: #E4F2FE;
+        }
+     
+      }
+    }
+
+    // pro-header调整
+    .pro-header{
+      &.pro-header-no-describe{
+        padding: var(--zaui-space-size-md, 16px) !important;
+        .pro-header-top{
+          padding-bottom: 0;
+        }
+      }
+      &.pro-header-has-describe{
+        .pro-header-nav-open{
+          border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+        }
+      }
+      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+    }
+
+
+    .pro-layout-content {
+      padding: 0 var(--zaui-space-size-md, 16px);
+      background: #f3f5f8;
     }
 
     .pro-layout-menu-open,
@@ -129,7 +198,7 @@
     }
 
     .anticon-caret-down {
-      color: #cacaca !important;
+      color: #999 !important;
     }
 
     .pro-layout-row .pro-layout-menu {
@@ -145,6 +214,12 @@
 
     .pro-layout-open-menu .@{ant-prefix}-menu-title-content div h2 {
       color: var(--zaui-text, #343434);
+      padding-right: 26px;
+    }
+    .@{ant-prefix}-menu-item-only-child{
+      .@{ant-prefix}-menu-title-content div h2{
+        padding-right: 0;
+      }
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item:hover,
@@ -156,7 +231,8 @@
         position: absolute;
         left: var(--zaui-space-size-sm, 8px);
         width: calc(100% - 16px);
-        height: 38px;
+        min-height: 38px;
+        height: 80%;
         background-color: var(--zaui-brand, #006aff);
         border-radius: var(--zaui-border-radius, 8px);
         opacity: 0.08;
@@ -192,7 +268,7 @@
     margin-top: 48px;
     margin-left: 48px;
     padding: 0 var(--zaui-space-size-lg, 32px);
-    transition: all 0.3s ease-in-out;
+    transition: all 0.24s ease;
 
     &.pro-layout-has-notice {
       min-height: calc(100vh - 80px);

package/lib/style/theme/antd.less

@@ -673,7 +673,6 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      // background: #fff;
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.2-beta.6",
+  "version": "3.4.2-beta.8",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",