From 2fe243560d6da1feac79c3c39cee1e3b1ca98548 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 5 Jan 2023 15:23:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?select=E5=A2=9E=E5=8A=A0round?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/button/__demo__/BtnLoading.vue |   2 +-
 .../src/components/popover/OPopover.vue       |   6 +
 .../src/components/select/OSelect.vue         |  40 ++++-
 .../select/__demo__/IndexSelect.vue           |   2 +
 .../select/__demo__/SelectDisabled.vue        |  14 +-
 .../select/__demo__/SelectPopupposition.vue   | 145 +++++++++++-------
 .../select/__demo__/SelectShape.vue           |  37 +++++
 .../components/select/__demo__/SelectSize.vue |   2 +-
 .../src/components/select/style/index.scss    |  47 +++---
 .../src/components/select/style/var.scss      |   2 +
 10 files changed, 211 insertions(+), 86 deletions(-)
 create mode 100644 packages/opendesign/src/components/select/__demo__/SelectShape.vue

diff --git a/packages/opendesign/src/components/button/__demo__/BtnLoading.vue b/packages/opendesign/src/components/button/__demo__/BtnLoading.vue
index 479056e9..d90811eb 100644
--- a/packages/opendesign/src/components/button/__demo__/BtnLoading.vue
+++ b/packages/opendesign/src/components/button/__demo__/BtnLoading.vue
@@ -22,7 +22,7 @@ const showLoading = (key: 'loading1' | 'loading2' | 'loading3', val: boolean) =>
       <template #icon><IconAdd /></template>Outline Button
     </OButton>
     <OButton type="text" :loading="rlt.loading3" @click="showLoading('loading3', true)">Text Button</OButton>
-    <OButton type="link" :loading="rlt.loading3" @click="showLoading('loading3', true)">Link Button</OButton>
+    <OButton type="link" :loading="!rlt.loading3" @click="showLoading('loading3', true)">Link Button</OButton>
   </section>
 </template>
 <style lang="scss"></style>
