From feb63c082b5fdb28af77b53e25937cc3c81fd559 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Thu, 14 Sep 2023 17:21:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0token=EF=BC=8Cwhite&black?=
 =?UTF-8?q?:=20@type=20color?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/_styles/dark.token.css     | 28 ++++++-------
 .../opendesign/src/_styles/light.token.css    | 28 ++++++-------
 packages/opendesign/src/badge/style/var.scss  |  8 ++--
 packages/opendesign/src/button/style/var.scss |  8 ++--
 .../opendesign/src/checkbox/style/var.scss    |  2 +-
 .../opendesign/src/progress/style/var.scss    |  2 +-
 packages/opendesign/src/radio/style/var.scss  |  2 +-
 packages/opendesign/src/switch/style/var.scss |  2 +-
 packages/opendesign/src/tag/style/var.scss    | 32 +++++++-------
 .../opendesign/tokens/opendesign-token.json   | 42 +++++++++----------
 .../portal-ak/src/ak/theme/a.dark.token.css   | 28 ++++++-------
 .../portal-ak/src/ak/theme/a.light.token.css  | 28 ++++++-------
 packages/portal-ak/src/ak/theme/button.scss   |  2 +-
 .../portal-ak/src/ak/theme/k.dark.token.css   | 28 ++++++-------
 .../portal-ak/src/ak/theme/k.light.token.css  | 28 ++++++-------
 packages/portal-ak/src/ak/theme/tag.scss      |  8 ++--
 .../portal/src/assets/style/a.dark.token.css  | 28 ++++++-------
 .../portal/src/assets/style/a.light.token.css | 28 ++++++-------
 .../portal/src/assets/style/k.dark.token.css  | 28 ++++++-------
 .../portal/src/assets/style/k.light.token.css | 28 ++++++-------
 20 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/packages/opendesign/src/_styles/dark.token.css b/packages/opendesign/src/_styles/dark.token.css
index 2b824c97..c4a7247b 100644
--- a/packages/opendesign/src/_styles/dark.token.css
+++ b/packages/opendesign/src/_styles/dark.token.css
@@ -1,19 +1,5 @@
 /* theme: dark */
 [data-o-theme="dark"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -980,6 +966,20 @@
    * @description 
    */
   --o-rosyred-10: 255, 242, 247;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/opendesign/src/_styles/light.token.css b/packages/opendesign/src/_styles/light.token.css
index e60244d0..a02e19e2 100644
--- a/packages/opendesign/src/_styles/light.token.css
+++ b/packages/opendesign/src/_styles/light.token.css
@@ -1,19 +1,5 @@
 /* theme: light */
 [data-o-theme="light"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -980,6 +966,20 @@
    * @description 
    */
   --o-rosyred-10: 77, 0, 48;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/opendesign/src/badge/style/var.scss b/packages/opendesign/src/badge/style/var.scss
index cac94d72..ef6ccb82 100644
--- a/packages/opendesign/src/badge/style/var.scss
+++ b/packages/opendesign/src/badge/style/var.scss
@@ -13,21 +13,21 @@
 }
 
 .o-badge-primary {
-  --badge-color: rgb(var(--o-color-white));
+  --badge-color: var(--o-color-white);
   --badge-bg-color: var(--o-color-primary1);
 }
 
 .o-badge-success {
-  --badge-color: rgb(var(--o-color-white));
+  --badge-color: var(--o-color-white);
   --badge-bg-color: var(--o-color-success1);
 }
 
 .o-badge-warning {
-  --badge-color: rgb(var(--o-color-white));
+  --badge-color: var(--o-color-white);
   --badge-bg-color: var(--o-color-warning1);
 }
 
 .o-badge-danger {
-  --badge-color: rgb(var(--o-color-white));
+  --badge-color: var(--o-color-white);
   --badge-bg-color: var(--o-color-danger1);
 }
diff --git a/packages/opendesign/src/button/style/var.scss b/packages/opendesign/src/button/style/var.scss
index e3496027..49e2c789 100644
--- a/packages/opendesign/src/button/style/var.scss
+++ b/packages/opendesign/src/button/style/var.scss
@@ -9,10 +9,10 @@
   --btn-bd-color-disabled: var(--o-color-control1);
 
   &.o-btn-solid {
-    --btn-color: rgb(var(--o-color-white));
-    --btn-color-hover: rgb(var(--o-color-white));
-    --btn-color-active: rgb(var(--o-color-white));
-    --btn-color-disabled: rgb(var(--o-color-white));
+    --btn-color: var(--o-color-white);
+    --btn-color-hover: var(--o-color-white);
+    --btn-color-active: var(--o-color-white);
+    --btn-color-disabled: var(--o-color-white);
 
     --btn-bg-color: var(--o-color-control1-light);
     --btn-bg-color-hover: var(--o-color-control2-light);
diff --git a/packages/opendesign/src/checkbox/style/var.scss b/packages/opendesign/src/checkbox/style/var.scss
index 895b03d7..6c816061 100644
--- a/packages/opendesign/src/checkbox/style/var.scss
+++ b/packages/opendesign/src/checkbox/style/var.scss
@@ -33,5 +33,5 @@
   --checkbox-input-bd-color-checked-disabled: var(--o-color-primary4);
 
   --checkbox-input-icon-size: calc(var(--checkbox-input-size) / 2);
-  --checkbox-input-icon-color: rgb(var(--o-color-white));
+  --checkbox-input-icon-color: var(--o-color-white);
 }
diff --git a/packages/opendesign/src/progress/style/var.scss b/packages/opendesign/src/progress/style/var.scss
index 75f6e98a..f5dc0356 100644
--- a/packages/opendesign/src/progress/style/var.scss
+++ b/packages/opendesign/src/progress/style/var.scss
@@ -4,7 +4,7 @@
 
   --progress-label-gap: 8px;
 
-  --progress-inner-label-color: rgb(var(--o-color-white));
+  --progress-inner-label-color: var(--o-color-white);
   --progress-inner-label-gap: 8px;
 }
 
