@zat-design/sisyphus-react 3.4.2 → 3.4.3

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

@@ -1,5 +1,7 @@
 import "antd/es/descriptions/style";
 import _Descriptions from "antd/es/descriptions";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/collapse/style";
@@ -7,6 +9,9 @@ import _Collapse from "antd/es/collapse";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
+import { ReactSVG } from 'react-svg';
+import { isBoolean } from 'lodash';
+import foldSvg from '../../../assets/fold.svg';
 var Panel = _Collapse.Panel;
 var ProCollapse = function ProCollapse(props) {
   var title = props.title,
@@ -27,7 +32,8 @@ var ProCollapse = function ProCollapse(props) {
     folding = _props$folding === void 0 ? false : _props$folding,
     collapseProps = props.collapseProps,
     collapsePanelProps = props.collapsePanelProps,
-    className = props.className;
+    className = props.className,
+    icon = props.icon;
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -40,6 +46,7 @@ var ProCollapse = function ProCollapse(props) {
     children: children
   });
   var renderPanel = function renderPanel() {
+    var _title = title;
     if (level === '2') {
       var level2Panel = classNames({
         'pro-collapse-level2-collapse': towCollapse,
@@ -51,7 +58,7 @@ var ProCollapse = function ProCollapse(props) {
         hasCollapse.collapsible = 'disabled';
       }
       return _jsx(Panel, _objectSpread(_objectSpread(_objectSpread({
-        header: title,
+        header: _title,
         className: level2Panel,
         extra: _jsx("div", {
           className: "extra-info",
@@ -62,8 +69,20 @@ var ProCollapse = function ProCollapse(props) {
         children: content
       }), "1");
     }
+    if (icon) {
+      _title = _jsxs(_Space, {
+        size: 8,
+        align: "center",
+        children: [_jsx("div", {
+          className: "pro-collapse-icon",
+          children: isBoolean(icon) ? _jsx(ReactSVG, {
+            src: foldSvg
+          }) : icon
+        }), title]
+      });
+    }
     return _jsx(Panel, _objectSpread(_objectSpread({
-      header: title,
+      header: _title,
       className: "pro-collapse-panel",
       extra: _jsx("div", {
         className: "extra-info",

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

@@ -2,12 +2,23 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-collapse {
-  background: #f6f8fc;
+  .pro-collapse-icon{
+    max-width: 18px;
+    min-width: 16px;
+    img{
+      vertical-align: sub;
+    }
+  }
 
   &.pro-collapse-no-title {
     .@{ant-prefix}-collapse-header {
       display: none !important;
     }
+    .pro-collapse-level2{
+      .@{ant-prefix}-collapse-header {
+        display: block !important;
+      }
+    }
   }
 
   &.@{ant-prefix}-collapse {
@@ -29,7 +40,7 @@
   }
 
   .@{ant-prefix}-collapse-expand-icon {
-    color: #c5c7cd;
+    color: #999;
   }
 
   &.@{ant-prefix}-collapse-borderless
@@ -41,7 +52,6 @@
 
   .@{ant-prefix}-collapse-content-box {
     padding: 0;
-    background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
       padding: var(--zaui-space-size-md, 16px);
@@ -52,16 +62,17 @@
   }
 
   &.pro-collapse-level2 {
-    margin-bottom: 0;
     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);
 
       .@{ant-prefix}-collapse-header-text {
         position: relative;
-        padding-left: 12px;
+        padding-left: 15px;
         font-size: var(--zaui-font-size, 14px);
 
         &::before {
@@ -71,7 +82,7 @@
           width: 4px;
           height: 14px;
           background: var(--zaui-brand);
-          border-radius: var(--zaui-border-radius-card, 2px);
+          border-radius: var(--zaui-border-radius-card, 4px);
           transform: translateY(-50%);
           content: '';
         }
@@ -85,13 +96,17 @@
     }
 
     .pro-collapse-content {
-      padding-top: var(--zaui-space-size-sm, 8px) !important;
+      padding: var(--zaui-space-size-sm, 8px) 0 !important;
     }
 
     .pro-collapse-level2-collapse {
+      margin-bottom: var(--zaui-space-size-md, 16px);
+      &.@{ant-prefix}-collapse-item-active{
+        margin-bottom: 0;
+      }
       .@{ant-prefix}-collapse-header {
         padding: 0 8px 6px !important;
-        border-bottom: 2px solid #dee0e3;
+        border-bottom: 1px solid #dee0e3;
         margin: 0 -8px;
         .@{ant-prefix}-collapse-arrow{
           right: 8px;
@@ -142,13 +157,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: 23px;
       }
     }
 
@@ -163,7 +181,7 @@
           width: 4px;
           height: 14px;
           background: var(--zaui-brand);
-          border-radius: var(--zaui-border-radius-card, 2px);
+          border-radius: var(--zaui-border-radius-card, 4px);
           transform: translateY(-50%);
           content: '';
         }

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 {
@@ -88,7 +89,7 @@
     line-height: 16px;
     white-space: pre;
     background: var(--ant-primary-1, #e6f4ff);
-    border-radius: var(--zaui-border-radius-card, 2px);
+    border-radius: var(--zaui-border-radius-card, 4px);
   }
 
   .pro-header-title {
@@ -101,11 +102,11 @@
   &.pro-header-fixed {
     position: sticky;
     z-index: 101;
-    box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+    box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
   }
 
   &.pro-header-shadow {
-    box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+    box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
   }
 
   .@{ant-prefix}-breadcrumb {
@@ -184,7 +185,7 @@
             font-style: initial;
             line-height: 24px;
             background: var(--ant-primary-1, #e6f4ff);
-            border-radius: var(--zaui-border-radius, 4px);
+            border-radius: var(--zaui-border-radius, 8px);
           }
 
           &.hidden {
@@ -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

@@ -1,16 +1,15 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
-@import "../components/Layout/index.less";
-@import "../components/ProCollapse/style/index.less";
-@import "../components/ProFooter/style/index.less";
-@import "../components/ProHeader/style/index.less";
-
+@import '../components/Layout/index.less';
+@import '../components/ProCollapse/style/index.less';
+@import '../components/ProFooter/style/index.less';
+@import '../components/ProHeader/style/index.less';
 
 .pro-layout {
-  display       : flex;
+  display: flex;
   flex-direction: column;
-  background    : var(--zaui-base-bg, #ffffff);
+  background: var(--zaui-base-bg, #ffffff);
 
   .pro-layout-menu-open {
     .pro-layout-open-menu-lv1 {
@@ -23,6 +22,76 @@
   // light模式
   &.pro-layout-light {
 
+    // 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-space-size-sm, 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,
     .pro-layout-menu {
@@ -30,80 +99,92 @@
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-title-content div .pro-layout-icon {
-      color   : var(--zaui-text, #343434);
       position: relative;
-      z-index : 1;
+      z-index: 1;
+      color: var(--zaui-text, #343434);
     }
-
-    .pro-layout-menu-fold-list {
-      li {
-        position: relative;
-
-        &>div {
+    .pro-layout-menu-fold {
+      .pro-layout-menu-fold-list {
+        border-right: 1px solid #f0f0f0;
+        li {
           position: relative;
-          z-index : 1;
-        }
 
-        &.active {
-          background: transparent;
-
-          div .pro-layout-icon {
-            color: #fff;
+          & > div {
+            position: relative;
+            z-index: 1;
           }
 
-          &::before {
-            content         : '';
-            border-radius   : var(--zaui-border-radius, 4px);
-            background-color: var(--zaui-brand, #006aff);
-            height          : 38px;
-            position        : absolute;
-            left            : 5px;
-            top             : 4px;
-            width           : calc(100% - 10px);
-            opacity         : 1 !important;
+          &.active {
+            background: transparent;
+            border-radius: var(--zaui-border-radius, 8px);
+
+            div .pro-layout-icon {
+              color: #fff;
+            }
+
+            &::before {
+              position: absolute;
+              top: 4px;
+              left: 5px;
+              width: calc(100% - 10px);
+              height: 38px;
+              background-color: var(--zaui-brand, #006aff);
+              border-radius: var(--zaui-border-radius, 8px);
+              opacity: 1 !important;
+              content: '';
+            }
           }
-        }
 
-        &:hover {
-          background: transparent;
-
-          &::before {
-            content         : '';
-            border-radius   : var(--zaui-border-radius, 4px);
-            background-color: var(--zaui-brand, #006aff);
-            height          : 38px;
-            position        : absolute;
-            left            : 5px;
-            top             : 4px;
-            width           : calc(100% - 10px);
-            opacity         : 0.08;
+          &:hover {
+            background: transparent;
+
+            &::before {
+              position: absolute;
+              top: 4px;
+              left: 5px;
+              width: calc(100% - 10px);
+              height: 38px;
+              background-color: var(--zaui-brand, #006aff);
+              border-radius: var(--zaui-border-radius, 8px);
+              opacity: 0.08;
+              content: '';
+            }
           }
 
-        }
-
-        div .pro-layout-icon {
-          color: var(--zaui-text, #343434);
+          div .pro-layout-icon {
+            color: var(--zaui-text, #343434);
+          }
         }
       }
     }
 
-
-    .pro-layout-menu-fold-list li.active {
-      border-radius: var(--zaui-border-radius, 4px);
-    }
-
     .pro-layout-menu-collapsed {
       position: relative;
+      background: var(--zaui-base-bg, #fff);
+      border-right: 1px solid #f0f0f0;
+      &:hover {
+        background: transparent !important;
+      }
+      &:hover::after {
+        position: absolute;
+        top: 5px;
+        left: 5px;
+        width: calc(100% - 10px);
+        height: 40px;
+        background-color: var(--zaui-brand, #006aff);
+        border-radius: var(--zaui-border-radius, 8px);
+        opacity: 0.08;
+        content: '';
+      }
 
       &::before {
-        content   : '';
-        height    : 1px;
-        background: #DEE0E3;
-        width     : calc(100% - 16px);
-        position  : absolute;
-        top       : 0;
-        left      : var(--zaui-space-size-sm, 8px);
-
+        position: absolute;
+        top: 0;
+        left: var(--zaui-space-size-sm, 8px);
+        width: calc(100% - 16px);
+        height: 1px;
+        background: #dee0e3;
+        content: '';
       }
     }
 
@@ -112,49 +193,56 @@
         border-color: var(--zaui-text, #343434);
       }
     }
-
-    .pro-layout-menu-collapsed {
-      background: var(--zaui-base-bg, #fff);
-    }
-
     .@{ant-prefix}-menu-root {
       overflow-x: hidden !important;
     }
 
     .anticon-caret-down {
-      color: #CACACA !important;
+      color: #999 !important;
     }
 
     .pro-layout-row .pro-layout-menu {
       background: var(--zaui-base-bg, #ffffff);
     }
 
-    .pro-layout-open-menu .@{ant-prefix}-menu-root>.@{ant-prefix}-menu-submenu .@{ant-prefix}-menu-sub {
+    .pro-layout-open-menu
+      .@{ant-prefix}-menu-root
+      > .@{ant-prefix}-menu-submenu
+      .@{ant-prefix}-menu-sub {
       background: var(--zaui-base-bg, #ffffff);
     }
 
     .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: 16px;
+      }
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item:hover,
-    .pro-layout-open-menu .@{ant-prefix}-menu-submenu-title:hover {
+    .pro-layout-open-menu .@{ant-prefix}-menu-submenu-title:hover,
+    .pro-layout-open-menu .@{ant-prefix}-menu-item-selected{
+      position: relative;
       background: transparent;
-      position  : relative;
 
       &:before {
-        content         : '';
-        border-radius   : var(--zaui-border-radius, 4px);
+        position: absolute;
+        left: var(--zaui-space-size-sm, 8px);
+        width: calc(100% - 16px);
+        min-height: 38px;
+        height: 80%;
         background-color: var(--zaui-brand, #006aff);
-        opacity         : 0.08;
-        height          : 38px;
-        position        : absolute;
-        left            : var(--zaui-space-size-sm, 8px);
-        width           : calc(100% - 16px);
+        border-radius: var(--zaui-border-radius, 8px);
+        opacity: 0.08;
+        content: '';
       }
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
+      padding-right: 16px;
       &::after {
         display: none;
       }
@@ -175,18 +263,18 @@
 
   /** 内容区 */
   .pro-layout-content {
-    flex       : auto;
+    z-index: 1;
+    flex: auto;
+    flex: auto;
+    min-height: calc(100vh - 48px);
+    margin-top: 48px;
     margin-left: 48px;
-    padding    : 0 var(--zaui-space-size-lg, 32px);
-    transition : all 0.3s ease-in-out;
-    z-index    : 1;
-    flex       : auto;
-    min-height : calc(100vh - 48px);
-    margin-top : 48px;
+    padding: 0 var(--zaui-space-size-lg, 32px);
+    transition: all 0.24s ease;
 
     &.pro-layout-has-notice {
-      margin-top: 80px;
       min-height: calc(100vh - 80px);
+      margin-top: 80px;
     }
   }
 
@@ -208,7 +296,7 @@
     }
   }
 
-  .pro-layout-header-pure+.pro-layout-row {
+  .pro-layout-header-pure + .pro-layout-row {
     .pro-layout-sider-new-nav {
       top: 0 !important;
     }

package/es/ProStep/components/Item/index.js

@@ -23,7 +23,8 @@ export default (function (_ref) {
     id: id,
     children: !register || collapse && collapseItem && title ? _jsx(ProCollapse, _objectSpread(_objectSpread({
       id: id,
-      title: title
+      title: title,
+      icon: true
     }, restProps), {}, {
       children: children
     })) : children