From ac8a0ebb4473d334e775b737b1e3e57835dab2fe Mon Sep 17 00:00:00 2001
From: sakurayinfei <970412446@qq.com>
Date: Thu, 4 Sep 2025 11:25:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=9A=AE=E8=82=A4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84=E4=BB=A5?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5=E7=9A=AE?=
 =?UTF-8?q?=E8=82=A4=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/dialog/style/theme-ascend.index.ts | 1 -
 packages/opendesign/src/dialog/style/theme-ascend.scss     | 1 +
 .../opendesign/src/dialog/style/theme-kunpeng.index.ts     | 1 -
 packages/opendesign/src/dialog/style/theme-kunpeng.scss    | 1 +
 .../opendesign/src/dialog/style/theme-openeuler.index.ts   | 1 -
 packages/opendesign/src/dialog/style/theme-openeuler.scss  | 1 +
 .../src/theme/ascend/{ => common}/a.dark.token.css         | 0
 .../src/theme/ascend/{ => common}/a.light.token.css        | 0
 .../opendesign/src/theme/ascend/{ => common}/base.scss     | 0
 packages/opendesign/src/theme/ascend/common/index.scss     | 3 +++
 packages/opendesign/src/theme/ascend/index.scss            | 7 ++-----
 packages/opendesign/src/theme/ascend/token.config.ts       | 1 +
 packages/opendesign/src/theme/{common.scss => grid.scss}   | 0
 .../opendesign/src/theme/kunpeng/{ => common}/base.scss    | 0
 packages/opendesign/src/theme/kunpeng/common/index.scss    | 3 +++
 .../src/theme/kunpeng/{ => common}/k.dark.token.css        | 0
 .../src/theme/kunpeng/{ => common}/k.light.token.css       | 0
 packages/opendesign/src/theme/kunpeng/index.scss           | 7 ++-----
 packages/opendesign/src/theme/kunpeng/token.config.ts      | 1 +
 .../src/theme/opendesign/{ => common}/dark.token.css       | 0
 packages/opendesign/src/theme/opendesign/common/index.scss | 2 ++
 .../src/theme/opendesign/{ => common}/light.token.css      | 0
 packages/opendesign/src/theme/opendesign/index.scss        | 5 ++---
 packages/opendesign/src/theme/opendesign/token.config.ts   | 1 +
 .../src/theme/openeuler/{ => common}/e.dark.token.css      | 0
 .../src/theme/openeuler/{ => common}/e.light.token.css     | 0
 packages/opendesign/src/theme/openeuler/common/index.scss  | 2 ++
 packages/opendesign/src/theme/openeuler/index.scss         | 6 ++----
 packages/opendesign/src/theme/openeuler/token.config.ts    | 1 +
 29 files changed, 25 insertions(+), 20 deletions(-)
 rename packages/opendesign/src/theme/ascend/{ => common}/a.dark.token.css (100%)
 rename packages/opendesign/src/theme/ascend/{ => common}/a.light.token.css (100%)
 rename packages/opendesign/src/theme/ascend/{ => common}/base.scss (100%)
 create mode 100644 packages/opendesign/src/theme/ascend/common/index.scss
 rename packages/opendesign/src/theme/{common.scss => grid.scss} (100%)
 rename packages/opendesign/src/theme/kunpeng/{ => common}/base.scss (100%)
 create mode 100644 packages/opendesign/src/theme/kunpeng/common/index.scss
 rename packages/opendesign/src/theme/kunpeng/{ => common}/k.dark.token.css (100%)
 rename packages/opendesign/src/theme/kunpeng/{ => common}/k.light.token.css (100%)
 rename packages/opendesign/src/theme/opendesign/{ => common}/dark.token.css (100%)
 create mode 100644 packages/opendesign/src/theme/opendesign/common/index.scss
 rename packages/opendesign/src/theme/opendesign/{ => common}/light.token.css (100%)
 rename packages/opendesign/src/theme/openeuler/{ => common}/e.dark.token.css (100%)
 rename packages/opendesign/src/theme/openeuler/{ => common}/e.light.token.css (100%)
 create mode 100644 packages/opendesign/src/theme/openeuler/common/index.scss

