@douyinfe/semi-ui 2.31.1 → 2.31.2-alpha.0

package/lib/es/table/ResizableTable.js

@@ -27,9 +27,9 @@ var __rest = this && this.__rest || function (s, e) {
 import React, { useState, useEffect, useMemo } from 'react';
 import { addClass, removeClass } from '@douyinfe/semi-foundation/lib/es/utils/classnames';
 import { strings, numbers } from '@douyinfe/semi-foundation/lib/es/table/constants';
-import { mergeColumns, assignColumnKeys, findColumn, withResizeWidth } from '@douyinfe/semi-foundation/lib/es/table/utils';
+import { assignColumnKeys, findColumn, withResizeWidth } from '@douyinfe/semi-foundation/lib/es/table/utils';
 import Table from './Table';
-import { cloneDeep } from './utils';
+import { cloneDeep, mergeColumns } from './utils';
 import getColumns from './getColumns';
 import ResizableHeaderCell from './ResizableHeaderCell';
 

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

@@ -60,7 +60,7 @@ declare class Table<RecordType extends Record<string, any>> extends BaseComponen
         components: PropTypes.Requireable<any>;
         bordered: PropTypes.Requireable<boolean>;
         loading: PropTypes.Requireable<boolean>;
-        size: PropTypes.Requireable<"default" | "small" | "middle">;
+        size: PropTypes.Requireable<"small" | "default" | "middle">;
         tableLayout: PropTypes.Requireable<"" | "fixed" | "auto">;
         columns: PropTypes.Requireable<PropTypes.InferProps<{
             align: PropTypes.Requireable<"left" | "right" | "center">;
@@ -297,7 +297,7 @@ declare class Table<RecordType extends Record<string, any>> extends BaseComponen
         showTotal?: boolean;
         pageSize?: number;
         pageSizeOpts?: number[];
-        size?: "default" | "small";
+        size?: "small" | "default";
         currentPage?: number;
         defaultCurrentPage?: number;
         onPageChange?: (currentPage: number) => void;

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

@@ -16,7 +16,7 @@ declare class Table<RecordType extends Record<string, any> = Data> extends React
         components: PropTypes.Requireable<any>;
         bordered: PropTypes.Requireable<boolean>;
         loading: PropTypes.Requireable<boolean>;
-        size: PropTypes.Requireable<"default" | "small" | "middle">;
+        size: PropTypes.Requireable<"small" | "default" | "middle">;
         tableLayout: PropTypes.Requireable<"" | "fixed" | "auto">;
         columns: PropTypes.Requireable<PropTypes.InferProps<{
             align: PropTypes.Requireable<"left" | "right" | "center">;

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

@@ -39,4 +39,5 @@ export declare function mergeComponents(components: TableComponents, virtualized
     };
 } & TableComponents;
 export declare const logger: Logger;
+export declare function mergeColumns(oldColumns?: any[], newColumns?: any[], keyPropNames?: any[], deep?: boolean): any[];
 export { cloneDeep };

package/lib/es/table/utils.js

@@ -1,7 +1,11 @@
+import _map from "lodash/map";
+import _find from "lodash/find";
+import _clone from "lodash/clone";
 import _merge from "lodash/merge";
 import Logger from '@douyinfe/semi-foundation/lib/es/utils/Logger';
 import { numbers } from '@douyinfe/semi-foundation/lib/es/table/constants';
 import { cloneDeep } from '../_utils';
+import { getColumnKey } from '@douyinfe/semi-foundation/lib/es/table/utils';
 let scrollbarVerticalSize, scrollbarHorizontalSize; // Measure scrollbar width for padding body during modal show/hide
 
 const scrollbarMeasure = {
@@ -105,4 +109,27 @@ export function mergeComponents(components, virtualized) {
   }, components);
 }
 export const logger = new Logger('[@douyinfe/semi-ui Table]');
+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;
+}
 export { cloneDeep };

package/lib/es/tagInput/index.d.ts

@@ -96,7 +96,7 @@ declare class TagInput extends BaseComponent<TagInputProps, TagInputState> {
         onAdd: PropTypes.Requireable<(...args: any[]) => any>;
         onRemove: PropTypes.Requireable<(...args: any[]) => any>;
         onKeyDown: PropTypes.Requireable<(...args: any[]) => any>;
-        size: PropTypes.Requireable<"default" | "small" | "large">;
+        size: PropTypes.Requireable<"small" | "default" | "large">;
         validateStatus: PropTypes.Requireable<"default" | "error" | "warning" | "success">;
         prefix: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
         suffix: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;

package/lib/es/timePicker/TimePicker.d.ts

@@ -130,7 +130,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         secondStep: PropTypes.Requireable<number>;
         focusOnOpen: PropTypes.Requireable<boolean>;
         autoFocus: PropTypes.Requireable<boolean>;
-        size: PropTypes.Requireable<"default" | "small" | "large">;
+        size: PropTypes.Requireable<"small" | "default" | "large">;
         panels: PropTypes.Requireable<PropTypes.InferProps<{
             panelHeader: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
             panelFooter: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;

package/lib/es/timePicker/index.d.ts

@@ -48,7 +48,7 @@ export default class LocaleTimePicker extends React.PureComponent<LocalePickerPr
         secondStep: import("prop-types").Requireable<number>;
         focusOnOpen: import("prop-types").Requireable<boolean>;
         autoFocus: import("prop-types").Requireable<boolean>;
-        size: import("prop-types").Requireable<"default" | "small" | "large">;
+        size: import("prop-types").Requireable<"small" | "default" | "large">;
         panels: import("prop-types").Requireable<import("prop-types").InferProps<{
             panelHeader: import("prop-types").Requireable<NonNullable<import("prop-types").ReactNodeLike>>;
             panelFooter: import("prop-types").Requireable<NonNullable<import("prop-types").ReactNodeLike>>;

package/lib/es/typography/title.d.ts

@@ -37,7 +37,7 @@ export default class Title extends PureComponent<TitleProps> {
         underline: PropTypes.Requireable<boolean>;
         strong: PropTypes.Requireable<boolean>;
         type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
-        heading: PropTypes.Requireable<1 | 2 | 3 | 4 | 6 | 5>;
+        heading: PropTypes.Requireable<4 | 2 | 1 | 3 | 6 | 5>;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;
         component: PropTypes.Requireable<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.31.1",
+    "version": "2.31.2-alpha.0",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -17,12 +17,12 @@
         "lib/*"
     ],
     "dependencies": {
-        "@douyinfe/semi-animation": "2.31.1",
-        "@douyinfe/semi-animation-react": "2.31.1",
-        "@douyinfe/semi-foundation": "2.31.1",
-        "@douyinfe/semi-icons": "2.31.1",
-        "@douyinfe/semi-illustrations": "2.31.1",
-        "@douyinfe/semi-theme-default": "2.31.1",
+        "@douyinfe/semi-animation": "2.31.2-alpha.0",
+        "@douyinfe/semi-animation-react": "2.31.2-alpha.0",
+        "@douyinfe/semi-foundation": "2.31.2-alpha.0",
+        "@douyinfe/semi-icons": "2.31.2-alpha.0",
+        "@douyinfe/semi-illustrations": "2.31.2-alpha.0",
+        "@douyinfe/semi-theme-default": "2.31.2-alpha.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -69,7 +69,7 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "00ded133e899ea816cbefe20eebcdb60fd983ecc",
+    "gitHead": "b502692ae72f3cb550595912d9caefe0517c52c6",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",