@douyinfe/semi-foundation 2.31.3-alpha.0 → 2.31.3

package/datePicker/_utils/isValidTimeZone.ts

@@ -0,0 +1,3 @@
+export default function isValidTimeZone(timeZone?: string | number) {
+    return ['string', 'number'].includes(typeof timeZone) && timeZone !== '';
+}

package/datePicker/foundation.ts

@@ -19,6 +19,7 @@ import type { ArrayElement, Motion } from '../utils/type';
 import type { Type, DateInputFoundationProps, InsetInputValue } from './inputFoundation';
 import type { MonthsGridFoundationProps } from './monthsGridFoundation';
 import type { WeekStartNumber } from './_utils/getMonthTable';
+import isValidTimeZone from './_utils/isValidTimeZone';
 
 export type ValidateStatus = ArrayElement<typeof strings.STATUS>;
 export type InputSize = ArrayElement<typeof strings.SIZE_SET>;
@@ -238,13 +239,6 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         this.initPanelOpenStatus(this.getProp('defaultOpen'));
     }
 
-    isValidTimeZone(timeZone?: string | number) {
-        const propTimeZone = this.getProp('timeZone');
-        const _timeZone = isNullOrUndefined(timeZone) ? propTimeZone : timeZone;
-
-        return ['string', 'number'].includes(typeof _timeZone) && _timeZone !== '';
-    }
-
     initFromProps({ value, timeZone, prevTimeZone }: Pick<DatePickerFoundationProps, 'value' | 'timeZone'> & { prevTimeZone?: string | number }) {
         const _value = (Array.isArray(value) ? [...value] : (value || value === 0) && [value]) || [];
 
@@ -274,17 +268,28 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         }
     }
 
