From 579f75baea1aef9f810f660715e11ed8a1960dd3 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Wed, 15 Mar 2023 15:17:39 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/breadcrumb/OBreadcrumbItem.vue |  2 +-
 .../components/breadcrumb/style/index.scss    | 12 ++++
 .../src/components/breadcrumb/style/var.scss  |  1 +
 .../checkbox-group/style/index.scss           | 10 +---
 .../components/checkbox-group/style/var.scss  |  2 +-
 .../src/components/checkbox/OCheckbox.vue     |  6 +-
 .../src/components/checkbox/style/index.scss  | 12 ++--
 .../src/components/checkbox/style/var.scss    | 23 ++++----
 .../src/components/divider/style/var.scss     |  6 +-
 .../src/components/menu/OSubMenu.vue          | 11 +---
 .../menu/__demo__/MenuAccordion.vue           | 10 ++--
 .../components/menu/__demo__/MenuBasic.vue    | 12 ++--
 .../src/components/menu/style/index.scss      | 22 +++-----
 .../src/components/menu/style/var.scss        | 19 ++++---
 .../src/components/progress/style/var.scss    |  4 +-
 .../src/components/progress/types.ts          |  2 -
 .../components/radio-group/style/index.scss   | 10 +---
 .../src/components/radio-group/style/var.scss |  2 +-
 .../src/components/radio/style/index.scss     | 55 ++++++++++---------
 .../src/components/radio/style/var.scss       | 13 +++--
 .../switch/__demo__/SwitchRound.vue           |  9 +--
 .../src/components/switch/style/index.scss    |  8 +--
 .../src/components/switch/style/var.scss      | 33 ++++-------
 .../opendesign/src/components/switch/types.ts |  8 ++-
 packages/portal/src/components/TheAside.vue   |  1 +
 25 files changed, 140 insertions(+), 153 deletions(-)

diff --git a/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue b/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue
index 8f37f5cdb..a3eb0ecc3 100644
--- a/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue
+++ b/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue
@@ -15,7 +15,7 @@ const breadcrumbInjection = inject(breadcrumbInjectKey, null);
     <a v-if="href" :href="href" :target="target" class="o-breadcrumb-item-label">
       <slot></slot>
     </a>
-    <router-link v-else-if="to" :to="to" :replace="replace">
+    <router-link v-else-if="to" :to="to" :replace="replace" class="o-breadcrumb-item-label">
       <slot></slot>
     </router-link>
     <span v-else class="o-breadcrumb-item-label">
diff --git a/packages/opendesign/src/components/breadcrumb/style/index.scss b/packages/opendesign/src/components/breadcrumb/style/index.scss
index e712d4512..4e5e16c38 100644
--- a/packages/opendesign/src/components/breadcrumb/style/index.scss
+++ b/packages/opendesign/src/components/breadcrumb/style/index.scss
@@ -6,6 +6,7 @@
   color: var(--breadcrumb-color);
   font-size: var(--breadcrumb-text-size);
   line-height: var(--breadcrumb-text-height);
