@douyinfe/semi-foundation 2.5.1 → 2.7.0-beta.0

package/lib/es/datePicker/inputFoundation.js

@@ -1,9 +1,13 @@
+import _set from "lodash/set";
+import _isObject from "lodash/isObject";
+import _cloneDeep from "lodash/cloneDeep";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
-
-/* eslint-disable max-len */
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import BaseFoundation from '../base/foundation';
 import { formatDateValues } from './_utils/formatter';
 import { getDefaultFormatTokenByType } from './_utils/getDefaultFormatToken';
+import getInsetInputFormatToken from './_utils/getInsetInputFormatToken';
+import getInsetInputValueFromInsetInputStr from './_utils/getInsetInputValueFromInsetInputStr';
 const KEY_CODE_ENTER = 'Enter';
 const KEY_CODE_TAB = 'Tab';
 export default class InputFoundation extends BaseFoundation {
@@ -62,7 +66,7 @@ export default class InputFoundation extends BaseFoundation {
     this._adapter.notifyRangeInputFocus(e, rangeType);
   }
 
-  formatShowText(value) {
+  formatShowText(value, customFormat) {
     const {
       type,
       dateFnsLocale,
@@ -70,7 +74,7 @@ export default class InputFoundation extends BaseFoundation {
       rangeSeparator
     } = this._adapter.getProps();
 
-    const formatToken = format || getDefaultFormatTokenByType(type);
+    const formatToken = customFormat || format || getDefaultFormatTokenByType(type);
     let text = '';
 
     switch (type) {
@@ -107,4 +111,188 @@ export default class InputFoundation extends BaseFoundation {
     return text;
   }
 
+  handleInsetInputChange(options) {
+    const {
+      value,
+      valuePath,
+      insetInputValue
+    } = options;
+
+    const {
+      format,
+      type
+    } = this._adapter.getProps();
+
+    const insetFormatToken = getInsetInputFormatToken({
+      type,
+      format
+    });
+
+    const newInsetInputValue = _set(_cloneDeep(insetInputValue), valuePath, value);
+
+    const newInputValue = this.concatInsetInputValue({
+      insetInputValue: newInsetInputValue
+    });
+
+    this._adapter.notifyInsetInputChange({
+      insetInputValue: newInsetInputValue,
+      format: insetFormatToken,
+      insetInputStr: newInputValue
+    });
+  }
+  /**
+   * 只有传入的 format 符合 formatReg 时，才会使用用户传入的 format
+   * 否则会使用默认的 format 作为 placeholder
+   *
+   * The format passed in by the user will be used only if the incoming format conforms to formatReg
+   * Otherwise the default format will be used as placeholder
+   */
+
+
+  getInsetInputPlaceholder() {
+    const {
+      type,
+      format
+    } = this._adapter.getProps();
+
+    const insetInputFormat = getInsetInputFormatToken({
+      type,
+      format
+    });
+    let datePlaceholder, timePlaceholder;
+
+    switch (type) {
+      case 'date':
+      case 'month':
+      case 'dateRange':
+        datePlaceholder = insetInputFormat;
+        break;
+
+      case 'dateTime':
+      case 'dateTimeRange':
+        [datePlaceholder, timePlaceholder] = insetInputFormat.split(' ');
+        break;
+    }
+
+    return {
+      datePlaceholder,
+      timePlaceholder
+    };
+  }
+  /**
+   * 从当前日期值或 inputValue 中解析出 insetInputValue
+   *
+   * Parse out insetInputValue from current date value or inputValue
+   */
+
+
+  getInsetInputValue(_ref) {
+    let {
+      value,
+      insetInputValue
+    } = _ref;
+
+    const {
+      type,
+      rangeSeparator,
+      format
+    } = this._adapter.getProps();
+
+    let inputValueStr = '';
+
+    if (_isObject(insetInputValue)) {
+      inputValueStr = this.concatInsetInputValue({
+        insetInputValue
+      });
+    } else {
+      const insetInputFormat = getInsetInputFormatToken({
+        format,
+        type
+      });
+      inputValueStr = this.formatShowText(value, insetInputFormat);
+    }
+
+    const newInsetInputValue = getInsetInputValueFromInsetInputStr({
+      inputValue: inputValueStr,
+      type,
+      rangeSeparator
+    });
+    return newInsetInputValue;
+  }
+
+  concatInsetDateAndTime(_ref2) {
+    var _context;
+
+    let {
+      date,
+      time
+    } = _ref2;
+    return _concatInstanceProperty(_context = "".concat(date, " ")).call(_context, time);
+  }
+
+  concatInsetDateRange(_ref3) {
+    var _context2, _context3;
+
+    let {
+      rangeStart,
+      rangeEnd
+    } = _ref3;
+
+    const {
+      rangeSeparator
+    } = this._adapter.getProps();
+
+    return _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = "".concat(rangeStart)).call(_context3, rangeSeparator)).call(_context2, rangeEnd);
+  }
+
+  concatInsetInputValue(_ref4) {
+    let {
+      insetInputValue
+    } = _ref4;
+
+    const {
+      type
+    } = this._adapter.getProps();
+
+    let inputValue = '';
+
+    switch (type) {
+      case 'date':
+      case 'month':
+        inputValue = insetInputValue.monthLeft.dateInput;
+        break;
+
+      case 'dateRange':
+        inputValue = this.concatInsetDateRange({
+          rangeStart: insetInputValue.monthLeft.dateInput,
+          rangeEnd: insetInputValue.monthRight.dateInput
+        });
+        break;
+
+      case 'dateTime':
+        inputValue = this.concatInsetDateAndTime({
+          date: insetInputValue.monthLeft.dateInput,
+          time: insetInputValue.monthLeft.timeInput
+        });
+        break;
+
+      case 'dateTimeRange':
+        const rangeStart = this.concatInsetDateAndTime({
+          date: insetInputValue.monthLeft.dateInput,
+          time: insetInputValue.monthLeft.timeInput
+        });
+        const rangeEnd = this.concatInsetDateAndTime({
+          date: insetInputValue.monthRight.dateInput,
+          time: insetInputValue.monthRight.timeInput
+        });
+        inputValue = this.concatInsetDateRange({
+          rangeStart,
+          rangeEnd
+        });
+        break;
+    }
+
+    return inputValue;
+  }
+
 }

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

@@ -26,6 +26,7 @@ export interface MonthFoundationProps {
     focusRecordsRef: any;
     locale: any;
     localeCode: string;
+    multiple: boolean;
 }
 export declare type MonthDayInfo = {
     dayNumber: number;

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

@@ -54,6 +54,7 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     isAnotherPanelHasOpened?: (currentRangeInput: 'rangeStart' | 'rangeEnd') => boolean;
     focusRecordsRef?: any;
     triggerRender?: (props: Record<string, any>) => any;
+    insetInput: boolean;
 }
 export interface MonthInfo {
     pickerDate: Date;

package/lib/es/datePicker/monthsGridFoundation.js

@@ -148,7 +148,8 @@ export default class MonthsGridFoundation extends BaseFoundation {
     let refreshPicker = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     const monthLeft = this.getState('monthLeft');
 
-    const newMonthLeft = _Object$assign({}, monthLeft);
+    const newMonthLeft = _Object$assign({}, monthLeft); // REMOVE:
+
 
     this._adapter.updateMonthOnLeft(newMonthLeft);
 
@@ -165,6 +166,7 @@ export default class MonthsGridFoundation extends BaseFoundation {
     if (refreshPicker) {
       this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, values[0] || newMonthLeft.pickerDate);
     } else {
+      // FIXME:
       this.handleShowDateAndTime(strings.PANEL_TYPE_LEFT, newMonthLeft.pickerDate);
     }
 
@@ -566,7 +568,7 @@ export default class MonthsGridFoundation extends BaseFoundation {
       selected: selectedSet,
       rangeStart,
       rangeEnd
-    } = this.getStates();
+    } = this.getStates(); // FIXME:
 
     const includeRange = _includesInstanceProperty(_context3 = ['dateRange', 'dateTimeRange']).call(_context3, type);
 

package/lib/es/datePicker/rtl.scss

@@ -181,5 +181,13 @@ $module: #{$prefix}-datepicker;
             padding-left: $spacing-datepicker_footer_compact-paddintRight;
             padding-right: auto;
         }
+
+        .#{$module}-inset-input {
+            &-separator {
+                border-right: $width-datepicker-border solid $color-datepicker_border-bg-default;
+                border-left: 0;
+                transform: translateX(-50%);
+            }
+        }
     }
 }