diff --git a/packages/opendesign/src/dialog/style/theme-ascend.index.ts b/packages/opendesign/src/dialog/style/theme-ascend.index.ts
index 435d9482..4e4890e8 100644
--- a/packages/opendesign/src/dialog/style/theme-ascend.index.ts
+++ b/packages/opendesign/src/dialog/style/theme-ascend.index.ts
@@ -1,4 +1,3 @@
-import '../../theme/common.scss';
 import '../../_styles';
 import '../../layer/style/theme-ascend.index';
 import '../../button/style/theme-ascend.index';
diff --git a/packages/opendesign/src/dialog/style/theme-ascend.scss b/packages/opendesign/src/dialog/style/theme-ascend.scss
index e69de29b..1b06a188 100644
--- a/packages/opendesign/src/dialog/style/theme-ascend.scss
+++ b/packages/opendesign/src/dialog/style/theme-ascend.scss
@@ -0,0 +1 @@
+@use '../../theme/grid.scss' as *;
diff --git a/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts b/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts
index 542bc714..35984c6f 100644
--- a/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts
+++ b/packages/opendesign/src/dialog/style/theme-kunpeng.index.ts
@@ -1,4 +1,3 @@
-import '../../theme/common.scss';
 import '../../_styles';
 import '../../layer/style/theme-kunpeng.index';
 import '../../button/style/theme-kunpeng.index';
diff --git a/packages/opendesign/src/dialog/style/theme-kunpeng.scss b/packages/opendesign/src/dialog/style/theme-kunpeng.scss
index e69de29b..6fa102ff 100644
--- a/packages/opendesign/src/dialog/style/theme-kunpeng.scss
+++ b/packages/opendesign/src/dialog/style/theme-kunpeng.scss
@@ -0,0 +1 @@
+@use '../../theme/grid.scss' as *;
\ No newline at end of file
diff --git a/packages/opendesign/src/dialog/style/theme-openeuler.index.ts b/packages/opendesign/src/dialog/style/theme-openeuler.index.ts
index c0cef23b..f178446e 100644
--- a/packages/opendesign/src/dialog/style/theme-openeuler.index.ts
+++ b/packages/opendesign/src/dialog/style/theme-openeuler.index.ts
@@ -1,4 +1,3 @@
-import '../../theme/common.scss';
 import '../../_styles';
 import '../../layer/style/theme-openeuler.index';
 import '../../button/style/theme-openeuler.index';
diff --git a/packages/opendesign/src/dialog/style/theme-openeuler.scss b/packages/opendesign/src/dialog/style/theme-openeuler.scss
index e69de29b..6fa102ff 100644
--- a/packages/opendesign/src/dialog/style/theme-openeuler.scss
+++ b/packages/opendesign/src/dialog/style/theme-openeuler.scss
@@ -0,0 +1 @@
+@use '../../theme/grid.scss' as *;
\ No newline at end of file
diff --git a/packages/opendesign/src/theme/ascend/a.dark.token.css b/packages/opendesign/src/theme/ascend/common/a.dark.token.css
similarity index 100%
rename from packages/opendesign/src/theme/ascend/a.dark.token.css
rename to packages/opendesign/src/theme/ascend/common/a.dark.token.css
diff --git a/packages/opendesign/src/theme/ascend/a.light.token.css b/packages/opendesign/src/theme/ascend/common/a.light.token.css
similarity index 100%
rename from packages/opendesign/src/theme/ascend/a.light.token.css
rename to packages/opendesign/src/theme/ascend/common/a.light.token.css
diff --git a/packages/opendesign/src/theme/ascend/base.scss b/packages/opendesign/src/theme/ascend/common/base.scss
similarity index 100%
rename from packages/opendesign/src/theme/ascend/base.scss
rename to packages/opendesign/src/theme/ascend/common/base.scss
diff --git a/packages/opendesign/src/theme/ascend/common/index.scss b/packages/opendesign/src/theme/ascend/common/index.scss
new file mode 100644
index 00000000..ad42fcf6
--- /dev/null
+++ b/packages/opendesign/src/theme/ascend/common/index.scss
@@ -0,0 +1,3 @@
+@use './a.light.token.css' as *;
+@use './a.dark.token.css' as *;
+@use './base.scss' as *;
diff --git a/packages/opendesign/src/theme/ascend/index.scss b/packages/opendesign/src/theme/ascend/index.scss
index 90e2972d..f9e1c217 100644
--- a/packages/opendesign/src/theme/ascend/index.scss
+++ b/packages/opendesign/src/theme/ascend/index.scss
@@ -1,9 +1,6 @@
-// 变量
-@use './a.dark.token.css' as *;
-@use './a.light.token.css' as *;
-@use '../common.scss' as *;
+// Token 及公共样式
+@use './common/index.scss' as *;
 // 样式
