✨(component): 优化 select-option 代码逻辑

package/component/src/component/checkbox/index.vue

@@ -13,12 +13,12 @@ import { CheckboxSize } from "./interface";
 export interface CheckboxProps {
   name?: string;
   skin?: string;
-  value: string | number | object;
   label?: string;
-  isIndeterminate?: boolean;
+  value: string | number | object;
   modelValue?: boolean | Array<string | number | object>;
-  disabled?: boolean;
+  isIndeterminate?: boolean;
   size?: CheckboxSize;
+  disabled?: boolean;
 }
 
 const props = withDefaults(defineProps<CheckboxProps>(), {
@@ -113,6 +113,8 @@ const isDisabled = computed(() => {
   }
   return false;
 });
+
+defineExpose({ toggle: handleClick });
 </script>
 
 <template>

package/component/src/component/dropdown/index.vue

@@ -20,7 +20,7 @@ import {
   cloneVNode,
   useAttrs,
   StyleValue,
-PropType,
+  PropType,
 } from "vue";
 import {
   computed,

package/component/src/component/selectOption/index.vue

@@ -12,7 +12,7 @@ import {
   inject,
   WritableComputedRef,
   Ref,
-  onMounted,
+  ref
 } from "vue";
 
 export interface SelectOptionProps {
@@ -30,17 +30,22 @@ const props = withDefaults(defineProps<SelectOptionProps>(), {
 
 const searchValue: Ref<string> = inject("searchValue") as Ref<string>;
 const selectRef: Ref<HTMLElement> = inject("selectRef") as Ref<HTMLElement>;
-const selectedValue: WritableComputedRef<any> = inject(
+const selectedValue: WritableComputedRef<any> = inject("selectedValue") as WritableComputedRef<any>;
-  "selectedValue"
-) as WritableComputedRef<any>;
 const multiple: ComputedRef = inject("multiple") as ComputedRef;
+const checkboxRef = ref<HTMLElement>();
 
 const handleSelect = () => {
-  if (!multiple.value && !props.disabled) {
+  if(multiple.value) {
-    // @ts-ignore
+    if(!props.disabled) {
-    selectRef.value.hide();
+      // @ts-ignore
-    selectedValue.value = props.value;
+      checkboxRef.value?.toggle();
-    select();
+    }
+  } else {
+    if(!props.disabled) {
+      // @ts-ignore
+      selectRef.value.hide();
+      selectedValue.value = props.value;
+    }
   }
 };
 
@@ -52,18 +57,6 @@ const selected = computed(() => {
   }
 });
 
-const select = () => {
-  if (multiple.value) {
-    if (Array.isArray(selectedValue.value)) {
-      if (notChecked.value) selectedValue.value.push(props.value);
-    } else {
-      selectedValue.value = [props.value];
-    }
-  } else {
-    selectedValue.value = props.value;
-  }
-};
-
 const display = computed(() => {
   return (
     props.keyword?.toString().indexOf(searchValue.value) > -1 ||
@@ -71,34 +64,30 @@ const display = computed(() => {
   );
 });
 
-const notChecked = computed(() => {
+const classes = computed(() => {
-  return (
+  return [
-    selectedValue.value.find((item: any) => {
+    'layui-select-option',
-      return item === props.value;
+    {
-    }) === undefined
+      "layui-this": selected.value,
-  );
+      "layui-disabled": props.disabled,
-});
+    }
-
+  ]
-onMounted(() => {
+})
-  selected.value && select();
-});
 </script>
 
 <template>
   <dd
     v-show="display"
-    :class="[
+    :class="classes"
-      'layui-select-option',
-      { 'layui-this': selected, 'layui-disabled': disabled },
-    ]"
     @click="handleSelect"
   >
     <template v-if="multiple">
       <lay-checkbox
+        skin="primary"
+        ref="checkboxRef" 
         v-model="selectedValue"
         :disabled="disabled"
         :value="value"
-        skin="primary"
       ></lay-checkbox>
     </template>
     <slot>{{ label }}</slot>

package/document-component/src/document/zh-CN/guide/changelog.md

@@ -18,9 +18,9 @@
         <ul>
           <li>[新增] upload 组件 text 属性, 设置上传描述。</li>
           <li>[新增] upload 组件 dragText 属性, 设置拖拽面板提示信息。</li>
+          <li>[修复] select-option 组件 default 插槽内容为多层元素时, 使用 label 属性值作为回显。</li>
           <li>[修复] input-number 组件 step 设置为小数时精度丢失的问题。</li>
           <li>[修复] tooltip 组件临近屏幕边界, 三角位置显示错误。</li>
-          <li>[优化] select-option 组件 default 插槽。</li>
           <li>
         </ul> 
       </li>