package/lib/es/datePicker/variables.scss

@@ -23,6 +23,14 @@ $width-datepicker_quick_control-borderRadius: var(--semi-border-radius-medium);
 $width-datepicker_slot-border: 1px; // 日期星期分割线宽度
 $width-datepicker_range_input-border: $border-thickness-control-focus;
 $width-datepicker_day_main-border: 1px;
+$height-datepicker_timeType_insetInput_yam: 100%; // 时间面板高度 - 内嵌输入框
+$height-datepicker_timeType_insetInput_tpk: 100%; // 时间面板高度 - 内嵌输入框
+$width-datepicker_insetInput_date_type_wrapper: 284px; // 日期类型内嵌输入框宽度
+$width-datepicker_insetInput_date_range_type_wrapper: $width-datepicker_insetInput_date_type_wrapper * 2; // 范围选择内嵌输入框宽度
+$width-datepicker_insetInput_month_type_wrapper: 204px; // 月份类型内嵌输入框宽度
+$height-datepicker_insetInput_separator: 32px;
+$height-datepicker_month_grid_yearType_insetInput: 312px;
+$height-datepicker_month_grid_timeType_insetInput: 314px;
 
 // Spacing
 $spacing-datepicker_day-marginX: ($width-datepicker_day - $width-datepicker_day_main) / 2; // 日期格子水平外边距