+
   a {
     color: inherit;
     text-decoration: none;
@@ -15,8 +16,10 @@
 .o-breadcrumb-item {
   display: inline-flex;
   align-items: center;
+
   &:last-child {
     color: var(--breadcrumb-color-active);
+    font-weight: 500;
 
     .o-breadcrumb-item-label {
       cursor: default;
@@ -30,8 +33,17 @@
 
 .o-breadcrumb-item-label {
   cursor: pointer;
+  &:hover {
+    color: var(--breadcrumb-color-active);
+  }
 }
 
 .o-breadcrumb-item-separator {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: var(--breadcrumb-seperator-size);
+  font-size: var(--breadcrumb-seperator-size);
+  line-height: 1;
   margin: 0 var(--breadcrumb-gap);
 }
diff --git a/packages/opendesign/src/components/breadcrumb/style/var.scss b/packages/opendesign/src/components/breadcrumb/style/var.scss
index 9da8ad6f3..0318102cd 100644
--- a/packages/opendesign/src/components/breadcrumb/style/var.scss
+++ b/packages/opendesign/src/components/breadcrumb/style/var.scss
@@ -6,4 +6,5 @@
   --breadcrumb-text-height: var(--o-line_height-text1);
 
   --breadcrumb-gap: var(--o-gap-1);
+  --breadcrumb-seperator-size: var(--o-icon_size-xs);
 }
diff --git a/packages/opendesign/src/components/checkbox-group/style/index.scss b/packages/opendesign/src/components/checkbox-group/style/index.scss
index 5a8c148c7..80be7f6a5 100644
--- a/packages/opendesign/src/components/checkbox-group/style/index.scss
+++ b/packages/opendesign/src/components/checkbox-group/style/index.scss
@@ -3,17 +3,9 @@
 .o-checkbox-group {
   display: inline-flex;
   flex-wrap: wrap;
-}
-
-.o-checkbox-group-direction-horizontal {
-  .o-checkbox + .o-checkbox {
-    margin-left: var(--checkbox-group-gap);
-  }
+  gap: var(--checkbox-group-gap);
 }
 
 .o-checkbox-group-direction-vertical {
   flex-direction: column;
-  .o-checkbox + .o-checkbox {
-    margin-top: var(--checkbox-group-gap);
-  }
 }
diff --git a/packages/opendesign/src/components/checkbox-group/style/var.scss b/packages/opendesign/src/components/checkbox-group/style/var.scss
index 2b50918dd..42ca62ceb 100644
--- a/packages/opendesign/src/components/checkbox-group/style/var.scss
+++ b/packages/opendesign/src/components/checkbox-group/style/var.scss
@@ -1,3 +1,3 @@
 .o-checkbox-group {
-  --checkbox-group-gap: var(--o-gap-2);
+  --checkbox-group-gap: var(--o-gap-5);
 }
diff --git a/packages/opendesign/src/components/checkbox/OCheckbox.vue b/packages/opendesign/src/components/checkbox/OCheckbox.vue
index 3aa68fe3d..f3d6eec65 100644
--- a/packages/opendesign/src/components/checkbox/OCheckbox.vue
+++ b/packages/opendesign/src/components/checkbox/OCheckbox.vue
@@ -98,8 +98,10 @@ defineExpose({
       <input type="checkbox" :value="props.value" :disabled="isDisabled" :checked="isChecked" @click="onClick" @change="onChange" />
       <slot name="checkbox" :checked="isChecked" :disabled="isDisabled">
         <span class="o-checkbox-input">
-          <IconMinus v-if="props.indeterminate" />
-          <IconDone v-else-if="isChecked" />
+          <Transition name="o-fade-in-enter">
+            <IconMinus v-if="props.indeterminate" />
+            <IconDone v-else-if="isChecked" />
+          </Transition>
         </span>
         <span class="o-checkbox-label">
           <slot></slot>
diff --git a/packages/opendesign/src/components/checkbox/style/index.scss b/packages/opendesign/src/components/checkbox/style/index.scss
index 37d3df4cd..9603fe7a2 100644
--- a/packages/opendesign/src/components/checkbox/style/index.scss
+++ b/packages/opendesign/src/components/checkbox/style/index.scss
@@ -32,19 +32,20 @@
   align-items: center;
   width: var(--checkbox-input-size);
   height: var(--checkbox-input-size);
-  background-color: var(--checkbox-input-bg);
+  background-color: var(--checkbox-input-bg-color);
   color: var(--checkbox-input-color);
   border: 1px solid var(--checkbox-input-bd-color);
+  border-radius: var(--checkbox-radius);
 }
 
 .o-checkbox-label {
-  margin-left: 8px;
+  margin-left: 12px;
 }
 
 .o-checkbox-checked,
 .o-checkbox-indeterminate {
   .o-checkbox-input {
-    background-color: var(--checkbox-input-bg-checked);
+    background-color: var(--checkbox-input-bg-color-checked);
     border-color: var(--checkbox-input-bd-color-checked);
   }
 }
@@ -53,6 +54,7 @@
   cursor: not-allowed;
   color: var(--checkbox-color-disabled);
   .o-checkbox-input {
+    background-color: var(--checkbox-input-bg-color-disabled);
     border-color: var(--checkbox-input-bd-color-disabled);
   }
 }
@@ -60,7 +62,7 @@
 .o-checkbox-checked.o-checkbox-disabled,
 .o-checkbox-indeterminate.o-checkbox-disabled {
   .o-checkbox-input {
-    background-color: var(--checkbox-input-bg-checked-disabled);
-    border-color: var(--checkbox-input-bg-checked-disabled);
+    background-color: var(--checkbox-input-bg-color-checked-disabled);
+    border-color: var(--checkbox-input-bg-color-checked-disabled);
   }
 }
diff --git a/packages/opendesign/src/components/checkbox/style/var.scss b/packages/opendesign/src/components/checkbox/style/var.scss
index 2d1f8a4cc..145ca8016 100644
--- a/packages/opendesign/src/components/checkbox/style/var.scss
+++ b/packages/opendesign/src/components/checkbox/style/var.scss
@@ -1,20 +1,23 @@
 .o-checkbox {
+  --checkbox-text-size: var(--o-font_size-text1);
+  --checkbox-text-height: var(--o-line_height-text1);
+
+  --checkbox-input-size: calc(var(--o-size-s) / 2);
+
+  --checkbox-radius: var(--o-radius-control-s);
+
   --checkbox-color: var(--o-color-info1);
   --checkbox-color-disabled: var(--o-color-info4);
 
-  --checkbox-text-size: var(--o-font_size-text1);
-  --checkbox-text-height: var(--o-line_height-text1);
+  --checkbox-input-color: rgb(var(--o-color-white));
 
-  --checkbox-input-color: var(--o-color-fill1);
+  --checkbox-input-bg-color: var(--o-color-control-light);
+  --checkbox-input-bg-color-checked: var(--o-color-primary1);
+  --checkbox-input-bg-color-disabled: var(--o-color-control4-light);
+  --checkbox-input-bg-color-checked-disabled: var(--o-color-primary4);
 
   --checkbox-input-bd-color: var(--o-color-control1);
-  --checkbox-input-bd-color-disabled: var(--o-color-control4);
   --checkbox-input-bd-color-checked: var(--o-color-primary1);
+  --checkbox-input-bd-color-disabled: var(--o-color-control4);
   --checkbox-input-bd-color-checked-disabled: var(--o-color-primary4);
-
-  --checkbox-input-bg: var(--o-color-fill1);
-  --checkbox-input-bg-checked: var(--o-color-primary1);
-  --checkbox-input-bg-checked-disabled: var(--o-color-primary4);
-
-  --checkbox-input-size: 16px;
 }
diff --git a/packages/opendesign/src/components/divider/style/var.scss b/packages/opendesign/src/components/divider/style/var.scss
index a5c57156c..bfcfaf384 100644
--- a/packages/opendesign/src/components/divider/style/var.scss
+++ b/packages/opendesign/src/components/divider/style/var.scss
@@ -1,16 +1,16 @@
 .o-divider {
   --o-divider-color: var(--o-color-info1);
 
-  --o-divider-bd-color: var(--o-color-control1);
+  --o-divider-bd-color: var(--o-color-control1-light);
 
   --o-divider-text-size: var(--o-font_size-text1);
   --o-divider-text-height: var(--o-line_height-text1);
 }
 
 .o-divider-horizontal {
-  --o-divider-gap: var(--o-gap-4);
+  --o-divider-gap: var(--o-gap-5);
 }
 
 .o-divider-vertical {
-  --o-divider-gap: var(--o-gap-2);
+  --o-divider-gap: var(--o-gap-5);
 }
diff --git a/packages/opendesign/src/components/menu/OSubMenu.vue b/packages/opendesign/src/components/menu/OSubMenu.vue
index 6b62001dd..67b57ce2d 100644
--- a/packages/opendesign/src/components/menu/OSubMenu.vue
+++ b/packages/opendesign/src/components/menu/OSubMenu.vue
@@ -100,17 +100,10 @@ const onLeave = (el: HTMLUListElement) => {
         <IconChevronRight />
       </span>
     </div>
-    <transition
-      name="sub-menu-children"
-      @before-enter="onBeforeEnter"
-      @enter="onEnter"
-      @after-enter="onAfterEnter"
-      @before-leave="onBeforeLeave"
-      @leave="onLeave"
-    >
+    <Transition @before-enter="onBeforeEnter" @enter="onEnter" @after-enter="onAfterEnter" @before-leave="onBeforeLeave" @leave="onLeave">
       <ul v-show="isExpanded" class="o-sub-menu-children">
         <slot></slot>
       </ul>
-    </transition>
+    </Transition>
   </li>
 </template>
diff --git a/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue b/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue
index 727871475..7ace3bb58 100644
--- a/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue
+++ b/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { IconAdd } from '../../icons';
+import { IconStar } from '../../icons';
 import { OMenu, OSubMenu, OMenuItem } from '../index';
 
 const expandedArr = ref(['2']);
@@ -13,7 +13,7 @@ const activeVal = ref('2-1');
     <OMenu v-model="activeVal" v-model:expanded="expandedArr" accordion>
       <OSubMenu value="1">
         <template #title>一级菜单1</template>
-        <template #icon><IconAdd /></template>
+        <template #icon><IconStar /></template>
         <OMenuItem value="1-1">二级菜单1-1</OMenuItem>
         <OMenuItem value="1-2">二级菜单1-2</OMenuItem>
         <OMenuItem value="1-3">二级菜单1-3</OMenuItem>
@@ -21,7 +21,7 @@ const activeVal = ref('2-1');
       </OSubMenu>
       <OSubMenu value="2">
         <template #title>一级菜单2</template>
-        <template #icon><IconAdd /></template>
+        <template #icon><IconStar /></template>
         <OMenuItem value="2-1">二级菜单2-1</OMenuItem>
         <OMenuItem value="2-2">二级菜单2-2</OMenuItem>
         <OMenuItem value="2-3">二级菜单2-3</OMenuItem>
@@ -29,10 +29,10 @@ const activeVal = ref('2-1');
       </OSubMenu>
       <OSubMenu value="3">
         <template #title>一级菜单3</template>
-        <template #icon><IconAdd /></template>
+        <template #icon><IconStar /></template>
         <OSubMenu value="3-1">
           <template #title>二级菜单3-1</template>
-          <template #icon><IconAdd /></template>
+          <template #icon><IconStar /></template>
           <OMenuItem value="3-1-1">三级菜单3-1-1</OMenuItem>
           <OMenuItem value="3-1-2">三级菜单3-1-2</OMenuItem>
           <OMenuItem value="3-1-3">三级菜单3-1-3</OMenuItem>
diff --git a/packages/opendesign/src/components/menu/__demo__/MenuBasic.vue b/packages/opendesign/src/components/menu/__demo__/MenuBasic.vue
index f211c504e..82821f9e4 100644
--- a/packages/opendesign/src/components/menu/__demo__/MenuBasic.vue
+++ b/packages/opendesign/src/components/menu/__demo__/MenuBasic.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { IconAdd } from '../../icons';
+import { IconStar } from '../../icons';
 import { OMenu, OSubMenu, OMenuItem } from '../index';
 
 const expandedArr = ref(['1']);
@@ -22,8 +22,8 @@ const activeVal2 = ref('1-1');
     <div>
       <OMenu v-model="activeVal" v-model:expanded="expandedArr" @change="handleChange" @expanded-change="handleExpandedChange">
         <OSubMenu value="1">
-          <template #title>一级菜单1</template>
-          <template #icon><IconAdd /></template>
+          <template #title>一级菜单1一级菜单1一级菜单1</template>
+          <template #icon><IconStar /></template>
           <OMenuItem value="1-1">二级菜单1-1</OMenuItem>
           <OMenuItem value="1-2" disabled>二级菜单1-2</OMenuItem>
           <OMenuItem value="1-3">二级菜单1-3</OMenuItem>
@@ -31,7 +31,7 @@ const activeVal2 = ref('1-1');
         </OSubMenu>
         <OSubMenu value="2">
           <template #title>一级菜单2</template>
-          <template #icon><IconAdd /></template>
+          <template #icon><IconStar /></template>
           <OMenuItem value="2-1">二级菜单2-1</OMenuItem>
           <OMenuItem value="2-2">二级菜单2-2</OMenuItem>
           <OMenuItem value="2-3">二级菜单2-3</OMenuItem>
@@ -39,10 +39,10 @@ const activeVal2 = ref('1-1');
         </OSubMenu>
         <OSubMenu value="3">
           <template #title>一级菜单3</template>
-          <template #icon><IconAdd /></template>
+          <template #icon><IconStar /></template>
           <OSubMenu value="3-1">
             <template #title>二级菜单3-1</template>
-            <template #icon><IconAdd /></template>
+            <template #icon><IconStar /></template>
             <OMenuItem value="3-1-1">三级菜单3-1-1</OMenuItem>
             <OMenuItem value="3-1-2">三级菜单3-1-2</OMenuItem>
             <OMenuItem value="3-1-3">三级菜单3-1-3</OMenuItem>
diff --git a/packages/opendesign/src/components/menu/style/index.scss b/packages/opendesign/src/components/menu/style/index.scss
index 6796624cb..92e4f14b8 100644
--- a/packages/opendesign/src/components/menu/style/index.scss
+++ b/packages/opendesign/src/components/menu/style/index.scss
@@ -4,7 +4,7 @@
   list-style: none;
   width: var(--menu-width);
   color: var(--menu-color);
-  background-color: var(--menu-bg);
+  background-color: var(--menu-bg-color);
   margin: 0;
   padding: 0;
 }
@@ -13,12 +13,11 @@
 .o-sub-menu {
   font-size: var(--sub-menu-text-size);
   line-height: var(--sub-menu-text-height);
-  font-weight: 400;
 }
 
 .o-sub-menu-active {
   & > .o-sub-menu-title {
-    font-weight: 700;
+    font-weight: 500;
   }
 }
 
@@ -34,20 +33,19 @@
   position: relative;
   display: flex;
   align-items: center;
-  padding: 16px 48px 16px 24px;
+  padding: 12px 48px 12px 24px;
   border-radius: var(--sub-menu-radius);
-  margin-bottom: 4px;
   cursor: pointer;
   transition: background-color var(--o-duration-m2) var(--o-easing-standard);
 
   &:hover {
-    background-color: var(--sub-menu-bg-hover);
+    background-color: var(--sub-menu-bg-color-hover);
   }
 }
 
 .o-sub-menu-title-icon {
   margin-right: 4px;
-  font-size: var(--sub-menu-icon-height);
+  font-size: var(--sub-menu-icon-size);
 }
 
 .o-sub-menu-title-content {
@@ -60,7 +58,7 @@
   position: absolute;
   right: 16px;
   transform: rotate(0);
-  font-size: var(--sub-menu-icon-height);
+  font-size: var(--sub-menu-icon-arrow-size);
   transition: transform var(--o-duration-m2) var(--o-easing-standard);
 }
 
@@ -77,20 +75,16 @@
   font-size: var(--menu-item-text-size);
   line-height: var(--menu-item-text-height);
   border-radius: var(--menu-item-radius);
-  padding: 12px 16px 12px 36px;
+  padding: 12px 16px 12px 24px;
   cursor: pointer;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
   transition: background-color var(--o-duration-s) var(--o-easing-standard);
 
-  &:not(.o-menu-item-disabled):hover {
+  &:not(.o-menu-item-active):hover {
     background-color: var(--menu-item-bg-hover);
   }
-
-  & + .o-menu-item {
-    margin-top: 4px;
-  }
 }
 
 .o-menu-item-active {
diff --git a/packages/opendesign/src/components/menu/style/var.scss b/packages/opendesign/src/components/menu/style/var.scss
index b6c2b59e9..8c028749d 100644
--- a/packages/opendesign/src/components/menu/style/var.scss
+++ b/packages/opendesign/src/components/menu/style/var.scss
@@ -1,22 +1,23 @@
 .o-menu {
-  --menu-width: 260px;
-  --menu-bg: var(--o-color-fill2);
+  --menu-width: 240px;
+  --menu-bg-color: transparent;
   --menu-color: var(--o-color-info1);
 }
 
 .o-sub-menu {
-  --sub-menu-bg-hover: var(--o-color-control2-light);
-  --sub-menu-text-size: var(--o-font_size-text2);
-  --sub-menu-text-height: var(--o-line_height-text2);
-  --sub-menu-icon-height: var(--o-font_size-h1);
-  --sub-menu-radius: var(--o-radius-control-s);
+  --sub-menu-bg-color-hover: var(--o-color-control2-light);
+  --sub-menu-text-size: var(--o-font_size-text1);
+  --sub-menu-text-height: var(--o-line_height-text1);
+  --sub-menu-icon-size: var(--o-icon_size-s);
+  --sub-menu-icon-arrow-size: var(--o-icon_size-xs);
+  --sub-menu-radius: var(--o-radius-control-m);
 }
 
 .o-menu-item {
   --menu-item-text-size: var(--o-font_size-text1);
   --menu-item-text-height: var(--o-line_height-text1);
-  --menu-item-bg-active: var(--o-color-control2);
+  --menu-item-bg-active: var(--o-color-control3-light);
   --menu-item-bg-hover: var(--o-color-control2-light);
   --menu-item-color-disabled: var(--o-color-info4);
-  --menu-item-radius: var(--o-radius-control-s);
+  --menu-item-radius: var(--o-radius-control-m);
 }
diff --git a/packages/opendesign/src/components/progress/style/var.scss b/packages/opendesign/src/components/progress/style/var.scss
index e962777e8..86a8ea45b 100644
--- a/packages/opendesign/src/components/progress/style/var.scss
+++ b/packages/opendesign/src/components/progress/style/var.scss
@@ -1,7 +1,7 @@
 .o-progress {
   --o-progress-track-bg-color: var(--o-color-control1-light);
-  --o-progress-text-size: var(--o-font_size-text);
-  --o-progress-text-height: var(--o-font_size-text);
+  --o-progress-text-size: var(--o-font_size-text1);
+  --o-progress-text-height: var(--o-font_size-text1);
   --o-progress-color: var(--o-color-info2);
 }
 
diff --git a/packages/opendesign/src/components/progress/types.ts b/packages/opendesign/src/components/progress/types.ts
index b0cec2f39..bd63b8e0f 100644
--- a/packages/opendesign/src/components/progress/types.ts
+++ b/packages/opendesign/src/components/progress/types.ts
@@ -1,7 +1,5 @@
 import { ExtractPropTypes, PropType } from 'vue';
 
-import type { ColorT } from '../_shared/global';
-
 export type ProgressVariantT = 'line' | 'circle';
 
 export type ProgressColorT = 'primary' | 'success' | 'warning' | 'danger';
diff --git a/packages/opendesign/src/components/radio-group/style/index.scss b/packages/opendesign/src/components/radio-group/style/index.scss
index 1de61546c..383b4dfc4 100644
--- a/packages/opendesign/src/components/radio-group/style/index.scss
+++ b/packages/opendesign/src/components/radio-group/style/index.scss
@@ -3,17 +3,9 @@
 .o-radio-group {
   display: inline-flex;
   flex-wrap: wrap;
-}
-
-.o-radio-group-direction-horizontal {
-  .o-radio + .o-radio {
-    margin-left: var(--radio-group-gap);
-  }
+  gap: var(--radio-group-gap);
 }
 
 .o-radio-group-direction-vertical {
   flex-direction: column;
-  .o-radio + .o-radio {
-    margin-top: var(--radio-group-gap);
-  }
 }
diff --git a/packages/opendesign/src/components/radio-group/style/var.scss b/packages/opendesign/src/components/radio-group/style/var.scss
index 54ecc6119..f1278aa00 100644
--- a/packages/opendesign/src/components/radio-group/style/var.scss
+++ b/packages/opendesign/src/components/radio-group/style/var.scss
@@ -1,5 +1,5 @@
 .o-radio-group {
-  --radio-group-gap: var(--o-gap-2);
+  --radio-group-gap: var(--o-gap-5);
 }
 
 
diff --git a/packages/opendesign/src/components/radio/style/index.scss b/packages/opendesign/src/components/radio/style/index.scss
index 29d0a1402..31a156df3 100644
--- a/packages/opendesign/src/components/radio/style/index.scss
+++ b/packages/opendesign/src/components/radio/style/index.scss
@@ -19,30 +19,6 @@
   }
 }
 
-.o-radio-disabled {
-  cursor: not-allowed;
-  color: var(--radio-color-disabled);
-  .o-radio-input {
-    border-color: var(--radio-input-bd-color-disabled);
-  }
-}
-
-.o-radio-checked {
-  .o-radio-input {
-    &::after {
-      background-color: var(--radio-input-inner-bg-color-checked);
-    }
-  }
-}
-
-.o-radio-checked.o-radio-disabled {
-  .o-radio-input {
-    &::after {
-      background-color: var(--radio-input-inner-bg-color-checked-disabled);
-    }
-  }
-}
-
 .o-radio-wrap {
   position: relative;
   display: inline-flex;
@@ -74,5 +50,34 @@
 }
 
 .o-radio-label {
-  margin-left: 8px;
+  margin-left: 12px;
+}
+
+.o-radio-checked {
+  .o-radio-input {
+    background-color: var(--radio-input-bg-color-checked);
+    border-color: var(--radio-input-bd-color-checked);
+    &::after {
+      background-color: var(--radio-input-inner-bg-color-checked);
+    }
+  }
+}
+
+.o-radio-disabled {
+  cursor: not-allowed;
+  color: var(--radio-color-disabled);
+  .o-radio-input {
+    background-color: var(--radio-input-bg-color-disabled);
+    border-color: var(--radio-input-bd-color-disabled);
+  }
+}
+
+.o-radio-checked.o-radio-disabled {
+  .o-radio-input {
+    background-color: var(--radio-input-bg-color-checked-disabled);
+    border-color: var(--radio-input-bd-color-checked-disabled);
+    &::after {
+      background-color: var(--radio-input-inner-bg-color-checked-disabled);
+    }
+  }
 }
diff --git a/packages/opendesign/src/components/radio/style/var.scss b/packages/opendesign/src/components/radio/style/var.scss
index c5725a553..0296f5bbf 100644
--- a/packages/opendesign/src/components/radio/style/var.scss
+++ b/packages/opendesign/src/components/radio/style/var.scss
@@ -2,18 +2,23 @@
   --radio-text-size: var(--o-font_size-text1);
   --radio-text-height: var(--o-line_height-text1);
 
-  --radio-input-size: 18px;
-  --radio-input-inner-size: 12px;
+  --radio-input-size: calc(var(--o-size-s) / 2);
+  --radio-input-inner-size: calc(var(--o-size-s) / 4);
 
   --radio-color: var(--o-color-info1);
   --radio-color-disabled: var(--o-color-info4);
 
   --radio-input-bg-color: var(--o-color-control-light);
+  --radio-input-bg-color-checked: var(--o-color-primary1);
+  --radio-input-bg-color-disabled: var(--o-color-control4-light);
+  --radio-input-bg-color-checked-disabled: var(--o-color-primary4);
 
   --radio-input-bd-color: var(--o-color-control1);
+  --radio-input-bd-color-checked: var(--o-color-primary1);
   --radio-input-bd-color-disabled: var(--o-color-control4);
+  --radio-input-bd-color-checked-disabled: var(--o-color-primary4);
 
   --radio-input-inner-bg-color: transparent;
-  --radio-input-inner-bg-color-checked: var(--o-color-primary1);
-  --radio-input-inner-bg-color-checked-disabled: var(--o-color-primary4);
+  --radio-input-inner-bg-color-checked: rgb(var(--o-color-white));
+  --radio-input-inner-bg-color-checked-disabled: rgb(var(--o-color-white));
 }
