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

package/dist/index.esm.css

@@ -1784,18 +1784,18 @@
   margin-right: 0;
 }
 .pro-table .ant-table-cell-with-append {
-  white-space: nowrap;
   position: relative;
   z-index: 100;
+  white-space: nowrap;
 }
 .pro-table .ant-table-row-expand-icon {
   position: absolute;
   left: -16px;
 }
 .pro-table .ant-table-content > table .ant-table-summary {
-  background-color: var(--zaui-table-header-bg, #f2f3f5);
   color: var(--zaui-text, #343434);
   font-weight: 600;
+  background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
 .pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
 .pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
@@ -1807,26 +1807,26 @@
 .pro-table .ant-table-content > table td .pro-form-view-container_nowrap {
   white-space: normal;
 }
-.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not( .ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
   position: static;
   top: 0;
   display: inline-block;
-  text-indent: -8px;
   color: #ff5050;
   font-size: var(--zaui-font-size-md, 14px);
   line-height: 1;
-  content: "*";
+  text-indent: -8px;
+  content: '*';
 }
-.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
-  width: auto;
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not( .ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
   position: static;
   top: 0;
   display: inline-block;
+  width: auto;
   margin-left: var(--zaui-space-size-xs, 4px);
   color: #ff5050;
   font-size: 14px;
   line-height: 1;
-  content: "*";
+  content: '*';
 }
 .pro-table .drag-wrapper {
   display: -webkit-box;
@@ -1836,8 +1836,8 @@
   width: 20px;
 }
 .pro-table .drag-wrapper .anticon {
-  cursor: pointer;
   margin-right: 12px;
+  cursor: pointer;
 }
 .pro-table .drag-wrapper .anticon .drag-icon {
   margin-right: 0;
@@ -2147,9 +2147,6 @@
 .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
   background: rgba(0, 106, 255, 0.08);
 }
-.pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: right;
-}
 .pro-tooltip {
   cursor: pointer;
 }
@@ -4526,7 +4523,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
 }
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: right;
+  text-align: left;
+  padding-left: 52px;
 }
 .pro-edit-label {
   display: inline-block;

package/dist/less.esm.css

@@ -1784,18 +1784,18 @@
   margin-right: 0;
 }
 .pro-table .ant-table-cell-with-append {
-  white-space: nowrap;
   position: relative;
   z-index: 100;
+  white-space: nowrap;
 }
 .pro-table .ant-table-row-expand-icon {
   position: absolute;
   left: -16px;
 }
 .pro-table .ant-table-content > table .ant-table-summary {
-  background-color: var(--zaui-table-header-bg, #f2f3f5);
   color: var(--zaui-text, #343434);
   font-weight: 600;
+  background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
 .pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
 .pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
@@ -1807,26 +1807,26 @@
 .pro-table .ant-table-content > table td .pro-form-view-container_nowrap {
   white-space: normal;
 }
-.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not( .ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
   position: static;
   top: 0;
   display: inline-block;
-  text-indent: -8px;
   color: #ff5050;
   font-size: var(--zaui-font-size-md, 14px);
   line-height: 1;
-  content: "*";
+  text-indent: -8px;
+  content: '*';
 }
-.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
-  width: auto;
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not( .ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
   position: static;
   top: 0;
   display: inline-block;
+  width: auto;
   margin-left: var(--zaui-space-size-xs, 4px);
   color: #ff5050;
   font-size: 14px;
   line-height: 1;
-  content: "*";
+  content: '*';
 }
 .pro-table .drag-wrapper {
   display: -webkit-box;
@@ -1836,8 +1836,8 @@
   width: 20px;
 }
 .pro-table .drag-wrapper .anticon {
-  cursor: pointer;
   margin-right: 12px;
+  cursor: pointer;
 }
 .pro-table .drag-wrapper .anticon .drag-icon {
   margin-right: 0;
@@ -2147,9 +2147,6 @@
 .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
   background: rgba(0, 106, 255, 0.08);
 }
-.pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: right;
-}
 .pro-tooltip {
   cursor: pointer;
 }
@@ -4526,7 +4523,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
 }
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: right;
+  text-align: left;
+  padding-left: 52px;
 }
 .pro-edit-label {
   display: inline-block;

package/es/ProEditTable/style/index.less

@@ -327,6 +327,7 @@
 
 .pro-edit-table-drag {
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
+    text-align: left;
+    padding-left: 52px;
   }
 }

