@zat-design/sisyphus-react 3.4.2-beta.3 → 3.4.2-beta.31

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,
@@ -26,13 +31,11 @@ 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;
+    className = props.className,
+    icon = props.icon;
   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
@@ -43,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,
@@ -54,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",
@@ -65,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,34 +2,23 @@
 @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-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 {
@@ -51,7 +40,7 @@
   }
 
   .@{ant-prefix}-collapse-expand-icon {
-    color: #c5c7cd;
+    color: #999;
   }
 
   &.@{ant-prefix}-collapse-borderless
@@ -73,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 {
@@ -106,10 +96,14 @@
     }
 
     .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: 1px solid #dee0e3;
@@ -163,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;
       }
     }
 

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 {
@@ -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 {
@@ -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-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,
@@ -129,7 +198,7 @@
     }
 
     .anticon-caret-down {
-      color: #cacaca !important;
+      color: #999 !important;
     }
 
     .pro-layout-row .pro-layout-menu {
@@ -145,10 +214,17 @@
 
     .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;
 
@@ -156,7 +232,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;
@@ -165,6 +242,7 @@
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
+      padding-right: 16px;
       &::after {
         display: none;
       }
@@ -192,7 +270,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/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

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