@zat-design/sisyphus-react 3.4.2 → 3.4.3

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

@@ -7,33 +7,36 @@
   .@{ant-prefix}-menu-root {
     overflow-y: auto !important;
 
-    &>.@{ant-prefix}-menu-submenu>.@{ant-prefix}-menu-submenu-title,
-    &>.@{ant-prefix}-menu-item.@{ant-prefix}-menu-item-only-child {
+    & > .@{ant-prefix}-menu-submenu > .@{ant-prefix}-menu-submenu-title,
+    & > .@{ant-prefix}-menu-item.@{ant-prefix}-menu-item-only-child {
       padding-left: 16px !important;
     }
 
-    &>.@{ant-prefix}-menu-submenu {
+    & > .@{ant-prefix}-menu-submenu {
       .@{ant-prefix}-menu-sub {
-        background: #1A202D;
+        background: #1a202d;
       }
 
-      &>.@{ant-prefix}-menu-sub>.@{ant-prefix}-menu-submenu>.@{ant-prefix}-menu-submenu-title,
-      &>.@{ant-prefix}-menu-item-only-child,
-      &>.@{ant-prefix}-menu-sub>.@{ant-prefix}-menu-item-only-child {
+      & > .@{ant-prefix}-menu-sub > .@{ant-prefix}-menu-submenu > .@{ant-prefix}-menu-submenu-title,
+      & > .@{ant-prefix}-menu-item-only-child,
+      & > .@{ant-prefix}-menu-sub > .@{ant-prefix}-menu-item-only-child {
         padding-left: 16px !important;
       }
     }
 
-    &>.@{ant-prefix}-menu-item-only-child {
-      min-height    : 48px;
-      padding-top   : 12px;
-      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) * var(--zaui-size; 1));
-      margin        : 0;
-      height        : auto;
+    & > .@{ant-prefix}-menu-item-only-child {
+      height: auto;
+      min-height: 48px;
+      margin: 0;
+      padding-top: 12px;
+      padding-bottom: calc(
+        var(--zaui-space-size-md; 16px) * var(--zaui-size; 1) - var(--zaui-space-size-xs; 4px) *
+          var(--zaui-size; 1)
+      );
 
       h2 {
+        height: auto !important;
         line-height: initial !important;
-        height     : auto !important;
         white-space: pre-wrap;
       }
     }
@@ -45,7 +48,6 @@
         display: none;
       }
     }
-
   }
 
   .@{ant-prefix}-menu-inline {
@@ -62,14 +64,12 @@
       h2 {
         color: #fff;
       }
-
     }
   }
 
-
   .@{ant-prefix}-menu.@{ant-prefix}-menu-dark {
-    background: #1A202D;
     overflow-x: hidden;
+    background: #1a202d;
 
     .@{ant-prefix}-menu-item-only-child {
       &:hover {
@@ -90,104 +90,107 @@
     }
   }
 
-  .@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline>.@{ant-prefix}-menu-item,
+  .@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline > .@{ant-prefix}-menu-item,
   .@{ant-prefix}-menu-submenu-title {
-    white-space: pre-wrap;
-    line-height: initial !important;
-    height     : auto !important;
-    margin     : 0;
+    height: auto !important;
+    min-height: 48px;
+    margin: 0;
     padding: 12px 0;
-    min-height : 48px;
+    line-height: initial !important;
+    white-space: pre-wrap;
   }
 
   .@{ant-prefix}-menu-title-content {
-
-
     div {
-      display        : flex;
-      align-items    : center;
+      display: flex;
+      align-items: center;
       justify-content: left;
 
       .pro-layout-icon {
-        flex  : 0 0 20px;
-        width : 20px;
+        flex: 0 0 20px;
+        width: 20px;
         height: 20px;
-        color : #CACACA;
+        color: #cacaca;
       }
 
       h2 {
-        flex-grow    : 1;
+        display: inline-block;
+        flex-grow: 1;
         margin-bottom: 0;
-        opacity      : 1;
-        transition   : opacity .3s cubic-bezier(.645, .045, .355, 1), margin .3s, color .3s;
-        display      : inline-block;
-        padding-left : 12px;
-        color        : #CACACA;
-        font-weight  : 400;
-        font-size    : var(--zaui-font-size-md, 14px);
+        padding-left: 12px;
+        color: #cacaca;
+        font-weight: 400;
+        font-size: var(--zaui-font-size-md, 14px);
+        opacity: 1;
+        transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), margin 0.3s, color 0.3s;
       }
     }
-
-
   }
 
   .anticon-caret-down {
-    color     : #CACACA;
-    transform : rotateZ(0deg);
-    top       : auto;
+    top: auto;
+    color: #cacaca;
+    transform: rotateZ(0deg);
     transition: all 0.1s ease-in;
   }
 
   .@{ant-prefix}-menu-submenu-open {
     .anticon-caret-down {
+      color: #fff;
       transform: rotateZ(180deg);
-      color    : #fff;
     }
 
     .@{ant-prefix}-menu-submenu-inline {
       .anticon-caret-down {
+        color: #cacaca;
         transform: rotateZ(0deg);
-        color    : #CACACA;
       }
 
       &.@{ant-prefix}-menu-submenu-open {
         .anticon-caret-down {
+          color: #fff;
           transform: rotateZ(180deg);
-          color    : #fff;
         }
       }
     }
   }
 