package/es/ProEditTable/utils/index.d.ts

@@ -6,4 +6,4 @@
  * @param columns 表格配置数据
  * @param config
  */
-export declare const transformColumns: (columns: any[], config: any) => any[];
+export declare const transformColumns: (columns: any[], config: any) => any;

package/es/ProEditTable/utils/index.js

@@ -13,28 +13,33 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { cloneDeep, isArray, isBoolean, isEqual } from 'lodash';
+import { cloneDeep, cloneDeepWith, isArray, isBoolean, isEqual } from 'lodash';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
 import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from './config';
-import { customValidate, getNamePath, splitNames, handleScrollToError } from './tools';
+import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeepFilterNode } from './tools';
 import ProTooltip from '../../ProTooltip';
 import { RenderField, ActionButton } from '../components';
 import tipSvg from '../../assets/tip.svg';
 import locale from '../../locale';
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
-  var disabled = config.disabled,
-    name = config.name,
-    form = config.form,
-    virtualKey = config.virtualKey,
-    validateKeys = config.validateKeys,
-    actionWidth = config.actionWidth,
-    actionProps = config.actionProps,
-    page = config.page,
-    rowDisabled = config.rowDisabled,
-    actionDirection = config.actionDirection;
+  var _cloneDeepWith = cloneDeepWith(config, function (value) {
+      if ( /*#__PURE__*/React.isValidElement(value)) {
+        return value;
+      }
+    }),
+    disabled = _cloneDeepWith.disabled,
+    name = _cloneDeepWith.name,
+    form = _cloneDeepWith.form,
+    virtualKey = _cloneDeepWith.virtualKey,
+    validateKeys = _cloneDeepWith.validateKeys,
+    actionWidth = _cloneDeepWith.actionWidth,
+    actionProps = _cloneDeepWith.actionProps,
+    page = _cloneDeepWith.page,
+    rowDisabled = _cloneDeepWith.rowDisabled,
+    actionDirection = _cloneDeepWith.actionDirection;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -195,7 +200,8 @@ export var transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = _toConsumableArray(columns);
+  var _columns = cloneDeepFilterNode(columns);
+  // 你的函数代码
   var _cacheMap = _objectSpread({}, cacheMap.current);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);

package/es/ProEditTable/utils/tools.d.ts

@@ -29,3 +29,9 @@ export declare const getDisabled: ({ globalControl, formDisabled, column, tabled
 /** 表格自动滚动到报错位置
  */
 export declare const handleScrollToError: () => void;
+/**
+ * 深copy一个对象，并过滤掉其中的React节点
+ * @param value 需要深拷贝的对象
+ * @returns 深拷贝后的对象，其中的React节点会被保留
+ */
+export declare function cloneDeepFilterNode(value: any): any;

package/es/ProEditTable/utils/tools.js

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { cloneDeep, isString, isObject, isEqual, transform, isFunction, isBoolean } from 'lodash';
+import React from 'react';
+import { cloneDeep, cloneDeepWith, isString, isObject, isEqual, transform, isFunction, isBoolean } from 'lodash';
 export var getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
@@ -182,4 +183,16 @@ export var handleScrollToError = function handleScrollToError() {
       }
     }
   }, 0);
-};
+};
+/**
+ * 深copy一个对象，并过滤掉其中的React节点
+ * @param value 需要深拷贝的对象
+ * @returns 深拷贝后的对象，其中的React节点会被保留
+ */
+export function cloneDeepFilterNode(value) {
+  return cloneDeepWith(value, function (val) {
+    if ( /*#__PURE__*/React.isValidElement(val)) {
+      return val;
+    }
+  });
+}

package/es/ProTable/style/index.less

