@douyinfe/semi-foundation 2.18.1 → 2.18.3

package/lib/cjs/table/mixin.scss

@@ -1,5 +1,5 @@
 @mixin genResizing() {
-    border-right: $border-table_resizer;
+    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
 
     .react-resizable-handle {
 
@@ -7,4 +7,4 @@
             background-color: unset;
         }
     }
-}
+}

package/lib/cjs/table/rtl.scss

@@ -19,7 +19,7 @@ $module: #{$prefix}-table;
 
                             &.resizing {
                                 // rtl override mixin
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
                         }
 
@@ -28,7 +28,7 @@ $module: #{$prefix}-table;
                             border-right: 1px solid $color-table_shadow-border-default;
 
                             &.resizing {
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
 
                             &[x-type="column-scrollbar"] {
@@ -40,7 +40,7 @@ $module: #{$prefix}-table;
                 }
 
                 .resizing {
-                    border-left: $border-table_resizer;
+                    border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
 
                 .react-resizable-handle {
@@ -57,7 +57,7 @@ $module: #{$prefix}-table;
 
                     &.resizing {
                         border-right: 0;
-                        border-left: $border-table_resizer;
+                        border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                     }
                 }
 
@@ -112,17 +112,17 @@ $module: #{$prefix}-table;
         &-bordered {
             .#{$module}-container {
                 border-left: 0;
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
             .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
                 border-right: 0;
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-placeholder {
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 border-right: 0;
             }
 
@@ -130,7 +130,7 @@ $module: #{$prefix}-table;
 
                 &::-webkit-scrollbar {
                     border-right: 0;
-                    border-left: $border-table;
+                    border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 }
             }
         }

package/lib/cjs/table/table.scss

@@ -60,7 +60,7 @@ $module: #{$prefix}-table;
 
         &::-webkit-scrollbar {
             background-color: transparent;
-            border-bottom: $border-table_head-bottom;
+            border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
         }
         scrollbar-base-color: transparent;
     }
@@ -91,7 +91,7 @@ $module: #{$prefix}-table;
                 color: $color-table_th-text-default;
                 font-weight: $font-weight-bold;
                 text-align: left;
-                border-bottom: $border-table_head-bottom;
+                border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
                 padding-left: $spacing-table_row_head-paddingX;
                 padding-right: $spacing-table_row_head-paddingX;
                 padding-top: $spacing-table_row_head-paddingY;
@@ -223,14 +223,14 @@ $module: #{$prefix}-table;
                 word-break: break-all;
                 border-left: none;
                 border-right: none;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 padding: $spacing-table_tbody_rowCell-padding;
                 box-sizing: border-box;
                 position: relative;
                 vertical-align: middle;
 
                 &.resizing {
-                    border-right: $border-table_resizer;
+                    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
             }
             &.#{$module}-row {
@@ -276,7 +276,7 @@ $module: #{$prefix}-table;
 
             & > .#{$module}-row-cell {
                 background-color: $color-table_selection-bg-default;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             & > .#{$module}-row-cell:not(.#{$module}-column-selection) {
@@ -431,27 +431,27 @@ $module: #{$prefix}-table;
         .#{$module}-title {
             padding-left: $spacing-table_bordered_titler-paddingLeft;
             padding-right: $spacing-table_bordered_titler-paddingRight;
-            border-top: $border-table;
-            border-right: $border-table;
-            border-left: $border-table;
+            border-top: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-container {
-            border: $border-table;
+            border: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             border-right: 0;
             border-bottom: 0;
         }
 
         .#{$module}-header {
             &::-webkit-scrollbar {
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
         }
 
         .#{$module}-footer {
-            border-left: $border-table;
-            border-right: $border-table;
-            border-bottom: $border-table;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head {
@@ -462,11 +462,11 @@ $module: #{$prefix}-table;
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
         .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-placeholder {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
     }
 
@@ -478,7 +478,7 @@ $module: #{$prefix}-table;
         font-size: #{$font-table_base-fontSize};
         text-align: center;
         background: $color-table_pl-bg-default;
-        border-bottom: $border-table;
+        border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         border-radius: 0 0 #{$radius-table_base} #{$radius-table_base};
     }
 

package/lib/cjs/table/utils.d.ts

@@ -1,7 +1,5 @@
-export declare function cloneDeep(value: any, customizer?: (v: any) => any): any;
 export declare function equalWith(value: any, other: any, customizer?: (...args: any[]) => boolean): boolean;
 export declare function getColumnKey(column: any, keyPropNames: any[]): any;
