@zat-design/sisyphus-react 3.4.2 → 3.4.3

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 {
@@ -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/lib/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/lib/ProStep/components/Item/index.js

@@ -30,7 +30,8 @@ var _default = exports.default = function _default(_ref) {
     id: id,
     children: !register || collapse && collapseItem && title ? (0, _jsxRuntime.jsx)(_ProCollapse.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       id: id,
-      title: title
+      title: title,
+      icon: true
     }, restProps), {}, {
       children: children
     })) : children

package/lib/ProStep/style/index.less

@@ -6,37 +6,38 @@
 }
 
 .pro-step {
-  position        : fixed;
-  right           : 0;
-  z-index         : 101;
-  min-width       : 48px;
-  min-height      : 48px;
-  text-align      : center;
-  background-color: var(--zaui-global-bg, #fff);
-  cursor          : pointer;
-  box-shadow      : -1px 0px 5px 0px var(--zaui-shadow, rgba(56,56,56,0.15));
-  transition      : width .2s;
+  position: fixed;
+  right: 0;
+  z-index: 101;
+  min-width: 48px;
+  min-height: 48px;
   overflow-x: hidden;
   overflow-y: auto;
-
-  >.step-menu {
-    display      : flex;
-    align-items  : center;
-    width        : 100%;
-    height       : 48px;
-    font-size    : var(--zaui-font-size-lg, 16px);
+  text-align: center;
+  background-color: var(--zaui-global-bg, #fff);
+  border-radius: 0 0 var(--zaui-border-radius) var(--zaui-border-radius);
+  box-shadow: -1px 0px 5px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
+  cursor: pointer;
+  transition: width 0.2s;
+
+  > .step-menu {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 48px;
+    font-size: var(--zaui-font-size-lg, 16px);
     border-bottom: 1px solid var(--zaui-line, #dddddd);
 
-    >.menu-icon {
+    > .menu-icon {
       font-size: var(--zaui-font-size-lg-title, 24px);
-      fill     : var(--zaui-brand, #006AFF);
+      fill: var(--zaui-brand, #006aff);
 
-      >div {
-        width          : 48px;
-        height         : 24px;
-        display        : flex;
-        align-items    : center;
+      > div {
+        display: flex;
+        align-items: center;
         justify-content: center;
+        width: 48px;
+        height: 24px;
       }
     }
   }
@@ -50,12 +51,12 @@
   }
 
   .com-menu-item {
-    display        : flex;
-    align-items    : center;
+    display: flex;
+    align-items: center;
     justify-content: space-between;
-    width          : 100%;
-    height         : 48px;
-    padding-right  : var(--zaui-space-size-md, 24px);
+    width: 100%;
+    height: 48px;
+    padding-right: var(--zaui-space-size-md, 24px);
 
     &:hover {
       background-color: rgba(185, 185, 189, 0.1);
@@ -69,63 +70,63 @@
       }
     }
 
-    >.menu-item {
-      display    : flex;
+    > .menu-item {
+      display: flex;
       align-items: center;
 
-      >.menu-icon {
-        display        : flex;
-        align-items    : center;
+      > .menu-icon {
+        display: flex;
+        align-items: center;
         justify-content: center;
-        width          : 48px;
-        height         : 100%;
+        width: 48px;
+        height: 100%;
 
-        >svg {
-          fill: var(--zaui-brand, #006AFF);
+        > svg {
+          fill: var(--zaui-brand, #006aff);
         }
 
-        >.dot {
-          width        : 6px;
-          height       : 6px;
-          background   : var(--zaui-brand, #006AFF);
+        > .dot {
+          width: 6px;
+          height: 6px;
+          background: var(--zaui-brand, #006aff);
           border-radius: 3px;
 
           &.errored {
             background: #ff5050;
-            fill      : #ff5050;
+            fill: #ff5050;
           }
 
           &.disabled {
             background: #939599;
-            fill      : #939599;
+            fill: #939599;
           }
         }
 
         .dot-icon {
-          display        : flex;
-          align-items    : center;
+          display: flex;
+          align-items: center;
           justify-content: center;
-          font-size      : var(--zaui-font-size-sm, 12px);
-          color          : #ffffff;
-          width          : 18px;
-          height         : 18px;
-          background     : var(--zaui-brand, #006AFF);
-          border-radius  : 9px;
+          width: 18px;
+          height: 18px;
+          color: #ffffff;
+          font-size: var(--zaui-font-size-sm, 12px);
+          background: var(--zaui-brand, #006aff);
+          border-radius: 9px;
 
           &.errored {
             background: #ff5050;
-            fill      : #ff5050;
+            fill: #ff5050;
           }
 
           &.disabled {
             background: #939599;
-            fill      : #939599;
+            fill: #939599;
           }
         }
       }
 
-      >.menu-name {
-        color: #0A0A0A;
+      > .menu-name {
+        color: #0a0a0a;
 
         &.disabled {
           color: #626366;
@@ -133,26 +134,26 @@
       }
     }
 
-    >.checked-status {
+    > .checked-status {
       height: 18px;
 
-      >svg {
-        fill: var(--zaui-brand, #006AFF);
+      > svg {
+        fill: var(--zaui-brand, #006aff);
       }
 
       .errorDot {
-        display        : flex;
-        align-items    : center;
+        display: flex;
+        align-items: center;
         justify-content: center;
-        width          : 16px;
-        height         : 16px;
-        background     : rgba(255, 80, 80, 0.2);
-        border-radius  : 8px;
-
-        >span {
-          color        : #ff5050;
-          font-weight  : 600;
-          font-size    : var(--aui-font-size-sm, 12px);
+        width: 16px;
+        height: 16px;
+        background: rgba(255, 80, 80, 0.2);
+        border-radius: 8px;
+
+        > span {
+          color: #ff5050;
+          font-weight: 600;
+          font-size: var(--aui-font-size-sm, 12px);
           border-radius: 8px;
         }
       }

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -5,7 +5,7 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;

package/lib/ProTable/components/RenderColumn/index.js

@@ -22,10 +22,10 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip;
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalTip) {
+    if (ellipsis || originalDiffTip) {
       if (ellipsis) {
         renderNode = (0, _jsxRuntime.jsx)(Text, {
           style: {
@@ -42,7 +42,7 @@ var RenderColumn = function RenderColumn(props) {
         style: {
           width: width
         },
-        title: originalTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
         children: renderNode

package/lib/ProTable/propsType.d.ts

@@ -26,7 +26,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {