fix(Select): clearable and group style (#1690)

Tencent · Oct 27, 2022 · cce18e9 · cce18e9
1 parent ee550a5
commit cce18e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/select/optionGroup.tsx b/src/select/optionGroup.tsx
@@ -1,5 +1,5 @@
 import {
-  computed, defineComponent, ref, toRefs, inject,
+  computed, defineComponent, toRefs, inject,
 } from '@vue/composition-api';
 import Vue from 'vue';
 import { ScopedSlotReturnValue } from 'vue/types/vnode';
@@ -21,7 +21,6 @@ export default defineComponent({
   props: { ...props },
   setup(props: TdOptionGroupProps) {
     const { divider } = toRefs(props);
-    const ulRef = ref<HTMLElement>(null);
     const tSelect: any = inject('tSelect');
     const { sizeClassNames } = useCommonClassName();
     const COMPONENT_NAME = usePrefixClass('select');
@@ -36,7 +35,6 @@ export default defineComponent({
     ]);
     return {
       classes,
-      ulRef,
       classPrefix,
       componentName: COMPONENT_NAME,
     };
@@ -47,9 +45,7 @@ export default defineComponent({
     return (
       <li class={this.classes}>
         <div class={`${this.componentName}-option-group__header`}>{this.label}</div>
-        <ul class={`${this.classPrefix}-select__list`} ref="ulRef">
-          {children}
-        </ul>
+        {children}
       </li>
     );
   },

diff --git a/src/select/select.tsx b/src/select/select.tsx
@@ -144,12 +144,12 @@ export default defineComponent({
       }
       const getOriginOptions = (val: SelectValue) => {
         const option = optionsMap.value.get(val);
-        delete (option as any).index;
+        if (option) delete (option as any).index;
         return option;
       };
       const getFormatOption = (val: SelectValue) => {
         const option = optionsMap.value.get(val) || oldValueMap.get(val);
-        delete (option as any).index;
+        if (option) delete (option as any).index;
         return {
           [valueOfKeys]: get(option, valueOfKeys),
           [labelOfKeys]: get(option, labelOfKeys),