From 24a992a4491beaaa67b5ef05a539176a21f8e9bf Mon Sep 17 00:00:00 2001
From: Uyarn <uyarnchen@gmail.com>
Date: Tue, 6 Jun 2023 17:11:23 +0800
Subject: [PATCH] chore: sync develop

---
 src/_common                              |  2 +-
 src/date-picker/DatePicker.tsx           |  4 ++-
 src/date-picker/DatePickerPanel.tsx      | 10 ++++---
 src/date-picker/DateRangePicker.tsx      | 14 ++++++---
 src/date-picker/DateRangePickerPanel.tsx |  8 +++--
 src/date-picker/base/Footer.tsx          |  3 +-
 src/date-picker/panel/ExtraContent.tsx   |  3 +-
 src/hooks/useResizeObserver.ts           |  2 +-
 src/image/index.ts                       |  1 +
 src/menu/index.ts                        |  4 +--
 src/select-input/useSingle.tsx           |  2 +-
 src/select/option.tsx                    | 12 ++++++--
 src/select/select-panel.tsx              |  2 +-
 src/slider/slider-button.tsx             |  2 +-
 src/table/_example/select-single.vue     |  9 +++++-
 src/table/hooks/useFixed.ts              |  2 +-
 src/table/thead.tsx                      |  9 ++++--
 src/tabs/tab-nav.tsx                     |  6 ----
 src/tag-input/hooks/useHover.ts          | 10 +++----
 src/tag-input/tag-input.tsx              | 11 ++++---
 src/tag-input/useTagList.tsx             |  6 ++--
 src/textarea/textarea.tsx                |  7 +++--
 src/time-picker/time-picker.tsx          |  6 +++-
 src/time-picker/time-range-picker.tsx    |  7 ++++-
 src/tree-select/tree-select.tsx          |  2 +-
 src/tree-select/useTreeSelect.ts         |  2 +-
 src/tree/index.ts                        | 37 ++++++++++++++----------
 27 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/src/_common b/src/_common