diff --git a/packages/opendesign/src/components/popover/OPopover.vue b/packages/opendesign/src/components/popover/OPopover.vue
index 7a249cc0..dd13980a 100644
--- a/packages/opendesign/src/components/popover/OPopover.vue
+++ b/packages/opendesign/src/components/popover/OPopover.vue
@@ -40,10 +40,16 @@ const props = defineProps({
     type: [String, Object] as PropType<string | HTMLElement>,
     default: document.body,
   },
+  /**
+   * 是否在隐藏时卸载
+   */
   unmountOnClose: {
     type: Boolean,
     default: true,
   },
+  /**
+   * 距离触发元素的偏移量
+   */
   offset: {
     type: Number,
     default: 8,
diff --git a/packages/opendesign/src/components/select/OSelect.vue b/packages/opendesign/src/components/select/OSelect.vue
index 285ee01c..d707d32e 100644
--- a/packages/opendesign/src/components/select/OSelect.vue
+++ b/packages/opendesign/src/components/select/OSelect.vue
@@ -3,20 +3,53 @@ import { provide, ref } from 'vue';
 import { defaultSize, defaultShape } from '../_shared/global';
 import type { SizeT, ShapeT } from '../_shared/global';
 import { IconArrowTraingleDown } from '../icons';
-import { OPopup, PopupPositionT } from '../popup';
+import { OPopup, PopupPositionT, PopupTriggerT } from '../popup';
 import { selectOptionInjectKey } from './provide';
 import { SelectOptionT } from './types';
 
 interface SelectPropT {
+  /**
+   * 下拉框的值
+   * v-model
+   */
   modelValue: string | number;
+  /**
+   * 大小
+   */
   size?: SizeT;
+  /**
+   * 形状
+   */
   shape?: ShapeT;
+  /**
+   * 提示文本
+   */
   placeholder?: string;
+  /**
+   * 下拉选项触发方式
+   */
+  trigger?: PopupTriggerT;
+  /**
+   * 是否禁用
+   */
   disabled?: boolean;
-
+  /**
+   * 下拉选项位置
+   */
   optionPosition?: PopupPositionT;
+  /**
+   * 下拉选项宽度自适应规则
+   * 'auto':自动 | 'min-width':最小宽度与选择框一致 | 'width': 宽度与选择框一致
+   */
   optionWidthMode?: 'auto' | 'min-width' | 'width';
+  /**
+   * 下拉容器自定义类
+   */
   optionWrapClass?: string;
+  /**
+   * 是否在结束选择时，卸载下拉选项
+   * v-model
+   */
   unmountOnClose?: boolean;
   /**
    * 默认初始值对应的label显示，不传则使用modelValue
@@ -29,6 +62,7 @@ const props = withDefaults(defineProps<SelectPropT>(), {
   size: undefined,
   shape: undefined,
   placeholder: 'please select...',
+  trigger: 'click',
   optionPosition: 'bl',
   optionWidthMode: 'min-width',
   optionWrapClass: '',
@@ -84,7 +118,7 @@ provide(selectOptionInjectKey, {
       :unmount-on-close="props.unmountOnClose"
       :position="props.optionPosition"
       :target="selectRef"
-      trigger="click"
+      :trigger="props.trigger"
       :offset="4"
       :adjust-min-width="props.optionWidthMode === 'min-width'"
       :adjust-width="props.optionWidthMode === 'width'"
diff --git a/packages/opendesign/src/components/select/__demo__/IndexSelect.vue b/packages/opendesign/src/components/select/__demo__/IndexSelect.vue
index c9b842f0..9c8d89ea 100644
--- a/packages/opendesign/src/components/select/__demo__/IndexSelect.vue
+++ b/packages/opendesign/src/components/select/__demo__/IndexSelect.vue
@@ -3,12 +3,14 @@ import '../style';
 import '../../option/style';
 
 import SelectSize from './SelectSize.vue';
+import SelectShape from './SelectShape.vue';
 import SelectDisabled from './SelectDisabled.vue';
 import SelectPopupposition from './SelectPopupposition.vue';
 </script>
 <template>
   <div class="page-demo">
     <SelectSize />
+    <SelectShape />
     <SelectDisabled />
     <SelectPopupposition />
   </div>
diff --git a/packages/opendesign/src/components/select/__demo__/SelectDisabled.vue b/packages/opendesign/src/components/select/__demo__/SelectDisabled.vue
index 3ff67101..ac3c4203 100644
--- a/packages/opendesign/src/components/select/__demo__/SelectDisabled.vue
+++ b/packages/opendesign/src/components/select/__demo__/SelectDisabled.vue
@@ -15,6 +15,13 @@ const options = [
 <template>
   <h4>Disabled</h4>
   <section>
+    <OSelect v-model="selectVal2" disabled>
+      <OOption :label="options[0].label" :value="options[0].value" />
+      <OOption :label="options[1].label" :value="options[1].value" disabled />
+      <OOption :label="options[2].label" :value="options[2].value" disabled />
+      <OOption :label="options[3].label" :value="options[3].value" />
+    </OSelect>
+
     <OSelect v-model="selectVal">
       <OOption :label="options[0].label" :value="options[0].value" />
       <OOption :label="options[1].label" :value="options[1].value" disabled />
@@ -26,13 +33,6 @@ const options = [
       <OOption :value="options[0].value" />
       <OOption :value="options[1].value" disabled />
     </OSelect>
-
-    <OSelect v-model="selectVal2" disabled>
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-      <OOption :label="options[2].label" :value="options[2].value" disabled />
-      <OOption :label="options[3].label" :value="options[3].value" />
-    </OSelect>
   </section>
 </template>
 <style lang="scss"></style>
diff --git a/packages/opendesign/src/components/select/__demo__/SelectPopupposition.vue b/packages/opendesign/src/components/select/__demo__/SelectPopupposition.vue
index fea66fbc..0fc7aaab 100644
--- a/packages/opendesign/src/components/select/__demo__/SelectPopupposition.vue
+++ b/packages/opendesign/src/components/select/__demo__/SelectPopupposition.vue
@@ -11,62 +11,101 @@ const options = [
 ];
 </script>
 <template>
-  <h4>popup position</h4>
+  <h4>Option Position</h4>
   <section>
-    <OSelect v-model="selectVal" option-position="tl">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="top">
-      <OOption :value="options[0].value" />
-      <OOption :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="tr">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="bl">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="bottom">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="br">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-
-    <OSelect v-model="selectVal2" option-position="lt">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="left">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="lb">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-
-    <OSelect v-model="selectVal2" option-position="rt">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="right">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
-    <OSelect v-model="selectVal2" option-position="rb">
-      <OOption :label="options[0].label" :value="options[0].value" />
-      <OOption :label="options[1].label" :value="options[1].value" disabled />
-    </OSelect>
+    <div>
+      <span>TL:</span
+      ><OSelect v-model="selectVal" option-position="tl">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>TOP:</span
+      ><OSelect v-model="selectVal2" option-position="top" trigger="hover">
+        <OOption :value="options[0].value" />
+        <OOption :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>TR:</span
+      ><OSelect v-model="selectVal2" option-position="tr">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>BL:</span
+      ><OSelect v-model="selectVal2" option-position="bl">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>BOTTOM:</span
+      ><OSelect v-model="selectVal2" option-position="bottom">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>BR:</span
+      ><OSelect v-model="selectVal2" option-position="br">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>LT:</span
+      ><OSelect v-model="selectVal2" option-position="lt">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>LEFT:</span
+      ><OSelect v-model="selectVal2" option-position="left">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>LB:</span
+      ><OSelect v-model="selectVal2" option-position="lb">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>RT:</span
+      ><OSelect v-model="selectVal2" option-position="rt">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>RIGHT:</span
+      ><OSelect v-model="selectVal2" option-position="right">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
+    <div>
+      <span>RB:</span
+      ><OSelect v-model="selectVal2" option-position="rb">
+        <OOption :label="options[0].label" :value="options[0].value" />
+        <OOption :label="options[1].label" :value="options[1].value" disabled />
+      </OSelect>
+    </div>
   </section>
 </template>
 <style lang="scss" scoped>
-section > * {
-  margin: 40px;
+section {
+  span {
+    display: inline-block;
+    width: 100px;
+    text-align: right;
+    margin-right: 12px;
+  }
 }
 </style>
diff --git a/packages/opendesign/src/components/select/__demo__/SelectShape.vue b/packages/opendesign/src/components/select/__demo__/SelectShape.vue
new file mode 100644
index 00000000..47ae2bc1
--- /dev/null
+++ b/packages/opendesign/src/components/select/__demo__/SelectShape.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import { OSelect } from '../index';
+import { OOption } from '../../option';
+const selectVal2 = ref('');
+const options = [
+  { label: 'option 1', value: 'opt1' },
+  { label: 'long long long long long long long long long long long long text option 2', value: 'opt2' },
+  { label: 'option 3', value: 'opt3' },
+  { label: 'option 4', value: 'opt4' },
+];
+const selectVal = ref(options[0].value);
+</script>
+<template>
+  <h4>Round</h4>
+  <section>
+    <OSelect v-model="selectVal" size="large" :default-label="options[0].label" shape="round">
+      <OOption :label="options[0].label" :value="options[0].value" />
+      <OOption :label="options[1].label" :value="options[1].value" />
+      <OOption :label="options[2].label" :value="options[2].value" />
+      <OOption :label="options[3].label" :value="options[3].value" />
+    </OSelect>
+
+    <OSelect v-model="selectVal2" shape="round">
+      <OOption :value="options[0].value" />
+      <OOption :value="options[1].value" disabled />
+    </OSelect>
+
+    <OSelect v-model="selectVal2" size="small" shape="round">
+      <OOption :label="options[0].label" :value="options[0].value" />
+      <OOption :label="options[1].label" :value="options[1].value" disabled />
+      <OOption :label="options[2].label" :value="options[2].value" />
+      <OOption :label="options[3].label" :value="options[3].value" />
+    </OSelect>
+  </section>
+</template>
+<style lang="scss"></style>
diff --git a/packages/opendesign/src/components/select/__demo__/SelectSize.vue b/packages/opendesign/src/components/select/__demo__/SelectSize.vue
index 139ef953..b07a0734 100644
--- a/packages/opendesign/src/components/select/__demo__/SelectSize.vue
+++ b/packages/opendesign/src/components/select/__demo__/SelectSize.vue
@@ -21,7 +21,7 @@ const selectVal = ref(options[0].value);
       <OOption :label="options[3].label" :value="options[3].value" />
     </OSelect>
 
-    <OSelect v-model="selectVal2">
+    <OSelect v-model="selectVal2" placeholder="click to select...">
       <OOption :value="options[0].value" />
       <OOption :value="options[1].value" disabled />
     </OSelect>
diff --git a/packages/opendesign/src/components/select/style/index.scss b/packages/opendesign/src/components/select/style/index.scss
index 6b4f9d06..ad214b37 100644
--- a/packages/opendesign/src/components/select/style/index.scss
+++ b/packages/opendesign/src/components/select/style/index.scss
@@ -1,8 +1,28 @@
 @import './var.scss';
 @import '../../popup/style/index.scss';
 
+.o-select {
+  border: 1px solid var(--select-border);
+  border-radius: 4px;
+  padding: 0 12px;
+  cursor: pointer;
+  color: var(--select-color);
+  display: inline-flex;
+  height: var(--select-height-m);
+
+  &:hover {
+    border-color: var(--select-border_hover);
+    background-color: var(--select-bg_hover);
+  }
+  &.is-disabled {
+    cursor: not-allowed;
+    border-color: var(--select-border_disabled);
+    background-color: var(--select-bg_disabled);
+    color: var(--select-color_disabled);
+  }
+}
 .o-select-size-small {
-  padding: 0 4px 0 8px;
+  padding: 0 6px 0 12px;
   height: var(--select-height-s);
   border-radius: var(--select-radius-s);
 }
@@ -28,32 +48,14 @@
   background-color: transparent;
   display: inline-flex;
 }
-.o-select {
-  border: 1px solid var(--select-border);
-  border-radius: 4px;
-  padding: 0 12px;
-  cursor: pointer;
-  color: var(--select-color);
-  display: inline-flex;
-  height: var(--select-height-m);
-
-  &:hover {
-    border-color: var(--select-border_hover);
-    background-color: var(--select-bg_hover);
-  }
-  &.is-disabled {
-    cursor: not-allowed;
-    border-color: var(--select-border_disabled);
-    background-color: var(--select-bg_disabled);
-    color: var(--select-color_disabled);
-  }
-}
 .o-select-suffix {
   display: inline-flex;
   align-items: center;
   flex-shrink: 0;
 }
 .o-select-icon-arrow {
+  font-size: 24px;
+  color: var(--select-icon-color);
   display: inline-flex;
   align-items: center;
   transition: transform var(--o-transition-duration-2);
@@ -64,6 +66,9 @@
     transform: rotateX(180deg);
   }
 }
+.o-select-shape-round {
+  border-radius: 100px;
+}
 
 .o-select-options {
   background-color: var(--select-options-bg);
diff --git a/packages/opendesign/src/components/select/style/var.scss b/packages/opendesign/src/components/select/style/var.scss
index 525a0aaf..3788e559 100644
--- a/packages/opendesign/src/components/select/style/var.scss
+++ b/packages/opendesign/src/components/select/style/var.scss
@@ -21,6 +21,8 @@
 
   --select-color: var(--o-color-text2);
   --select-color_disabled: var(--o-color-text4);
+
+  --select-icon-color: var(--o-color-text3);
 }
 
 .o-select-options {
-- 
Gitee


From cf3db8ff7529407de2f491e88d2af321cb4dc921 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 5 Jan 2023 15:27:25 +0800
Subject: [PATCH 2/4] =?UTF-8?q?select=20demo=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../select/__demo__/IndexSelect.vue           |  6 ++----
 .../{SelectShape.vue => SelectSizeShape.vue}  | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 rename packages/opendesign/src/components/select/__demo__/{SelectShape.vue => SelectSizeShape.vue} (60%)

diff --git a/packages/opendesign/src/components/select/__demo__/IndexSelect.vue b/packages/opendesign/src/components/select/__demo__/IndexSelect.vue
index 9c8d89ea..736151f7 100644
--- a/packages/opendesign/src/components/select/__demo__/IndexSelect.vue
+++ b/packages/opendesign/src/components/select/__demo__/IndexSelect.vue
@@ -2,15 +2,13 @@
 import '../style';
 import '../../option/style';
 
-import SelectSize from './SelectSize.vue';
-import SelectShape from './SelectShape.vue';
+import SelectSizeShape from './SelectSizeShape.vue';
 import SelectDisabled from './SelectDisabled.vue';
 import SelectPopupposition from './SelectPopupposition.vue';
 </script>
 <template>
   <div class="page-demo">
-    <SelectSize />
-    <SelectShape />
+    <SelectSizeShape />
     <SelectDisabled />
     <SelectPopupposition />
   </div>
diff --git a/packages/opendesign/src/components/select/__demo__/SelectShape.vue b/packages/opendesign/src/components/select/__demo__/SelectSizeShape.vue
similarity index 60%
rename from packages/opendesign/src/components/select/__demo__/SelectShape.vue
rename to packages/opendesign/src/components/select/__demo__/SelectSizeShape.vue
index 47ae2bc1..16ed27a7 100644
--- a/packages/opendesign/src/components/select/__demo__/SelectShape.vue
+++ b/packages/opendesign/src/components/select/__demo__/SelectSizeShape.vue
@@ -12,6 +12,27 @@ const options = [
 const selectVal = ref(options[0].value);
 </script>
 <template>
+  <h4>Size</h4>
+  <section>
+    <OSelect v-model="selectVal" size="large" :default-label="options[0].label">
+      <OOption :label="options[0].label" :value="options[0].value" />
+      <OOption :label="options[1].label" :value="options[1].value" />
+      <OOption :label="options[2].label" :value="options[2].value" />
+      <OOption :label="options[3].label" :value="options[3].value" />
+    </OSelect>
+
+    <OSelect v-model="selectVal2" placeholder="click to select...">
+      <OOption :value="options[0].value" />
+      <OOption :value="options[1].value" disabled />
+    </OSelect>
+
+    <OSelect v-model="selectVal2" size="small">
+      <OOption :label="options[0].label" :value="options[0].value" />
+      <OOption :label="options[1].label" :value="options[1].value" disabled />
+      <OOption :label="options[2].label" :value="options[2].value" />
+      <OOption :label="options[3].label" :value="options[3].value" />
+    </OSelect>
+  </section>
   <h4>Round</h4>
   <section>
     <OSelect v-model="selectVal" size="large" :default-label="options[0].label" shape="round">
-- 
Gitee


From 9b21a8df088c4f1599f8c5518f9662590ac1f15c Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 5 Jan 2023 15:50:05 +0800
Subject: [PATCH 3/4] review waitch

---
 .../src/components/switch/OSwitch.vue         |  6 ++++-
 .../switch/__demo__/IndexSwitch.vue           | 11 ++--------
 .../switch/__demo__/SwitchBeforeChange.vue    | 22 ++++++++-----------
 .../__demo__/SwitchDisabledAndLoading.vue     |  3 ++-
 .../switch/__demo__/SwitchShape.vue           |  2 +-
 .../{SwitchSize.vue => SwitchSizeShape.vue}   | 10 ++++++---
 .../switch/__demo__/SwitchSlots.vue           |  5 +++--
 .../src/components/switch/style/index.scss    |  3 ++-
 8 files changed, 31 insertions(+), 31 deletions(-)
 rename packages/opendesign/src/components/switch/__demo__/{SwitchSize.vue => SwitchSizeShape.vue} (65%)

diff --git a/packages/opendesign/src/components/switch/OSwitch.vue b/packages/opendesign/src/components/switch/OSwitch.vue
index 4fe72f99..5270e69b 100644
--- a/packages/opendesign/src/components/switch/OSwitch.vue
+++ b/packages/opendesign/src/components/switch/OSwitch.vue
@@ -5,6 +5,9 @@ import { defaultSize, defaultShape } from '../_shared/global';
 import type { SizeT, ShapeT } from '../_shared/global';
 import { IconLoading } from '../_shared/icons';
 
+// TODO:
+// 1. props 参数注释需要补全
+// 2. 增加chang事件的示例
 interface SwitchPropT {
   /**
    * 开关尺寸: 'large' | 'normal' | 'small'
@@ -33,7 +36,7 @@ const emits = defineEmits<{
   (e: 'update:modelValue', val: boolean): void;
   (e: 'change', val: boolean): void;
 }>();
-
+// TODO：这个函数命名太宽泛了，建议明确下如：isExpectBeforeChangeType，或者如果只在一个地方使用，就不用抽取函数了
 const isExpectType = (res: unknown) => {
   return isPromise(res) || isBoolean(res);
 };
@@ -84,6 +87,7 @@ const onClick = () => {
   >
     <div class="o-switch-wrapper">
       <div class="o-switch-handler">
+        <!-- TODO：尽量不要使用语义不对应的标签，无语义的使用span就好了 -->
         <i v-if="props.loading" class="o-switch-icon_loading">
           <IconLoading />
         </i>
diff --git a/packages/opendesign/src/components/switch/__demo__/IndexSwitch.vue b/packages/opendesign/src/components/switch/__demo__/IndexSwitch.vue
index 4123a145..6bfadeb3 100644
--- a/packages/opendesign/src/components/switch/__demo__/IndexSwitch.vue
+++ b/packages/opendesign/src/components/switch/__demo__/IndexSwitch.vue
@@ -1,23 +1,16 @@
 <script setup lang="ts">
 import '../style';
 
-import SwitchShape from './SwitchShape.vue';
-import SwitchSize from './SwitchSize.vue';
+import SwitchSizeShape from './SwitchSizeShape.vue';
 import SwitchDisabledAndLoading from './SwitchDisabledAndLoading.vue';
 import SwitchBeforeChange from './SwitchBeforeChange.vue';
 import SwitchSlots from './SwitchSlots.vue';
 </script>
 <template>
   <div class="page-demo">
-    <h4>Shape</h4>
-    <SwitchShape />
-    <h4>Size</h4>
-    <SwitchSize />
-    <h4>Disabled & Loading</h4>
+    <SwitchSizeShape />
     <SwitchDisabledAndLoading />
-    <h4>阻止切换</h4>
     <SwitchBeforeChange />
-    <h4>插槽</h4>
     <SwitchSlots />
   </div>
 </template>
diff --git a/packages/opendesign/src/components/switch/__demo__/SwitchBeforeChange.vue b/packages/opendesign/src/components/switch/__demo__/SwitchBeforeChange.vue
index d7b2d4da..68ed61f2 100644
--- a/packages/opendesign/src/components/switch/__demo__/SwitchBeforeChange.vue
+++ b/packages/opendesign/src/components/switch/__demo__/SwitchBeforeChange.vue
@@ -4,33 +4,29 @@ import { OSWitch } from '../index';
 
 const switchVal1 = ref(false);
 const loading1 = ref(false);
+let cnt = 0;
 const beforeChange1 = (): Promise<boolean> => {
   loading1.value = true;
-
+  cnt += 1;
   return new Promise((resolve) => {
     setTimeout(() => {
       loading1.value = false;
-      return resolve(true);
+      return resolve(cnt % 2 === 0);
     }, 1000);
   });
 };
 
 const switchVal2 = ref(true);
-const loading2 = ref(false);
-const beforeChange2 = (): Promise<boolean> => {
-  loading2.value = true;
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      loading2.value = false;
-      return reject(new Error('Error'));
-    }, 1000);
-  });
+const beforeChange2 = () => {
+  cnt += 1;
+  return cnt % 2 === 0;
 };
 </script>
 
 <template>
+  <h4>阻止切换</h4>
   <section>
-    <OSWitch v-model="switchVal1" shape="normal" :loading="loading1" :before-change="beforeChange1" />
-    <OSWitch v-model="switchVal2" shape="round" :loading="loading2" :before-change="beforeChange2" />
+    <OSWitch v-model="switchVal1" :loading="loading1" :before-change="beforeChange1" />
+    <OSWitch v-model="switchVal2" shape="round" :before-change="beforeChange2" />
   </section>
 </template>
diff --git a/packages/opendesign/src/components/switch/__demo__/SwitchDisabledAndLoading.vue b/packages/opendesign/src/components/switch/__demo__/SwitchDisabledAndLoading.vue
index 29967256..84454288 100644
--- a/packages/opendesign/src/components/switch/__demo__/SwitchDisabledAndLoading.vue
+++ b/packages/opendesign/src/components/switch/__demo__/SwitchDisabledAndLoading.vue
@@ -6,8 +6,9 @@ const switchVal2 = ref(true);
 </script>
 
 <template>
+  <h4>Disabled & Loading</h4>
   <section>
-    <OSWitch v-model="switchVal1" shape="normal" loading />
+    <OSWitch v-model="switchVal1" loading />
     <OSWitch v-model="switchVal2" shape="round" loading />
   </section>
 </template>
diff --git a/packages/opendesign/src/components/switch/__demo__/SwitchShape.vue b/packages/opendesign/src/components/switch/__demo__/SwitchShape.vue
index ee40f473..ea2d8dab 100644
--- a/packages/opendesign/src/components/switch/__demo__/SwitchShape.vue
+++ b/packages/opendesign/src/components/switch/__demo__/SwitchShape.vue
@@ -7,7 +7,7 @@ const switchVal2 = ref(true);
 
 <template>
   <section>
-    <OSWitch v-model="switchVal1" shape="normal" />
+    <OSWitch v-model="switchVal1" />
     <OSWitch v-model="switchVal2" shape="round" />
   </section>
 </template>
diff --git a/packages/opendesign/src/components/switch/__demo__/SwitchSize.vue b/packages/opendesign/src/components/switch/__demo__/SwitchSizeShape.vue
similarity index 65%
rename from packages/opendesign/src/components/switch/__demo__/SwitchSize.vue
rename to packages/opendesign/src/components/switch/__demo__/SwitchSizeShape.vue
index 788ee383..4663c2bb 100644
--- a/packages/opendesign/src/components/switch/__demo__/SwitchSize.vue
+++ b/packages/opendesign/src/components/switch/__demo__/SwitchSizeShape.vue
@@ -6,10 +6,14 @@ const switchVal2 = ref(true);
 </script>
 
 <template>
+  <h4>Size</h4>
+  <section>
+    <OSWitch v-model="switchVal1" size="small" />
+    <OSWitch v-model="switchVal1" size="normal" />
+    <OSWitch v-model="switchVal1" size="large" />
+  </section>
+  <h4>Round</h4>
   <section>
-    <OSWitch v-model="switchVal1" shape="normal" size="small" />
-    <OSWitch v-model="switchVal1" shape="normal" size="normal" />
-    <OSWitch v-model="switchVal1" shape="normal" size="large" />
     <OSWitch v-model="switchVal2" shape="round" size="small" />
     <OSWitch v-model="switchVal2" shape="round" size="normal" />
     <OSWitch v-model="switchVal2" shape="round" size="large" />
diff --git a/packages/opendesign/src/components/switch/__demo__/SwitchSlots.vue b/packages/opendesign/src/components/switch/__demo__/SwitchSlots.vue
index 133e81b0..f96d607c 100644
--- a/packages/opendesign/src/components/switch/__demo__/SwitchSlots.vue
+++ b/packages/opendesign/src/components/switch/__demo__/SwitchSlots.vue
@@ -8,13 +8,14 @@ const switchVal2 = ref(true);
 </script>
 
 <template>
+  <h4>插槽</h4>
   <section>
-    <OSWitch v-model="switchVal1" shape="normal">
+    <OSWitch v-model="switchVal1">
       <template #on>开</template>
       <template #off>关</template>
     </OSWitch>
 
-    <OSWitch v-model="switchVal1" shape="normal">
+    <OSWitch v-model="switchVal1">
       <template #on><IconDone /></template>
       <template #off><IconX /></template>
     </OSWitch>
diff --git a/packages/opendesign/src/components/switch/style/index.scss b/packages/opendesign/src/components/switch/style/index.scss
index 507f2c21..df3d321c 100644
--- a/packages/opendesign/src/components/switch/style/index.scss
+++ b/packages/opendesign/src/components/switch/style/index.scss
@@ -7,7 +7,7 @@
   color: var(--switch-color);
   transition: all 0.3s;
   cursor: pointer;
-
+  // TODO 以o-xxx的类 不需要嵌套，尽量减少嵌套
   .o-switch-wrapper {
     width: 100%;
     height: 100%;
@@ -116,6 +116,7 @@
 
   .o-switch-wrapper {
     font-size: var(--switch-text-size-l);
+    // TODO
     line-height: --switch-text-height-l;
     .o-switch-handler {
       width: 20px;
-- 
Gitee


From a681ed956cb3c3c7b6dc73f41474b97d00ea2509 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 5 Jan 2023 16:21:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?select=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/components/select/style/index.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/opendesign/src/components/select/style/index.scss b/packages/opendesign/src/components/select/style/index.scss
index ad214b37..7e252450 100644
--- a/packages/opendesign/src/components/select/style/index.scss
+++ b/packages/opendesign/src/components/select/style/index.scss
@@ -14,6 +14,10 @@
     border-color: var(--select-border_hover);
     background-color: var(--select-bg_hover);
   }
+  &.is-selecting {
+    border-color: var(--select-border_hover);
+    background-color: var(--select-bg_hover);
+  }
   &.is-disabled {
     cursor: not-allowed;
     border-color: var(--select-border_disabled);
-- 
Gitee