-export declare function mergeColumns(oldColumns?: any[], newColumns?: any[], keyPropNames?: any[], deep?: boolean): any[];
 /**
  *
  * @param {Array<number>} arr
@@ -80,7 +78,7 @@ export declare function mergeQueries(query: Record<string, any>, queries?: Recor
  * @param {Object[]} columns columns retain the column width after resize
  * @param {Object[]} newColumns
  */
-export declare function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]): any;
+export declare function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]): Record<string, any>[];
 /**
  * Pure function version of the same function in table foundation
  * This is not accessible in getDerivedStateFromProps, so fork one out

package/lib/cjs/table/utils.js

@@ -10,7 +10,6 @@ _Object$defineProperty(exports, "__esModule", {
 
 exports.arrayAdd = arrayAdd;
 exports.assignColumnKeys = assignColumnKeys;
-exports.cloneDeep = cloneDeep;
 exports.equalWith = equalWith;
 exports.expandBtnShouldInRow = expandBtnShouldInRow;
 exports.filterColumns = filterColumns;
@@ -42,7 +41,6 @@ exports.isScrollbarColumn = isScrollbarColumn;
 exports.isSelected = isSelected;
 exports.isSelectionColumn = isSelectionColumn;
 exports.isTreeTable = isTreeTable;
-exports.mergeColumns = mergeColumns;
 exports.mergeQueries = mergeQueries;
 exports.sliceColumnsByLevel = sliceColumnsByLevel;
 exports.warnIfNoDataIndex = warnIfNoDataIndex;
@@ -50,8 +48,6 @@ exports.withResizeWidth = withResizeWidth;
 
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
 
-var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
-
 var _every = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/every"));
 
 var _includes2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
@@ -64,6 +60,8 @@ var _some2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stab
 
 var _findIndex2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
+
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
 
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
@@ -78,10 +76,6 @@ var _findIndex3 = _interopRequireDefault(require("lodash/findIndex"));
 
 var _each2 = _interopRequireDefault(require("lodash/each"));
 
-var _clone2 = _interopRequireDefault(require("lodash/clone"));
-
-var _map2 = _interopRequireDefault(require("lodash/map"));
-
 var _find2 = _interopRequireDefault(require("lodash/find"));
 
 var _filter2 = _interopRequireDefault(require("lodash/filter"));
@@ -90,26 +84,12 @@ var _get2 = _interopRequireDefault(require("lodash/get"));
 
 var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
 
-var _cloneDeepWith2 = _interopRequireDefault(require("lodash/cloneDeepWith"));
-
 var _constants = require("./constants");
 
 var _isNullOrUndefined = _interopRequireDefault(require("../utils/isNullOrUndefined"));
 
 var _Logger = _interopRequireDefault(require("../utils/Logger"));
 
-function cloneDeep(value, customizer) {
-  return (0, _cloneDeepWith2.default)(value, v => {
-    if (typeof v === 'function') {
-      return v;
-    } else if (typeof customizer === 'function') {
-      return customizer(v);
-    }
-
-    return undefined;
-  });
-}
-
 function equalWith(value, other, customizer) {
   return (0, _isEqualWith2.default)(value, other, function (objVal, othVal) {
     if (typeof objVal === 'function' && typeof othVal === 'function') {
@@ -143,27 +123,6 @@ function getColumnKey(column, keyPropNames) {
   });
   return key;
 }
-
-function mergeColumns() {
-  let oldColumns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  let newColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  let keyPropNames = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-  let deep = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  const finalColumns = [];
-  const clone = deep ? cloneDeep : _clone2.default;
-  (0, _map2.default)(newColumns, newColumn => {
-    newColumn = (0, _assign.default)({}, newColumn);
-    const key = getColumnKey(newColumn, keyPropNames);
-    const oldColumn = key != null && (0, _find2.default)(oldColumns, item => getColumnKey(item, keyPropNames) === key);
-
-    if (oldColumn) {
-      finalColumns.push(clone((0, _assign.default)((0, _assign.default)({}, oldColumn), newColumn)));
-    } else {
-      finalColumns.push(clone(newColumn));
-    }
-  });
-  return finalColumns;
-}
 /**
  *
  * @param {Array<number>} arr
@@ -551,7 +510,7 @@ function mergeQueries(query) {
 
 
 function withResizeWidth(columns, newColumns) {
-  const _newColumns = cloneDeep(newColumns);
+  const _newColumns = [...newColumns];
 
   for (const column of columns) {
     if (!(0, _isNullOrUndefined.default)(column.width)) {

package/lib/cjs/table/variables.scss

@@ -80,9 +80,6 @@ $font-table_base-fontSize: 14px; // 表格默认文本字号
 $border-table_base-borderStyle: solid; // 表格描边样式
 $shadow-table_left: -3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 左侧
 $shadow-table_right: 3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 右侧
-$border-table: $width-table_base_border $border-table_base-borderStyle $color-table-border-default; // 表格默认描边
-$border-table_head-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default; // 表头单元格描边 - 底部
-$border-table_resizer: $width-table_resizer_border solid $color-table_resizer-bg-default; // 表格拉伸标识描边
 
 $z-table-fixed: 101!default; // fixed列的zIndex值
 $z-table_fixed_column: $z-table-fixed; // fixed列的zIndex值

package/lib/cjs/tree/treeUtil.d.ts

@@ -74,6 +74,6 @@ export declare function getValueOrKey(data: any): any;
 export declare function normalizeValue(value: any, withObject: boolean): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

package/lib/cjs/upload/constants.d.ts

@@ -18,7 +18,7 @@ declare const strings: {
     DRAG_AREA_ILLEGAL: string;
     TRIGGER_AUTO: "auto";
     TRIGGER_CUSTOM: "custom";
-    UPLOAD_TRIGGER: ("auto" | "custom")[];
+    UPLOAD_TRIGGER: ("custom" | "auto")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/lib/es/table/mixin.scss

@@ -1,5 +1,5 @@
 @mixin genResizing() {
-    border-right: $border-table_resizer;
+    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
 
     .react-resizable-handle {
 
@@ -7,4 +7,4 @@
             background-color: unset;
         }
     }
-}
+}

package/lib/es/table/rtl.scss

@@ -19,7 +19,7 @@ $module: #{$prefix}-table;
 
                             &.resizing {
                                 // rtl override mixin
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
                         }
 
@@ -28,7 +28,7 @@ $module: #{$prefix}-table;
                             border-right: 1px solid $color-table_shadow-border-default;
 
                             &.resizing {
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
 
                             &[x-type="column-scrollbar"] {
@@ -40,7 +40,7 @@ $module: #{$prefix}-table;
                 }
 
                 .resizing {
-                    border-left: $border-table_resizer;
+                    border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
 
                 .react-resizable-handle {
@@ -57,7 +57,7 @@ $module: #{$prefix}-table;
 
                     &.resizing {
                         border-right: 0;
-                        border-left: $border-table_resizer;
+                        border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                     }
                 }
 
@@ -112,17 +112,17 @@ $module: #{$prefix}-table;
         &-bordered {
             .#{$module}-container {
                 border-left: 0;
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
             .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
                 border-right: 0;
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-placeholder {
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 border-right: 0;
             }
 
@@ -130,7 +130,7 @@ $module: #{$prefix}-table;
 
                 &::-webkit-scrollbar {
                     border-right: 0;
-                    border-left: $border-table;
+                    border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 }
             }
         }

package/lib/es/table/table.scss

@@ -60,7 +60,7 @@ $module: #{$prefix}-table;
 
         &::-webkit-scrollbar {
             background-color: transparent;
-            border-bottom: $border-table_head-bottom;
+            border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
         }
         scrollbar-base-color: transparent;
     }
@@ -91,7 +91,7 @@ $module: #{$prefix}-table;
                 color: $color-table_th-text-default;
                 font-weight: $font-weight-bold;
                 text-align: left;
-                border-bottom: $border-table_head-bottom;
+                border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
                 padding-left: $spacing-table_row_head-paddingX;
                 padding-right: $spacing-table_row_head-paddingX;
                 padding-top: $spacing-table_row_head-paddingY;
@@ -223,14 +223,14 @@ $module: #{$prefix}-table;
                 word-break: break-all;
                 border-left: none;
                 border-right: none;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 padding: $spacing-table_tbody_rowCell-padding;
                 box-sizing: border-box;
                 position: relative;
                 vertical-align: middle;
 
                 &.resizing {
-                    border-right: $border-table_resizer;
+                    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
             }
             &.#{$module}-row {
@@ -276,7 +276,7 @@ $module: #{$prefix}-table;
 
             & > .#{$module}-row-cell {
                 background-color: $color-table_selection-bg-default;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             & > .#{$module}-row-cell:not(.#{$module}-column-selection) {
@@ -431,27 +431,27 @@ $module: #{$prefix}-table;
         .#{$module}-title {
             padding-left: $spacing-table_bordered_titler-paddingLeft;
             padding-right: $spacing-table_bordered_titler-paddingRight;
-            border-top: $border-table;
-            border-right: $border-table;
-            border-left: $border-table;
+            border-top: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-container {
-            border: $border-table;
+            border: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             border-right: 0;
             border-bottom: 0;
         }
 
         .#{$module}-header {
             &::-webkit-scrollbar {
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
         }
 
         .#{$module}-footer {
-            border-left: $border-table;
-            border-right: $border-table;
-            border-bottom: $border-table;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head {
@@ -462,11 +462,11 @@ $module: #{$prefix}-table;
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
         .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-placeholder {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
     }
 
@@ -478,7 +478,7 @@ $module: #{$prefix}-table;
         font-size: #{$font-table_base-fontSize};
         text-align: center;
         background: $color-table_pl-bg-default;
-        border-bottom: $border-table;
+        border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         border-radius: 0 0 #{$radius-table_base} #{$radius-table_base};
     }
 

package/lib/es/table/utils.d.ts

@@ -1,7 +1,5 @@
-export declare function cloneDeep(value: any, customizer?: (v: any) => any): any;
 export declare function equalWith(value: any, other: any, customizer?: (...args: any[]) => boolean): boolean;
 export declare function getColumnKey(column: any, keyPropNames: any[]): any;
-export declare function mergeColumns(oldColumns?: any[], newColumns?: any[], keyPropNames?: any[], deep?: boolean): any[];
 /**
  *
  * @param {Array<number>} arr
@@ -80,7 +78,7 @@ export declare function mergeQueries(query: Record<string, any>, queries?: Recor
  * @param {Object[]} columns columns retain the column width after resize
  * @param {Object[]} newColumns
  */
