From 2eb04c849331fd14266b6e7fb8b5229675169a79 Mon Sep 17 00:00:00 2001
From: whr2349 <378237242@qq.com>
Date: Tue, 7 Jan 2025 16:35:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor(vscode):=20=E8=B0=83=E6=95=B4=20ESLint?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 "source.fixAll.eslint" 设置为 "explicit" 模式
- 格式化 .vscode/settings
---
 .vscode/settings.json                 |  2 +-
 src/components/common/app-loading.vue | 10 ++++++++++
 src/layouts/index.ts                  | 10 ++++++++++
 src/main.ts                           | 11 +++++++++++
 src/settings/index.ts                 | 10 ++++++++++
 src/store/modules/theme/helpers.ts    | 15 ++++++++++++++-
 6 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9cc38b1e..3f848af3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -48,7 +48,7 @@
     "ភាសាខ្មែរ"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "editor.fontLigatures": true,
   "editor.formatOnSave": false,
diff --git a/src/components/common/app-loading.vue b/src/components/common/app-loading.vue
index f81875f7..0448baf1 100644
--- a/src/components/common/app-loading.vue
+++ b/src/components/common/app-loading.vue
@@ -1,3 +1,13 @@
+<!--
+ * @Author: whr2349 378237242@QQ.com
+ * @Date: 2023-08-17 09:25:28
+ * @LastEditors: whr2349 378237242@QQ.com
+ * @LastEditTime: 2023-09-05 10:35:12
+ * @FilePath: \soybean-admin\src\components\common\app-loading.vue
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+-->
 <template>
   <div class="fixed-center flex-col">
     <system-logo class="text-128px text-primary" />
diff --git a/src/layouts/index.ts b/src/layouts/index.ts
index ed4558f8..b2967d66 100644
--- a/src/layouts/index.ts
+++ b/src/layouts/index.ts
@@ -1,3 +1,13 @@
+/*
+ * @Author: whr2349 378237242@QQ.com
+ * @Date: 2023-08-17 09:25:28
+ * @LastEditors: whr2349 378237242@QQ.com
+ * @LastEditTime: 2023-08-17 17:14:37
+ * @FilePath: \soybean-admin\src\layouts\index.ts
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ */
 const BasicLayout = () => import('./basic-layout/index.vue');
 const BlankLayout = () => import('./blank-layout/index.vue');
 
diff --git a/src/main.ts b/src/main.ts
index a6e94c09..92dae7a4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,3 +1,13 @@
+/*
+ * @Author: whr2349 378237242@QQ.com
+ * @Date: 2023-08-17 09:25:28
+ * @LastEditors: whr2349 378237242@QQ.com
+ * @LastEditTime: 2023-08-17 14:11:06
+ * @FilePath: \soybean-admin\src\main.ts
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ */
 import { createApp } from 'vue';
 import App from './App.vue';
 import AppLoading from './components/common/app-loading.vue';
@@ -16,6 +26,7 @@ async function setupApp() {
 
   appLoading.mount('#appLoading');
 
+  // app
   const app = createApp(App);
 
   // store plugin: pinia
diff --git a/src/settings/index.ts b/src/settings/index.ts
index dafbcb8a..030389cf 100644
--- a/src/settings/index.ts
+++ b/src/settings/index.ts
@@ -1,2 +1,12 @@
+/*
+ * @Author: whr2349 378237242@QQ.com
+ * @Date: 2023-08-17 09:25:28
+ * @LastEditors: whr2349 378237242@QQ.com
+ * @LastEditTime: 2023-08-23 15:34:22
+ * @FilePath: \soybean-admin\src\settings\index.ts
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ */
 export * from './theme';
 export * from './color';
diff --git a/src/store/modules/theme/helpers.ts b/src/store/modules/theme/helpers.ts
index cc477d38..54d47b46 100644
--- a/src/store/modules/theme/helpers.ts
+++ b/src/store/modules/theme/helpers.ts
@@ -1,3 +1,13 @@
+/*
+ * @Author: whr2349 378237242@QQ.com
+ * @Date: 2023-08-17 09:25:28
+ * @LastEditors: whr2349 378237242@QQ.com
+ * @LastEditTime: 2023-08-25 11:24:58
+ * @FilePath: \soybean-admin\src\store\modules\theme\helpers.ts
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ */
 import type { GlobalThemeOverrides } from 'naive-ui';
 import { cloneDeep } from 'lodash-es';
 import { themeSetting } from '@/settings';
@@ -12,11 +22,14 @@ export function initThemeSettings() {
   if (isProd && storageSettings) {
     return storageSettings;
   }
-
   const themeColor = sessionStg.get('themeColor') || themeSetting.themeColor;
+  // 获取颜色对应的信息颜色
   const info = themeSetting.isCustomizeInfoColor ? themeSetting.otherColor.info : getColorPalette(themeColor, 7);
+  // 将颜色对应的信息颜色和其他颜色合并
   const otherColor = { ...themeSetting.otherColor, info };
+  // 将其他颜色和颜色对应的信息颜色合并
   const setting = cloneDeep({ ...themeSetting, themeColor, otherColor });
+  // 返回设置
   return setting;
 }