From 3dd3b9edbda93d4dfa29ee07837642cade448880 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Sat, 7 Jan 2023 22:00:32 +0800
Subject: [PATCH 1/5] style

---
 packages/opendesign/src/components/tabs/TabContent.vue   | 6 +++---
 packages/opendesign/src/components/tabs/style/index.scss | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/opendesign/src/components/tabs/TabContent.vue b/packages/opendesign/src/components/tabs/TabContent.vue
index d9681cc3..afaf74d0 100644
--- a/packages/opendesign/src/components/tabs/TabContent.vue
+++ b/packages/opendesign/src/components/tabs/TabContent.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h, mergeProps, PropType, Transition, vShow, withDirectives, SetupContext, Slots, ref } from 'vue';
+import { computed, defineComponent, h, mergeProps, PropType, Transition, vShow, withDirectives, SetupContext, Slots } from 'vue';
 
 export default defineComponent({
   name: 'TabContent',
@@ -56,11 +56,11 @@ export default defineComponent({
     const active = computed(() => props.activeValue === props.value);
     const toMount = computed(() => (props.lazy ? active.value : true));
 
-    // pane只渲染default 插槽的内容
+    // content只渲染default 插槽的内容
     return () => {
       const p = mergeProps(
         {
-          class: ['o-tab-pane', { active: active.value }],
+          class: ['o-tab-content', { active: active.value }],
         },
         props.attrs
       );
diff --git a/packages/opendesign/src/components/tabs/style/index.scss b/packages/opendesign/src/components/tabs/style/index.scss
index a2e41a6a..e70ef06f 100644
--- a/packages/opendesign/src/components/tabs/style/index.scss
+++ b/packages/opendesign/src/components/tabs/style/index.scss
@@ -83,7 +83,7 @@
   display: flex;
 }
 
-.o-tab-pane {
+.o-tab-content {
   flex-shrink: 0;
   width: 100%;
   display: none;
-- 
Gitee


From 86736c9114c67ce3948e375fe6e96f5b3604a257 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Sat, 7 Jan 2023 22:16:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0inject=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/components/option/OOption.vue | 2 +-
 packages/opendesign/src/components/tabs/OTabPane.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opendesign/src/components/option/OOption.vue b/packages/opendesign/src/components/option/OOption.vue
index 76aace7c..4ec51e94 100644
--- a/packages/opendesign/src/components/option/OOption.vue
+++ b/packages/opendesign/src/components/option/OOption.vue
@@ -13,7 +13,7 @@ const props = withDefaults(defineProps<OptionPropT>(), {
   label: '',
 });
 
-const selectInject = inject(selectOptionInjectKey);
+const selectInject = inject(selectOptionInjectKey, null);
 
 const currentVal = computed(() => {
   if (selectInject) {
diff --git a/packages/opendesign/src/components/tabs/OTabPane.vue b/packages/opendesign/src/components/tabs/OTabPane.vue
index 39f5faca..0f2115ff 100644
--- a/packages/opendesign/src/components/tabs/OTabPane.vue
+++ b/packages/opendesign/src/components/tabs/OTabPane.vue
@@ -56,7 +56,7 @@ export default defineComponent({
     },
   },
   setup(props, { slots, attrs }) {
-    const tabsInjection = inject(tabsInjectKey);
+    const tabsInjection = inject(tabsInjectKey, null);
 
     const instance = getCurrentInstance();
 
-- 
Gitee


From 50d4d05200cce652fcbb65977259fef6b47f789f Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 12 Jan 2023 11:07:35 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/style/index.scss           | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/opendesign/src/components/style/index.scss b/packages/opendesign/src/components/style/index.scss
index 9546225a..038d602b 100644
--- a/packages/opendesign/src/components/style/index.scss
+++ b/packages/opendesign/src/components/style/index.scss
@@ -9,16 +9,29 @@
   --o-size-l: 40px;
   --o-size-m: 32px;
   --o-size-s: 24px;
-  --o-transition-duration-1: 0.1s;
-  --o-transition-duration-2: 0.2s;
-  --o-transition-duration-3: 0.3s;
-  --o-transition-duration-4: 0.4s;
-  --o-transition-duration-6: 0.6s;
-  --o-transition-duration-long: 1.5s;
 
-  --o-transition-function-linear: linear;
-  --o-transition-function-ease-in: ease-in;
-  --o-transition-function-ease-out: cubic-bezier(0, 0, 0.25, 1);
+  // Exit
+  --o-duration-s: 200ms;
+  // Enter for standard-in
+  --o-duration-m1: 250ms;
+  // Begin and End for standard
+  --o-duration-m2: 300ms;
+  // Enter for emphasized-in
+  --o-duration-m3: 400ms;
+  // Begin and End for emphasized
+  --o-duration-l: 500ms;
+  // 轮播切换 for emphasized
+  --o-duration-xl: 1000ms;
+
+  --o-easing-linear: cubic-bezier(0, 0, 1, 1);
+  // 用于组件
+  --o-easing-standard: cubic-bezier(0.2, 0, 0, 1);
+  --o-easing-standard-in: cubic-bezier(0, 0, 0, 1);
+  --o-easing-standard-out: cubic-bezier(0.3, 0, 1, 1);
+  // 用于大卡片、场景切换
+  --o-easing-emphasized: cubic-bezier(0.2, 0, 0, 1);
+  --o-easing-emphasized-in: cubic-bezier(0.3, 0, 0.8, 0.15);
+  --o-easing-emphasized-out: cubic-bezier(0.05, 0.7, 0.1, 1);
 }
 
 // icons
-- 
Gitee


From 7fe1ca9c85b271d94131b56377429f891aedec8e Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 12 Jan 2023 11:11:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/style/index.scss           | 29 ----------------
 .../opendesign/src/components/style/token.css | 33 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/packages/opendesign/src/components/style/index.scss b/packages/opendesign/src/components/style/index.scss
index 038d602b..910d07e8 100644
--- a/packages/opendesign/src/components/style/index.scss
+++ b/packages/opendesign/src/components/style/index.scss
@@ -5,35 +5,6 @@
   box-sizing: border-box;
 }
 
-:root {
-  --o-size-l: 40px;
-  --o-size-m: 32px;
-  --o-size-s: 24px;
-
-  // Exit
-  --o-duration-s: 200ms;
-  // Enter for standard-in
-  --o-duration-m1: 250ms;
-  // Begin and End for standard
-  --o-duration-m2: 300ms;
-  // Enter for emphasized-in
-  --o-duration-m3: 400ms;
-  // Begin and End for emphasized
-  --o-duration-l: 500ms;
-  // 轮播切换 for emphasized
-  --o-duration-xl: 1000ms;
-
-  --o-easing-linear: cubic-bezier(0, 0, 1, 1);
-  // 用于组件
-  --o-easing-standard: cubic-bezier(0.2, 0, 0, 1);
-  --o-easing-standard-in: cubic-bezier(0, 0, 0, 1);
-  --o-easing-standard-out: cubic-bezier(0.3, 0, 1, 1);
-  // 用于大卡片、场景切换
-  --o-easing-emphasized: cubic-bezier(0.2, 0, 0, 1);
-  --o-easing-emphasized-in: cubic-bezier(0.3, 0, 0.8, 0.15);
-  --o-easing-emphasized-out: cubic-bezier(0.05, 0.7, 0.1, 1);
-}
-
 // icons
 .o-icon {
   --icon-g1: var(--o-color-text1);
diff --git a/packages/opendesign/src/components/style/token.css b/packages/opendesign/src/components/style/token.css
index bb1690a6..2222dda1 100644
--- a/packages/opendesign/src/components/style/token.css
+++ b/packages/opendesign/src/components/style/token.css
@@ -1,4 +1,35 @@
+/* 全局变量，不随皮肤变化 */
 :root {
+  --o-size-l: 40px;
+  --o-size-m: 32px;
+  --o-size-s: 24px;
+
+  /* Exit */
+  --o-duration-s: 200ms;
+  /* Enter for standard-in */
+  --o-duration-m1: 250ms;
+  /* Begin and End for standard */
+  --o-duration-m2: 300ms;
+  /* Enter for emphasized-in */
+  --o-duration-m3: 400ms;
+  /* Begin and End for emphasized */
+  --o-duration-l: 500ms;
+  /* 轮播切换 for emphasized */
+  --o-duration-xl: 1000ms;
+
+  --o-easing-linear: cubic-bezier(0, 0, 1, 1);
+  /* 用于组件 */
+  --o-easing-standard: cubic-bezier(0.2, 0, 0, 1);
+  --o-easing-standard-in: cubic-bezier(0, 0, 0, 1);
+  --o-easing-standard-out: cubic-bezier(0.3, 0, 1, 1);
+  /* 用于大卡片、场景切换 */
+  --o-easing-emphasized: cubic-bezier(0.2, 0, 0, 1);
+  --o-easing-emphasized-in: cubic-bezier(0.3, 0, 0.8, 0.15);
+  --o-easing-emphasized-out: cubic-bezier(0.05, 0.7, 0.1, 1);
+}
+
+:root,
+:root[theme="light"] {
   /* 品牌色 */
   --o-color-primary1: #002fa7;
   --o-color-primary2: #406fe7;
@@ -15,7 +46,7 @@
   --o-color-warning1: #ff8e36;
   --o-color-warning2: #ffb45c;
   --o-color-warning3: #ff801c;
-  --o-color-warning4: #ffd2af; 
+  --o-color-warning4: #ffd2af;
   /* 错误色 */
   --o-color-danger1: #f3524d;
   --o-color-danger2: #ff7873;
-- 
Gitee


From b80e6cdbfd1f1caa665984514c32e9877e39a04d Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 12 Jan 2023 11:50:00 +0800
Subject: [PATCH 5/5] token tansition

---
 .../opendesign/src/components/_shared/global.ts  |  2 +-
 .../src/components/button/style/index.scss       |  2 +-
 .../src/components/link/style/index.scss         |  2 +-
 .../src/components/popup/style/index.scss        |  2 +-
 .../src/components/radio/style/index.scss        |  2 +-
 .../src/components/select/style/index.scss       |  2 +-
 .../src/components/style/animation.scss          | 16 +++++++++-------
 .../src/components/switch/style/index.scss       |  4 ++--
 8 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/opendesign/src/components/_shared/global.ts b/packages/opendesign/src/components/_shared/global.ts
index f6e0c944..83db256f 100644
--- a/packages/opendesign/src/components/_shared/global.ts
+++ b/packages/opendesign/src/components/_shared/global.ts
@@ -12,4 +12,4 @@ export type ShapeT = 'round' | 'normal'
 export const defaultShape = ref<ShapeT>('normal');
 export function initShape(type: ShapeT) {
   defaultShape.value = type;
-}
\ No newline at end of file
+}
diff --git a/packages/opendesign/src/components/button/style/index.scss b/packages/opendesign/src/components/button/style/index.scss
index 0425ceac..6c71fd9d 100644
--- a/packages/opendesign/src/components/button/style/index.scss
+++ b/packages/opendesign/src/components/button/style/index.scss
@@ -5,7 +5,7 @@
   border: 1px solid transparent;
   font-size: var(--btn-text-size);
   line-height: var(--btn-text-height);
-  transition: all 0.2s ease-in-out;
+  transition: all var(--o-duration-s) var(--o-easing-standard);
   white-space: nowrap;
   cursor: pointer;
 
diff --git a/packages/opendesign/src/components/link/style/index.scss b/packages/opendesign/src/components/link/style/index.scss
index 0ddde8c2..e90f42eb 100644
--- a/packages/opendesign/src/components/link/style/index.scss
+++ b/packages/opendesign/src/components/link/style/index.scss
@@ -29,7 +29,7 @@
   }
 
   &.arrow svg {
-    transition: transform var(--o-transition-duration-2);
+    transition: transform var(--o-duration-s) var(--o-easing-standard);
   }
 }
 
diff --git a/packages/opendesign/src/components/popup/style/index.scss b/packages/opendesign/src/components/popup/style/index.scss
index f9928e45..e2748664 100644
--- a/packages/opendesign/src/components/popup/style/index.scss
+++ b/packages/opendesign/src/components/popup/style/index.scss
@@ -4,7 +4,7 @@
   position: absolute;
   z-index: 100;
   opacity: 1;
-  transition: opacity var(--o-transition-duration-3);
+  transition: opacity var(--o-duration-m1) var(--o-easing-standard);
   &.out-view {
     opacity: 0;
     pointer-events: none;
diff --git a/packages/opendesign/src/components/radio/style/index.scss b/packages/opendesign/src/components/radio/style/index.scss
index 6ed649f8..a3519a15 100644
--- a/packages/opendesign/src/components/radio/style/index.scss
+++ b/packages/opendesign/src/components/radio/style/index.scss
@@ -64,7 +64,7 @@
     height: 12px;
     border-radius: 50%;
     background-color: transparent;
-    transition: background-color 0.3s;
+    transition: background-color var(--o-duration-s) var(--o-easing-standard);
   }
 }
 
diff --git a/packages/opendesign/src/components/select/style/index.scss b/packages/opendesign/src/components/select/style/index.scss
index 7e252450..e8a611ed 100644
--- a/packages/opendesign/src/components/select/style/index.scss
+++ b/packages/opendesign/src/components/select/style/index.scss
@@ -62,7 +62,7 @@
   color: var(--select-icon-color);
   display: inline-flex;
   align-items: center;
-  transition: transform var(--o-transition-duration-2);
+  transition: transform var(--o-duration-s) var(--o-easing-standard);
   svg {
     display: block;
   }
diff --git a/packages/opendesign/src/components/style/animation.scss b/packages/opendesign/src/components/style/animation.scss
index 8d3fefaa..619bff4d 100644
--- a/packages/opendesign/src/components/style/animation.scss
+++ b/packages/opendesign/src/components/style/animation.scss
@@ -9,7 +9,7 @@
 }
 
 .o-rotating {
-  animation: o-rotating var(--o-transition-duration-long) var(--o-transition-function-linear) infinite;
+  animation: o-rotating 2s var(--o-easing-linear) infinite;
 }
 
 @keyframes o-zoom-fade-in {
@@ -24,10 +24,10 @@
 }
 
 .o-zoom-fade-enter-active {
-  animation: o-zoom-fade-in var(--o-transition-duration-long);
+  animation: o-zoom-fade-in var(--o-duration-m1);
 }
 .o-zoom-fade-leave-active {
-  animation: o-zoom-fade-in var(--o-transition-duration-1) reverse;
+  animation: o-zoom-fade-in var(--o-duration-s) reverse;
 }
 
 @keyframes o-fade-in {
@@ -51,15 +51,17 @@
 }
 
 .o-fade-up-enter-enter-active {
-  animation: o-fade-up var(--o-transition-duration-6);
+  animation: o-fade-up var(--o-duration-s) var(--o-easing-standard-out);
 }
 .o-fade-in-enter-enter-active {
-  animation: o-fade-in var(--o-transition-duration-6);
+  animation: o-fade-in var(--o-duration-m1) var(--o-easing-standard-in);
 }
 
-.o-fade-up-enter-active,
+.o-fade-up-enter-active {
+  transition: all var(--o-duration-m1) var(--o-easing-standard-in);
+}
 .o-fade-up-leave-active {
-  transition: all var(--o-transition-duration-6) var(--o-transition-function-ease-out);
+  transition: all var(--o-duration-s) var(--o-easing-standard-out);
 }
 
 .o-fade-up-enter-from,
diff --git a/packages/opendesign/src/components/switch/style/index.scss b/packages/opendesign/src/components/switch/style/index.scss
index 80e57f6c..c8d4d9dd 100644
--- a/packages/opendesign/src/components/switch/style/index.scss
+++ b/packages/opendesign/src/components/switch/style/index.scss
@@ -4,7 +4,7 @@
   position: relative;
   background-color: var(--switch-bg);
   color: var(--switch-color);
-  transition: background-color var(--o-transition-duration-3);
+  transition: background-color var(--o-duration-s) var(--o-easing-standard);
   cursor: pointer;
 
   .o-switch-handler {
@@ -12,7 +12,7 @@
     top: 50%;
     transform: translateY(-50%);
     background-color: var(--switch-handler-bg);
-    transition: left var(--o-transition-duration-3);
+    transition: left var(--o-duration-s) var(--o-easing-standard);
 
     .o-switch-icon_loading {
       width: 100%;
-- 
Gitee