@@ -53,6 +61,14 @@ $spacing-datepicker_range_input_suffix-paddingLeft: 8px;
 $spacing-datepicker_range_input_suffix-paddingRight: 12px;
 $spacing-datepicker_range_input_clearbtn-paddingLeft: 8px;
 $spacing-datepicker_range_input_clearbtn-paddingRight: 12px;
+$spacing-datepicker_navigation_insetInput-paddingY: 8px; // 年月切换 header 垂直内边距 - 内嵌输入框
+$spacing-datepicker_insetInput_wrapper-margin: 8px;
+$spacing-datepicker_insetInput_wrapper-paddingY: 12px;
+$spacing-datepicker_insetInput_wrapper-paddingX: 16px;
+$spacing-datepicker_insetInput_wrapper-paddingBottom: 0;
+$spacing-datepicker_insetInput_separator-paddingY: 0;
+$spacing-datepicker_insetInput_separator-paddingX: 4px;
+
 
 // Color
 $color-datepicker_panel-bg-default: var(--semi-color-bg-3); // 日期选择器背景颜色
@@ -118,6 +134,7 @@ $color-datepicker_range_input_inputWrapper-bg-default: transparent;
 $color-datepicker_range_input_inputWrapper-bg-focus: var(--semi-color-fill-1);
 $color-datepicker_range_input_separator-text-active: var(--semi-color-text-0);
 $color-datepicker_day_main-border: var(--semi-color-primary-active);
+$color-datepicker_insetInput_separator: var(--semi-color-text-3);
 
 // Font
 $font-datepicker_range_input_prefix_suffix_clearbtn-fontWeight: 600;
@@ -144,9 +161,17 @@ $radius-datepicker_range_input_inputWrapper: var(--semi-border-radius-small);
 $height-datepicker_range_input-default: 32px;
 $height-datepicker_range_input-small: 24px;
 $height-datepicker_range_input-large: 40px;
