Merge branch 'develop' of https://github.com/Tencent/tdesign-mobile-vue…

… into fix/picker-columns
Tencent · Dec 8, 2023 · a02311b · a02311b
2 parents 77a107e + 4c85efd
commit a02311b
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 14 deletions.
diff --git a/src/dropdown-menu/dropdown-item-props.ts b/src/dropdown-menu/dropdown-item-props.ts
@@ -33,16 +33,16 @@ export default {
   },
   /** 选中值 */
   value: {
-    type: [String, Number] as PropType<TdDropdownItemProps['value']>,
+    type: [String, Number, Array] as PropType<TdDropdownItemProps['value']>,
     default: undefined,
   },
   modelValue: {
-    type: [String, Number] as PropType<TdDropdownItemProps['value']>,
+    type: [String, Number, Array] as PropType<TdDropdownItemProps['value']>,
     default: undefined,
   },
   /** 选中值，非受控属性 */
   defaultValue: {
-    type: [String, Number] as PropType<TdDropdownItemProps['defaultValue']>,
+    type: [String, Number, Array] as PropType<TdDropdownItemProps['defaultValue']>,
     default: undefined,
   },
   /** 值改变时触发 */

diff --git a/src/dropdown-menu/dropdown-menu.en-US.md b/src/dropdown-menu/dropdown-menu.en-US.md
@@ -21,8 +21,8 @@ label | String | - | \- | N
 multiple | Boolean | false | \- | N
 options | Array | [] | Typescript：`Array<DropdownOption>` `interface DropdownOption { label: string; disabled: boolean; value: DropdownValue; }`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
 optionsColumns | String / Number | 1 | \- | N
-value | String / Number | undefined | `v-model` and `v-model:value` is supported。Typescript：`DropdownValue ` `type DropdownValue = string \| number;`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
-defaultValue | String / Number | undefined | uncontrolled property。Typescript：`DropdownValue ` `type DropdownValue = string \| number;`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
+value | String / Number / Array | undefined | `v-model` and `v-model:value` is supported。Typescript：`DropdownValue ` `type DropdownValue = string \| number \| Array<DropdownValue>;`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
+defaultValue | String / Number / Array | undefined | uncontrolled property。Typescript：`DropdownValue ` `type DropdownValue = string \| number \| Array<DropdownValue>;`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
 onChange | Function |  | Typescript：`(value: DropdownValue) => void`<br/> | N
 onConfirm | Function |  | Typescript：`(value: DropdownValue) => void`<br/> | N
 onReset | Function |  | Typescript：`(value: DropdownValue) => void`<br/> | N