diff --git a/packages/opendesign/src/radio/style/var.scss b/packages/opendesign/src/radio/style/var.scss
index ca743607..dc3a3923 100644
--- a/packages/opendesign/src/radio/style/var.scss
+++ b/packages/opendesign/src/radio/style/var.scss
@@ -31,5 +31,5 @@
   --radio-input-bd-color-checked-disabled: var(--o-color-primary4);
 
   --radio-input-icon-size: calc(var(--radio-input-size) / 2);
-  --radio-input-icon-color: rgb(var(--o-color-white));
+  --radio-input-icon-color: var(--o-color-white);
 }
diff --git a/packages/opendesign/src/switch/style/var.scss b/packages/opendesign/src/switch/style/var.scss
index d0dfc37d..baece915 100644
--- a/packages/opendesign/src/switch/style/var.scss
+++ b/packages/opendesign/src/switch/style/var.scss
@@ -13,7 +13,7 @@
   --switch-bg-color-checked-active: var(--o-color-primary3);
   --switch-bg-color-checked-disabled: var(--o-color-primary4);
 
-  --switch-handler-bg-color: rgb(var(--o-color-white));
+  --switch-handler-bg-color: var(--o-color-white);
   --switch-handler-bg-color-disabled: rgb(var(--o-color-white), 0.6);
   --switch-handler-bg-color-checked-disabled: rgb(var(--o-color-white), 0.4);
 