-export declare function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]): any;
+export declare function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]): Record<string, any>[];
 /**
  * Pure function version of the same function in table foundation
  * This is not accessible in getDerivedStateFromProps, so fork one out

package/lib/es/table/utils.js

@@ -4,36 +4,22 @@ import _includes from "lodash/includes";
 import _some from "lodash/some";
 import _findIndex from "lodash/findIndex";
 import _each from "lodash/each";
-import _clone from "lodash/clone";
-import _map from "lodash/map";
 import _find from "lodash/find";
 import _filter from "lodash/filter";
 import _get from "lodash/get";
 import _isEqualWith from "lodash/isEqualWith";
-import _cloneDeepWith from "lodash/cloneDeepWith";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
-import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _everyInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/every";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
 import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
 import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
+import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
 import { strings, numbers } from './constants';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 import Logger from '../utils/Logger';
-export function cloneDeep(value, customizer) {
-  return _cloneDeepWith(value, v => {
-    if (typeof v === 'function') {
-      return v;
-    } else if (typeof customizer === 'function') {
-      return customizer(v);
-    }
-
-    return undefined;
-  });
-}
 export function equalWith(value, other, customizer) {
   return _isEqualWith(value, other, function (objVal, othVal) {
     if (typeof objVal === 'function' && typeof othVal === 'function') {
@@ -68,29 +54,6 @@ export function getColumnKey(column, keyPropNames) {
 
   return key;
 }
-export function mergeColumns() {
-  let oldColumns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  let newColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  let keyPropNames = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-  let deep = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  const finalColumns = [];
-  const clone = deep ? cloneDeep : _clone;
-
-  _map(newColumns, newColumn => {
-    newColumn = _Object$assign({}, newColumn);
-    const key = getColumnKey(newColumn, keyPropNames);
-
-    const oldColumn = key != null && _find(oldColumns, item => getColumnKey(item, keyPropNames) === key);
-
-    if (oldColumn) {
-      finalColumns.push(clone(_Object$assign(_Object$assign({}, oldColumn), newColumn)));
-    } else {
-      finalColumns.push(clone(newColumn));
-    }
-  });
-
-  return finalColumns;
-}
 /**
  *
  * @param {Array<number>} arr
@@ -458,7 +421,7 @@ export function mergeQueries(query) {
  */
 
 export function withResizeWidth(columns, newColumns) {
-  const _newColumns = cloneDeep(newColumns);
+  const _newColumns = [...newColumns];
 
   for (const column of columns) {
     if (!isNullOrUndefined(column.width)) {

package/lib/es/table/variables.scss

@@ -80,9 +80,6 @@ $font-table_base-fontSize: 14px; // 表格默认文本字号
 $border-table_base-borderStyle: solid; // 表格描边样式
 $shadow-table_left: -3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 左侧
 $shadow-table_right: 3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 右侧
-$border-table: $width-table_base_border $border-table_base-borderStyle $color-table-border-default; // 表格默认描边
-$border-table_head-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default; // 表头单元格描边 - 底部
-$border-table_resizer: $width-table_resizer_border solid $color-table_resizer-bg-default; // 表格拉伸标识描边
 
 $z-table-fixed: 101!default; // fixed列的zIndex值
 $z-table_fixed_column: $z-table-fixed; // fixed列的zIndex值

package/lib/es/tree/treeUtil.d.ts

@@ -74,6 +74,6 @@ export declare function getValueOrKey(data: any): any;
 export declare function normalizeValue(value: any, withObject: boolean): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

package/lib/es/upload/constants.d.ts

@@ -18,7 +18,7 @@ declare const strings: {
     DRAG_AREA_ILLEGAL: string;
     TRIGGER_AUTO: "auto";
     TRIGGER_CUSTOM: "custom";
-    UPLOAD_TRIGGER: ("auto" | "custom")[];
+    UPLOAD_TRIGGER: ("custom" | "auto")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.18.1",
+    "version": "2.18.3",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "42e7d9b618dc5cabad8d5ce7287f0c5f5d7691bd",
+    "gitHead": "680b7e5bb7e5c52474df556db3a72f65c0be28c0",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",

package/table/mixin.scss

@@ -1,5 +1,5 @@
 @mixin genResizing() {
-    border-right: $border-table_resizer;
+    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
 
     .react-resizable-handle {
 
@@ -7,4 +7,4 @@
             background-color: unset;
         }
     }
-}
+}

package/table/rtl.scss

@@ -19,7 +19,7 @@ $module: #{$prefix}-table;
 
                             &.resizing {
                                 // rtl override mixin
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
                         }
 
@@ -28,7 +28,7 @@ $module: #{$prefix}-table;
                             border-right: 1px solid $color-table_shadow-border-default;
 
                             &.resizing {
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
 
                             &[x-type="column-scrollbar"] {
@@ -40,7 +40,7 @@ $module: #{$prefix}-table;
                 }
 
                 .resizing {
-                    border-left: $border-table_resizer;
+                    border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
 
                 .react-resizable-handle {
@@ -57,7 +57,7 @@ $module: #{$prefix}-table;
 
                     &.resizing {
                         border-right: 0;
-                        border-left: $border-table_resizer;
+                        border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                     }
                 }
 
@@ -112,17 +112,17 @@ $module: #{$prefix}-table;
         &-bordered {
             .#{$module}-container {
                 border-left: 0;
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
             .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
                 border-right: 0;
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-placeholder {
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 border-right: 0;
             }
 
@@ -130,7 +130,7 @@ $module: #{$prefix}-table;
 
                 &::-webkit-scrollbar {
                     border-right: 0;
-                    border-left: $border-table;
+                    border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 }
             }
         }

package/table/table.scss

@@ -60,7 +60,7 @@ $module: #{$prefix}-table;
 
         &::-webkit-scrollbar {
             background-color: transparent;
-            border-bottom: $border-table_head-bottom;
+            border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
         }
         scrollbar-base-color: transparent;
     }
@@ -91,7 +91,7 @@ $module: #{$prefix}-table;
                 color: $color-table_th-text-default;
                 font-weight: $font-weight-bold;
                 text-align: left;
-                border-bottom: $border-table_head-bottom;
+                border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
                 padding-left: $spacing-table_row_head-paddingX;
                 padding-right: $spacing-table_row_head-paddingX;
                 padding-top: $spacing-table_row_head-paddingY;
@@ -223,14 +223,14 @@ $module: #{$prefix}-table;
                 word-break: break-all;
                 border-left: none;
                 border-right: none;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 padding: $spacing-table_tbody_rowCell-padding;
                 box-sizing: border-box;
                 position: relative;
                 vertical-align: middle;
 
                 &.resizing {
-                    border-right: $border-table_resizer;
+                    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
             }
             &.#{$module}-row {
@@ -276,7 +276,7 @@ $module: #{$prefix}-table;
 
             & > .#{$module}-row-cell {
                 background-color: $color-table_selection-bg-default;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             & > .#{$module}-row-cell:not(.#{$module}-column-selection) {
@@ -431,27 +431,27 @@ $module: #{$prefix}-table;
         .#{$module}-title {
             padding-left: $spacing-table_bordered_titler-paddingLeft;
             padding-right: $spacing-table_bordered_titler-paddingRight;
-            border-top: $border-table;
-            border-right: $border-table;
-            border-left: $border-table;
+            border-top: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-container {
-            border: $border-table;
+            border: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             border-right: 0;
             border-bottom: 0;
         }
 
         .#{$module}-header {
             &::-webkit-scrollbar {
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
         }
 
         .#{$module}-footer {
-            border-left: $border-table;
-            border-right: $border-table;
-            border-bottom: $border-table;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head {
@@ -462,11 +462,11 @@ $module: #{$prefix}-table;
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
         .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-placeholder {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
     }
 
@@ -478,7 +478,7 @@ $module: #{$prefix}-table;
         font-size: #{$font-table_base-fontSize};
         text-align: center;
         background: $color-table_pl-bg-default;
-        border-bottom: $border-table;
+        border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         border-radius: 0 0 #{$radius-table_base} #{$radius-table_base};
     }
 

package/table/utils.ts

@@ -2,7 +2,6 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable eqeqeq */
 import {
-    cloneDeepWith,
     isEqualWith,
     get,
     filter,
@@ -21,17 +20,6 @@ import isNullOrUndefined from '../utils/isNullOrUndefined';
 import Logger from '../utils/Logger';
 
 
-export function cloneDeep(value: any, customizer?: (v: any) => any) {
-    return cloneDeepWith(value, v => {
-        if (typeof v === 'function') {
-            return v;
-        } else if (typeof customizer === 'function') {
-            return customizer(v);
-        }
-        return undefined;
-    });
-}
-
 export function equalWith(value: any, other: any, customizer?: (...args: any[]) => boolean) {
     return isEqualWith(value, other, (objVal, othVal, ...rest) => {
         if (typeof objVal === 'function' && typeof othVal === 'function') {
@@ -61,31 +49,6 @@ export function getColumnKey(column: any, keyPropNames: any[]): any {
     return key;
 }
 
-export function mergeColumns(oldColumns: any[] = [], newColumns: any[] = [], keyPropNames: any[] = null, deep = true) {
-    const finalColumns: any[] = [];
-    const clone = deep ? cloneDeep : lodashClone;
-
-    map(newColumns, newColumn => {
-        newColumn = { ...newColumn };
-        const key = getColumnKey(newColumn, keyPropNames);
-
-        const oldColumn = key != null && find(oldColumns, item => getColumnKey(item, keyPropNames) === key);
-
-        if (oldColumn) {
-            finalColumns.push(
-                clone({
-                    ...oldColumn,
-                    ...newColumn,
-                })
-            );
-        } else {
-            finalColumns.push(clone(newColumn));
-        }
-    });
-
-    return finalColumns;
-}
-
 /**
  *
  * @param {Array<number>} arr
@@ -432,7 +395,7 @@ export function mergeQueries(query: Record<string, any>, queries: Record<string,
  * @param {Object[]} newColumns
  */
 export function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]) {
-    const _newColumns = cloneDeep(newColumns);
+    const _newColumns = [ ...newColumns ];
     for (const column of columns) {
         if (!isNullOrUndefined(column.width)) {
             const currentColumn = column.key;

package/table/variables.scss

@@ -80,9 +80,6 @@ $font-table_base-fontSize: 14px; // 表格默认文本字号
 $border-table_base-borderStyle: solid; // 表格描边样式
 $shadow-table_left: -3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 左侧
 $shadow-table_right: 3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 右侧
-$border-table: $width-table_base_border $border-table_base-borderStyle $color-table-border-default; // 表格默认描边
-$border-table_head-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default; // 表头单元格描边 - 底部
-$border-table_resizer: $width-table_resizer_border solid $color-table_resizer-bg-default; // 表格拉伸标识描边
 
 $z-table-fixed: 101!default; // fixed列的zIndex值
 $z-table_fixed_column: $z-table-fixed; // fixed列的zIndex值