index ed87e5eb1..073a392b3 160000
--- a/src/_common
+++ b/src/_common
@@ -1 +1 @@
-Subproject commit ed87e5eb1dac093d2c9440aec2763db847204873
+Subproject commit 073a392b3ea154cde592d4e10ee939aeb2c7d2a5
diff --git a/src/date-picker/DatePicker.tsx b/src/date-picker/DatePicker.tsx
index b91f45004..d4bf6513b 100644
--- a/src/date-picker/DatePicker.tsx
+++ b/src/date-picker/DatePicker.tsx
@@ -193,7 +193,7 @@ export default defineComponent({
     }
 
     // 预设
-    function onPresetClick(presetValue: DateValue | (() => DateValue)) {
+    function onPresetClick(presetValue: any, context: any) {
       const presetVal = typeof presetValue === 'function' ? presetValue() : presetValue;
       onChange?.(
         formatDate(presetVal, {
@@ -205,6 +205,8 @@ export default defineComponent({
           trigger: 'preset',
         },
       );
+      props.onPresetClick?.(context);
+      emit('preset-click', context);
       popupVisible.value = false;
     }
 
diff --git a/src/date-picker/DatePickerPanel.tsx b/src/date-picker/DatePickerPanel.tsx
index 40d5dd709..77b2ce82f 100644
--- a/src/date-picker/DatePickerPanel.tsx
+++ b/src/date-picker/DatePickerPanel.tsx
@@ -32,7 +32,7 @@ export default defineComponent({
     timePickerProps: datePickerProps.timePickerProps,
     ...datePickerPanelProps,
   },
-  setup(props: TdDatePickerPanelProps, { emit }) {
+  setup(props: TdDatePickerPanelProps, { emit, attrs }) {
     const {
       cacheValue, value, year, month, time, onChange,
     } = useSingleValue(props);
@@ -168,14 +168,14 @@ export default defineComponent({
     }
 
     // 预设
-    function onPresetClick(presetValue: DateValue | (() => DateValue), { e, preset }: any) {
+    function onPresetClick(presetValue: any, context: any) {
       const presetVal = typeof presetValue === 'function' ? presetValue() : presetValue;
       onChange?.(formatDate(presetVal, { format: formatRef.value.format }) as DateValue, {
         dayjsValue: parseToDayjs(presetVal, formatRef.value.format),
         trigger: 'preset',
       });
-      props.onPresetClick?.({ e, preset });
-      emit('preset-click', { e, preset });
+      props.onPresetClick?.(context);
+      emit('preset-click', context);
     }
 
     function onYearChange(nextYear: number) {
@@ -226,6 +226,8 @@ export default defineComponent({
       timePickerProps: props.timePickerProps,
       enableTimePicker: props.enableTimePicker,
       presetsPlacement: props.presetsPlacement,
+      // 该属性在单独使用此panel时无特别意义, 不应该暴露为props
+      popupVisible: (attrs?.popupVisible as Boolean) ?? true,
       onPanelClick,
       onCellClick,
       onJumperClick,
diff --git a/src/date-picker/DateRangePicker.tsx b/src/date-picker/DateRangePicker.tsx
index 95447f74d..bf6cde92b 100644
--- a/src/date-picker/DateRangePicker.tsx
+++ b/src/date-picker/DateRangePicker.tsx
@@ -21,6 +21,7 @@ import {
   initYearMonthTime,
 } from '../_common/js/date-picker/format';
 import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
+import useFormDisabled from '../hooks/useFormDisabled';
 
 export default defineComponent({
   name: 'TDateRangePicker',
@@ -28,6 +29,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const COMPONENT_NAME = usePrefixClass('date-range-picker');
     const { CalendarIcon } = useGlobalIcon({ CalendarIcon: TdCalendarIcon });
+    const { formDisabled } = useFormDisabled();
 
     const {
       inputValue,
@@ -51,6 +53,7 @@ export default defineComponent({
       format: props.format,
       valueType: props.valueType,
     }));
+    const isDisabled = computed(() => formDisabled.value || props.disabled);
 
     // 记录面板是否选中过
     const isSelected = ref(false);
@@ -315,18 +318,18 @@ export default defineComponent({
       }
 
       // 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
-      if (!isFirstValueSelected.value) {
+      if (nextValue.length === 1 || !isFirstValueSelected.value) {
         let nextIndex = notValidIndex;
         if (nextIndex === -1) nextIndex = activeIndex.value ? 0 : 1;
         activeIndex.value = nextIndex;
         isFirstValueSelected.value = true;
-      } else {
+      } else if (nextValue.length === 2) {
         popupVisible.value = false;
       }
     }
 
     // 预设
-    function onPresetClick(preset: any) {
+    function onPresetClick(preset: any, context: any) {
       let presetValue = preset;
       if (typeof preset === 'function') {
         presetValue = preset();
@@ -346,6 +349,8 @@ export default defineComponent({
           },
         );
         popupVisible.value = false;
+        props.onPresetClick?.(context);
+        emit('preset-click', context);
       }
     }
 
@@ -414,6 +419,7 @@ export default defineComponent({
       popupVisible,
       panelProps,
       CalendarIcon,
+      isDisabled,
     };
   },
   render() {
@@ -438,7 +444,7 @@ export default defineComponent({
     return (
       <div class={COMPONENT_NAME}>
         <TRangeInputPopup
-          disabled={this.disabled}
+          disabled={this.isDisabled}
           status={this.status}
           tips={this.tips || this.$scopedSlots.tips}
           inputValue={inputValue as string[]}
diff --git a/src/date-picker/DateRangePickerPanel.tsx b/src/date-picker/DateRangePickerPanel.tsx
index 33e94a214..f52fcafe0 100644
--- a/src/date-picker/DateRangePickerPanel.tsx
+++ b/src/date-picker/DateRangePickerPanel.tsx
@@ -35,7 +35,7 @@ export default defineComponent({
     panelPreselection: dateRangePickerProps.panelPreselection,
     ...dateRangePickerPanelProps,
   },
-  setup(props: TdDateRangePickerPanelProps, { emit }) {
+  setup(props: TdDateRangePickerPanelProps, { emit, attrs }) {
     const {
       value, year, month, time, cacheValue, isFirstValueSelected, onChange,
     } = useRangeValue(props);
@@ -274,7 +274,7 @@ export default defineComponent({
     }
 
     // 预设
-    function onPresetClick(preset: any) {
+    function onPresetClick(preset: any, context: any) {
       let presetValue = preset;
       if (typeof preset === 'function') {
         presetValue = preset();
@@ -292,6 +292,8 @@ export default defineComponent({
             trigger: 'preset',
           },
         );
+        props.onPresetClick?.(context);
+        emit('preset-click', context);
       }
     }
 
@@ -372,6 +374,8 @@ export default defineComponent({
       enableTimePicker: props.enableTimePicker,
       presetsPlacement: props.presetsPlacement,
       panelPreselection: props.panelPreselection,
+      // 该属性本身主要是联动父组件使用, 单独使用没有特别意义, 不应该暴露为props
+      popupVisible: (attrs?.popupVisible as Boolean) ?? true,
       onPanelClick,
       onCellClick,
       onCellMouseEnter,
diff --git a/src/date-picker/base/Footer.tsx b/src/date-picker/base/Footer.tsx
index e77789a6b..2448d0c64 100644
--- a/src/date-picker/base/Footer.tsx
+++ b/src/date-picker/base/Footer.tsx
@@ -41,7 +41,8 @@ export default defineComponent({
                   key={key}
                   size="small"
                   variant="text"
-                  onClick={(e: MouseEvent) => this.onPresetClick?.(this.presets[key], { e })}
+                  onClick={(e: MouseEvent) => this.onPresetClick?.(this.presets[key], { e, preset: { [key]: this.presets[key] } })
+                  }
                 >
                   {key}
                 </TButton>
diff --git a/src/date-picker/panel/ExtraContent.tsx b/src/date-picker/panel/ExtraContent.tsx
index adc825786..b6da86164 100644
--- a/src/date-picker/panel/ExtraContent.tsx
+++ b/src/date-picker/panel/ExtraContent.tsx
@@ -10,7 +10,8 @@ export default defineComponent({
     presetsPlacement: String as PropType<TdDatePickerProps['presetsPlacement']>,
     onPresetClick: Function,
     onConfirmClick: Function,
-    selectedValue: String as PropType<DateValue>,
+    // 支持时间戳模式：时间戳为Number类型
+    selectedValue: [String, Number] as PropType<DateValue>,
   },
   setup(props) {
     const showPanelFooter = computed(() => props.enableTimePicker || props.presets);
diff --git a/src/hooks/useResizeObserver.ts b/src/hooks/useResizeObserver.ts
index e7a37c825..a2bfd5f43 100644
--- a/src/hooks/useResizeObserver.ts
+++ b/src/hooks/useResizeObserver.ts
@@ -4,7 +4,7 @@ export default function useResizeObserver(
   container: Ref<HTMLElement>,
   callback: (data: ResizeObserverEntry[]) => void,
 ) {
-  const isSupport = window && window.ResizeObserver;
+  const isSupport = typeof window !== 'undefined' && window.ResizeObserver;
   // unit tests do not need any warn console; too many warns influence focusing on more important log info
   if (!isSupport) return;
 
diff --git a/src/image/index.ts b/src/image/index.ts
index 65cb17dfd..99d1303c8 100644
--- a/src/image/index.ts
+++ b/src/image/index.ts
@@ -8,5 +8,6 @@ import './style';
 export type ImageProps = TdImageProps;
 export * from './type';
 
+// @ts-ignore
 export const Image = withInstall(mapProps(['value'])(_Image));
 export default Image;
diff --git a/src/menu/index.ts b/src/menu/index.ts
index d38d28fcb..1ba7c0cf0 100644
--- a/src/menu/index.ts
+++ b/src/menu/index.ts
@@ -31,7 +31,7 @@ export const Menu = withInstall(
     ],
     {
       model: { prop: 'value', event: 'change' },
-    },
+    }, // @ts-ignore
   )(_Menu),
 );
 
@@ -49,7 +49,7 @@ export const HeadMenu = withInstall(
     ],
     {
       model: { prop: 'value', event: 'change' },
-    },
+    }, // @ts-ignore
   )(_HeadMenu),
 );
 
diff --git a/src/select-input/useSingle.tsx b/src/select-input/useSingle.tsx
index dd12a1cd5..8f106e220 100644
--- a/src/select-input/useSingle.tsx
+++ b/src/select-input/useSingle.tsx
@@ -77,7 +77,7 @@ export default function useSingle(props: TdSelectInputProps, context: SetupConte
     const prefixContent = [renderTNode('label'), singleValueDisplay];
     const inputProps = {
       ...commonInputProps.value,
-      value: singleValueDisplay ? undefined : displayedValue,
+      value: singleValueDisplay && props.value ? undefined : displayedValue,
       label: prefixContent.length ? () => prefixContent : undefined,
       autoWidth: props.autoWidth,
       autofocus: props.autofocus,
diff --git a/src/select/option.tsx b/src/select/option.tsx
index 269f9ffee..f57acb863 100644
--- a/src/select/option.tsx
+++ b/src/select/option.tsx
@@ -54,7 +54,6 @@ export default defineComponent({
     isVirtual: Boolean,
     bufferSize: Number,
     index: Number,
-    panelElement: HTMLElement,
   },
   components: {
     TCheckbox: Checkbox,
@@ -68,7 +67,16 @@ export default defineComponent({
     const { classPrefix } = useConfig('classPrefix');
 
     const {
-      value, label, multiple, disabled, panelElement, scrollType, bufferSize, index, isCreatedOption,
+      value,
+      label,
+      multiple,
+      disabled,
+      // @ts-ignore
+      panelElement,
+      scrollType,
+      bufferSize,
+      index,
+      isCreatedOption,
     } = toRefs(props);
 
     const { hasLazyLoadHolder = null, tRowHeight = null } = useLazyLoad(
diff --git a/src/select/select-panel.tsx b/src/select/select-panel.tsx
index 7b201b974..cb5c7203a 100644
--- a/src/select/select-panel.tsx
+++ b/src/select/select-panel.tsx
@@ -358,6 +358,6 @@ export default defineComponent({
       );
     }
 
-    return <div>{this.renderPanelContent()}</div>;
+    return (this.renderPanelContent as Function)();
   },
 });
diff --git a/src/slider/slider-button.tsx b/src/slider/slider-button.tsx
index 4438b3b8c..434f702de 100644
--- a/src/slider/slider-button.tsx
+++ b/src/slider/slider-button.tsx
@@ -183,7 +183,7 @@ export default mixins(classPrefixMixins, Vue as VueConstructor<SliderInstanceTyp
         this.hideTooltipComponent();
       }
     },
-    onButtonDown(event: UIEvent) {
+    onButtonDown(event: MouseEvent | TouchEvent) {
       if (this.disabled) {
         return;
       }
diff --git a/src/table/_example/select-single.vue b/src/table/_example/select-single.vue
index 7e7118141..235551c5f 100644
--- a/src/table/_example/select-single.vue
+++ b/src/table/_example/select-single.vue
@@ -15,7 +15,9 @@
         <p v-if="row.status === 0" class="status">健康</p>
         <p v-if="row.status === 1" class="status unhealth">异常</p>
       </template>
-      <template #op-column><p>操作</p></template>
+      <template #op-column>
+        <p>操作</p>
+      </template>
       <template #op="slotProps">
         <a class="link" @click="rehandleClickOp(slotProps)">管理</a>
         <a class="link" @click="rehandleClickOp(slotProps)">删除</a>
@@ -126,6 +128,7 @@ export default {
   .t-table__row--selected {
     background-color: #ecf2fe;
   }
+
   /** 最右侧选中图标示范 */
   .t-table__row--selected > td:last-child::after {
     content: '✅';
@@ -144,10 +147,12 @@ export default {
   cursor: pointer;
   margin-right: 15px;
 }
+
 .status {
   position: relative;
   color: #00a870;
   margin-left: 10px;
+
   &::before {
     position: absolute;
     top: 50%;
@@ -161,8 +166,10 @@ export default {
     border-radius: 50%;
   }
 }
+
 .status.unhealth {
   color: #e34d59;
+
   &::before {
     background-color: #e34d59;
   }
diff --git a/src/table/hooks/useFixed.ts b/src/table/hooks/useFixed.ts
index 65235eff6..788ddafe6 100644
--- a/src/table/hooks/useFixed.ts
+++ b/src/table/hooks/useFixed.ts
@@ -369,7 +369,7 @@ export default function useFixed(
     if (!rect) return;
     // 存在纵向滚动条，且固定表头时，需去除滚动条宽度
     const reduceWidth = isFixedHeader.value ? scrollbarWidth.value : 0;
-    tableWidth.value = Math.floor(rect.width - reduceWidth - (props.bordered ? 1 : 0));
+    tableWidth.value = rect.width - reduceWidth - (props.bordered ? 1 : 0);
     const elmRect = tableElmRef?.value?.getBoundingClientRect();
     tableElmWidth.value = elmRect?.width;
   };
diff --git a/src/table/thead.tsx b/src/table/thead.tsx
index e6203afea..e9b4b9edf 100644
--- a/src/table/thead.tsx
+++ b/src/table/thead.tsx
@@ -161,7 +161,10 @@ export default defineComponent({
           const resizeColumnListener = this.resizable || !canDragSort
             ? {
               mousedown: (e: MouseEvent) => {
-                this.columnResizeParams?.onColumnMousedown?.(e, col, index);
+                e.stopPropagation();
+                if (this.resizable) {
+                  this.columnResizeParams?.onColumnMousedown?.(e, col, index);
+                }
                 if (!canDragSort) {
                   const timer = setTimeout(() => {
                     const thList = this.theadRef.querySelectorAll('th');
@@ -170,7 +173,9 @@ export default defineComponent({
                   }, 10);
                 }
               },
-              mousemove: (e: MouseEvent) => this.columnResizeParams?.onColumnMouseover?.(e, col),
+              mousemove: (e: MouseEvent) => {
+                this.resizable && this.columnResizeParams?.onColumnMouseover?.(e, col);
+              },
             }
             : {};
           const content = isFunction(col.ellipsisTitle) ? col.ellipsisTitle(h, { col, colIndex: index }) : undefined;
diff --git a/src/tabs/tab-nav.tsx b/src/tabs/tab-nav.tsx
index fdf44c113..5ce379386 100644
--- a/src/tabs/tab-nav.tsx
+++ b/src/tabs/tab-nav.tsx
@@ -96,12 +96,6 @@ export default mixins(classPrefixMixins, getGlobalIconMixins()).extend({
   },
   computed: {
     navs(): Array<VNode> {
-      // https://github.com/vuejs/jsx-vue2/releases/tag/v1.3.0
-      // In some legacy codebases, a standalone render function might rely on its this context rather than the runtime currentInstance. So there may be incompatibilities.
-      // add const h = this.$createElement to the beginning of the problematic function
-
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      // const h = this.$createElement;
       return this.panels.map((panel, index) => (
         <TTabNavItem
           ref={`tabItem${index}`}
diff --git a/src/tag-input/hooks/useHover.ts b/src/tag-input/hooks/useHover.ts
index 393069fcf..73f423cc1 100644
--- a/src/tag-input/hooks/useHover.ts
+++ b/src/tag-input/hooks/useHover.ts
@@ -1,8 +1,8 @@
-import { ref, SetupContext } from 'vue';
+import { ref, SetupContext, Ref } from 'vue';
 
 export interface UseHoverParams {
-  readonly: boolean;
-  disabled: boolean;
+  readonly: Ref<boolean>;
+  disabled: Ref<boolean>;
   onMouseenter: (context: { e: MouseEvent }) => void;
   onMouseleave: (context: { e: MouseEvent }) => void;
 }
@@ -14,14 +14,14 @@ export default function useHover(props: UseHoverParams, { emit }: SetupContext)
   const isHover = ref<boolean>(false);
 
   const addHover = (context: { e: MouseEvent }) => {
-    if (readonly || disabled) return;
+    if (readonly.value || disabled.value) return;
     isHover.value = true;
     onMouseenter?.(context);
     emit('mouseenter', context);
   };
 
   const cancelHover = (context: { e: MouseEvent }) => {
-    if (readonly || disabled) return;
+    if (readonly.value || disabled.value) return;
     isHover.value = false;
     onMouseleave?.(context);
     emit('mouseleave', context);
diff --git a/src/tag-input/tag-input.tsx b/src/tag-input/tag-input.tsx
index b761b242c..de6cc5ffb 100644
--- a/src/tag-input/tag-input.tsx
+++ b/src/tag-input/tag-input.tsx
@@ -1,9 +1,9 @@
 import {
-  defineComponent, computed, toRefs, ref, nextTick, Ref, toRef,
+  defineComponent, computed, toRefs, ref, nextTick,
 } from 'vue';
 
 import { CloseCircleFilledIcon as TdCloseCircleFilledIcon } from 'tdesign-icons-vue';
-import TInput, { InputProps, InputValue, TdInputProps } from '../input';
+import TInput, { InputProps, InputValue } from '../input';
 import { TdTagInputProps } from './type';
 import props from './props';
 import { renderTNodeJSX } from '../utils/render-tnode';
@@ -21,8 +21,7 @@ export default defineComponent({
   props: { ...props },
 
   setup(props: TdTagInputProps, context) {
-    const { inputValue } = toRefs(props);
-    const inputProps = toRef(props, 'inputProps') as Ref<TdInputProps>;
+    const { inputValue, inputProps } = toRefs(props);
     // 除了绑定 DOM 的变量，其他的一律不可使用 Ref 作为后缀
     const isComposition = ref(false);
     const COMPONENT_NAME = usePrefixClass('tag-input');
@@ -41,8 +40,8 @@ export default defineComponent({
     } = toRefs(props);
     const { isHover, addHover, cancelHover } = useHover(
       {
-        readonly: props.readonly,
-        disabled: props.disabled,
+        readonly,
+        disabled,
         onMouseenter: props.onMouseenter,
         onMouseleave: props.onMouseleave,
       },
diff --git a/src/tag-input/useTagList.tsx b/src/tag-input/useTagList.tsx
index 098c907d1..3031efff6 100644
--- a/src/tag-input/useTagList.tsx
+++ b/src/tag-input/useTagList.tsx
@@ -43,7 +43,7 @@ export default function useTagList(props: TdTagInputProps, context: SetupContext
   const onInnerEnter = (value: InputValue, params: { e: KeyboardEvent }) => {
     const valueStr = String(value).trim();
     let newValue: TagInputValue = tagValue.value;
-    const isLimitExceeded = max.value && tagValue.value?.length >= max.value;
+    const isLimitExceeded = max && tagValue.value?.length >= max.value;
     if (!isLimitExceeded && valueStr) {
       newValue = tagValue.value instanceof Array ? tagValue.value.concat(String(valueStr)) : [valueStr];
       setTagValue(newValue, {
@@ -92,7 +92,7 @@ export default function useTagList(props: TdTagInputProps, context: SetupContext
     const newList = minCollapsedNum.value ? tagValue.value.slice(0, minCollapsedNum.value) : tagValue.value;
     const list = displayNode
       ? [displayNode]
-      : newList?.map((item, index) => {
+      : newList?.map?.((item, index) => {
         const tagContent = renderTNode('tag', { params: { value: item } });
         const TagNode = (
             <Tag
@@ -122,7 +122,7 @@ export default function useTagList(props: TdTagInputProps, context: SetupContext
         ) : (
           TagNode
         );
-      });
+      }) || [];
     if (![null, undefined, ''].includes(label)) {
       list.unshift(
         <div class={`${classPrefix.value}-tag-input__prefix`} key="label">
diff --git a/src/textarea/textarea.tsx b/src/textarea/textarea.tsx
index 3e0e67d9c..898b4cfad 100644
--- a/src/textarea/textarea.tsx
+++ b/src/textarea/textarea.tsx
@@ -1,8 +1,6 @@
 import Vue, { VueConstructor } from 'vue';
 import isFunction from 'lodash/isFunction';
 import { getUnicodeLength, limitUnicodeMaxLength } from '../_common/js/utils/helper';
-import props from './props';
-import { TextareaValue } from './type';
 import { getPropsApiByEvent, getCharacterLength } from '../utils/helper';
 import calcTextareaHeight from './calcTextareaHeight';
 import { renderTNodeJSX } from '../utils/render-tnode';
@@ -10,6 +8,9 @@ import { ClassName } from '../common';
 import { getClassPrefixMixins } from '../config-provider/config-receiver';
 import mixins from '../utils/mixins';
 
+import props from './props';
+import type { TextareaValue } from './type';
+
 const classPrefixMixins = getClassPrefixMixins('textarea');
 
 function getValidAttrs(obj: object): object {
@@ -106,7 +107,7 @@ export default mixins(Vue as VueConstructor<Textarea>, classPrefixMixins).extend
     adjustTextareaHeight() {
       if (this.autosize === true) {
         this.textareaStyle = calcTextareaHeight(this.$refs.refTextareaElem as HTMLTextAreaElement);
-      } else if (typeof this.autosize === 'object') {
+      } else if (this.autosize && typeof this.autosize === 'object') {
         this.textareaStyle = calcTextareaHeight(
           this.$refs.refTextareaElem as HTMLTextAreaElement,
           this.autosize?.minRows,
diff --git a/src/time-picker/time-picker.tsx b/src/time-picker/time-picker.tsx
index d6d2fcf22..fb897990b 100755
--- a/src/time-picker/time-picker.tsx
+++ b/src/time-picker/time-picker.tsx
@@ -13,6 +13,7 @@ import type { InputProps } from '../input';
 import useVModel from '../hooks/useVModel';
 import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { useGlobalIcon } from '../hooks/useGlobalIcon';
+import useFormDisabled from '../hooks/useFormDisabled';
 
 import props from './props';
 
@@ -25,10 +26,12 @@ export default defineComponent({
     const { classPrefix } = useConfig('classPrefix');
     const componentName = usePrefixClass('time-picker');
     const { TimeIcon } = useGlobalIcon({ TimeIcon: TdTimeIcon });
+    const { formDisabled } = useFormDisabled();
 
     const currentValue = ref('');
     const isShowPanel = ref(false);
     const { global } = useConfig('timePicker');
+    const isDisabled = computed(() => formDisabled.value || props.disabled);
 
     const { value } = toRefs(props);
     const [innerValue, setInnerValue] = useVModel(value, props.defaultValue, props.onChange, 'change');
@@ -116,6 +119,7 @@ export default defineComponent({
       global,
       currentValue,
       TimeIcon,
+      isDisabled,
     };
   },
   render() {
@@ -129,7 +133,7 @@ export default defineComponent({
               onClear: this.handleClear,
               onBlur: this.handleInputBlur,
               onInputChange: this.handleInputChange,
-              disabled: this.disabled,
+              disabled: this.isDisabled,
               clearable: this.clearable,
               allowInput: this.allowInput,
               class: this.inputClasses,
diff --git a/src/time-picker/time-range-picker.tsx b/src/time-picker/time-range-picker.tsx
index bca5614c1..b92a60fe5 100644
--- a/src/time-picker/time-range-picker.tsx
+++ b/src/time-picker/time-range-picker.tsx
@@ -19,6 +19,7 @@ import type { TimeRangePickerPartial } from './type';
 import useVModel from '../hooks/useVModel';
 import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { useGlobalIcon } from '../hooks/useGlobalIcon';
+import useFormDisabled from '../hooks/useFormDisabled';
 
 dayjs.extend(customParseFormat);
 
@@ -36,6 +37,7 @@ export default defineComponent({
     const { global } = useConfig('timePicker');
     const { classPrefix } = useConfig('classPrefix');
     const { TimeIcon } = useGlobalIcon({ TimeIcon: TdTimeIcon });
+    const { formDisabled } = useFormDisabled();
 
     const currentPanelIdx = ref(undefined);
     const currentValue = ref<Array<string>>(TIME_PICKER_EMPTY);
@@ -47,6 +49,8 @@ export default defineComponent({
         [`${classPrefix.value}-is-focused`]: isShowPanel.value,
       },
     ]);
+    const isDisabled = computed(() => formDisabled.value || props.disabled);
+
     const { value, format } = toRefs(props);
     const [innerValue, setInnerValue] = useVModel(value, props.defaultValue, props.onChange, 'change');
 
@@ -150,6 +154,7 @@ export default defineComponent({
       handleInputBlur,
       handleTimeChange,
       TimeIcon,
+      isDisabled,
     };
   },
   render() {
@@ -161,7 +166,7 @@ export default defineComponent({
           {...{
             props: {
               onInputChange: this.handleInputChange,
-              disabled: this.disabled,
+              disabled: this.isDisabled,
               popupVisible: this.isShowPanel,
               inputValue: this.isShowPanel ? this.currentValue : this.innerValue ?? TIME_PICKER_EMPTY,
               popupProps: {
diff --git a/src/tree-select/tree-select.tsx b/src/tree-select/tree-select.tsx
index 5c514f218..b5c3c9fad 100644
--- a/src/tree-select/tree-select.tsx
+++ b/src/tree-select/tree-select.tsx
@@ -84,7 +84,7 @@ export default defineComponent({
           {!this.loading ? (
             <Tree
               ref="treeRef"
-              key={this.treeKey}
+              key={!(this.treeProps as TreeProps)?.load && this.treeKey}
               props={{
                 keys: this.tKeys,
                 value: [...this.multipleChecked],
diff --git a/src/tree-select/useTreeSelect.ts b/src/tree-select/useTreeSelect.ts
index 9b29efe09..4f1d0e575 100644
--- a/src/tree-select/useTreeSelect.ts
+++ b/src/tree-select/useTreeSelect.ts
@@ -205,7 +205,7 @@ export default function useTreeSelect(props: TdTreeSelectProps, context: SetupCo
   const filterByText = computed<TreeProps['filter'] | undefined>(() => {
     if (props.onSearch || context.listeners.search) return;
     if ((props.filter || props.filterable) && innerInputValue.value && !context.listeners.search) {
-      return props.filter ? (node) => props.filter(innerInputValue.value, node) : defaultFilterFunction;
+      return props.filter ? (node) => props.filter(innerInputValue.value, node) : (node) => defaultFilterFunction(node);
     }
     return undefined;
   });
diff --git a/src/tree/index.ts b/src/tree/index.ts
index 1f53440e3..5200f47b8 100644
--- a/src/tree/index.ts
+++ b/src/tree/index.ts
@@ -4,22 +4,27 @@ import withInstall from '../utils/withInstall';
 
 import './style';
 
-export const Tree = withInstall(mapProps([
-  {
-    name: 'value',
-    event: ['change', 'update:value'],
-  },
-  {
-    name: 'expanded',
-    event: ['expand', 'update:expanded'],
-  },
-  {
-    name: 'actived',
-    event: ['active', 'update:actived'],
-  },
-], {
-  model: { prop: 'value', event: 'change' },
-})(_TdTree));
+export const Tree = withInstall(
+  mapProps(
+    [
+      {
+        name: 'value',
+        event: ['change', 'update:value'],
+      },
+      {
+        name: 'expanded',
+        event: ['expand', 'update:expanded'],
+      },
+      {
+        name: 'actived',
+        event: ['active', 'update:actived'],
+      },
+    ],
+    {
+      model: { prop: 'value', event: 'change' },
+    }, // @ts-ignore
+  )(_TdTree),
+);
 
 export * from './interface';
 export default Tree;