diff --git a/packages/opendesign/src/tag/style/var.scss b/packages/opendesign/src/tag/style/var.scss
index 0c25e85b..8e92ab60 100644
--- a/packages/opendesign/src/tag/style/var.scss
+++ b/packages/opendesign/src/tag/style/var.scss
@@ -22,13 +22,13 @@
 }
 
 .o-tag-primary {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: var(--o-color-primary1);
   --tag-bd-color: var(--o-color-primary1);
 
-  --tag-icon-close-color: rgb(var(--o-color-white));
-  --tag-icon-close-color-hover: rgb(var(--o-color-white));
-  --tag-icon-close-color-active: rgb(var(--o-color-white));
+  --tag-icon-close-color: var(--o-color-white);
+  --tag-icon-close-color-hover: var(--o-color-white);
+  --tag-icon-close-color-active: var(--o-color-white);
 
   &.o-tag-outline {
     --tag-bg-color: transparent;
@@ -41,13 +41,13 @@
 }
 
 .o-tag-success {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: var(--o-color-success1);
   --tag-bd-color: var(--o-color-success1);
 
-  --tag-icon-close-color: rgb(var(--o-color-white));
-  --tag-icon-close-color-hover: rgb(var(--o-color-white));
-  --tag-icon-close-color-active: rgb(var(--o-color-white));
+  --tag-icon-close-color: var(--o-color-white);
+  --tag-icon-close-color-hover: var(--o-color-white);
+  --tag-icon-close-color-active: var(--o-color-white);
 
   &.o-tag-outline {
     --tag-bg-color: transparent;
@@ -60,13 +60,13 @@
 }
 
 .o-tag-warning {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: var(--o-color-warning1);
   --tag-bd-color: var(--o-color-warning1);
 
-  --tag-icon-close-color: rgb(var(--o-color-white));
-  --tag-icon-close-color-hover: rgb(var(--o-color-white));
-  --tag-icon-close-color-active: rgb(var(--o-color-white));
+  --tag-icon-close-color: var(--o-color-white);
+  --tag-icon-close-color-hover: var(--o-color-white);
+  --tag-icon-close-color-active: var(--o-color-white);
 
   &.o-tag-outline {
     --tag-bg-color: transparent;
@@ -79,13 +79,13 @@
 }
 
 .o-tag-danger {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: var(--o-color-danger1);
   --tag-bd-color: var(--o-color-danger1);
 
-  --tag-icon-close-color: rgb(var(--o-color-white));
-  --tag-icon-close-color-hover: rgb(var(--o-color-white));
-  --tag-icon-close-color-active: rgb(var(--o-color-white));
+  --tag-icon-close-color: var(--o-color-white);
+  --tag-icon-close-color-hover: var(--o-color-white);
+  --tag-icon-close-color-active: var(--o-color-white);
 
   &.o-tag-outline {
     --tag-bg-color: transparent;
diff --git a/packages/opendesign/tokens/opendesign-token.json b/packages/opendesign/tokens/opendesign-token.json
index 47c1f6de..3bbc7d07 100644
--- a/packages/opendesign/tokens/opendesign-token.json
+++ b/packages/opendesign/tokens/opendesign-token.json
@@ -1,25 +1,4 @@
 {
-  "base": {
-    "name": "基础色(不同皮肤色相不变)",
-    "type": "palette",
-    "typeName": "色盘",
-    "value": [
-      {
-        "key": "color-white",
-        "value": {
-          "light": "255, 255, 255",
-          "dark": "255, 255, 255"
-        }
-      },
-      {
-        "key": "color-black",
-        "value": {
-          "light": "0, 0, 0",
-          "dark": "0, 0, 0"
-        }
-      }
-    ]
-  },
   "deepblue": {
     "name": "深蓝色",
     "type": "palette",
@@ -1078,6 +1057,27 @@
     ]
   },
 
+  "base": {
+    "name": "基础色(不同皮肤色相不变)",
+    "type": "color",
+    "typeName": "颜色",
+    "value": [
+      {
+        "key": "color-white",
+        "value": {
+          "light": "rgb(255, 255, 255)",
+          "dark": "rgb(255, 255, 255)"
+        }
+      },
+      {
+        "key": "color-black",
+        "value": {
+          "light": "rgb(0, 0, 0)",
+          "dark": "rgb(0, 0, 0)"
+        }
+      }
+    ]
+  },
   "primary": {
     "name": "强调色",
     "type": "color",
diff --git a/packages/portal-ak/src/ak/theme/a.dark.token.css b/packages/portal-ak/src/ak/theme/a.dark.token.css
index 4157825e..ec77d1b1 100644
--- a/packages/portal-ak/src/ak/theme/a.dark.token.css
+++ b/packages/portal-ak/src/ak/theme/a.dark.token.css
@@ -1,19 +1,5 @@
 /* theme: a.dark */
 [data-o-theme="a.dark"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 255, 242, 247;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/a.light.token.css b/packages/portal-ak/src/ak/theme/a.light.token.css
index cbbe6696..0fe81650 100644
--- a/packages/portal-ak/src/ak/theme/a.light.token.css
+++ b/packages/portal-ak/src/ak/theme/a.light.token.css
@@ -1,19 +1,5 @@
 /* theme: a.light */
 [data-o-theme="a.light"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 77, 0, 48;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/button.scss b/packages/portal-ak/src/ak/theme/button.scss
index e7217d60..08e8f59a 100644
--- a/packages/portal-ak/src/ak/theme/button.scss
+++ b/packages/portal-ak/src/ak/theme/button.scss
@@ -27,7 +27,7 @@
 .c-btn-activity,
 .c-btn-kunpeng,
 .c-btn-ascend {
-  color: rgb(var(--o-color-white)) !important;
+  color: var(--o-color-white) !important;
   background: linear-gradient(90deg, rgb(var(--ak-color-band-start)) 0%, rgb(var(--ak-color-band-end)) 100%);
   border-color: transparent;
   background-repeat: no-repeat;
diff --git a/packages/portal-ak/src/ak/theme/k.dark.token.css b/packages/portal-ak/src/ak/theme/k.dark.token.css
index 122ab423..fa9d89dc 100644
--- a/packages/portal-ak/src/ak/theme/k.dark.token.css
+++ b/packages/portal-ak/src/ak/theme/k.dark.token.css
@@ -1,19 +1,5 @@
 /* theme: k.dark */
 [data-o-theme="k.dark"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 255, 242, 247;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/k.light.token.css b/packages/portal-ak/src/ak/theme/k.light.token.css
index 30e2009b..29c8806c 100644
--- a/packages/portal-ak/src/ak/theme/k.light.token.css
+++ b/packages/portal-ak/src/ak/theme/k.light.token.css
@@ -1,19 +1,5 @@
 /* theme: k.light */
 [data-o-theme="k.light"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 77, 0, 48;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/tag.scss b/packages/portal-ak/src/ak/theme/tag.scss
index b0f326a4..400a8225 100644
--- a/packages/portal-ak/src/ak/theme/tag.scss
+++ b/packages/portal-ak/src/ak/theme/tag.scss
@@ -18,19 +18,19 @@
 }
 
 .o-tag-normal.c-tag-normal-inverse {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: rgba(var(--o-mixedgray-14), 0.2);
   --tag-bd-color: transparent;
 }
 
 .o-tag-normal.c-tag-unstart {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: rgba(var(--o-mixedgray-14), 0.4);
   --tag-bd-color: transparent;
 }
 
 .o-tag-normal.c-tag-processing {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   --tag-bg-color: rgba(var(--o-blue-6));
   --tag-bd-color: rgba(var(--o-blue-6));
 }
@@ -38,7 +38,7 @@
 .c-tag-activity,
 .c-tag-ascend,
 .c-tag-kunpeng {
-  --tag-color: rgb(var(--o-color-white));
+  --tag-color: var(--o-color-white);
   background: linear-gradient(90deg, rgb(var(--ak-color-band-start)) 0%, rgb(var(--ak-color-band-end)) 100%);
   border: none;
 }
diff --git a/packages/portal/src/assets/style/a.dark.token.css b/packages/portal/src/assets/style/a.dark.token.css
index 4157825e..ec77d1b1 100644
--- a/packages/portal/src/assets/style/a.dark.token.css
+++ b/packages/portal/src/assets/style/a.dark.token.css
@@ -1,19 +1,5 @@
 /* theme: a.dark */
 [data-o-theme="a.dark"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 255, 242, 247;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/a.light.token.css b/packages/portal/src/assets/style/a.light.token.css
index cbbe6696..0fe81650 100644
--- a/packages/portal/src/assets/style/a.light.token.css
+++ b/packages/portal/src/assets/style/a.light.token.css
@@ -1,19 +1,5 @@
 /* theme: a.light */
 [data-o-theme="a.light"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 77, 0, 48;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/k.dark.token.css b/packages/portal/src/assets/style/k.dark.token.css
index 122ab423..fa9d89dc 100644
--- a/packages/portal/src/assets/style/k.dark.token.css
+++ b/packages/portal/src/assets/style/k.dark.token.css
@@ -1,19 +1,5 @@
 /* theme: k.dark */
 [data-o-theme="k.dark"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 255, 242, 247;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/k.light.token.css b/packages/portal/src/assets/style/k.light.token.css
index 30e2009b..29c8806c 100644
--- a/packages/portal/src/assets/style/k.light.token.css
+++ b/packages/portal/src/assets/style/k.light.token.css
@@ -1,19 +1,5 @@
 /* theme: k.light */
 [data-o-theme="k.light"] {
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-white: 255, 255, 255;
-  /**
-   * @name 
-   * @type palette
-   * @group base
-   * @description 
-   */
-  --o-color-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -987,6 +973,20 @@
    * @description 
    */
   --o-rosyred-10: 77, 0, 48;
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-white: rgb(255, 255, 255);
+  /**
+   * @name 
+   * @type color
+   * @group base
+   * @description 
+   */
+  --o-color-black: rgb(0, 0, 0);
   /**
    * @name 
    * @type color
-- 
Gitee


From aaa4dc4c1e55c08bc6bb11b7497f3e8e488645c2 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Thu, 14 Sep 2023 18:13:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/_styles/dark.token.css     | 18 ++++++++--
 .../opendesign/src/_styles/light.token.css    | 18 ++++++++--
 .../opendesign/tokens/opendesign-token.json   | 36 ++++++++++++++++---
 .../portal-ak/src/ak/theme/a.dark.token.css   | 18 ++++++++--
 .../portal-ak/src/ak/theme/a.light.token.css  | 18 ++++++++--
 .../portal-ak/src/ak/theme/k.dark.token.css   | 18 ++++++++--
 .../portal-ak/src/ak/theme/k.light.token.css  | 18 ++++++++--
 .../portal/src/assets/style/a.dark.token.css  | 18 ++++++++--
 .../portal/src/assets/style/a.light.token.css | 18 ++++++++--
 .../portal/src/assets/style/k.dark.token.css  | 18 ++++++++--
 .../portal/src/assets/style/k.light.token.css | 18 ++++++++--
 11 files changed, 192 insertions(+), 24 deletions(-)

diff --git a/packages/opendesign/src/_styles/dark.token.css b/packages/opendesign/src/_styles/dark.token.css
index c4a7247b..0a63ec34 100644
--- a/packages/opendesign/src/_styles/dark.token.css
+++ b/packages/opendesign/src/_styles/dark.token.css
@@ -1,5 +1,19 @@
 /* theme: dark */
 [data-o-theme="dark"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -972,14 +986,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/opendesign/src/_styles/light.token.css b/packages/opendesign/src/_styles/light.token.css
index a02e19e2..58e2bfa2 100644
--- a/packages/opendesign/src/_styles/light.token.css
+++ b/packages/opendesign/src/_styles/light.token.css
@@ -1,5 +1,19 @@
 /* theme: light */
 [data-o-theme="light"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -972,14 +986,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/opendesign/tokens/opendesign-token.json b/packages/opendesign/tokens/opendesign-token.json
index 3bbc7d07..d5936dc1 100644
--- a/packages/opendesign/tokens/opendesign-token.json
+++ b/packages/opendesign/tokens/opendesign-token.json
@@ -1,4 +1,32 @@
 {
+  "white": {
+    "name": "白色",
+    "type": "palette",
+    "typeName": "颜色",
+    "value": [
+      {
+        "key": "white",
+        "value": {
+          "light": "255, 255, 255",
+          "dark": "255, 255, 255"
+        }
+      }
+    ]
+  },
+  "black": {
+    "name": "黑色",
+    "type": "palette",
+    "typeName": "颜色",
+    "value": [
+      {
+        "key": "black",
+        "value": {
+          "light": "0, 0, 0",
+          "dark": "0, 0, 0"
+        }
+      }
+    ]
+  },
   "deepblue": {
     "name": "深蓝色",
     "type": "palette",
@@ -1065,15 +1093,15 @@
       {
         "key": "color-white",
         "value": {
-          "light": "rgb(255, 255, 255)",
-          "dark": "rgb(255, 255, 255)"
+          "light": "rgb(var(--o-white))",
+          "dark": "rgb(var(--o-white))"
         }
       },
       {
         "key": "color-black",
         "value": {
-          "light": "rgb(0, 0, 0)",
-          "dark": "rgb(0, 0, 0)"
+          "light": "rgb(var(--o-black))",
+          "dark": "rgb(var(--o-black))"
         }
       }
     ]
diff --git a/packages/portal-ak/src/ak/theme/a.dark.token.css b/packages/portal-ak/src/ak/theme/a.dark.token.css
index ec77d1b1..706a4b24 100644
--- a/packages/portal-ak/src/ak/theme/a.dark.token.css
+++ b/packages/portal-ak/src/ak/theme/a.dark.token.css
@@ -1,5 +1,19 @@
 /* theme: a.dark */
 [data-o-theme="a.dark"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/a.light.token.css b/packages/portal-ak/src/ak/theme/a.light.token.css
index 0fe81650..350b18e2 100644
--- a/packages/portal-ak/src/ak/theme/a.light.token.css
+++ b/packages/portal-ak/src/ak/theme/a.light.token.css
@@ -1,5 +1,19 @@
 /* theme: a.light */
 [data-o-theme="a.light"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/k.dark.token.css b/packages/portal-ak/src/ak/theme/k.dark.token.css
index fa9d89dc..b7b997a2 100644
--- a/packages/portal-ak/src/ak/theme/k.dark.token.css
+++ b/packages/portal-ak/src/ak/theme/k.dark.token.css
@@ -1,5 +1,19 @@
 /* theme: k.dark */
 [data-o-theme="k.dark"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal-ak/src/ak/theme/k.light.token.css b/packages/portal-ak/src/ak/theme/k.light.token.css
index 29c8806c..8efc5907 100644
--- a/packages/portal-ak/src/ak/theme/k.light.token.css
+++ b/packages/portal-ak/src/ak/theme/k.light.token.css
@@ -1,5 +1,19 @@
 /* theme: k.light */
 [data-o-theme="k.light"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/a.dark.token.css b/packages/portal/src/assets/style/a.dark.token.css
index ec77d1b1..706a4b24 100644
--- a/packages/portal/src/assets/style/a.dark.token.css
+++ b/packages/portal/src/assets/style/a.dark.token.css
@@ -1,5 +1,19 @@
 /* theme: a.dark */
 [data-o-theme="a.dark"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/a.light.token.css b/packages/portal/src/assets/style/a.light.token.css
index 0fe81650..350b18e2 100644
--- a/packages/portal/src/assets/style/a.light.token.css
+++ b/packages/portal/src/assets/style/a.light.token.css
@@ -1,5 +1,19 @@
 /* theme: a.light */
 [data-o-theme="a.light"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/k.dark.token.css b/packages/portal/src/assets/style/k.dark.token.css
index fa9d89dc..b7b997a2 100644
--- a/packages/portal/src/assets/style/k.dark.token.css
+++ b/packages/portal/src/assets/style/k.dark.token.css
@@ -1,5 +1,19 @@
 /* theme: k.dark */
 [data-o-theme="k.dark"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
diff --git a/packages/portal/src/assets/style/k.light.token.css b/packages/portal/src/assets/style/k.light.token.css
index 29c8806c..8efc5907 100644
--- a/packages/portal/src/assets/style/k.light.token.css
+++ b/packages/portal/src/assets/style/k.light.token.css
@@ -1,5 +1,19 @@
 /* theme: k.light */
 [data-o-theme="k.light"] {
+  /**
+   * @name 
+   * @type palette
+   * @group white
+   * @description 
+   */
+  --o-white: 255, 255, 255;
+  /**
+   * @name 
+   * @type palette
+   * @group black
+   * @description 
+   */
+  --o-black: 0, 0, 0;
   /**
    * @name 
    * @type palette
@@ -979,14 +993,14 @@
    * @group base
    * @description 
    */
-  --o-color-white: rgb(255, 255, 255);
+  --o-color-white: rgb(var(--o-white));
   /**
    * @name 
    * @type color
    * @group base
    * @description 
    */
-  --o-color-black: rgb(0, 0, 0);
+  --o-color-black: rgb(var(--o-black));
   /**
    * @name 
    * @type color
-- 
Gitee