@@ -2,17 +2,17 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-table {
-  &.pro-table-draggable-only{
-    .ant-table-tbody{
+  &.pro-table-draggable-only {
+    .ant-table-tbody {
       .anticon {
         margin-right: 0;
       }
     }
   }
   .@{ant-prefix}-table-cell-with-append {
-    white-space: nowrap;
     position: relative;
     z-index: 100;
+    white-space: nowrap;
   }
   .@{ant-prefix}-table-row-expand-icon {
     position: absolute;
@@ -20,16 +20,15 @@
   }
 
   .@{ant-prefix}-table-content {
-    >table {
+    > table {
       .@{ant-prefix}-table-summary {
+        color: var(--zaui-text, #343434);
+        font-weight: 600;
         background-color: var(--zaui-table-header-bg, #f2f3f5);
-        color           : var(--zaui-text, #343434);
-        font-weight     : 600;
 
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-
         }
       }
 
@@ -43,33 +42,37 @@
         }
       }
 
-      .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
+      .@{ant-prefix}-table-thead
+        > tr
+        > th:not(.@{ant-prefix}-table-selection-column):not(
+          .@{ant-prefix}-table-row-expand-icon-cell
+        ):not([colspan]).is-required {
         &.is-required-right {
           .pro-edit-table-title {
             &::before {
-              position   : static;
-              top        : 0;
-              display    : inline-block;
-              text-indent: -8px;
-              color      : #ff5050;
-              font-size  : var(--zaui-font-size-md, 14px);
+              position: static;
+              top: 0;
+              display: inline-block;
+              color: #ff5050;
+              font-size: var(--zaui-font-size-md, 14px);
               line-height: 1;
-              content    : "*";
+              text-indent: -8px;
+              content: '*';
             }
           }
         }
         &.is-required-left {
           .pro-edit-table-title {
             &::after {
+              position: static;
+              top: 0;
+              display: inline-block;
               width: auto;
-              position   : static;
-              top        : 0;
-              display    : inline-block;
               margin-left: var(--zaui-space-size-xs, 4px);
-              color      : #ff5050;
-              font-size  : 14px;
+              color: #ff5050;
+              font-size: 14px;
               line-height: 1;
-              content    : "*";
+              content: '*';
             }
           }
         }
@@ -80,9 +83,9 @@
     display: flex;
     width: 20px;
     .anticon {
-      cursor: pointer;
       margin-right: 12px;
-      .drag-icon{
+      cursor: pointer;
+      .drag-icon {
         margin-right: 0;
       }
     }
@@ -93,8 +96,6 @@
     }
   }
 
-
-
   &.pro-table-bordered {
     .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
       border-bottom: 1px solid #f0f0f0;
@@ -557,10 +558,4 @@
       }
     }
   }
-}
-
-.pro-edit-table-drag {
-  table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
-  }
-}
+}

package/lib/ProEditTable/style/index.less

@@ -327,6 +327,7 @@
 
 .pro-edit-table-drag {
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
+    text-align: left;
+    padding-left: 52px;
   }
 }

package/lib/ProEditTable/utils/index.d.ts

@@ -6,4 +6,4 @@
  * @param columns 表格配置数据
  * @param config
  */
-export declare const transformColumns: (columns: any[], config: any) => any[];
+export declare const transformColumns: (columns: any[], config: any) => any;

package/lib/ProEditTable/utils/index.js

@@ -29,16 +29,21 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
-  var disabled = config.disabled,
-    name = config.name,
-    form = config.form,
-    virtualKey = config.virtualKey,
-    validateKeys = config.validateKeys,
-    actionWidth = config.actionWidth,
-    actionProps = config.actionProps,
-    page = config.page,
-    rowDisabled = config.rowDisabled,
-    actionDirection = config.actionDirection;
+  var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, function (value) {
+      if ( /*#__PURE__*/_react.default.isValidElement(value)) {
+        return value;
+      }
+    }),
+    disabled = _cloneDeepWith.disabled,
+    name = _cloneDeepWith.name,
+    form = _cloneDeepWith.form,
+    virtualKey = _cloneDeepWith.virtualKey,
+    validateKeys = _cloneDeepWith.validateKeys,
+    actionWidth = _cloneDeepWith.actionWidth,
+    actionProps = _cloneDeepWith.actionProps,
+    page = _cloneDeepWith.page,
+    rowDisabled = _cloneDeepWith.rowDisabled,
+    actionDirection = _cloneDeepWith.actionDirection;
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -199,7 +204,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = (0, _toConsumableArray2.default)(columns);
+  var _columns = (0, _tools.cloneDeepFilterNode)(columns);
+  // 你的函数代码
   var _cacheMap = (0, _objectSpread2.default)({}, cacheMap.current);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);

package/lib/ProEditTable/utils/tools.d.ts