diff --git a/src/dropdown-menu/dropdown-menu.md b/src/dropdown-menu/dropdown-menu.md
@@ -21,8 +21,8 @@ label | String | - | 标题 | N
 multiple | Boolean | false | 是否多选 | N
 options | Array | [] | 选项数据。TS 类型：`Array<DropdownOption>` `interface DropdownOption { label: string; disabled: boolean; value: DropdownValue; }`。[详细类型定义](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
 optionsColumns | String / Number | 1 | 选项分栏（1-3） | N
-value | String / Number | undefined | 选中值。支持语法糖 `v-model` 或 `v-model:value`。TS 类型：`DropdownValue ` `type DropdownValue = string \| number;`。[详细类型定义](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
-defaultValue | String / Number | undefined | 选中值。非受控属性。TS 类型：`DropdownValue ` `type DropdownValue = string \| number;`。[详细类型定义](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
+value | String / Number / Array | undefined | 选中值。支持语法糖 `v-model` 或 `v-model:value`。TS 类型：`DropdownValue ` `type DropdownValue = string \| number \| Array<DropdownValue>;`。[详细类型定义](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
+defaultValue | String / Number / Array | undefined | 选中值。非受控属性。TS 类型：`DropdownValue ` `type DropdownValue = string \| number \| Array<DropdownValue>;`。[详细类型定义](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/dropdown-menu/type.ts) | N
 onChange | Function |  | TS 类型：`(value: DropdownValue) => void`<br/>值改变时触发 | N
 onConfirm | Function |  | TS 类型：`(value: DropdownValue) => void`<br/>点击确认时触发 | N
 onReset | Function |  | TS 类型：`(value: DropdownValue) => void`<br/>点击重置时触发 | N

diff --git a/src/dropdown-menu/type.ts b/src/dropdown-menu/type.ts
@@ -96,4 +96,4 @@ export interface DropdownOption {
   value: DropdownValue;
 }
 
-export type DropdownValue = string | number;
+export type DropdownValue = string | number | Array<DropdownValue>;
diff --git a/src/slider/demos/label.vue b/src/slider/demos/label.vue
@@ -11,8 +11,8 @@
 import { ref } from 'vue';
 
 const value = ref(10);
-const onChange = (e: any) => {
-  value.value = e.value;
+const onChange = (e: number) => {
+  value.value = e;
 };
 </script>
 

diff --git a/src/tabs/tabs.vue b/src/tabs/tabs.vue
@@ -59,6 +59,7 @@ import {
   Fragment,
   watch,
   CSSProperties,
+  onActivated,
 } from 'vue';
 import config from '../config';
 import TabsProps from './props';
@@ -175,6 +176,9 @@ export default defineComponent({
     onBeforeUnmount(() => {
       window.removeEventListener('resize', moveToActiveTab);
     });
+    onActivated(() => {
+      moveToActiveTab();
+    });
 
     watch(value, () => {
       nextTick(() => {

diff --git a/src/textarea/demos/card.vue b/src/textarea/demos/card.vue
@@ -4,15 +4,15 @@
       class="textarea"
       label="标签文字"
       placeholder="请输入文字"
-      maxlength="500"
+      :maxlength="500"
       indicator
       layout="vertical"
     />
   </div>
 
   <div class="textarea-example card">
     <div class="textarea-example__summary">卡片样式</div>
-    <t-textarea class="textarea" label="标签文字" placeholder="请输入文字" maxlength="500" indicator />
+    <t-textarea class="textarea" label="标签文字" placeholder="请输入文字" :maxlength="500" indicator />
   </div>
 </template>
 

diff --git a/src/textarea/demos/custom.vue b/src/textarea/demos/custom.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="textarea-example">
     <text class="textarea-example__label">标签文字</text>
-    <t-textarea class="textarea" placeholder="请输入文字" bordered maxlength="100" indicator style="{{style}}" />
+    <t-textarea class="textarea" placeholder="请输入文字" bordered :maxlength="100" indicator style="{{style}}" />
   </div>
 </template>
 

diff --git a/src/textarea/textarea.vue b/src/textarea/textarea.vue
@@ -52,7 +52,6 @@ export default defineComponent({
     const textareaLength = ref(0);
     const { value, modelValue } = toRefs(props);
     const [innerValue, setInnerValue] = useVModel(value, modelValue, props.defaultValue, props.onChange);
-
     const textareaClass = computed(() => [
       `${componentName}`,
       {
@@ -85,6 +84,8 @@ export default defineComponent({
     const adjustTextareaHeight = () => {
       if (props.autosize === true) {
         textareaStyle.value = calcTextareaHeight(textareaRef.value as HTMLTextAreaElement);
+      } else if (props.autosize === false) {
+        textareaStyle.value = calcTextareaHeight(textareaRef.value as HTMLTextAreaElement, 1, 1);
       } else if (typeof props.autosize === 'object') {
         const { minRows, maxRows } = props.autosize;
         textareaStyle.value = calcTextareaHeight(textareaRef.value as HTMLTextAreaElement, minRows, maxRows);
@@ -144,6 +145,12 @@ export default defineComponent({
         adjustTextareaHeight();
       });
     });
+    watch(
+      () => props.autosize,
+      () => {
+        adjustTextareaHeight();
+      },
+    );
     return {
       componentName,
       ...toRefs(props),