-  .@{ant-prefix}-menu-submenu:hover>.@{ant-prefix}-menu-submenu-title>.@{ant-prefix}-menu-submenu-expand-icon {
+  .@{ant-prefix}-menu-submenu:hover
+    > .@{ant-prefix}-menu-submenu-title
+    > .@{ant-prefix}-menu-submenu-expand-icon {
     color: #fff;
   }
 
+ .@{ant-prefix}-menu-item-selected{
+  .@{ant-prefix}-menu-title-content{
+    h2{
+      font-weight: bold !important;
+    }
+  }
+ }
+
   .@{ant-prefix}-menu-submenu-selected {
-    &>.@{ant-prefix}-menu-submenu-title {
+    & > .@{ant-prefix}-menu-submenu-title {
       .@{ant-prefix}-menu-title-content div {
         .pro-layout-icon {
           color: #fff;
         }
 
         h2 {
-          font-weight: bold;
-          color      : #fff;
+          color: #fff;
         }
       }
-
     }
 
     .@{ant-prefix}-menu-item-only-child .@{ant-prefix}-menu-title-content div {
       .pro-layout-icon {
-        color: #CACACA;
+        color: #cacaca;
       }
 
       h2 {
+        color: #cacaca;
         font-weight: 400;
-        color      : #CACACA;
       }
     }
-
   }
 }

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

@@ -1,36 +1,35 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
-@import "../FoldMenu/style/index.less";
-@import "../OpenMenu/style/index.less";
-@import "../SideMenu/style/index.less";
+@import '../FoldMenu/style/index.less';
+@import '../OpenMenu/style/index.less';
+@import '../SideMenu/style/index.less';
 
 /** 侧边栏 + 内容区 */
 .pro-layout-row {
   flex-direction: column;
 
-
   .pro-layout-menu-open {
-    .pro-layout-arrow  {
+    .pro-layout-arrow {
       transform: rotate(225deg);
     }
   }
 
   .pro-layout-arrow {
-    width           : 10px;
-    height          : 10px;
+    width: 10px;
+    height: 10px;
+    margin-left: -5px;
     background-color: transparent;
     /* 模块背景为透明 */
-    border-color    : #fff;
-    border-style    : solid;
-    border-width    : 2px 2px 0 0;
-    margin-left     : -5px;
-    transform       : rotate(45deg);
+    border-color: #fff;
+    border-style: solid;
+    border-width: 2px 2px 0 0;
+    transform: rotate(45deg);
   }
 
   &.pro-layout-menu-no-collapsed {
     .pro-layout-menu-fold-li {
-      display        : flex;
-      align-items    : center;
+      display: flex;
+      align-items: center;
       justify-content: center;
 
       div {
@@ -42,11 +41,10 @@
       }
 
       h2 {
-        display    : inline-block;
+        display: inline-block;
         white-space: nowrap;
-        opacity    : 0;
-        transition : opacity 0.5s cubic-bezier(0.645, 0.045, 0.355, 1),
-          color 0.5s;
+        opacity: 0;
+        transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.3s;
       }
     }
   }
@@ -81,18 +79,18 @@
   }
 
   .pro-layout-menu {
-    position        : fixed;
-    top             : 48px;
-    left            : 0;
-    z-index         : 1;
-    width           : 48px;
-    height          : 100vh;
-    min-height      : 100%;
-    padding         : 0;
-    overflow-x      : hidden;
-    overflow-y      : auto;
+    position: fixed;
+    top: 48px;
+    left: 0;
+    z-index: 99;
+    width: 48px;
+    height: 100vh;
+    min-height: 100%;
+    padding: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
     background-color: #1a202d;
-    transition      : background .3s, width .3s cubic-bezier(.2, 0, 0, 1) 0s;
+    transition: background 0.3s, width 0.3s cubic-bezier(0.2, 0, 0, 1) 0s;
 
     &.pro-layout-menu-open {
       width: 220px;
@@ -101,52 +99,50 @@
 
   /** 内容区 */
   .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-md, 16px);
-    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-md, 16px);
+    transition: all 0.3s ease-in-out;
   }
 
-
-
   .pro-layout-menu.pro-layout-menu-open .pro-layout-menu-collapsed {
-    left : 0;
-    width: 220px
+    left: 0;
+    width: 220px;
   }
 
   .pro-layout-menu.pro-layout-menu-open .pro-layout-menu-collapsed img {
-    transform: rotate(-180deg)
+    transform: rotate(-180deg);
   }
 
   .pro-layout-menu .pro-layout-menu-collapsed {
-    position       : fixed;
-    bottom         : 0;
-    left           : 0;
-    z-index        : 2;
-    display        : flex;
-    align-items    : center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 2;
+    display: flex;
+    align-items: center;
     justify-content: center;
-    width          : 48px;
-    height         : 48px;
-    transition     : all .25s ease;
-    background     : #292f3b
+    width: 48px;
+    height: 48px;
+    background: #292f3b;
+    transition: all 0.3s ease;
   }
 
   .pro-layout-menu .pro-layout-menu-collapsed:hover {
-    background-color: rgba(185, 185, 189, .1)
+    background-color: rgba(185, 185, 189, 0.1);
   }
 
   .pro-layout-menu .pro-layout-menu-collapsed img {
     display: inline-block;
-    width  : 20px;
-    height : 20px
+    width: 20px;
+    height: 20px;
   }
 
-  .pro-layout-menu-open~.pro-layout-content {
-    margin-left: 220px !important
+  .pro-layout-menu-open ~ .pro-layout-content {
+    margin-left: 220px !important;
   }
 }

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

@@ -20,6 +20,11 @@ export interface ProCollapseProps {
     */
     title?: string | React.ReactNode;
     /**
+   * @description       标题前图标
+   * @default           -
+   */
+    icon?: React.ReactNode | Boolean;
+    /**
     * @description       折叠头部多个标题
     * @default           []
     */

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

@@ -11,6 +11,9 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _reactSvg = require("react-svg");
+var _lodash = require("lodash");
+var _fold = _interopRequireDefault(require("../../../assets/fold.svg"));
 var Panel = _antd.Collapse.Panel;
 var ProCollapse = function ProCollapse(props) {
   var title = props.title,
@@ -31,7 +34,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 = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -44,6 +48,7 @@ var ProCollapse = function ProCollapse(props) {
     children: children
   });
   var renderPanel = function renderPanel() {
+    var _title = title;
     if (level === '2') {
       var level2Panel = (0, _classnames.default)({
         'pro-collapse-level2-collapse': towCollapse,
@@ -55,7 +60,7 @@ var ProCollapse = function ProCollapse(props) {
         hasCollapse.collapsible = 'disabled';
       }
       return (0, _jsxRuntime.jsx)(Panel, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-        header: title,
+        header: _title,
         className: level2Panel,
         extra: (0, _jsxRuntime.jsx)("div", {
           className: "extra-info",
@@ -66,8 +71,20 @@ var ProCollapse = function ProCollapse(props) {
         children: content
       }), "1");
     }
+    if (icon) {
+      _title = (0, _jsxRuntime.jsxs)(_antd.Space, {
+        size: 8,
+        align: "center",
+        children: [(0, _jsxRuntime.jsx)("div", {
+          className: "pro-collapse-icon",
+          children: (0, _lodash.isBoolean)(icon) ? (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+            src: _fold.default
+          }) : icon
+        }), title]
+      });
+    }
     return (0, _jsxRuntime.jsx)(Panel, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      header: title,
+      header: _title,
       className: "pro-collapse-panel",
       extra: (0, _jsxRuntime.jsx)("div", {
         className: "extra-info",

package/lib/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/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,