@@ -29,3 +29,9 @@ export declare const getDisabled: ({ globalControl, formDisabled, column, tabled
 /** 表格自动滚动到报错位置
  */
 export declare const handleScrollToError: () => void;
+/**
+ * 深copy一个对象，并过滤掉其中的React节点
+ * @param value 需要深拷贝的对象
+ * @returns 深拷贝后的对象，其中的React节点会被保留
+ */
+export declare function cloneDeepFilterNode(value: any): any;

package/lib/ProEditTable/utils/tools.js

@@ -4,8 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.cloneDeepFilterNode = cloneDeepFilterNode;
 exports.splitNames = exports.onDelete = exports.handleScrollToError = exports.getRandom = exports.getNamePath = exports.getDisabled = exports.difference = exports.customValidate = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var getRandom = exports.getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
@@ -189,4 +191,16 @@ var handleScrollToError = exports.handleScrollToError = function handleScrollToE
       }
     }
   }, 0);
-};
+};
+/**
+ * 深copy一个对象，并过滤掉其中的React节点
+ * @param value 需要深拷贝的对象
+ * @returns 深拷贝后的对象，其中的React节点会被保留
+ */
+function cloneDeepFilterNode(value) {
+  return (0, _lodash.cloneDeepWith)(value, function (val) {
+    if ( /*#__PURE__*/_react.default.isValidElement(val)) {
+      return val;
+    }
+  });
+}

package/lib/ProTable/style/index.less

@@ -2,17 +2,17 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-table {
-  &.pro-table-draggable-only{
-    .ant-table-tbody{
+  &.pro-table-draggable-only {
+    .ant-table-tbody {
       .anticon {
         margin-right: 0;
       }
     }
   }
   .@{ant-prefix}-table-cell-with-append {
-    white-space: nowrap;
     position: relative;
     z-index: 100;
+    white-space: nowrap;
   }
   .@{ant-prefix}-table-row-expand-icon {
     position: absolute;
@@ -20,16 +20,15 @@
   }
 
   .@{ant-prefix}-table-content {
-    >table {
+    > table {
       .@{ant-prefix}-table-summary {
+        color: var(--zaui-text, #343434);
+        font-weight: 600;
         background-color: var(--zaui-table-header-bg, #f2f3f5);
-        color           : var(--zaui-text, #343434);
-        font-weight     : 600;
 
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-
         }
       }
 
@@ -43,33 +42,37 @@
         }
       }
 
-      .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
+      .@{ant-prefix}-table-thead
+        > tr
+        > th:not(.@{ant-prefix}-table-selection-column):not(
+          .@{ant-prefix}-table-row-expand-icon-cell
+        ):not([colspan]).is-required {
         &.is-required-right {
           .pro-edit-table-title {
             &::before {
-              position   : static;
-              top        : 0;
-              display    : inline-block;
-              text-indent: -8px;
-              color      : #ff5050;
-              font-size  : var(--zaui-font-size-md, 14px);
+              position: static;
+              top: 0;
+              display: inline-block;
+              color: #ff5050;
+              font-size: var(--zaui-font-size-md, 14px);
               line-height: 1;
-              content    : "*";
+              text-indent: -8px;
+              content: '*';
             }
           }
         }
         &.is-required-left {
           .pro-edit-table-title {
             &::after {
+              position: static;
+              top: 0;
+              display: inline-block;
               width: auto;
-              position   : static;
-              top        : 0;
-              display    : inline-block;
               margin-left: var(--zaui-space-size-xs, 4px);
-              color      : #ff5050;
-              font-size  : 14px;
+              color: #ff5050;
+              font-size: 14px;
               line-height: 1;
-              content    : "*";
+              content: '*';
             }
           }
         }
@@ -80,9 +83,9 @@
     display: flex;
     width: 20px;
     .anticon {
-      cursor: pointer;
       margin-right: 12px;
-      .drag-icon{
+      cursor: pointer;
+      .drag-icon {
         margin-right: 0;
       }
     }
@@ -93,8 +96,6 @@
     }
   }
 
-
-
   &.pro-table-bordered {
     .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
       border-bottom: 1px solid #f0f0f0;
@@ -557,10 +558,4 @@
       }
     }
   }
-}
-
-.pro-edit-table-drag {
-  table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
-  }
-}
+}

package/package.json

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