+$width-datepicker_insetInput_date_type_wrapper_compact: 216px;
+$width-datepicker_insetInput_date_range_type_wrapper_compact: $width-datepicker_insetInput_date_type_wrapper_compact * 2;
+$width-datepicker_insetInput_month_type_wrapper_compact: 195px;
+$height-datepicker_insetInput_tpk_compact: 100%;
+$height-datepicker_timeType_insetInput_yam_compact: 100%;
+$height-datepicker_insetInput_wrapper_compact: 28px;
 
 $lineHeight-datepicker_compact: 20px;
 $lineHeight-datepicker_weekday_item_compact: 28px;
+$height-datepicker_insetInput_compact: 26px;
+$fontSize-datepicker_insetInput_compact-fontSize: 12px;
 
 $spacing-datepicker_switch_compact-padding: 6px;
 $spacing-datepicker_day_compact-margin: ($width-datepicker_day_compact - $width-datepicker_day_main_compact) / 2;
@@ -163,6 +188,11 @@ $spacing-datepicker_footer_compact-paddintBottom: 10px;
 $spacing-datepicker_footer_compact-paddintRight: 8px;
 $spacing-datepicker_scrolllist_shade_pre_compact-marginTop: -17px;
 $spacing-datepicker_scrolllist_shade_post_compact-marginTop: 17px;
+$spacing-datepicker_insetInput_wrapper_compact-margin: 4px;
+$spacing-datepicker_insetInput_wrapper_compact-paddingY: 8px;
+$spacing-datepicker_insetInput_wrapper_compact-paddingX: 8px;
+$spacing-datepicker_insetInput_wrapper_compact-paddingBottom: 0;
+$spacing-datepicker_insetInput_wrapper_rangeType_compact-paddingTop: 0;
 
 // Radius
 $radius-datepicker_range_input: var(--semi-border-radius-small);

package/lib/es/table/table.css

@@ -380,7 +380,7 @@
   position: relative;
   z-index: 1;
   padding: 16px 12px;
-  color: var(--semi-color-disabled-bg);
+  color: var(--semi-color-text-2);
   font-size: 14px;
   text-align: center;
   background: transparent;

package/lib/es/table/table.scss

@@ -466,7 +466,7 @@ $module: #{$prefix}-table;
         position: relative;
         z-index: 1;
         padding: #{$spacing-table-paddingY} #{$spacing-table-paddingX};
-        color: $color-table_disabled-bg-default;
+        color: $color-table_placeholder-text-default;
         font-size: #{$font-table_base-fontSize};
         text-align: center;
         background: $color-table_pl-bg-default;

package/lib/es/table/variables.scss

@@ -73,6 +73,7 @@ $color-table_sorter-text-hover: var(--semi-color-text-2); // 表格排序按钮
 $color-table_page-text-default: var(--semi-color-text-2); // 表格翻页器文本颜色
 $color-table_resizer-bg-default: var(--semi-color-primary); // 表格拉伸标示线颜色
 $color-table_selection-bg-default: rgba(var(--semi-grey-0), 1); // 表格分组背景色
+$color-table_placeholder-text-default: var(--semi-color-text-2); // 表格空数据文本颜色
 
 // Other
 $font-table_base-fontSize: 14px; // 表格默认文本字号

package/lib/es/tag/tag.css

@@ -10,6 +10,7 @@
   user-select: none;
   overflow: hidden;
   white-space: nowrap;