diff --git a/packages/opendesign/src/components/switch/__demo__/SwitchRound.vue b/packages/opendesign/src/components/switch/__demo__/SwitchRound.vue
index 56bf2965f..b66d62993 100644
--- a/packages/opendesign/src/components/switch/__demo__/SwitchRound.vue
+++ b/packages/opendesign/src/components/switch/__demo__/SwitchRound.vue
@@ -13,29 +13,26 @@ const r4 = '4px';
   <h4>Round</h4>
   <section>
     <div>
+      <p>round = 'pill'</p>
       <section>
-        <p>round="pill"</p>
         <OSWitch v-model="switchVal1" round="pill" size="small" />
         <OSWitch v-model="switchVal1" round="pill" size="medium" />
-        <OSWitch v-model="switchVal1" round="pill" size="large" />
       </section>
     </div>
 
     <div>
+      <p>round = {{ r2 }}</p>
       <section>
-        <p>round={{ r2 }}</p>
         <OSWitch v-model="switchVal2" :round="r2" size="small" />
         <OSWitch v-model="switchVal2" :round="r2" size="medium" />
-        <OSWitch v-model="switchVal2" :round="r2" size="large" />
       </section>
     </div>
 
     <div>
+      <p>round = {{ r4 }}</p>
       <section>
