From 1b8a541db225b90e878e45df0a5a88cb1db19ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= <liuyuxia@jsspisoft.com>
Date: Thu, 20 Jun 2024 13:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/lang/index.ts   |  4 ---
 ui/dasadmin/src/styles/var.scss | 46 +++++++++++++--------------------
 ui/dasadmin/vite.config.ts      |  2 +-
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/ui/dasadmin/src/lang/index.ts b/ui/dasadmin/src/lang/index.ts
index 114bb440..aa940e91 100644
--- a/ui/dasadmin/src/lang/index.ts
+++ b/ui/dasadmin/src/lang/index.ts
@@ -35,16 +35,12 @@ export async function loadLang(app: App) {
     if (locale == 'zh-cn') {
         window.loadLangHandle = {
             ...import.meta.glob('./backend/zh-cn/**/*.ts'),
-            ...import.meta.glob('./frontend/zh-cn/**/*.ts'),
             ...import.meta.glob('./backend/zh-cn.ts'),
-            ...import.meta.glob('./frontend/zh-cn.ts'),
         }
     } else {
         window.loadLangHandle = {
             ...import.meta.glob('./backend/en/**/*.ts'),
-            ...import.meta.glob('./frontend/en/**/*.ts'),
             ...import.meta.glob('./backend/en.ts'),
-            ...import.meta.glob('./frontend/en.ts'),
         }
     }
 
diff --git a/ui/dasadmin/src/styles/var.scss b/ui/dasadmin/src/styles/var.scss
index 69446242..bf29d9b4 100644
--- a/ui/dasadmin/src/styles/var.scss
+++ b/ui/dasadmin/src/styles/var.scss
@@ -1,33 +1,22 @@
 @use 'sass:map';
-@use 'mixins' as *;
-$colors: (
-    ) !default;
-$colors: map.deep-merge(('white': #ffffff,
-            'black': #000000,
-            'primary': ('base': red,
-            ),
-            'success': ('base': #67c23a,
-            ),
-            'warning': ('base': #e6a23c,
-            ),
-            'danger': ('base': #f56c6c,
-            ),
-            'error': ('base': #f56c6c,
-            ),
-            'info': ('base': #909399,
-            ),
-        ),
-        $colors
-);
 
-$color-white: map.get($colors, 'white') !default;
-$color-black: map.get($colors, 'black') !default;
-$color-primary: map.get($colors, 'primary', 'base') !default;
-$color-success: map.get($colors, 'success', 'base') !default;
-$color-warning: map.get($colors, 'warning', 'base') !default;
-$color-danger: map.get($colors, 'danger', 'base') !default;
-$color-error: map.get($colors, 'error', 'base') !default;
-$color-info: map.get($colors, 'info', 'base') !default;
+@use 'mixins' as *;
+
+@forward 'element-plus/theme-chalk/src/common/var.scss' with ($colors: ('primary': ('base': #003261,
+        ),
+        'success': ('base': #21ba45,
+        ),
+        'warning': ('base': #f2711c,
+        ),
+        'danger': ('base': #db2828,
+        ),
+        'error': ('base': #db2828,
+        ),
+        'info': ('base': #42b8dd,
+        ),
+    ),
+    $button-padding-horizontal: ('default': 80px,
+    ));
 
 // 后台主体窗口左右间距
 $main-space: 16px;
@@ -53,6 +42,7 @@ $border-color: map.merge(('': #f6f6f6,
 :root {
     @include set-css-var-value('main-space', $main-space);
     @include set-css-var-value('color-primary-light', $primary-light);
+
     @include set-component-css-var('bg-color', $bg-color);
     @include set-component-css-var('border-color', $border-color);
 }
\ No newline at end of file
diff --git a/ui/dasadmin/vite.config.ts b/ui/dasadmin/vite.config.ts
index 4be68fc1..8a1e6f43 100644
--- a/ui/dasadmin/vite.config.ts
+++ b/ui/dasadmin/vite.config.ts
@@ -16,7 +16,7 @@ const viteConfig = ({ mode }: ConfigEnv): UserConfig => {
     const alias: Record<string, string> = {
         '/@': pathResolve('./src/'),
         assets: pathResolve('./src/assets'),
-        'vue-i18n': isProd(mode) ? 'vue-i18n/dist/vue-i18n.cjs.prod.js' : 'vue-i18n/dist/vue-i18n.cjs.js',
+        'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',
     }
 
     const createProxy = (proxyList: any) => {