-@use './base.scss' as *;
 @use '../../index.scss' as *;
 
 // 皮肤
diff --git a/packages/opendesign/src/theme/ascend/token.config.ts b/packages/opendesign/src/theme/ascend/token.config.ts
index 1a6a6e56..22063ad7 100644
--- a/packages/opendesign/src/theme/ascend/token.config.ts
+++ b/packages/opendesign/src/theme/ascend/token.config.ts
@@ -1,5 +1,6 @@
 module.exports = {
   prefix: '--o-',
+  output: './common',
   themeMap: [
     {
       key: 'light',
diff --git a/packages/opendesign/src/theme/common.scss b/packages/opendesign/src/theme/grid.scss
similarity index 100%
rename from packages/opendesign/src/theme/common.scss
rename to packages/opendesign/src/theme/grid.scss
diff --git a/packages/opendesign/src/theme/kunpeng/base.scss b/packages/opendesign/src/theme/kunpeng/common/base.scss
similarity index 100%
rename from packages/opendesign/src/theme/kunpeng/base.scss
rename to packages/opendesign/src/theme/kunpeng/common/base.scss
diff --git a/packages/opendesign/src/theme/kunpeng/common/index.scss b/packages/opendesign/src/theme/kunpeng/common/index.scss
new file mode 100644
index 00000000..34eda5bd
--- /dev/null
+++ b/packages/opendesign/src/theme/kunpeng/common/index.scss
@@ -0,0 +1,3 @@
+@use './k.light.token.css' as *;
+@use './k.dark.token.css' as *;
+@use './base.scss' as *;
diff --git a/packages/opendesign/src/theme/kunpeng/k.dark.token.css b/packages/opendesign/src/theme/kunpeng/common/k.dark.token.css
similarity index 100%
rename from packages/opendesign/src/theme/kunpeng/k.dark.token.css
rename to packages/opendesign/src/theme/kunpeng/common/k.dark.token.css
diff --git a/packages/opendesign/src/theme/kunpeng/k.light.token.css b/packages/opendesign/src/theme/kunpeng/common/k.light.token.css
similarity index 100%
rename from packages/opendesign/src/theme/kunpeng/k.light.token.css
rename to packages/opendesign/src/theme/kunpeng/common/k.light.token.css
diff --git a/packages/opendesign/src/theme/kunpeng/index.scss b/packages/opendesign/src/theme/kunpeng/index.scss
index ee8780ea..576c428d 100644
--- a/packages/opendesign/src/theme/kunpeng/index.scss
+++ b/packages/opendesign/src/theme/kunpeng/index.scss
@@ -1,9 +1,6 @@
-// 变量
-@use './k.dark.token.css' as *;
-@use './k.light.token.css' as *;
-@use '../common.scss' as *;
+// Token 及公共样式
+@use './common/index.scss' as *;
 // 样式
-@use './base.scss' as *;
 @use '../../index.scss' as *;
 
 // 皮肤
diff --git a/packages/opendesign/src/theme/kunpeng/token.config.ts b/packages/opendesign/src/theme/kunpeng/token.config.ts
index d0138f03..48c5991b 100644
--- a/packages/opendesign/src/theme/kunpeng/token.config.ts
+++ b/packages/opendesign/src/theme/kunpeng/token.config.ts
@@ -1,5 +1,6 @@
 module.exports = {
   prefix: '--o-',
+  output: './common',
   themeMap: [
     {
       key: 'light',
diff --git a/packages/opendesign/src/theme/opendesign/dark.token.css b/packages/opendesign/src/theme/opendesign/common/dark.token.css
similarity index 100%
rename from packages/opendesign/src/theme/opendesign/dark.token.css
rename to packages/opendesign/src/theme/opendesign/common/dark.token.css
diff --git a/packages/opendesign/src/theme/opendesign/common/index.scss b/packages/opendesign/src/theme/opendesign/common/index.scss
new file mode 100644
index 00000000..e3a438ca
--- /dev/null
+++ b/packages/opendesign/src/theme/opendesign/common/index.scss
@@ -0,0 +1,2 @@
+@use './dark.token.css' as *;
+@use './light.token.css' as *;
diff --git a/packages/opendesign/src/theme/opendesign/light.token.css b/packages/opendesign/src/theme/opendesign/common/light.token.css
similarity index 100%
rename from packages/opendesign/src/theme/opendesign/light.token.css
rename to packages/opendesign/src/theme/opendesign/common/light.token.css
diff --git a/packages/opendesign/src/theme/opendesign/index.scss b/packages/opendesign/src/theme/opendesign/index.scss
index bef847d6..e663debd 100644
--- a/packages/opendesign/src/theme/opendesign/index.scss
+++ b/packages/opendesign/src/theme/opendesign/index.scss
@@ -1,6 +1,5 @@
-// 变量
-@use './dark.token.css' as *;
-@use './light.token.css' as *;
+// Token 及公共样式
+@use './common/index.scss' as *;
 
 // 样式
 @use '../../index.scss';
diff --git a/packages/opendesign/src/theme/opendesign/token.config.ts b/packages/opendesign/src/theme/opendesign/token.config.ts
index 0434f9bf..4b025b29 100644
--- a/packages/opendesign/src/theme/opendesign/token.config.ts
+++ b/packages/opendesign/src/theme/opendesign/token.config.ts
@@ -1,5 +1,6 @@
 module.exports = {
   prefix: '--o-',
+  output: './common',
   themeMap: [
     {
       key: 'light',
diff --git a/packages/opendesign/src/theme/openeuler/e.dark.token.css b/packages/opendesign/src/theme/openeuler/common/e.dark.token.css
similarity index 100%
rename from packages/opendesign/src/theme/openeuler/e.dark.token.css
rename to packages/opendesign/src/theme/openeuler/common/e.dark.token.css
diff --git a/packages/opendesign/src/theme/openeuler/e.light.token.css b/packages/opendesign/src/theme/openeuler/common/e.light.token.css
similarity index 100%
rename from packages/opendesign/src/theme/openeuler/e.light.token.css
rename to packages/opendesign/src/theme/openeuler/common/e.light.token.css
diff --git a/packages/opendesign/src/theme/openeuler/common/index.scss b/packages/opendesign/src/theme/openeuler/common/index.scss
new file mode 100644
index 00000000..b515d24d
--- /dev/null
+++ b/packages/opendesign/src/theme/openeuler/common/index.scss
@@ -0,0 +1,2 @@
+@use './e.light.token.css' as *;
+@use './e.dark.token.css' as *;
diff --git a/packages/opendesign/src/theme/openeuler/index.scss b/packages/opendesign/src/theme/openeuler/index.scss
index 5fcff8d7..47848503 100644
--- a/packages/opendesign/src/theme/openeuler/index.scss
+++ b/packages/opendesign/src/theme/openeuler/index.scss
@@ -1,7 +1,5 @@
-// 变量
-@use './e.dark.token.css' as *;
-@use './e.light.token.css' as *;
-@use '../common.scss' as *;
+// Token 及公共样式
+@use './common/index.scss' as *;
 
 // 样式
 @use '../../index.scss' as *;
diff --git a/packages/opendesign/src/theme/openeuler/token.config.ts b/packages/opendesign/src/theme/openeuler/token.config.ts
index b5b4f861..381a450f 100644
--- a/packages/opendesign/src/theme/openeuler/token.config.ts
+++ b/packages/opendesign/src/theme/openeuler/token.config.ts
@@ -1,5 +1,6 @@
 module.exports = {
   prefix: '--o-',
+  output: './common',
   themeMap: [
     {
       key: 'light',
-- 
Gitee