-        <p>round={{ r4 }}</p>
         <OSWitch v-model="switchVal3" :round="r4" size="small" />
         <OSWitch v-model="switchVal3" :round="r4" size="medium" />
-        <OSWitch v-model="switchVal3" :round="r4" size="large" />
       </section>
     </div>
   </section>
diff --git a/packages/opendesign/src/components/switch/style/index.scss b/packages/opendesign/src/components/switch/style/index.scss
index 2ee22e462..9430a1081 100644
--- a/packages/opendesign/src/components/switch/style/index.scss
+++ b/packages/opendesign/src/components/switch/style/index.scss
@@ -2,7 +2,7 @@
 
 .o-switch {
   display: inline-block;
-  height: var(--switch-height);
+  height: var(--switch-size);
   font-size: var(--switch-text-size);
   line-height: var(--switch-text-height);
   color: var(--switch-color);
@@ -77,14 +77,10 @@
   background-color: var(--switch-bg-color-disabled);
 }
 
-.o-switch-large {
-  min-width: 60px;
-}
-
 .o-switch-medium {
   min-width: 40px;
 }
 
 .o-switch-small {
-  min-width: 30px;
+  min-width: 40px;
 }
diff --git a/packages/opendesign/src/components/switch/style/var.scss b/packages/opendesign/src/components/switch/style/var.scss
index 4251299c2..9ff9911eb 100644
--- a/packages/opendesign/src/components/switch/style/var.scss
+++ b/packages/opendesign/src/components/switch/style/var.scss
@@ -9,34 +9,25 @@
   --switch-handler-bg-color: rgb(var(--o-color-white));
 }
 
