From 13cabad76a2886ff0934619c357aca4b2cc34d74 Mon Sep 17 00:00:00 2001
From: luoer <luoer@szbeihai.com>
Date: Fri, 12 Jan 2024 14:56:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/interceptors/auth.ts       |  7 +++--
 src/libs/dayjs/index.ts            | 13 ++++-----
 src/pages/_layout/UserDropdown.vue |  2 +-
 src/pages/_layout/index.vue        | 44 +++++++++++++++---------------
 src/pages/_login/index.vue         | 31 +++++++++++----------
 src/pages/home/index.vue           |  5 ++--
 src/pages/system/role/index.vue    |  2 +-
 src/router/guards/auth.ts          |  3 +-
 src/router/guards/progress.ts      |  2 +-
 src/router/guards/title.ts         |  3 +-
 src/store/index.ts                 |  2 --
 src/styles/css-arco.less           |  6 +++-
 12 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/api/interceptors/auth.ts b/src/api/interceptors/auth.ts
index 9af5bf4..f433c10 100644
--- a/src/api/interceptors/auth.ts
+++ b/src/api/interceptors/auth.ts
@@ -1,12 +1,13 @@
-import { store, useUserStore } from "@/store";
-import { AxiosInstance } from "axios";
+import { store } from '@/store';
+import { useUserStore } from '@/store/user';
+import { AxiosInstance } from 'axios';
 
 /**
  * 登陆令牌拦截器
  * @param axios Axios实例
  */
 export function addAuthInterceptor(axios: AxiosInstance) {
-  axios.interceptors.request.use((config) => {
+  axios.interceptors.request.use(config => {
     const userStore = useUserStore(store);
     if (userStore.accessToken) {
       config.headers.Authorization = `Bearer ${userStore.accessToken}`;
diff --git a/src/libs/dayjs/index.ts b/src/libs/dayjs/index.ts
index e73da4a..accf608 100644
--- a/src/libs/dayjs/index.ts
+++ b/src/libs/dayjs/index.ts
@@ -39,17 +39,17 @@ dayjs.extend(localData);
 /**
  * 默认时间格式
  */
-dayjs.DATETIME = DATETIME;
+dayjs.DATETIME = 'YYYY-MM-DD HH:mm';
 
 /**
  * 默认日期格式
  */
-dayjs.DATE = DATE;
+dayjs.DATE = 'YYYY-MM-DD';
 
 /**
  * 默认时间格式
  */
-dayjs.TIME = TIME;
+dayjs.TIME = 'HH:mm:ss';
 
 /**
  * 保留原方法
@@ -59,11 +59,8 @@ dayjs.prototype._format = dayjs.prototype.format;
 /**
  * 重写，设置默认时间格式
  */
-dayjs.prototype.format = function (format?: string) {
-  if (format) {
-    return this._format(format);
-  }
-  return this._format(dayjs.DATETIME);
+dayjs.prototype.format = function (format: string = dayjs.DATETIME) {
+  return this._format(format);
 };
 
 export { DATE, DATETIME, TIME, dayjs };
diff --git a/src/pages/_layout/UserDropdown.vue b/src/pages/_layout/UserDropdown.vue
index b9cbab8..3be3592 100644
--- a/src/pages/_layout/UserDropdown.vue
+++ b/src/pages/_layout/UserDropdown.vue
@@ -62,7 +62,7 @@
 
 <script setup lang="ts">
 import { useFormModal } from '@/components/AnForm';
-import { useUserStore } from '@/store';
+import { useUserStore } from '@/store/user';
 import { delConfirm } from '@/utils';
 import { Message } from '@arco-design/web-vue';
 
diff --git a/src/pages/_layout/index.vue b/src/pages/_layout/index.vue
index bbe1905..2030612 100644
--- a/src/pages/_layout/index.vue
+++ b/src/pages/_layout/index.vue
@@ -57,13 +57,13 @@
           <Menu />
         </a-scrollbar>
         <template #trigger="{ collapsed }">
-          <div class="w-full h-full py-1 px-1" @click.stop>
-            <span
-              class="inline-block w-10 h-full rounded flex items-center justify-center hover:bg-gray-100 text-base text-gray-400"
+          <div class="w-full h-full py-1 px-1 flex justify-between items-center gap-2" @click.stop>
+            <div
+              class="inline-block w-10 h-10 h-full rounded flex items-center justify-center hover:bg-zinc-100 text-base text-gray-400"
               @click="() => (isCollapsed = !isCollapsed)"
             >
               <i :class="collapsed ? `icon-park-outline-expand-left` : 'icon-park-outline-expand-right'"></i>
-            </span>
+            </div>
           </div>
         </template>
       </a-layout-sider>
@@ -86,12 +86,13 @@
 </template>
 
 <script lang="tsx" setup>
-import { useAppStore } from '@/store';
+import { useAppStore } from '@/store/app';
 import { useMenuStore } from '@/store/menu';
 import { Message } from '@arco-design/web-vue';
 import { IconSync } from '@arco-design/web-vue/es/icon';
 import Menu from './Menu.vue';
 import userDropdown from './UserDropdown.vue';
+import { useFullscreen } from '@vueuse/core';
 
 defineOptions({ name: 'LayoutPage' });
 
@@ -100,18 +101,7 @@ const appStore = useAppStore();
 const menuStore = useMenuStore();
 const isCollapsed = ref(false);
 const themeConfig = ref({ visible: false });
-
-const ButtonWithTooltip = (props: { tooltip: string; icon: string; onClick: any }) => {
-  return (
-    <a-tooltip content={props.tooltip}>
-      <a-button onClick={props.onClick} class="!bg-transparent !hover:bg-gray-100">
-        {{
-          icon: () => <i class={`${props.icon} text-base`}></i>,
-        }}
-      </a-button>
-    </a-tooltip>
-  );
-};
+const { toggle, isSupported } = useFullscreen();
 
 const buttons = [
   {
@@ -122,10 +112,14 @@ const buttons = [
     },
   },
   {
-    icon: 'icon-park-outline-config',
-    tooltip: '设置',
+    icon: 'icon-park-outline-full-screen',
+    tooltip: '全屏',
     onClick: () => {
-      themeConfig.value.visible = true;
+      if (!isSupported) {
+        Message.info('您的浏览器不支持全屏');
+        return;
+      }
+      toggle();
     },
   },
   {
@@ -135,6 +129,13 @@ const buttons = [
       window.open('https://github.com/appnify/starter-vue', '_blank');
     },
   },
+  {
+    icon: 'icon-park-outline-config',
+    tooltip: '设置',
+    onClick: () => {
+      themeConfig.value.visible = true;
+    },
+  },
 ];
 </script>
 
@@ -209,8 +210,7 @@ const buttons = [
     "name": "LayoutPage",
     "sort": 101,
     "title": "首页",
-    "icon": "icon-park-outline-home",
-    "keepAlive": true
+    "icon": "icon-park-outline-home"
   }
 }
 </route>
diff --git a/src/pages/_login/index.vue b/src/pages/_login/index.vue
index 7cb700f..cc714a7 100644
--- a/src/pages/_login/index.vue
+++ b/src/pages/_login/index.vue
@@ -42,7 +42,7 @@
                 <a-link @click="onForgetPassword">忘记密码?</a-link>
               </div>
               <a-button type="primary" html-type="submit" long class="mt-2" :loading="loading" @click="onSubmitForm">
-                {{ loading ? "登陆中" : "立即登录" }}
+                {{ loading ? '登陆中' : '立即登录' }}
               </a-button>
               <p type="text" long class="text-gray-400 text-center m-0">暂不支持其他方式登录</p>
             </a-space>
@@ -55,18 +55,19 @@
 </template>
 
 <script lang="ts" setup>
-import { api } from "@/api";
-import { dayjs } from "@/libs/dayjs";
-import { useAppStore, useUserStore } from "@/store";
-import { FieldRule, Form, Message, Modal, Notification } from "@arco-design/web-vue";
-import { reactive } from "vue";
+import { api } from '@/api';
+import { dayjs } from '@/libs/dayjs';
+import { useAppStore } from '@/store/app';
+import { useUserStore } from '@/store/user';
+import { FieldRule, Form, Message, Modal, Notification } from '@arco-design/web-vue';
+import { reactive } from 'vue';
 
-defineOptions({ name: "LoginPage" });
+defineOptions({ name: 'LoginPage' });
 
 const meridiem = dayjs.localeData().meridiem(dayjs().hour(), dayjs().minute());
 const appStore = useAppStore();
 const userStore = useUserStore();
-const model = reactive({ username: "", password: "" });
+const model = reactive({ username: '', password: '' });
 const route = useRoute();
 const router = useRouter();
 const loading = ref(false);
@@ -76,22 +77,22 @@ const formRules: Record<string, FieldRule[]> = {
   username: [
     {
       required: true,
-      message: "请输入账号/手机号/邮箱",
+      message: '请输入账号/手机号/邮箱',
     },
   ],
   password: [
     {
       required: true,
-      message: "请输入密码",
+      message: '请输入密码',
     },
   ],
 };
 
 const onForgetPassword = () => {
   Modal.info({
-    title: "忘记密码?",
-    content: "如已忘记密码，请联系管理员进行密码重置!",
-    modalClass: "text-center",
+    title: '忘记密码?',
+    content: '如已忘记密码，请联系管理员进行密码重置!',
+    modalClass: 'text-center',
     maskClosable: false,
   });
 };
@@ -105,10 +106,10 @@ const onSubmitForm = async () => {
     const res = await api.auth.login(model);
     userStore.setAccessToken(res.data.data);
     Notification.success({
-      title: "提示",
+      title: '提示',
       content: `${meridiem}好，您已成功登陆本系统!`,
     });
-    router.push({ path: (route.query.redirect as string) || "/" });
+    router.push({ path: (route.query.redirect as string) || '/' });
   } catch (error: any) {
     const message = error?.response?.data?.message;
     message && Message.warning(`提示：${message}`);
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 6018eca..5ff41ce 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -19,6 +19,7 @@
           </div>
         </div>
       </div>
+
       <div class="bg-white px-5 py-4 rounded-sm mt-4">
         <div>常用服务</div>
         <div class="grid grid-cols-5 justify-between gap-4 mt-4">
@@ -58,7 +59,7 @@
           <ul class="list-none w-full m-0 p-0">
             <li v-for="i in 8" class="w-full h-6 items-center overflow-hidden justify-between flex gap-2 mb-2">
               <a-tag>{{ i }}</a-tag>
-              <span class="flex-1 truncate hover:underline underline-offset-2 cursor-pointer">
+              <span class="flex-1 truncate hover:underline underline-offset-2 hover:text-brand-500 cursor-pointer">
                 但是预测已加载的数据不足以
               </span>
               <span class="text-gray-400">3天前</span>
@@ -71,7 +72,7 @@
 </template>
 
 <script setup lang="ts">
-import { useUserStore } from '@/store';
+import { useUserStore } from '@/store/user';
 
 const userStore = useUserStore();
 
diff --git a/src/pages/system/role/index.vue b/src/pages/system/role/index.vue
index d6a1e19..ec8492a 100644
--- a/src/pages/system/role/index.vue
+++ b/src/pages/system/role/index.vue
@@ -1,6 +1,6 @@
 <template>
   <BreadPage>
-    <role-table></role-table>
+    <RoleTable></RoleTable>
   </BreadPage>
 </template>
 
diff --git a/src/router/guards/auth.ts b/src/router/guards/auth.ts
index 9330e5d..b17e576 100644
--- a/src/router/guards/auth.ts
+++ b/src/router/guards/auth.ts
@@ -1,7 +1,8 @@
 import { api } from '@/api';
 import { env } from '@/config/env';
-import { store, useUserStore } from '@/store';
+import { useUserStore } from '@/store/user';
 import { useMenuStore } from '@/store/menu';
+import { store } from '@/store';
 import { treeEach } from '@/utils/listToTree';
 import { Notification } from '@arco-design/web-vue';
 import { Router } from 'vue-router';
diff --git a/src/router/guards/progress.ts b/src/router/guards/progress.ts
index 8da8e93..440b10e 100644
--- a/src/router/guards/progress.ts
+++ b/src/router/guards/progress.ts
@@ -1,5 +1,5 @@
 import { NProgress } from '@/libs/nprogress';
-import { useAppStore } from '@/store';
+import { useAppStore } from '@/store/app';
 import { Router } from 'vue-router';
 
 const routeMap = new Map<string, boolean>();
diff --git a/src/router/guards/title.ts b/src/router/guards/title.ts
index 3c6bf7d..b817ea7 100644
--- a/src/router/guards/title.ts
+++ b/src/router/guards/title.ts
@@ -1,4 +1,5 @@
-import { store, useAppStore } from '@/store';
+import { store } from '@/store';
+import { useAppStore } from '@/store/app';
 import { Router } from 'vue-router';
 
 export function useTitleGuard(router: Router) {
diff --git a/src/store/index.ts b/src/store/index.ts
index 2e3a00e..d406816 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,3 +1 @@
-export * from './app';
 export * from './store';
-export * from './user';
diff --git a/src/styles/css-arco.less b/src/styles/css-arco.less
index 4fbcea2..58e5353 100644
--- a/src/styles/css-arco.less
+++ b/src/styles/css-arco.less
@@ -75,7 +75,7 @@ body {
     .arco-menu-item {
       margin: 0 4px;
       &:hover {
-        background-color: var(--color-neutral-1);
+        background-color: var(--color-neutral-2);
       }
       &.arco-menu-selected {
         // color: @arcoblue-6;
@@ -135,6 +135,10 @@ body {
   .an-form-modal .arco-modal-body {
     padding-bottom: 8px;
   }
+
+  .arco-form-item-message {
+    margin-top: 8px;
+  }
 }
 .dark {
   .arco-menu-item.arco-menu-selected {