From 5a2ea43524ea51123f8784cfd266a008b555f859 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Thu, 23 Mar 2023 18:04:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20select=E5=AF=BC=E5=87=BAupdateLabel&?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/components/cascader/OCascader.vue  | 11 ++++++++++-
 .../src/components/checkbox-group/style/index.scss    | 10 +++++++++-
 .../src/components/radio-group/style/index.scss       | 10 +++++++++-
 packages/opendesign/src/components/rate/ORate.vue     |  2 +-
 .../opendesign/src/components/rate/style/index.scss   |  9 ++++++---
 packages/opendesign/src/components/select/OSelect.vue |  7 +++++++
 .../src/components/textarea/style/index.scss          |  2 ++
 7 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/packages/opendesign/src/components/cascader/OCascader.vue b/packages/opendesign/src/components/cascader/OCascader.vue
index 314de659..13d95d0e 100644
--- a/packages/opendesign/src/components/cascader/OCascader.vue
+++ b/packages/opendesign/src/components/cascader/OCascader.vue
@@ -24,6 +24,8 @@ const emits = defineEmits<{
   (e: 'change', val: CascaderValueT): void;
 }>();
 
+const selectRef = ref<InstanceType<typeof OSelect> | null>();
+
 const _value = ref(props.modelValue);
 const inputLabel = ref();
 
@@ -66,8 +68,14 @@ watch(
   }
 );
 
+watch(
+  () => inputLabel.value,
+  (val) => {
+    selectRef.value?.updateLabel(val);
+  }
+);
+
 const onClick = (option: ColumnInfoT, columnInfo: Array<ColumnInfoT>) => {
-  console.log(panelInfo.value);
   if (!isArray(panelInfo.value)) {
     return;
   }
@@ -101,6 +109,7 @@ const onClick = (option: ColumnInfoT, columnInfo: Array<ColumnInfoT>) => {
 
 <template>
   <OSelect
+    ref="selectRef"
     :model-value="inputLabel"
     :round="props.round"
     :variant="props.variant"
diff --git a/packages/opendesign/src/components/checkbox-group/style/index.scss b/packages/opendesign/src/components/checkbox-group/style/index.scss
index 59ba2eae..b6928158 100644
--- a/packages/opendesign/src/components/checkbox-group/style/index.scss
+++ b/packages/opendesign/src/components/checkbox-group/style/index.scss
@@ -3,9 +3,17 @@
 .o-checkbox-group {
   display: inline-flex;
   flex-wrap: wrap;
-  gap: var(--checkbox-group-gap);
+}
+
+.o-checkbox-group-direction-h {
+  .o-checkbox + .o-checkbox {
+    margin-left: var(--checkbox-group-gap);
+  }
 }
 
 .o-checkbox-group-direction-v {
   flex-direction: column;
+  .o-checkbox + .o-checkbox {
+    margin-top: var(--checkbox-group-gap);
+  }
 }
diff --git a/packages/opendesign/src/components/radio-group/style/index.scss b/packages/opendesign/src/components/radio-group/style/index.scss
index e4ec1f55..49fde798 100644
--- a/packages/opendesign/src/components/radio-group/style/index.scss
+++ b/packages/opendesign/src/components/radio-group/style/index.scss
@@ -3,9 +3,17 @@
 .o-radio-group {
   display: inline-flex;
   flex-wrap: wrap;
-  gap: var(--radio-group-gap);
+}
+
+.o-radio-group-direction-h {
+  .o-radio + .o-radio {
+    margin-left: var(--radio-group-gap);
+  }
 }
 
 .o-radio-group-direction-v {
   flex-direction: column;
+  .o-radio + .o-radio {
+    margin-top: var(--radio-group-gap);
+  }
 }
diff --git a/packages/opendesign/src/components/rate/ORate.vue b/packages/opendesign/src/components/rate/ORate.vue
index 82dda797..874ae739 100644
--- a/packages/opendesign/src/components/rate/ORate.vue
+++ b/packages/opendesign/src/components/rate/ORate.vue
@@ -83,7 +83,7 @@ const iconStatus = computed(() => {
       v-for="(item, key) in count"
       :key="key"
       class="o-rate-item"
-      :class="{ 'is-full-active': iconStatus[key] === 'full', 'is-half-active': iconStatus[key] === 'half' }"
+      :class="{ 'is-full': iconStatus[key] === 'full', 'is-half': iconStatus[key] === 'half' }"
     >
       <span class="o-rate-icon o-rate-icon-top" @mouseenter="setHoverIndex(key, true)" @click="setValue(key, true)">
         <slot name="icon" :index="item" :status="iconStatus[key]">
diff --git a/packages/opendesign/src/components/rate/style/index.scss b/packages/opendesign/src/components/rate/style/index.scss
index 7b2d06e3..7f147b76 100644
--- a/packages/opendesign/src/components/rate/style/index.scss
+++ b/packages/opendesign/src/components/rate/style/index.scss
@@ -3,7 +3,6 @@
 .o-rate {
   display: inline-flex;
   align-items: center;
-  gap: var(--rate-gap);
   user-select: none;
   font-size: var(--rate-size);
   cursor: pointer;
@@ -12,17 +11,21 @@
 .o-rate-item {
   position: relative;
 
-  &.is-half-active {
+  &.is-half{
     .o-rate-icon-top {
       opacity: 1;
     }
   }
 
-  &.is-full-active {
+  &.is-full{
     .o-rate-icon-bottom {
       color: var(--rate-color-active);
     }
   }
+
+  & + .o-rate-item {
+    margin-left: var(--rate-gap);
+  }
 }
 
 .o-rate-icon {
diff --git a/packages/opendesign/src/components/select/OSelect.vue b/packages/opendesign/src/components/select/OSelect.vue
index c66bf682..48f6e18d 100644
--- a/packages/opendesign/src/components/select/OSelect.vue
+++ b/packages/opendesign/src/components/select/OSelect.vue
@@ -58,6 +58,13 @@ provide(selectOptionInjectKey, {
     }
   },
 });
+
+defineExpose({
+  updateLabel(label: string, isVisible: boolean = false) {
+    activeLabel.value = label;
+    showOption.value = isVisible;
+  },
+});
 </script>
 <template>
   <div
diff --git a/packages/opendesign/src/components/textarea/style/index.scss b/packages/opendesign/src/components/textarea/style/index.scss
index 44b280e4..b1bd1ffe 100644
--- a/packages/opendesign/src/components/textarea/style/index.scss
+++ b/packages/opendesign/src/components/textarea/style/index.scss
@@ -16,6 +16,8 @@
   position: relative;
   flex-direction: column;
   justify-items: stretch;
+  width: 100%;
+  height: 100%;
   &:hover {
     border-color: var(--textarea-bd-color-hover);
     background-color: var(--textarea-bg-color-hover);
-- 
Gitee