@zat-design/sisyphus-react 3.4.2-beta.2 → 3.4.2-beta.4

package/es/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.5s cubic-bezier(0.645, 0.045, 0.355, 1), color 0.5s;
       }
     }
   }
@@ -81,18 +79,18 @@
   }
 
   .pro-layout-menu {
-    position        : fixed;
-    top             : 48px;
-    left            : 0;
-    z-index         : 99;
-    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.25s 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/es/ProLayout/components/ProCollapse/style/index.less

@@ -17,6 +17,12 @@
       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;
+      }
+   
+    }
   }
 
 
@@ -106,7 +112,7 @@
     .pro-collapse-level2-collapse {
       .@{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;

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 {
@@ -22,7 +21,8 @@
 
   // light模式
   &.pro-layout-light {
-
+    .pro-layout-menu-collapsed {
+    }
 
     .pro-layout-menu-open,
     .pro-layout-menu {
@@ -30,80 +30,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, 8px);
-            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, 8px);
-            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, 8px);
-    }
-
     .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,24 +124,22 @@
         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: #cacaca !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);
     }
 
@@ -139,18 +149,18 @@
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item:hover,
     .pro-layout-open-menu .@{ant-prefix}-menu-submenu-title:hover {
+      position: relative;
       background: transparent;
-      position  : relative;
 
       &:before {
-        content         : '';
-        border-radius   : var(--zaui-border-radius, 8px);
+        position: absolute;
+        left: var(--zaui-space-size-sm, 8px);
+        width: calc(100% - 16px);
+        height: 38px;
         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: '';
       }
     }
 
@@ -175,18 +185,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.3s ease-in-out;
 
     &.pro-layout-has-notice {
-      margin-top: 80px;
       min-height: calc(100vh - 80px);
+      margin-top: 80px;
     }
   }
 
@@ -208,7 +218,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/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/es/ProTable/components/RenderColumn/index.js

@@ -18,10 +18,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 = _jsx(Text, {
           style: {
@@ -38,7 +38,7 @@ var RenderColumn = function RenderColumn(props) {
         style: {
           width: width
         },
-        title: originalTip ? _jsxs(_Fragment, {
+        title: originalDiffTip ? _jsxs(_Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
         children: renderNode

package/es/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 | {

package/es/ProTable/utils.js

@@ -57,8 +57,8 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalTip = column.originalTip,
-    originalTip = _column$originalTip === void 0 ? true : _column$originalTip;
+    _column$originalDiffT = column.originalDiffTip,
+    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -122,7 +122,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: renderValue,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -151,7 +151,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -203,7 +203,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -224,7 +224,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (precision || prefix || suffix) {
@@ -250,7 +250,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (valueType === 'address') {
@@ -322,7 +322,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
           node: value,
           value: value,
           currentValue: value || '-',
-          originalTip: originalTip
+          originalDiffTip: originalDiffTip
         }), suffixNode(value, record, index)]
       });
     };
@@ -344,7 +344,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: value || '-',
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   }

package/es/ProThemeTools/component/PrdTools/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const PrdTools: ({ onReset, onClose, setState, visible, state, tableBorder, tableStripe, prefixCls, }: DevToolsPropsType) => JSX.Element;
+declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, prefixCls, }: DevToolsPropsType) => JSX.Element;
 export default PrdTools;

package/es/ProThemeTools/component/PrdTools/index.js

@@ -24,7 +24,7 @@ var PrdTools = function PrdTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
-    visible = _ref.visible,
+    open = _ref.open,
     state = _ref.state,
     tableBorder = _ref.tableBorder,
     tableStripe = _ref.tableStripe,
@@ -68,7 +68,7 @@ var PrdTools = function PrdTools(_ref) {
     title: "".concat(locale.ProThemeTools.title),
     placement: "right",
     onClose: onClose,
-    open: visible,
+    open: open,
     closable: false,
     children: [_jsx("div", {
       className: "pro-drawer-close",