+    /**
+     * value 可能是 UTC value 也可能是 zoned value
+     * 
+     * UTC value -> 受控传入的 value
+     * 
+     * zoned value -> statue.value，保存的是当前计算机时区下选择的日期
+     * 
+     * 如果是时区变化，则需要将旧 zoned value 转为新时区下的 zoned value
+     * 
+     * 如果是 value 变化，则不需要传入之前的时区，将 UTC value 转为 zoned value 即可
+     * 
+     */
     parseWithTimezone(value: ValueType, timeZone: string | number, prevTimeZone: string | number) {
         const result: Date[] = [];
         if (Array.isArray(value) && value.length) {
             for (const v of value) {
                 let parsedV = (v || v === 0) && this._parseValue(v);
                 if (parsedV) {
-                    if (this.isValidTimeZone(prevTimeZone)) {
-                        parsedV = zonedTimeToUtc(parsedV, prevTimeZone as string);
+                    if (isValidTimeZone(prevTimeZone)) {
+                        parsedV = zonedTimeToUtc(parsedV, prevTimeZone);
                     }
-
-                    result.push(this.isValidTimeZone(timeZone) ? utcToZonedTime(parsedV, timeZone as string) : parsedV);
+                    result.push(isValidTimeZone(timeZone) ? utcToZonedTime(parsedV, timeZone) : parsedV);
                 }
             }
         }
@@ -1098,9 +1103,9 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      */
     disposeCallbackArgs(value: Date | Date[]) {
         let _value = Array.isArray(value) ? value : (value && [value]) || [];
+        const timeZone = this.getProp('timeZone');
 
-        if (this.isValidTimeZone()) {
-            const timeZone = this.getProp('timeZone');
+        if (isValidTimeZone(timeZone)) {
             _value = _value.map(date => zonedTimeToUtc(date, timeZone));
         }
         const type = this.getProp('type');

package/datePicker/monthsGridFoundation.ts

@@ -23,6 +23,7 @@ import isNullOrUndefined from '../utils/isNullOrUndefined';
 import { BaseValueType, DateInputFoundationProps, PresetPosition, ValueType } from './foundation';
 import { MonthDayInfo } from './monthFoundation';
 import { ArrayElement } from '../utils/type';
+import isValidTimeZone from './_utils/isValidTimeZone';
 
 const dateDiffFns = {
     month: differenceInCalendarMonths,
@@ -448,13 +449,6 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
         return format(date, token, { locale: dateFnsLocale });
     }
 
-    isValidTimeZone(timeZone?: string | number) {
-        const propTimeZone = this.getProp('timeZone');
-        const _timeZone = isNullOrUndefined(timeZone) ? propTimeZone : timeZone;
-
-        return ['string', 'number'].includes(typeof _timeZone) && _timeZone !== '';
-    }
-
     /**
      * 根据 type 处理 onChange 返回的参数
      *
@@ -484,9 +478,9 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
      */
     disposeCallbackArgs(value: Date | Date[]) {
         let _value = Array.isArray(value) ? value : (value && [value]) || [];
+        const timeZone = this.getProp('timeZone');
 
-        if (this.isValidTimeZone()) {
-            const timeZone = this.getProp('timeZone');
+        if (isValidTimeZone(timeZone)) {
             _value = _value.map(date => zonedTimeToUtc(date, timeZone));
         }
         const type = this.getProp('type');

package/lib/cjs/datePicker/_utils/isValidTimeZone.d.ts

@@ -0,0 +1 @@
+export default function isValidTimeZone(timeZone?: string | number): boolean;

package/lib/cjs/datePicker/_utils/isValidTimeZone.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = isValidTimeZone;
+
+function isValidTimeZone(timeZone) {
+  return ['string', 'number'].includes(typeof timeZone) && timeZone !== '';
+}

package/lib/cjs/datePicker/foundation.d.ts

@@ -187,7 +187,6 @@ export interface DatePickerAdapter extends DefaultAdapter<DatePickerFoundationPr
 export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapter> {
     constructor(adapter: DatePickerAdapter);
     init(): void;
-    isValidTimeZone(timeZone?: string | number): boolean;
     initFromProps({ value, timeZone, prevTimeZone }: Pick<DatePickerFoundationProps, 'value' | 'timeZone'> & {
         prevTimeZone?: string | number;
     }): void;
@@ -197,6 +196,18 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      * If the user passes an empty value, you need to set the range input focus to rangeStart, so that the user can continue to select from the beginning after clearing
      */
     initRangeInputFocus(result: Date[]): void;
+    /**
+     * value 可能是 UTC value 也可能是 zoned value
+     *
+     * UTC value -> 受控传入的 value
+     *
+     * zoned value -> statue.value，保存的是当前计算机时区下选择的日期
+     *
+     * 如果是时区变化，则需要将旧 zoned value 转为新时区下的 zoned value
+     *
+     * 如果是 value 变化，则不需要传入之前的时区，将 UTC value 转为 zoned value 即可
+     *
+     */
     parseWithTimezone(value: ValueType, timeZone: string | number, prevTimeZone: string | number): Date[];
     _isMultiple(): boolean;
     /**

package/lib/cjs/datePicker/foundation.js

@@ -37,6 +37,8 @@ var _getInsetInputFormatToken = _interopRequireDefault(require("./_utils/getInse
 
 var _getInsetInputValueFromInsetInputStr = _interopRequireDefault(require("./_utils/getInsetInputValueFromInsetInputStr"));
 
+var _isValidTimeZone = _interopRequireDefault(require("./_utils/isValidTimeZone"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable no-nested-ternary */
@@ -105,14 +107,6 @@ class DatePickerFoundation extends _foundation.default {
     this.initPanelOpenStatus(this.getProp('defaultOpen'));
   }
 
-  isValidTimeZone(timeZone) {
-    const propTimeZone = this.getProp('timeZone');
-
-    const _timeZone = (0, _isNullOrUndefined.default)(timeZone) ? propTimeZone : timeZone;
-
-    return ['string', 'number'].includes(typeof _timeZone) && _timeZone !== '';
-  }
-
   initFromProps(_ref) {
     let {
       value,
@@ -156,6 +150,19 @@ class DatePickerFoundation extends _foundation.default {
       this._adapter.setRangeInputFocus('rangeStart');
     }
   }
+  /**
+   * value 可能是 UTC value 也可能是 zoned value
+   *
+   * UTC value -> 受控传入的 value
+   *
+   * zoned value -> statue.value，保存的是当前计算机时区下选择的日期
+   *
+   * 如果是时区变化，则需要将旧 zoned value 转为新时区下的 zoned value
+   *
+   * 如果是 value 变化，则不需要传入之前的时区，将 UTC value 转为 zoned value 即可
+   *
+   */
+
 
   parseWithTimezone(value, timeZone, prevTimeZone) {
     const result = [];
@@ -165,11 +172,11 @@ class DatePickerFoundation extends _foundation.default {
         let parsedV = (v || v === 0) && this._parseValue(v);
 
         if (parsedV) {
-          if (this.isValidTimeZone(prevTimeZone)) {
+          if ((0, _isValidTimeZone.default)(prevTimeZone)) {
             parsedV = (0, _dateFnsExtra.zonedTimeToUtc)(parsedV, prevTimeZone);
           }
 
-          result.push(this.isValidTimeZone(timeZone) ? (0, _dateFnsExtra.utcToZonedTime)(parsedV, timeZone) : parsedV);
+          result.push((0, _isValidTimeZone.default)(timeZone) ? (0, _dateFnsExtra.utcToZonedTime)(parsedV, timeZone) : parsedV);
         }
       }
     }
@@ -1155,8 +1162,9 @@ class DatePickerFoundation extends _foundation.default {
   disposeCallbackArgs(value) {
     let _value = Array.isArray(value) ? value : value && [value] || [];
 
-    if (this.isValidTimeZone()) {
-      const timeZone = this.getProp('timeZone');
+    const timeZone = this.getProp('timeZone');
+
+    if ((0, _isValidTimeZone.default)(timeZone)) {
       _value = _value.map(date => (0, _dateFnsExtra.zonedTimeToUtc)(date, timeZone));
     }
 

package/lib/cjs/datePicker/monthsGridFoundation.d.ts

@@ -158,7 +158,6 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
      * @returns
      */
     localeFormat(date: Date, token: string): string;
-    isValidTimeZone(timeZone?: string | number): boolean;
     /**
      * 根据 type 处理 onChange 返回的参数
      *

package/lib/cjs/datePicker/monthsGridFoundation.js

@@ -27,7 +27,7 @@ var _dateFnsExtra = require("../utils/date-fns-extra");
 
 var _getDefaultFormatToken = require("./_utils/getDefaultFormatToken");
 
-var _isNullOrUndefined = _interopRequireDefault(require("../utils/isNullOrUndefined"));
+var _isValidTimeZone = _interopRequireDefault(require("./_utils/isValidTimeZone"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -438,14 +438,6 @@ class MonthsGridFoundation extends _foundation.default {
       locale: dateFnsLocale
     });
   }
-
-  isValidTimeZone(timeZone) {
-    const propTimeZone = this.getProp('timeZone');
-
-    const _timeZone = (0, _isNullOrUndefined.default)(timeZone) ? propTimeZone : timeZone;
-
-    return ['string', 'number'].includes(typeof _timeZone) && _timeZone !== '';
-  }
   /**
    * 根据 type 处理 onChange 返回的参数
    *
@@ -478,8 +470,9 @@ class MonthsGridFoundation extends _foundation.default {
   disposeCallbackArgs(value) {
     let _value = Array.isArray(value) ? value : value && [value] || [];
 
-    if (this.isValidTimeZone()) {
-      const timeZone = this.getProp('timeZone');
+    const timeZone = this.getProp('timeZone');
+
+    if ((0, _isValidTimeZone.default)(timeZone)) {
       _value = _value.map(date => (0, _dateFnsExtra.zonedTimeToUtc)(date, timeZone));
     }
 

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

@@ -2,7 +2,7 @@ declare const cssClasses: {
     PREFIX: string;
 };
 declare const strings: {
-    BOUNDARY_SET: ("start" | "end")[];
+    BOUNDARY_SET: ("end" | "start")[];
     POSITION_SET: string[];
     MODE_SET: string[];
     MODE_MAP: {

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

@@ -1,6 +1,8 @@
 import { strings } from './constants';
+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
@@ -79,58 +81,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>[]): {
-    [x: number]: Record<string, any>;
-    length: number;
-    toString(): string;
-    toLocaleString(): string;
-    pop(): Record<string, any>;
-    push(...items: Record<string, any>[]): number;
-    concat(...items: ConcatArray<Record<string, any>>[]): Record<string, any>[];
-    concat(...items: (Record<string, any> | ConcatArray<Record<string, any>>)[]): Record<string, any>[];
-    join(separator?: string): string;
-    reverse(): Record<string, any>[];
-    shift(): Record<string, any>;
-    slice(start?: number, end?: number): Record<string, any>[];
-    sort(compareFn?: (a: Record<string, any>, b: Record<string, any>) => number): Record<string, any>[];
-    splice(start: number, deleteCount?: number): Record<string, any>[];
-    splice(start: number, deleteCount: number, ...items: Record<string, any>[]): Record<string, any>[];
-    unshift(...items: Record<string, any>[]): number;
-    indexOf(searchElement: Record<string, any>, fromIndex?: number): number;
-    lastIndexOf(searchElement: Record<string, any>, fromIndex?: number): number;
-    every<S extends Record<string, any>>(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => value is S, thisArg?: any): this is S[];
-    every(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => unknown, thisArg?: any): boolean;
-    some(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => unknown, thisArg?: any): boolean;
-    forEach(callbackfn: (value: Record<string, any>, index: number, array: Record<string, any>[]) => void, thisArg?: any): void;
-    map<U>(callbackfn: (value: Record<string, any>, index: number, array: Record<string, any>[]) => U, thisArg?: any): U[];
-    filter<S_1 extends Record<string, any>>(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => value is S_1, thisArg?: any): S_1[];
-    filter(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => unknown, thisArg?: any): Record<string, any>[];
-    reduce(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>): Record<string, any>;
-    reduce(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>, initialValue: Record<string, any>): Record<string, any>;
-    reduce<U_1>(callbackfn: (previousValue: U_1, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => U_1, initialValue: U_1): U_1;
-    reduceRight(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>): Record<string, any>;
-    reduceRight(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>, initialValue: Record<string, any>): Record<string, any>;
-    reduceRight<U_2>(callbackfn: (previousValue: U_2, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => U_2, initialValue: U_2): U_2;
-    find<S_2 extends Record<string, any>>(predicate: (this: void, value: Record<string, any>, index: number, obj: Record<string, any>[]) => value is S_2, thisArg?: any): S_2;
-    find(predicate: (value: Record<string, any>, index: number, obj: Record<string, any>[]) => unknown, thisArg?: any): Record<string, any>;
-    findIndex(predicate: (value: Record<string, any>, index: number, obj: Record<string, any>[]) => unknown, thisArg?: any): number;
-    fill(value: Record<string, any>, start?: number, end?: number): Record<string, any>[];
-    copyWithin(target: number, start: number, end?: number): Record<string, any>[];
-    entries(): IterableIterator<[number, Record<string, any>]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<Record<string, any>>;
-    includes(searchElement: Record<string, any>, fromIndex?: number): boolean;
-    [Symbol.iterator](): IterableIterator<Record<string, any>>;
-    [Symbol.unscopables](): {
-        copyWithin: boolean;
-        entries: boolean;
-        fill: boolean;
-        find: boolean;
-        findIndex: boolean;
-        keys: boolean;
-        values: boolean;
-    };
-};
+export declare function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]): 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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.arrayAdd = arrayAdd;
 exports.assignColumnKeys = assignColumnKeys;
+exports.cloneDeep = cloneDeep;
 exports.equalWith = equalWith;
 exports.expandBtnShouldInRow = expandBtnShouldInRow;
 exports.filterColumns = filterColumns;
@@ -37,6 +38,7 @@ exports.isScrollbarColumn = isScrollbarColumn;
 exports.isSelected = isSelected;
 exports.isSelectionColumn = isSelectionColumn;
 exports.isTreeTable = isTreeTable;
+exports.mergeColumns = mergeColumns;
 exports.mergeQueries = mergeQueries;
 exports.sliceColumnsByLevel = sliceColumnsByLevel;
 exports.warnIfNoDataIndex = warnIfNoDataIndex;
@@ -54,6 +56,10 @@ var _findIndex2 = _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"));
@@ -62,6 +68,8 @@ 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"));
@@ -70,6 +78,18 @@ var _Logger = _interopRequireDefault(require("../utils/Logger"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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') {
@@ -103,6 +123,33 @@ 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;
+
+  if (deep) {
+    const logger = new _Logger.default('[@douyinfe/semi-ui Table]');
+    logger.warn('Should not deep merge columns from foundation since columns may have react elements. Merge columns deep from semi-ui');
+  }
+
+  (0, _map2.default)(newColumns, newColumn => {
+    newColumn = Object.assign({}, newColumn);
+    const key = getColumnKey(newColumn, keyPropNames);
+    const oldColumn = key != null && (0, _find2.default)(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
@@ -482,7 +529,7 @@ function mergeQueries(query) {
 
 
 function withResizeWidth(columns, newColumns) {
-  const _newColumns = Object.assign({}, newColumns);
+  const _newColumns = cloneDeep(newColumns);
 
   for (const column of columns) {
     if (!(0, _isNullOrUndefined.default)(column.width)) {

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

@@ -75,6 +75,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): 0 | 1 | -1;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 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: ("custom" | "auto")[];
+    UPLOAD_TRIGGER: ("auto" | "custom")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/lib/cjs/utils/date-fns-extra.d.ts

@@ -18,30 +18,37 @@ export declare const toIANA: (tz: string | number) => any;
  * @returns {Date}
  */
 declare const parse: (date: string | number | Date, formatToken: string, options?: any) => Date;
+declare const format: (date: number | Date, formatToken: string, options?: any) => string;
 /**
+ * Returns a Date which will format as the local time of any time zone from a specific UTC time
  *
- * @param {string | number | Date} date
- * @param {string} formatToken
- * @param {object} [options]
- * @param {string} [options.timeZone]
- */
-declare const format: (date: string | number | Date, formatToken: string, options?: any) => string;
-/**
+ * @example
+ * ```javascript
+ * import { utcToZonedTime } from 'date-fns-tz'
+ * const { isoDate, timeZone } = fetchInitialValues() // 2014-06-25T10:00:00.000Z, America/New_York
+ * const date = utcToZonedTime(isoDate, timeZone) // In June 10am UTC is 6am in New York (-04:00)
+ * renderDatePicker(date) // 2014-06-25 06:00:00 (in the system time zone)
+ * renderTimeZoneSelect(timeZone) // America/New_York
+ * ```
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @see https://github.com/marnusw/date-fns-tz#utctozonedtime
  */
-declare const utcToZonedTime: (date: string | number | Date, timeZone: string, options?: OptionsWithTZ) => Date;
+declare const utcToZonedTime: (date: string | number | Date, timeZone: string | number, options?: OptionsWithTZ) => Date;
 /**
+ * Given a date and any time zone, returns a Date with the equivalent UTC time
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @example
+ * ```
+ * import { zonedTimeToUtc } from 'date-fns-tz'
+ * const date = getDatePickerValue() // e.g. 2014-06-25 10:00:00 (picked in any time zone)
+ * const timeZone = getTimeZoneValue() // e.g. America/Los_Angeles
+ * const utcDate = zonedTimeToUtc(date, timeZone) // In June 10am in Los Angeles is 5pm UTC
+ * postToServer(utcDate.toISOString(), timeZone) // post 2014-06-25T17:00:00.000Z, America/Los_Angeles
+ * ```
+ *
+ * @see https://github.com/marnusw/date-fns-tz#zonedtimetoutc
  */
-declare const zonedTimeToUtc: (date: string | number | Date, timeZone: string, options?: OptionsWithTZ) => Date;
+declare const zonedTimeToUtc: (date: string | number | Date, timeZone: string | number, options?: OptionsWithTZ) => Date;
 /**
  * return current system hour offset based on utc:
  *

package/lib/cjs/utils/date-fns-extra.js

@@ -75,14 +75,6 @@ const parse = (date, formatToken, options) => {
 
   return (0, _dateFnsTz.toDate)(date, options);
 };
-/**
- *
- * @param {string | number | Date} date
- * @param {string} formatToken
- * @param {object} [options]
- * @param {string} [options.timeZone]
- */
-
 /* istanbul ignore next */
 
 
@@ -100,11 +92,18 @@ const format = (date, formatToken, options) => {
   return (0, _dateFnsTz.format)(date, formatToken, options);
 };
 /**
+ * Returns a Date which will format as the local time of any time zone from a specific UTC time
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @example
+ * ```javascript
+ * import { utcToZonedTime } from 'date-fns-tz'
+ * const { isoDate, timeZone } = fetchInitialValues() // 2014-06-25T10:00:00.000Z, America/New_York
+ * const date = utcToZonedTime(isoDate, timeZone) // In June 10am UTC is 6am in New York (-04:00)
+ * renderDatePicker(date) // 2014-06-25 06:00:00 (in the system time zone)
+ * renderTimeZoneSelect(timeZone) // America/New_York
+ * ```
+ *
+ * @see https://github.com/marnusw/date-fns-tz#utctozonedtime
  */
 
 
@@ -112,11 +111,18 @@ exports.format = format;
 
 const utcToZonedTime = (date, timeZone, options) => (0, _dateFnsTz.utcToZonedTime)(date, toIANA(timeZone), options);
 /**
+ * Given a date and any time zone, returns a Date with the equivalent UTC time
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @example
+ * ```
+ * import { zonedTimeToUtc } from 'date-fns-tz'
+ * const date = getDatePickerValue() // e.g. 2014-06-25 10:00:00 (picked in any time zone)
+ * const timeZone = getTimeZoneValue() // e.g. America/Los_Angeles
+ * const utcDate = zonedTimeToUtc(date, timeZone) // In June 10am in Los Angeles is 5pm UTC
+ * postToServer(utcDate.toISOString(), timeZone) // post 2014-06-25T17:00:00.000Z, America/Los_Angeles
+ * ```
+ *
+ * @see https://github.com/marnusw/date-fns-tz#zonedtimetoutc
  */
 
 

package/lib/es/datePicker/_utils/isValidTimeZone.d.ts

@@ -0,0 +1 @@
+export default function isValidTimeZone(timeZone?: string | number): boolean;

package/lib/es/datePicker/_utils/isValidTimeZone.js

@@ -0,0 +1,3 @@
+export default function isValidTimeZone(timeZone) {
+  return ['string', 'number'].includes(typeof timeZone) && timeZone !== '';
+}

package/lib/es/datePicker/foundation.d.ts

@@ -187,7 +187,6 @@ export interface DatePickerAdapter extends DefaultAdapter<DatePickerFoundationPr
 export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapter> {
     constructor(adapter: DatePickerAdapter);
     init(): void;
-    isValidTimeZone(timeZone?: string | number): boolean;
     initFromProps({ value, timeZone, prevTimeZone }: Pick<DatePickerFoundationProps, 'value' | 'timeZone'> & {
         prevTimeZone?: string | number;
     }): void;
@@ -197,6 +196,18 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      * If the user passes an empty value, you need to set the range input focus to rangeStart, so that the user can continue to select from the beginning after clearing
      */
     initRangeInputFocus(result: Date[]): void;
+    /**
+     * value 可能是 UTC value 也可能是 zoned value
+     *
+     * UTC value -> 受控传入的 value
+     *
+     * zoned value -> statue.value，保存的是当前计算机时区下选择的日期
+     *
+     * 如果是时区变化，则需要将旧 zoned value 转为新时区下的 zoned value
+     *
+     * 如果是 value 变化，则不需要传入之前的时区，将 UTC value 转为 zoned value 即可
+     *
+     */
     parseWithTimezone(value: ValueType, timeZone: string | number, prevTimeZone: string | number): Date[];
     _isMultiple(): boolean;
     /**

package/lib/es/datePicker/foundation.js

@@ -18,6 +18,7 @@ import { strings } from './constants';
 import { strings as inputStrings } from '../input/constants';
 import getInsetInputFormatToken from './_utils/getInsetInputFormatToken';
 import getInsetInputValueFromInsetInputStr from './_utils/getInsetInputValueFromInsetInputStr';
+import isValidTimeZone from './_utils/isValidTimeZone';
 /**
  * The datePicker foundation.js is responsible for maintaining the date value and the input box value, as well as the callback of both
  *  task 1. Accept the selected date change, update the date value, and update the input box value according to the date = > Notify the change
@@ -81,14 +82,6 @@ export default class DatePickerFoundation extends BaseFoundation {
     this.initPanelOpenStatus(this.getProp('defaultOpen'));
   }
 
-  isValidTimeZone(timeZone) {
-    const propTimeZone = this.getProp('timeZone');
-
-    const _timeZone = isNullOrUndefined(timeZone) ? propTimeZone : timeZone;
-
-    return ['string', 'number'].includes(typeof _timeZone) && _timeZone !== '';
-  }
-
   initFromProps(_ref) {
     let {
       value,
@@ -132,6 +125,19 @@ export default class DatePickerFoundation extends BaseFoundation {
       this._adapter.setRangeInputFocus('rangeStart');
     }
   }
+  /**
+   * value 可能是 UTC value 也可能是 zoned value
+   *
+   * UTC value -> 受控传入的 value
+   *
+   * zoned value -> statue.value，保存的是当前计算机时区下选择的日期
+   *
+   * 如果是时区变化，则需要将旧 zoned value 转为新时区下的 zoned value
+   *
+   * 如果是 value 变化，则不需要传入之前的时区，将 UTC value 转为 zoned value 即可
+   *
+   */
+
 
   parseWithTimezone(value, timeZone, prevTimeZone) {
     const result = [];
@@ -141,11 +147,11 @@ export default class DatePickerFoundation extends BaseFoundation {
         let parsedV = (v || v === 0) && this._parseValue(v);
 
         if (parsedV) {
-          if (this.isValidTimeZone(prevTimeZone)) {
+          if (isValidTimeZone(prevTimeZone)) {
             parsedV = zonedTimeToUtc(parsedV, prevTimeZone);
           }
 
-          result.push(this.isValidTimeZone(timeZone) ? utcToZonedTime(parsedV, timeZone) : parsedV);
+          result.push(isValidTimeZone(timeZone) ? utcToZonedTime(parsedV, timeZone) : parsedV);
         }
       }
     }
@@ -1134,8 +1140,9 @@ export default class DatePickerFoundation extends BaseFoundation {
   disposeCallbackArgs(value) {
     let _value = Array.isArray(value) ? value : value && [value] || [];
 
-    if (this.isValidTimeZone()) {
-      const timeZone = this.getProp('timeZone');
+    const timeZone = this.getProp('timeZone');
+
+    if (isValidTimeZone(timeZone)) {
       _value = _value.map(date => zonedTimeToUtc(date, timeZone));
     }
 

package/lib/es/datePicker/monthsGridFoundation.d.ts

@@ -158,7 +158,6 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
      * @returns
      */
     localeFormat(date: Date, token: string): string;
-    isValidTimeZone(timeZone?: string | number): boolean;
     /**
      * 根据 type 处理 onChange 返回的参数
      *

package/lib/es/datePicker/monthsGridFoundation.js

@@ -11,7 +11,7 @@ import { formatFullDate } from './_utils/getMonthTable';
 import { compatibleParse } from './_utils/parser';
 import { zonedTimeToUtc } from '../utils/date-fns-extra';
 import { getDefaultFormatTokenByType } from './_utils/getDefaultFormatToken';
-import isNullOrUndefined from '../utils/isNullOrUndefined';
+import isValidTimeZone from './_utils/isValidTimeZone';
 const dateDiffFns = {
   month: differenceInCalendarMonths,
   year: differenceInCalendarYears
@@ -417,14 +417,6 @@ export default class MonthsGridFoundation extends BaseFoundation {
       locale: dateFnsLocale
     });
   }
-
-  isValidTimeZone(timeZone) {
-    const propTimeZone = this.getProp('timeZone');
-
-    const _timeZone = isNullOrUndefined(timeZone) ? propTimeZone : timeZone;
-
-    return ['string', 'number'].includes(typeof _timeZone) && _timeZone !== '';
-  }
   /**
    * 根据 type 处理 onChange 返回的参数
    *
@@ -457,8 +449,9 @@ export default class MonthsGridFoundation extends BaseFoundation {
   disposeCallbackArgs(value) {
     let _value = Array.isArray(value) ? value : value && [value] || [];
 
-    if (this.isValidTimeZone()) {
-      const timeZone = this.getProp('timeZone');
+    const timeZone = this.getProp('timeZone');
+
+    if (isValidTimeZone(timeZone)) {
       _value = _value.map(date => zonedTimeToUtc(date, timeZone));
     }
 

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

@@ -2,7 +2,7 @@ declare const cssClasses: {
     PREFIX: string;
 };
 declare const strings: {
-    BOUNDARY_SET: ("start" | "end")[];
+    BOUNDARY_SET: ("end" | "start")[];
     POSITION_SET: string[];
     MODE_SET: string[];
     MODE_MAP: {

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

@@ -1,6 +1,8 @@
 import { strings } from './constants';
+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
@@ -79,58 +81,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>[]): {
-    [x: number]: Record<string, any>;
-    length: number;
-    toString(): string;
-    toLocaleString(): string;
-    pop(): Record<string, any>;
-    push(...items: Record<string, any>[]): number;
-    concat(...items: ConcatArray<Record<string, any>>[]): Record<string, any>[];
-    concat(...items: (Record<string, any> | ConcatArray<Record<string, any>>)[]): Record<string, any>[];
-    join(separator?: string): string;
-    reverse(): Record<string, any>[];
-    shift(): Record<string, any>;
-    slice(start?: number, end?: number): Record<string, any>[];
-    sort(compareFn?: (a: Record<string, any>, b: Record<string, any>) => number): Record<string, any>[];
-    splice(start: number, deleteCount?: number): Record<string, any>[];
-    splice(start: number, deleteCount: number, ...items: Record<string, any>[]): Record<string, any>[];
-    unshift(...items: Record<string, any>[]): number;
-    indexOf(searchElement: Record<string, any>, fromIndex?: number): number;
-    lastIndexOf(searchElement: Record<string, any>, fromIndex?: number): number;
-    every<S extends Record<string, any>>(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => value is S, thisArg?: any): this is S[];
-    every(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => unknown, thisArg?: any): boolean;
-    some(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => unknown, thisArg?: any): boolean;
-    forEach(callbackfn: (value: Record<string, any>, index: number, array: Record<string, any>[]) => void, thisArg?: any): void;
-    map<U>(callbackfn: (value: Record<string, any>, index: number, array: Record<string, any>[]) => U, thisArg?: any): U[];
-    filter<S_1 extends Record<string, any>>(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => value is S_1, thisArg?: any): S_1[];
-    filter(predicate: (value: Record<string, any>, index: number, array: Record<string, any>[]) => unknown, thisArg?: any): Record<string, any>[];
-    reduce(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>): Record<string, any>;
-    reduce(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>, initialValue: Record<string, any>): Record<string, any>;
-    reduce<U_1>(callbackfn: (previousValue: U_1, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => U_1, initialValue: U_1): U_1;
-    reduceRight(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>): Record<string, any>;
-    reduceRight(callbackfn: (previousValue: Record<string, any>, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => Record<string, any>, initialValue: Record<string, any>): Record<string, any>;
-    reduceRight<U_2>(callbackfn: (previousValue: U_2, currentValue: Record<string, any>, currentIndex: number, array: Record<string, any>[]) => U_2, initialValue: U_2): U_2;
-    find<S_2 extends Record<string, any>>(predicate: (this: void, value: Record<string, any>, index: number, obj: Record<string, any>[]) => value is S_2, thisArg?: any): S_2;
-    find(predicate: (value: Record<string, any>, index: number, obj: Record<string, any>[]) => unknown, thisArg?: any): Record<string, any>;
-    findIndex(predicate: (value: Record<string, any>, index: number, obj: Record<string, any>[]) => unknown, thisArg?: any): number;
-    fill(value: Record<string, any>, start?: number, end?: number): Record<string, any>[];
-    copyWithin(target: number, start: number, end?: number): Record<string, any>[];
-    entries(): IterableIterator<[number, Record<string, any>]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<Record<string, any>>;
-    includes(searchElement: Record<string, any>, fromIndex?: number): boolean;
-    [Symbol.iterator](): IterableIterator<Record<string, any>>;
-    [Symbol.unscopables](): {
-        copyWithin: boolean;
-        entries: boolean;
-        fill: boolean;
-        find: boolean;
-        findIndex: boolean;
-        keys: boolean;
-        values: boolean;
-    };
-};
+export declare function withResizeWidth(columns: Record<string, any>[], newColumns: Record<string, any>[]): 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,13 +4,27 @@ 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 { 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') {
@@ -45,6 +59,34 @@ 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;
+
+  if (deep) {
+    const logger = new Logger('[@douyinfe/semi-ui Table]');
+    logger.warn('Should not deep merge columns from foundation since columns may have react elements. Merge columns deep from semi-ui');
+  }
+
+  _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
@@ -403,7 +445,7 @@ export function mergeQueries(query) {
  */
 
 export function withResizeWidth(columns, newColumns) {
-  const _newColumns = Object.assign({}, newColumns);
+  const _newColumns = cloneDeep(newColumns);
 
   for (const column of columns) {
     if (!isNullOrUndefined(column.width)) {

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

@@ -75,6 +75,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): 0 | 1 | -1;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 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: ("custom" | "auto")[];
+    UPLOAD_TRIGGER: ("auto" | "custom")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/lib/es/utils/date-fns-extra.d.ts

@@ -18,30 +18,37 @@ export declare const toIANA: (tz: string | number) => any;
  * @returns {Date}
  */
 declare const parse: (date: string | number | Date, formatToken: string, options?: any) => Date;
+declare const format: (date: number | Date, formatToken: string, options?: any) => string;
 /**
+ * Returns a Date which will format as the local time of any time zone from a specific UTC time
  *
- * @param {string | number | Date} date
- * @param {string} formatToken
- * @param {object} [options]
- * @param {string} [options.timeZone]
- */
-declare const format: (date: string | number | Date, formatToken: string, options?: any) => string;
-/**
+ * @example
+ * ```javascript
+ * import { utcToZonedTime } from 'date-fns-tz'
+ * const { isoDate, timeZone } = fetchInitialValues() // 2014-06-25T10:00:00.000Z, America/New_York
+ * const date = utcToZonedTime(isoDate, timeZone) // In June 10am UTC is 6am in New York (-04:00)
+ * renderDatePicker(date) // 2014-06-25 06:00:00 (in the system time zone)
+ * renderTimeZoneSelect(timeZone) // America/New_York
+ * ```
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @see https://github.com/marnusw/date-fns-tz#utctozonedtime
  */
-declare const utcToZonedTime: (date: string | number | Date, timeZone: string, options?: OptionsWithTZ) => Date;
+declare const utcToZonedTime: (date: string | number | Date, timeZone: string | number, options?: OptionsWithTZ) => Date;
 /**
+ * Given a date and any time zone, returns a Date with the equivalent UTC time
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @example
+ * ```
+ * import { zonedTimeToUtc } from 'date-fns-tz'
+ * const date = getDatePickerValue() // e.g. 2014-06-25 10:00:00 (picked in any time zone)
+ * const timeZone = getTimeZoneValue() // e.g. America/Los_Angeles
+ * const utcDate = zonedTimeToUtc(date, timeZone) // In June 10am in Los Angeles is 5pm UTC
+ * postToServer(utcDate.toISOString(), timeZone) // post 2014-06-25T17:00:00.000Z, America/Los_Angeles
+ * ```
+ *
+ * @see https://github.com/marnusw/date-fns-tz#zonedtimetoutc
  */
-declare const zonedTimeToUtc: (date: string | number | Date, timeZone: string, options?: OptionsWithTZ) => Date;
+declare const zonedTimeToUtc: (date: string | number | Date, timeZone: string | number, options?: OptionsWithTZ) => Date;
 /**
  * return current system hour offset based on utc:
  *

package/lib/es/utils/date-fns-extra.js

@@ -62,14 +62,6 @@ const parse = (date, formatToken, options) => {
 
   return toDate(date, options);
 };
-/**
- *
- * @param {string | number | Date} date
- * @param {string} formatToken
- * @param {object} [options]
- * @param {string} [options.timeZone]
- */
-
 /* istanbul ignore next */
 
 
@@ -85,21 +77,35 @@ const format = (date, formatToken, options) => {
   return dateFnsFormat(date, formatToken, options);
 };
 /**
+ * Returns a Date which will format as the local time of any time zone from a specific UTC time
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @example
+ * ```javascript
+ * import { utcToZonedTime } from 'date-fns-tz'
+ * const { isoDate, timeZone } = fetchInitialValues() // 2014-06-25T10:00:00.000Z, America/New_York
+ * const date = utcToZonedTime(isoDate, timeZone) // In June 10am UTC is 6am in New York (-04:00)
+ * renderDatePicker(date) // 2014-06-25 06:00:00 (in the system time zone)
+ * renderTimeZoneSelect(timeZone) // America/New_York
+ * ```
+ *
+ * @see https://github.com/marnusw/date-fns-tz#utctozonedtime
  */
 
 
 const utcToZonedTime = (date, timeZone, options) => dateFnsUtcToZonedTime(date, toIANA(timeZone), options);
 /**
+ * Given a date and any time zone, returns a Date with the equivalent UTC time
  *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * @example
+ * ```
+ * import { zonedTimeToUtc } from 'date-fns-tz'
+ * const date = getDatePickerValue() // e.g. 2014-06-25 10:00:00 (picked in any time zone)
+ * const timeZone = getTimeZoneValue() // e.g. America/Los_Angeles
+ * const utcDate = zonedTimeToUtc(date, timeZone) // In June 10am in Los Angeles is 5pm UTC
+ * postToServer(utcDate.toISOString(), timeZone) // post 2014-06-25T17:00:00.000Z, America/Los_Angeles
+ * ```
+ *
+ * @see https://github.com/marnusw/date-fns-tz#zonedtimetoutc
  */
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.31.3-alpha.0",
+    "version": "2.31.3",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -10,8 +10,8 @@
         "@douyinfe/semi-animation": "2.12.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
-        "date-fns": "^2.9.0",
-        "date-fns-tz": "^1.0.10",
+        "date-fns": "^2.29.3",
+        "date-fns-tz": "^1.3.8",
         "lodash": "^4.17.21",
         "memoize-one": "^5.2.1",
         "scroll-into-view-if-needed": "^2.2.24"
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "132450ec528a6a6396458866467d7e5acd74dfb3",
+    "gitHead": "6335109d0cfce3930842beeefcf11efa296da433",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/table/utils.ts

@@ -2,6 +2,7 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable eqeqeq */
 import {
+    cloneDeepWith,
     isEqualWith,
     get,
     filter,
@@ -20,6 +21,17 @@ 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') {
@@ -49,6 +61,36 @@ 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;
+
+    if (deep) {
+        const logger = new Logger('[@douyinfe/semi-ui Table]');
+        logger.warn('Should not deep merge columns from foundation since columns may have react elements. Merge columns deep from semi-ui');
+    }
+
+    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
@@ -395,7 +437,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 = { ...newColumns };
+    const _newColumns = cloneDeep(newColumns);
     for (const column of columns) {
         if (!isNullOrUndefined(column.width)) {
             const currentColumn = column.key;

package/utils/date-fns-extra.ts

@@ -100,15 +100,8 @@ const parse = (date: string | number | Date, formatToken: string, options?: any)
     return toDate(date, options);
 };
 
-/**
- *
- * @param {string | number | Date} date
- * @param {string} formatToken
- * @param {object} [options]
- * @param {string} [options.timeZone]
- */
 /* istanbul ignore next */
-const format = (date: string | number | Date, formatToken: string, options?: any) => {
+const format = (date: number | Date, formatToken: string, options?: any) => {
     if (options && options.timeZone != null && options.timeZone !== '') {
         const timeZone = toIANA(options.timeZone);
         options = { ...options, timeZone };
@@ -120,22 +113,36 @@ const format = (date: string | number | Date, formatToken: string, options?: any
 };
 
 /**
- *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * Returns a Date which will format as the local time of any time zone from a specific UTC time
+ * 
+ * @example
+ * ```javascript
+ * import { utcToZonedTime } from 'date-fns-tz'
+ * const { isoDate, timeZone } = fetchInitialValues() // 2014-06-25T10:00:00.000Z, America/New_York
+ * const date = utcToZonedTime(isoDate, timeZone) // In June 10am UTC is 6am in New York (-04:00)
+ * renderDatePicker(date) // 2014-06-25 06:00:00 (in the system time zone)
+ * renderTimeZoneSelect(timeZone) // America/New_York
+ * ```
+ * 
+ * @see https://github.com/marnusw/date-fns-tz#utctozonedtime
  */
-const utcToZonedTime = (date: string | number | Date, timeZone: string, options?: OptionsWithTZ) => dateFnsUtcToZonedTime(date, toIANA(timeZone), options);
+const utcToZonedTime = (date: string | number | Date, timeZone: string | number, options?: OptionsWithTZ) => dateFnsUtcToZonedTime(date, toIANA(timeZone), options);
 
 /**
- *
- * @param {string | number | Date} date
- * @param {string} timeZone
- * @param {object} options
- * @returns {Date}
+ * Given a date and any time zone, returns a Date with the equivalent UTC time
+ * 
+ * @example
+ * ```
+ * import { zonedTimeToUtc } from 'date-fns-tz'
+ * const date = getDatePickerValue() // e.g. 2014-06-25 10:00:00 (picked in any time zone)
+ * const timeZone = getTimeZoneValue() // e.g. America/Los_Angeles
+ * const utcDate = zonedTimeToUtc(date, timeZone) // In June 10am in Los Angeles is 5pm UTC
+ * postToServer(utcDate.toISOString(), timeZone) // post 2014-06-25T17:00:00.000Z, America/Los_Angeles
+ * ```
+ * 
+ * @see https://github.com/marnusw/date-fns-tz#zonedtimetoutc
  */
-const zonedTimeToUtc = (date: string | number | Date, timeZone: string, options?: OptionsWithTZ) => dateFnsZonedTimeToUtc(date, toIANA(timeZone), options);
+const zonedTimeToUtc = (date: string | number | Date, timeZone: string | number, options?: OptionsWithTZ) => dateFnsZonedTimeToUtc(date, toIANA(timeZone), options);
 
 /**
  * return current system hour offset based on utc: