Merge branch 'develop' of github.com:Tencent/tdesign-vue into main

Tencent · Mar 26, 2022 · 42ddaa7 · 42ddaa7
2 parents 44c9728 + eb23596
commit 42ddaa7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ toc: false
 docClass: timeline
 ---
 
+## 0.38.1 `2022-03-26`
+### Features
+* SelectInput: 实现 `enter` 事件 [pr #642](https://github.com/Tencent/tdesign-vue/pull/642)，[@pengYYYYY](https://github.com/pengYYYYY)
+
+## Bug Fixes
+* SelectInput: 修复单选可输入状态下的 focus 时 input value 的错误 [pr #642](https://github.com/Tencent/tdesign-vue/pull/642)，[@pengYYYYY](https://github.com/pengYYYYY)
+
 ## 0.38.0 `2022-03-25`
 ### BREAKING CHANGES
 * Input/Textarea: Input 外部传入样式挂载至 `t-input__wrap` 层级的 DOM 节点，不再传入到 `t-input` 层级；Textarea 去除 `t-textarea__wrap`，[pr #276](https://github.com/Tencent/tdesign-vue/pull/627)，[@pengYYYYY](https://github.com/pengYYYYY)

diff --git a/examples/select-input/demos/collapsed-items.vue b/examples/select-input/demos/collapsed-items.vue
@@ -151,6 +151,7 @@ export default {
 .tdesign-demo__panel-options-collapsed-items {
   width: 100%;
   padding: 4px 0;
+  display: inline-block;
 }
 .tdesign-demo__panel-options-collapsed-items .t-checkbox {
   display: flex;

diff --git a/examples/select-input/demos/excess-tags-display-type.vue b/examples/select-input/demos/excess-tags-display-type.vue
@@ -116,6 +116,7 @@ export default {
 .tdesign-demo__panel-options-excess-tags-display-type {
   width: 100%;
   padding: 4px 0;
+  display: inline-block;
 }
 .tdesign-demo__panel-options-excess-tags-display-type .t-checkbox {
   display: flex;

diff --git a/examples/select-input/demos/multiple.vue b/examples/select-input/demos/multiple.vue
@@ -133,7 +133,9 @@ export default {
 .tdesign-demo__panel-options-multiple {
   width: 100%;
   padding: 4px 0;
+  display: inline-block;
 }
+
 .tdesign-demo__panel-options-multiple .t-checkbox {
   display: flex;
   border-radius: 3px;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-vue",
   "purename": "tdesign",
-  "version": "0.38.0",
+  "version": "0.38.1",
   "description": "tdesign-vue",
   "title": "tdesign-vue",
   "keywords": [
@@ -186,4 +186,4 @@
       "npm run lint:fix"
     ]
   }
-}
+}
diff --git a/src/select-input/useSingle.tsx b/src/select-input/useSingle.tsx
@@ -102,11 +102,15 @@ export default function useSingle(props: TdSelectInputProps, context: SetupConte
         onBlur={(val: InputValue, context: { e: MouseEvent }) => {
           props.onBlur?.(value.value, { ...context, inputValue: val });
           instance.emit('blur', value.value, { ...context, inputValue: val });
-          inputValue.value = getInputValue(value.value, keys.value);
+        }}
+        onEnter={(val: InputValue, context: { e: KeyboardEvent }) => {
+          props.onEnter?.(value.value, { ...context, inputValue: val });
+          instance.emit('enter', value.value, { ...context, inputValue: val });
         }}
         onFocus={(val: InputValue, context: { e: MouseEvent }) => {
           props.onFocus?.(value.value, { ...context, inputValue: val });
           instance.emit('focus', value.value, { ...context, tagInputValue: val });
+          !popupVisible && setInputValue(getInputValue(value.value, keys.value), { ...context, trigger: 'input' }); // 聚焦时拿到value
         }}
       />
     );