+  vertical-align: bottom;
 }
 .semi-tag-default, .semi-tag-small {
   font-size: 12px;

package/lib/es/tag/tag.scss

@@ -18,6 +18,7 @@ $types: "ghost", "solid", "light";
     // hidden avatar tag image
     overflow: hidden;
     white-space: nowrap;
+    vertical-align: bottom;
 
     &-default,
     &-small {

package/lib/es/tooltip/foundation.js

@@ -520,25 +520,25 @@ export default class Tooltip extends BaseFoundation {
         break;
 
       case 'leftTopOver':
-        left = triggerRect.left;
-        top = triggerRect.top;
+        left = triggerRect.left - SPACING;
+        top = triggerRect.top - SPACING;
         break;
 
       case 'rightTopOver':
-        left = triggerRect.right;
-        top = triggerRect.top;
+        left = triggerRect.right + SPACING;
+        top = triggerRect.top - SPACING;
         translateX = -1;
         break;
 
       case 'leftBottomOver':
-        left = triggerRect.left;
-        top = triggerRect.bottom;
+        left = triggerRect.left - SPACING;
+        top = triggerRect.bottom + SPACING;
         translateY = -1;
         break;
 
       case 'rightBottomOver':
-        left = triggerRect.right;
-        top = triggerRect.bottom;
+        left = triggerRect.right + SPACING;
+        top = triggerRect.bottom + SPACING;
         translateX = -1;
         translateY = -1;
         break;

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

@@ -27,7 +27,7 @@ export interface BasicOnChange {
     (node: BasicTreeNodeData[] | BasicTreeNodeData, e: any): void;
     (value: BasicTreeNodeData['value'] | Array<BasicTreeNodeData['value']>, node: BasicTreeNodeData[] | BasicTreeNodeData, e: any): void;
 }
-export interface BasicTreeSelectProps extends Pick<BasicTreeProps, 'virtualize' | 'renderFullLabel' | 'renderLabel' | 'autoExpandParent' | 'className' | 'defaultExpandAll' | 'defaultExpandedKeys' | 'defaultValue' | 'disabled' | 'emptyContent' | 'expandAction' | 'expandedKeys' | 'filterTreeNode' | 'labelEllipsis' | 'leafOnly' | 'multiple' | 'onChangeWithObject' | 'showClear' | 'showFilteredOnly' | 'style' | 'treeData' | 'treeNodeFilterProp' | 'value' | 'onExpand' | 'onSearch' | 'expandAll' | 'disableStrictly' | 'aria-label' | 'checkRelation'> {
+export interface BasicTreeSelectProps extends Pick<BasicTreeProps, 'virtualize' | 'renderFullLabel' | 'renderLabel' | 'autoExpandParent' | 'className' | 'defaultExpandAll' | 'defaultExpandedKeys' | 'defaultValue' | 'disabled' | 'emptyContent' | 'expandAction' | 'expandedKeys' | 'filterTreeNode' | 'labelEllipsis' | 'leafOnly' | 'multiple' | 'onChangeWithObject' | 'showClear' | 'showFilteredOnly' | 'style' | 'treeData' | 'treeNodeFilterProp' | 'value' | 'onExpand' | 'expandAll' | 'disableStrictly' | 'aria-label' | 'checkRelation'> {
     motion?: Motion;
     mouseEnterDelay?: number;
     mouseLeaveDelay?: number;
@@ -63,6 +63,7 @@ export interface BasicTreeSelectProps extends Pick<BasicTreeProps, 'virtualize'
     renderSelectedItem?: BasicRenderSelectedItem;
     getPopupContainer?: () => HTMLElement;
     onBlur?: (e: any) => void;
+    onSearch?: (sunInput: string, filteredExpandedKeys: string[]) => void;
     onChange?: BasicOnChange;
     onFocus?: (e: any) => void;
     onVisibleChange?: (isVisible: boolean) => void;
@@ -84,7 +85,7 @@ export interface TreeSelectAdapter<P = Record<string, any>, S = Record<string, a
     rePositionDropdown: () => void;
     updateState: (states: Partial<BasicTreeSelectInnerData>) => void;
     notifySelect: (selectedKeys: string, selected: boolean, selectedNode: BasicTreeNodeData) => void;
-    notifySearch: (input: string) => void;
+    notifySearch: (input: string, filteredExpandedKeys: string[]) => void;
     cacheFlattenNodes: (bool: boolean) => void;
     openMenu: () => void;
     closeMenu: (cb?: () => void) => void;

package/lib/es/treeSelect/foundation.js

@@ -14,6 +14,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
+import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
 import _everyInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/every";
 import { strings } from '../treeSelect/constants';
@@ -159,7 +160,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
     const isSearching = Boolean(inputValue);
     const treeNodeProps = {
       eventKey: key,
-      expanded: isSearching ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
+      expanded: isSearching && !this._isExpandControlled() ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
       selected: _includesInstanceProperty(selectedKeys).call(selectedKeys, key),
       checked: realChecked,
       halfChecked: realHalfChecked,
@@ -446,20 +447,25 @@ export default class TreeSelectFoundation extends BaseFoundation {
 
   clearInput() {
     const {
+      flattenNodes,
       expandedKeys,
       selectedKeys,
       keyEntities,
       treeData
     } = this.getStates();
+    const newExpandedKeys = new _Set(expandedKeys);
+
+    const isExpandControlled = this._isExpandControlled();
+
     const expandedOptsKeys = findAncestorKeys(selectedKeys, keyEntities);
 
-    _forEachInstanceProperty(expandedOptsKeys).call(expandedOptsKeys, item => expandedKeys.add(item));
+    _forEachInstanceProperty(expandedOptsKeys).call(expandedOptsKeys, item => newExpandedKeys.add(item));
 
-    const flattenNodes = flattenTreeData(treeData, expandedKeys);
+    const newFlattenNodes = flattenTreeData(treeData, newExpandedKeys);
 
     this._adapter.updateState({
-      expandedKeys,
-      flattenNodes,
+      expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
+      flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
       inputValue: '',
       motionKeys: new _Set([]),
       filteredKeys: new _Set([]),
@@ -473,6 +479,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
     this._adapter.updateInputValue(sugInput);
 
     const {
+      flattenNodes,
       expandedKeys,
       selectedKeys,
       keyEntities,
@@ -483,17 +490,18 @@ export default class TreeSelectFoundation extends BaseFoundation {
       filterTreeNode,
       treeNodeFilterProp
     } = this.getProps();
+    const newExpandedKeys = new _Set(expandedKeys);
     let filteredOptsKeys = [];
     let expandedOptsKeys = [];
-    let flattenNodes = [];
+    let newFlattenNodes = [];
     let filteredShownKeys = new _Set([]);
 
     if (!sugInput) {
       expandedOptsKeys = findAncestorKeys(selectedKeys, keyEntities);
 
-      _forEachInstanceProperty(expandedOptsKeys).call(expandedOptsKeys, item => expandedKeys.add(item));
+      _forEachInstanceProperty(expandedOptsKeys).call(expandedOptsKeys, item => newExpandedKeys.add(item));
 
-      flattenNodes = flattenTreeData(treeData, expandedKeys);
+      newFlattenNodes = flattenTreeData(treeData, newExpandedKeys);
     } else {
       var _context3, _context4;
 
@@ -506,17 +514,19 @@ export default class TreeSelectFoundation extends BaseFoundation {
       expandedOptsKeys = findAncestorKeys(filteredOptsKeys, keyEntities, false);
       const shownChildKeys = findDescendantKeys(filteredOptsKeys, keyEntities, true);
       filteredShownKeys = new _Set([...shownChildKeys, ...expandedOptsKeys]);
-      flattenNodes = flattenTreeData(treeData, new _Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
+      newFlattenNodes = flattenTreeData(treeData, new _Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
     }
 
-    this._adapter.notifySearch(sugInput);
+    const newFilteredExpandedKeys = new _Set(expandedOptsKeys);
+
+    this._adapter.notifySearch(sugInput, _Array$from(newFilteredExpandedKeys));
 
     this._adapter.updateState({
-      expandedKeys,
-      flattenNodes,
+      expandedKeys: this._isExpandControlled() ? expandedKeys : newExpandedKeys,
+      flattenNodes: this._isExpandControlled() ? flattenNodes : newFlattenNodes,
       motionKeys: new _Set([]),
       filteredKeys: new _Set(filteredOptsKeys),
-      filteredExpandedKeys: new _Set(expandedOptsKeys),
+      filteredExpandedKeys: newFilteredExpandedKeys,
       filteredShownKeys
     });
   }
@@ -760,7 +770,9 @@ export default class TreeSelectFoundation extends BaseFoundation {
       return;
     }
 
-    if (isSearching) {
+    const isExpandControlled = this._isExpandControlled();
+
+    if (isSearching && !isExpandControlled) {
       this.handleNodeExpandInSearch(e, treeNode);
       return;
     }
@@ -788,7 +800,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
 
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
 
-    if (!this._isExpandControlled()) {
+    if (!isExpandControlled) {
       const flattenNodes = flattenTreeData(treeData, expandedKeys);
       const motionKeys = this._isAnimated() ? getMotionKeys(eventKey, expandedKeys, keyEntities) : [];
       const newState = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.5.1",
+    "version": "2.7.0-beta.0",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -8,7 +8,7 @@
     },
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
-        "@douyinfe/semi-animation": "2.5.1",
+        "@douyinfe/semi-animation": "2.7.0-beta.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.9.0",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "3f83639f8a4fff7f912a237bf2842cb0944d993c",
+    "gitHead": "51cc4f6fa52f3275728d2112a98446ba54619c5b",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",

package/table/table.scss

@@ -466,7 +466,7 @@ $module: #{$prefix}-table;
         position: relative;
         z-index: 1;
         padding: #{$spacing-table-paddingY} #{$spacing-table-paddingX};
-        color: $color-table_disabled-bg-default;
+        color: $color-table_placeholder-text-default;
         font-size: #{$font-table_base-fontSize};
         text-align: center;
         background: $color-table_pl-bg-default;

package/table/variables.scss

@@ -73,6 +73,7 @@ $color-table_sorter-text-hover: var(--semi-color-text-2); // 表格排序按钮
 $color-table_page-text-default: var(--semi-color-text-2); // 表格翻页器文本颜色
 $color-table_resizer-bg-default: var(--semi-color-primary); // 表格拉伸标示线颜色
 $color-table_selection-bg-default: rgba(var(--semi-grey-0), 1); // 表格分组背景色
+$color-table_placeholder-text-default: var(--semi-color-text-2); // 表格空数据文本颜色
 
 // Other
 $font-table_base-fontSize: 14px; // 表格默认文本字号

package/tag/tag.scss

@@ -18,6 +18,7 @@ $types: "ghost", "solid", "light";
     // hidden avatar tag image
     overflow: hidden;
     white-space: nowrap;
+    vertical-align: bottom;
 
     &-default,
     &-small {

package/tooltip/foundation.ts

@@ -426,22 +426,22 @@ export default class Tooltip<P = Record<string, any>, S = Record<string, any>> e
                 translateY = -1;
                 break;
             case 'leftTopOver':
-                left = triggerRect.left;
-                top = triggerRect.top;
+                left = triggerRect.left - SPACING;
+                top = triggerRect.top - SPACING;
                 break;
             case 'rightTopOver':
-                left = triggerRect.right;
-                top = triggerRect.top;
+                left = triggerRect.right + SPACING;
+                top = triggerRect.top - SPACING;
                 translateX = -1;
                 break;
             case 'leftBottomOver':
-                left = triggerRect.left;
-                top = triggerRect.bottom;
+                left = triggerRect.left - SPACING;
+                top = triggerRect.bottom + SPACING;
                 translateY = -1;
                 break;
             case 'rightBottomOver':
-                left = triggerRect.right;
-                top = triggerRect.bottom;
+                left = triggerRect.right + SPACING;
+                top = triggerRect.bottom + SPACING;
                 translateX = -1;
                 translateY = -1;
                 break;