-.o-switch-large {
-  --switch-height: 28px;
-  --switch-radius: 8px;
-  --switch-text-size: var(--o-font_size-h4);
-  --switch-text-height: var(--o-line_height-h4);
-  --switch-handler-size: 20px;
-  --switch-content-padding: 8px;
-  --switch-handler-offset: 4px;
-}
-
 .o-switch-medium {
-  --switch-height: 20px;
-  --switch-radius: 6px;
+  --switch-size: var(--o-size-xs);
+  --switch-radius: var(--o-radius-control-s);
   --switch-text-size: var(--o-font_size-tip1);
   --switch-text-height: var(--o-line_height-tip1);
-  --switch-handler-size: 16px;
+  --switch-handler-size: var(--o-size-xxs);
   --switch-content-padding: 6px;
-  --switch-handler-offset: 4px;
+  --switch-handler-offset: var(--o-gap-1);
 }
 
 .o-switch-small {
-  --switch-height: 16px;
-  --switch-radius: 4px;
-  --switch-text-size: var(--o-font_size-tip2);
-  --switch-text-height: var(--o-line_height-tip2);
-  --switch-handler-size: 12px;
-  --switch-content-padding: 4px;
-  --switch-handler-offset: 2px;
+  --switch-size: var(--o-size-xs);
+  --switch-radius: var(--o-radius-control-s);
+  --switch-text-size: var(--o-font_size-tip1);
+  --switch-text-height: var(--o-line_height-tip1);
+  --switch-handler-size: var(--o-size-xxs);
+  --switch-content-padding: 6px;
+  --switch-handler-offset: 4px;
+  scale: 0.5;
 }
 
 .o-switch-round-pill {
diff --git a/packages/opendesign/src/components/switch/types.ts b/packages/opendesign/src/components/switch/types.ts
index 1b703878f..7ef866c89 100644
--- a/packages/opendesign/src/components/switch/types.ts
+++ b/packages/opendesign/src/components/switch/types.ts
@@ -1,6 +1,8 @@
-import type { SizeT, RoundT } from '../_shared/global';
+import type { RoundT } from '../_shared/global';
 import type { ExtractPropTypes, PropType } from 'vue';
 
+export type SwitchSizeT = 'medium' | 'small';
+
 export const switchProps = {
   /**
    * 双向绑定值
@@ -31,10 +33,10 @@ export const switchProps = {
   },
   /**
    * 开关尺寸
-   * 'large' | 'medium' | 'small'
+   * 'medium' | 'small'
    */
   size: {
-    type: String as PropType<SizeT>,
+    type: String as PropType<SwitchSizeT>,
   },
   /**
    * 圆角值
diff --git a/packages/portal/src/components/TheAside.vue b/packages/portal/src/components/TheAside.vue
index 0ed71f7e4..4f510869a 100644
--- a/packages/portal/src/components/TheAside.vue
+++ b/packages/portal/src/components/TheAside.vue
@@ -58,6 +58,7 @@ const navClick = (item: typeof navList[0]) => {
   padding: 8px 16px;
   cursor: pointer;
   &:hover {
+    color: var(--o-color-info1-inverse);
     background-color: var(--o-color-primary1-light);
   }
   &.active {
-- 
Gitee