Merge remote-tracking branch 'origin/frame' into dev

build/config/themeConfig.ts

@@ -5,9 +5,9 @@
  */
 import { generate } from '@ant-design/colors';
 
-export const primaryColor = '#257AFA';
+export const primaryColor = '#FF6600';
 
-export const darkMode = 'light';
+export const darkMode = 'black';
 
 type Fn = (...arg: any) => any;
 

src/components/Application/src/AppLogo.vue

@@ -3,13 +3,12 @@
  * @Author: lijj
  * @Date: 2024-07-17 08:39:50
 -->
-<!--
- * @Author: Vben
- * @Description: logo component
--->
 <template>
   <div class="anticon" @click="goHome">
-    <img v-if="showTitle" style="margin: 10px 18px; height: 40px; width: 160px;" :src="getDarkMode == 'white' ? '/src/assets/images/logob.png' : '/src/assets/images/logoh.png'" />
+    <span v-if="showTitle">
+      <img v-if="getDarkMode == 'white'" style="margin: 10px 18px; height: 40px; width: 160px;" src="../../../assets/images/logob.png" />
+      <img v-else style="margin: 10px 18px; height: 40px; width: 160px;" src="../../../assets/images/logoh.png" />
+    </span>
     <img v-else style="width: 32px; height: 32px; margin: 16px 7px;" src="../../../assets/images/logo1.png" />
     <!-- <div v-show="showTitle" class="ml-2 truncate md:opacity-100" :class="getTitleClass">
       {{ title }}
@@ -40,7 +39,6 @@
      */
     alwaysShowTitle: { type: Boolean },
   })
-
   const { prefixCls } = useDesign('app-logo')
   const { getCollapsedShowTitle } = useMenuSetting()
   const userStore = useUserStore()

src/design/public.less

@@ -17,7 +17,7 @@
 // }
 
 ::-webkit-scrollbar-track {
-  background-color: rgb(0 0 0 / 5%);
+  background-color: #F0F2F5!important;
 }
 
 ::-webkit-scrollbar-thumb {

src/enums/appEnum.ts

@@ -17,6 +17,9 @@ export enum ContentEnum {
 export enum ThemeEnum {
   DARK = 'dark',
   LIGHT = 'light',
+  BLACK = 'black',
+  BLUE = 'blue',
+  WHITE = 'white'
 }
 
 export enum SettingButtonPositionEnum {

src/router/guard/permissionGuard.ts

@@ -8,6 +8,12 @@ import { useUserStoreWithOut } from '/@/store/modules/user'
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'
 
 import { RootRoute } from '/@/router/routes'
+import { useRootSetting } from '/@/hooks/setting/useRootSetting'
+const { getDarkMode, setDarkMode } = useRootSetting()
+// 设置默认主题
+if (getDarkMode.value === 'light') {
+  setDarkMode('black')
+}
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN