@zat-design/sisyphus-react 3.4.0 → 3.4.1-beta.1

package/lib/ProTable/style/index.less

@@ -3,53 +3,152 @@
 
 .pro-table {
   &.pro-table-bordered {
-    .@{ant-prefix}-table .@{ant-prefix}-table-thead>tr>th {
-      border-bottom: 1px solid #f0f0f0
+    .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
+      border-bottom: 1px solid #f0f0f0;
     }
 
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-content>table,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-header>table {
+    .@{ant-prefix}-table > .@{ant-prefix}-table-container > .@{ant-prefix}-table-content > table,
+    .@{ant-prefix}-table > .@{ant-prefix}-table-container > .@{ant-prefix}-table-header > table {
       border-top: 1px solid rgba(0, 0, 0, 0.06);
     }
 
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-content>table>thead>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-header>table>thead>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-body>table>thead>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-summary>table>thead>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-content>table>tbody>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-header>table>tbody>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-body>table>tbody>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-summary>table>tbody>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-content>table>tfoot>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-header>table>tfoot>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-body>table>tfoot>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-summary>table>tfoot>tr>th,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-content>table>tfoot>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-header>table>tfoot>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-body>table>tfoot>tr>td,
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container>.@{ant-prefix}-table-summary>table>tfoot>tr>td {
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-content
+      > table
+      > thead
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-header
+      > table
+      > thead
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-body
+      > table
+      > thead
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-summary
+      > table
+      > thead
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-content
+      > table
+      > tbody
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-header
+      > table
+      > tbody
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-body
+      > table
+      > tbody
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-summary
+      > table
+      > tbody
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-content
+      > table
+      > tfoot
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-header
+      > table
+      > tfoot
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-body
+      > table
+      > tfoot
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-summary
+      > table
+      > tfoot
+      > tr
+      > th,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-content
+      > table
+      > tfoot
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-header
+      > table
+      > tfoot
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-body
+      > table
+      > tfoot
+      > tr
+      > td,
+    .@{ant-prefix}-table
+      > .@{ant-prefix}-table-container
+      > .@{ant-prefix}-table-summary
+      > table
+      > tfoot
+      > tr
+      > td {
       border-right: 1px solid rgba(0, 0, 0, 0.06);
     }
 
-    .@{ant-prefix}-table .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-measure-row)>td {
+    .@{ant-prefix}-table
+      .@{ant-prefix}-table-tbody
+      > tr:not(.@{ant-prefix}-table-measure-row)
+      > td {
       border-bottom: 1px solid #f0f0f0;
     }
 
-    .@{ant-prefix}-table>.@{ant-prefix}-table-container {
+    .@{ant-prefix}-table > .@{ant-prefix}-table-container {
       border-left: 1px solid rgba(0, 0, 0, 0.06);
     }
   }
 
   .custom-column-btn {
-    display    : inline-flex;
+    display: inline-flex;
     align-items: center;
 
     &:hover,
     &:visited,
     &:focus {
-      color     : unset;
-      border    : 1px solid #d9d9d9;
+      color: unset;
       background: unset;
+      border: 1px solid #d9d9d9;
     }
 
     .anticon {
@@ -58,7 +157,8 @@
   }
 
   .@{ant-prefix}-table-tbody {
-    .@{ant-prefix}-table-cell-fix-left, .@{ant-prefix}-table-cell-fix-right {
+    .@{ant-prefix}-table-cell-fix-left,
+    .@{ant-prefix}-table-cell-fix-right {
       background: unset !important;
     }
   }
@@ -75,8 +175,8 @@
 
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;
-      background: var(--zaui-contract-bg, #fffaa1);
       padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+      background: var(--zaui-contract-bg, #fffaa1);
       border-radius: var(--zaui-border-radius, 4px);
     }
 
@@ -86,17 +186,15 @@
   }
 
   .copyable-table-cell {
-
-
     .@{ant-prefix}-typography {
+      display: flex;
+      align-items: center;
       margin-bottom: 0;
-      display      : flex;
-      align-items  : center;
     }
 
     .drag-icon {
-      &>div {
-        display    : flex;
+      & > div {
+        display: flex;
         align-items: center;
       }
     }
@@ -108,15 +206,18 @@
     }
 
     svg {
-      width  : 14px;
-      height : 14px;
-      fill   : #3f3f3f;
       display: inline-block;
+      width: 16px;
+      height: 16px;
+      fill: var(--zaui-brand, #006aff);
     }
   }
 
   &.pro-table-no-stripe {
-    .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(n)>td {
+    .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal
+      .@{ant-prefix}-table-tbody
+      .@{ant-prefix}-table-row:nth-child(n)
+      > td {
       background: var(--zaui-base-bg, #ffffff);
     }
   }
@@ -124,10 +225,9 @@
   .@{ant-prefix}-table-thead {
     .@{ant-prefix}-dropdown-trigger {
       &.@{ant-prefix}-dropdown-open {
-
         .anticon-down {
+          transform: rotateZ(180deg);
           transition: transform 0.3s;
-          transform : rotateZ(180deg);
         }
       }
     }
@@ -137,12 +237,12 @@
     position: relative;
 
     .pro-table-resizable-line {
-      position   : absolute;
-      width      : 0;
-      top        : 0;
+      position: absolute;
+      top: 0;
+      left: 100px;
+      width: 0;
+      height: 100%;
       border-left: 1px solid var(--zaui-brand, #006aff);
-      height     : 100%;
-      left       : 100px;
     }
   }
 
@@ -169,22 +269,21 @@
   }
 
   .column-config {
-    display        : flex;
+    display: flex;
     justify-content: space-between;
-    margin-bottom  : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
     .right-actions {
-      display    : flex;
+      display: flex;
       align-items: center;
 
-      >.@{ant-prefix}-btn {
-
+      > .@{ant-prefix}-btn {
         &:hover,
         &:visited,
         &:focus {
-          color     : unset;
-          border    : 1px solid #d9d9d9;
+          color: unset;
           background: unset;
+          border: 1px solid #d9d9d9;
         }
       }
 
@@ -209,15 +308,15 @@
     }
   }
 
-  .@{ant-prefix}-table .@{ant-prefix}-table-thead>tr>th {
+  .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
+    white-space: nowrap;
+    background: var(--zaui-table-header-bg, #f2f3f5);
     border-bottom: 0;
-    white-space  : nowrap;
-    background   : var(--zaui-table-header-bg, #f2f3f5);
 
     .pro-table-th-cell {
-      width        : 100%;
-      overflow     : hidden;
-      white-space  : nowrap;
+      width: 100%;
+      overflow: hidden;
+      white-space: nowrap;
       text-overflow: ellipsis;
     }
 
@@ -232,20 +331,19 @@
     }
 
     .pro-table-tooltip {
-      display    : inline-flex;
+      display: inline-flex;
       align-items: center;
 
       .icon-tip {
-
         div {
-          width : 14px;
+          width: 14px;
           height: 14px;
 
           svg {
+            width: 14px;
+            height: 14px;
             margin-left: 8px;
-            width      : 14px;
-            height     : 14px;
-            fill       : #909090;
+            fill: #909090;
           }
         }
       }
@@ -253,15 +351,15 @@
   }
 
   .@{ant-prefix}-table.@{ant-prefix}-table-bordered {
-    .@{ant-prefix}-table-thead>tr>th {
+    .@{ant-prefix}-table-thead > tr > th {
       border-bottom: 1px solid #f0f0f0;
     }
 
-    .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-placeholder)>td {
+    .@{ant-prefix}-table-tbody > tr:not(.@{ant-prefix}-table-placeholder) > td {
       border-bottom: 1px solid #f0f0f0;
     }
 
-    .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-measure-row)>td {
+    .@{ant-prefix}-table-tbody > tr:not(.@{ant-prefix}-table-measure-row) > td {
       border-bottom: 1px solid #f0f0f0;
     }
   }
@@ -270,16 +368,16 @@
     background: var(--zaui-base-bg, #ffffff) !important;
   }
 
-  .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-placeholder)>td {
+  .@{ant-prefix}-table-tbody > tr:not(.@{ant-prefix}-table-placeholder) > td {
     border-bottom: 0;
   }
 
-  .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-measure-row)>td {
+  .@{ant-prefix}-table-tbody > tr:not(.@{ant-prefix}-table-measure-row) > td {
     border-bottom: 0;
   }
 
   .react-resizable {
-    position       : relative;
+    position: relative;
     background-clip: padding-box;
 
     .@{ant-prefix}-table-filter-trigger {
@@ -289,51 +387,51 @@
 
   .react-resizable-handle {
     position: absolute;
-    right   : -5px;
-    bottom  : 0;
-    z-index : 1;
-    width   : 10px;
-    height  : 100%;
-    cursor  : col-resize;
+    right: -5px;
+    bottom: 0;
+    z-index: 1;
+    width: 10px;
+    height: 100%;
+    cursor: col-resize;
 
     &::before {
-      content   : '';
-      position  : absolute;
-      left      : 50%;
-      top       : 50%;
-      width     : 1px;
-      height    : 18px;
-      background: #DCDCDC;
-      transform : translateY(-50%);
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 1px;
+      height: 18px;
+      background: #dcdcdc;
+      transform: translateY(-50%);
+      content: '';
     }
 
     &.active::before,
     &:hover::before {
-      content    : '';
-      position   : absolute;
-      left       : 50%;
-      height     : 100%;
-      bottom     : 0;
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      height: 100%;
       border-left: 5px solid var(--zaui-brand, #006aff);
+      content: '';
     }
   }
 
   .@{ant-prefix}-table-tbody tr td .@{ant-prefix}-checkbox-wrapper-checked.checkbox-disabled {
+    cursor: not-allowed;
+    opacity: 0.5;
     pointer-events: none;
-    cursor        : not-allowed;
-    opacity       : 0.5;
   }
 
   .@{ant-prefix}-pagination-options-quick-jumper input {
-    border    : unset;
-    background: #FAFAFA;
-    min-width : 32px;
-    height    : 32px;
+    min-width: 32px;
+    height: 32px;
+    background: #fafafa;
+    border: unset;
   }
 
   .@{ant-prefix}-pagination .@{ant-prefix}-pagination-item-active a {
-    color        : #ffffff;
-    background   : var(--zaui-brand, #006aff) !important;
+    color: #ffffff;
+    background: var(--zaui-brand, #006aff) !important;
     border-radius: var(--zaui-border-radius, 4px);
   }
 
@@ -351,16 +449,15 @@
     background-color: var(--zaui-table-header-bg, #f2f3f5);
 
     .@{ant-prefix}-table-cell {
-      font-weight     : 500;
+      font-weight: 500;
       background-color: var(--zaui-table-header-bg, #f2f3f5);
-      border          : none;
+      border: none;
     }
   }
 }
 
 .@{ant-prefix}-dropdown-placement-bottomLeft {
   .@{ant-prefix}-dropdown-menu-vertical.@{ant-prefix}-dropdown-menu-light {
-
     .@{ant-prefix}-dropdown-menu-item-only-child {
       &:hover {
         background: rgba(0, 106, 255, 0.08);

package/lib/ProTable/utils.js

@@ -215,7 +215,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var realCode = typeof code === 'function' ? code() : code;
+      var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');

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

@@ -249,9 +249,9 @@ var PrdTools = function PrdTools(_ref) {
             setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
               zauiStripe: value
             }));
-            (0, _index.setTableNoStripe)(value);
             (0, _index.setThemes)({
-              'zaui-stripe': value
+              'zaui-stripe': value,
+              'zaui-table-strip-bg': value ? '#fafafa' : '#ffffff'
             });
           }
         })

package/lib/ProThemeTools/index.js

@@ -157,7 +157,9 @@ var ProThemeTools = function ProThemeTools(_ref) {
   }, [zauiBrand]);
   // 斑马纹设置
   (0, _react.useEffect)(function () {
-    (0, _index.setTableNoStripe)(zauiStripe, prefixCls);
+    (0, _index.setThemes)({
+      'zaui-table-strip-bg': zauiStripe ? '#fafafa' : '#ffffff'
+    });
   }, [zauiStripe]);
   // 表格边框设置
   (0, _react.useEffect)(function () {

package/lib/ProTreeModal/components/SortableItem.js

@@ -10,10 +10,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
-var _reactSvg = require("react-svg");
+var _ProIcon = _interopRequireDefault(require("../../ProIcon"));
 var _index = require("../../index");
-var _disabled = _interopRequireDefault(require("../../assets/disabled.svg"));
-var _drag = _interopRequireDefault(require("../../assets/drag.svg"));
 var SortableItem = function SortableItem(props) {
   var drag = props.drag,
     label = props.label,
@@ -49,12 +47,12 @@ var SortableItem = function SortableItem(props) {
       onClose: function onClose(e) {
         return _onClose(e);
       },
-      children: [drag ? item.disabled || disabled ? (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+      children: [drag ? item.disabled || disabled ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         className: "disabled-icon",
-        src: _disabled.default
-      }) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)({
+        type: "lock"
+      }) : (0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
         className: "drag-icon",
-        src: _drag.default
+        type: "drag"
       }, listeners)) : null, (0, _jsxRuntime.jsx)(_index.ProTooltip, {
         mode: "auto",
         line: 1,

package/lib/ProTreeModal/style/index.less

@@ -240,12 +240,6 @@
       border: none;
       border-radius: var(--zaui-border-radius, 4px);
 
-      .drag-icon {
-        height: 20px;
-        margin-right: var(--zaui-space-size-xs, 4px);
-        cursor: move;
-      }
-
       .pro-tooltip {
         flex: 1;
         max-width: calc(100% - 42px);

package/lib/style/core/mixins.less

@@ -2,8 +2,8 @@
 .clearfix() {
   &:before,
   &:after {
-    content: ' ';
     display: table;
+    content: ' ';
   }
 
   &:after {
@@ -14,8 +14,8 @@
 // 水平居中
 .center-block() {
   display: block;
-  margin-left: auto;
   margin-right: auto;
+  margin-left: auto;
 }
 
 // 尺码助手
@@ -30,17 +30,17 @@
 
 // 可调整大小的文本区域
 .resizable(@direction: both) {
-  // Options: horizontal, vertical, both
-  resize: @direction;
   // Safari fix
   overflow: auto;
+  // Options: horizontal, vertical, both
+  resize: @direction;
 }
 
 // 截断文本
 .text-truncate() {
   overflow: hidden;
-  text-overflow: ellipsis;
   white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 // mixins函数
@@ -68,3 +68,10 @@
 .set-sm-text-size() {
   font-size: calc(@zaui-font-size - 2px);
 }
+
+.pro-icon.drag-icon {
+  // height: 20px;
+  // width: 20px;
+  margin-right: var(--zaui-space-size-xs, 4px);
+  cursor: move;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.0",
+  "version": "3.4.1-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",