From 4fc62a940dffa05511b524865bf50e9cab2eaaf6 Mon Sep 17 00:00:00 2001
From: bqy_fe <1743369777@qq.com>
Date: Mon, 13 Dec 2021 11:36:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20rootadmin=20=E5=81=87=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95,=E9=81=BF=E5=85=8D=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BA=BA=E8=A2=AB=E8=BF=AB=E4=B8=8B=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   8 -
 package.json                                  |   3 +
 src/api/account/model.d.ts                    |   1 +
 src/components/dynamic-table/hooks/index.ts   |   1 -
 .../dynamic-table/hooks/useCalculate.ts       |  86 ------
 src/layout/header/components.ts               |  33 ---
 src/layout/header/index.vue                   | 264 +++++++++---------
 src/layout/menu/menu-item.vue                 |   2 +-
 src/router/router-guards.ts                   |   2 +-
 src/router/staticModules/error.ts             |   2 +-
 src/router/staticModules/redirect.ts          |   4 +-
 src/store/modules/user.ts                     |   3 +
 src/utils/common.ts                           |   4 +-
 src/views/shared/dashboard/welcome/index.vue  |   4 +-
 .../demos/form/basic-form/form-schema.ts      |   2 +-
 .../demos/form/rule-form/form-schema.ts       |   2 +-
 src/views/shared/login/index.vue              |   5 +-
 tsconfig.json                                 |  47 ++--
 types/modules.d.ts                            |   8 +-
 types/vue-router.d.ts                         |  26 +-
 types/vuex.d.ts                               |   8 +-
 vue.config.js                                 |  22 +-
 22 files changed, 211 insertions(+), 326 deletions(-)
 delete mode 100644 src/components/dynamic-table/hooks/useCalculate.ts
 delete mode 100644 src/layout/header/components.ts

diff --git a/README.md b/README.md
index c260de5c7..158c2a3e3 100644
--- a/README.md
+++ b/README.md
@@ -18,14 +18,6 @@
 
 > 使用了 Vue3.0 全家桶、ant-design-vue2.0 和 typescript4.0，实践 vue3.0 的新特性以及玩法，不得不说 vue3.0 的 Composition API 相比于 vue2.0 的 Options API 灵活很多，让我们可以灵活地组合组件逻辑，我们可以很轻松的使用 hooks 的形式去代替以前 mixins 等的写法。更多 hooks 可以参考[vueuse](https://vueuse.org/functions.html)
 
-## 克隆项目
-
-```bash
-git clone --single-branch https://github.com/buqiyuan/vite-vue3-lowcode.git
-or
-git clone --depth=1 https://github.com/buqiyuan/vite-vue3-lowcode.git
-```
-
 ## Project setup
 
 ```shell
diff --git a/package.json b/package.json
index 28d76b981..c3922a1e0 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,9 @@
     "typescript"
   ],
   "license": "MIT",
+  "engines": {
+    "node": "^12 || >=14"
+  },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
       "eslint --fix",
diff --git a/src/api/account/model.d.ts b/src/api/account/model.d.ts
index 439cac29a..cf790a24f 100644
--- a/src/api/account/model.d.ts
+++ b/src/api/account/model.d.ts
@@ -31,6 +31,7 @@ declare namespace API {
     psalt: string;
     nickName: string;
     headImg: string;
+    loginIp: string;
     email: string;
     phone: string;
     remark: string;
diff --git a/src/components/dynamic-table/hooks/index.ts b/src/components/dynamic-table/hooks/index.ts
index 2975b518e..397ae13b7 100644
--- a/src/components/dynamic-table/hooks/index.ts
+++ b/src/components/dynamic-table/hooks/index.ts
@@ -1,3 +1,2 @@
 export { useDragCol } from './useDragCol';
 export { useExpandLoading } from './useExpandLoading';
-export { useCalculate } from './useCalculate';
diff --git a/src/components/dynamic-table/hooks/useCalculate.ts b/src/components/dynamic-table/hooks/useCalculate.ts
deleted file mode 100644
index 31d092ce8..000000000
--- a/src/components/dynamic-table/hooks/useCalculate.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { nextTick } from 'vue';
-import { isFunction } from '@/utils/is';
-
-interface CalculateParams {
-  /** 表格实例 */
-  tableRef: any;
-  /** 数据源 */
-  dataSource: any[];
-  /** 表格列的配置描述 */
-  columns: any[];
-  /** 合计显示文本 */
-  sumText: string;
-  /** 合计行计算方法 */
-  summaryFunc?: (params: { dataSource: any[]; columns: any[] }) => string[];
-}
-
-/**
- * 表格尾部合计行
- */
-export const useCalculate = () => {
-  let tr: HTMLTableRowElement;
-
-  const setCalculateRow = async (params: CalculateParams) => {
-    await nextTick();
-    const { tableRef, dataSource = [], columns = [], sumText, summaryFunc } = params;
-    if (!dataSource.length) return;
-    const tbody = tableRef.value.$el.querySelector('.ant-table-tbody') as HTMLTableSectionElement;
-    if (!tr) {
-      tr = tbody.lastElementChild?.cloneNode(true) as HTMLTableRowElement;
-      tr.style.backgroundColor = '#f8f8f9';
-      tr.style.position = 'sticky';
-      tr.style.zIndex = '999';
-      tr.style.bottom = '0';
-      tr.setAttribute('data-row-key', String(Math.random()));
-    }
-    // 渲染单元格
-    const renderCol = (colEls?: HTMLTableCellElement[]) => {
-      // 如果有传进自定义合计行渲染方法
-      if (isFunction(summaryFunc)) {
-        const result = summaryFunc({ dataSource, columns });
-        [...tr.children].forEach((item: HTMLTableCellElement, index) => {
-          item.textContent = result[index];
-          item.style.backgroundColor = 'inherit';
-        });
-      } else {
-        // 没有自定义合计行方法就默认渲染囖
-        const lastData = Object.keys(dataSource[0]).reduce((prev, key) => {
-          const count = dataSource.map((n) => n[key]).reduce((p, c) => c + p, 0);
-          prev[key] = isNaN(Number(count)) ? 'N/A' : count;
-          return prev;
-        }, {});
-        const columnKeys = columns.map((item) => item.dataIndex ?? item.key);
-        [...tr.children].forEach((item: HTMLTableCellElement, index) => {
-          if (index == 0) {
-            item.textContent = sumText;
-          } else {
-            item.textContent = lastData[columnKeys[index]];
-          }
-          item.style.backgroundColor = 'inherit';
-        });
-      }
-      if (colEls?.length) {
-        [...tr.children].forEach((item: HTMLTableCellElement, index) => {
-          Object.keys(colEls[index].style || []).forEach((key) => {
-            const styleKey = colEls[index].style[key];
-            item.style[styleKey] = colEls[index].style[styleKey];
-            item.className = colEls[index].className;
-          });
-        });
-      }
-    };
-
-    renderCol();
-
-    if (!tbody.contains(tr)) {
-      tbody.appendChild(tr);
-      setTimeout(() => {
-        const colEls =
-          tableRef.value.$el.querySelector('.ant-table-tbody')?.firstElementChild?.children;
-        colEls && renderCol([...colEls] as HTMLTableCellElement[]);
-      }, 100);
-    }
-  };
-
-  return { setCalculateRow };
-};
diff --git a/src/layout/header/components.ts b/src/layout/header/components.ts
deleted file mode 100644
index 92f3717a3..000000000
--- a/src/layout/header/components.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Layout, Avatar, Menu, Dropdown, Breadcrumb, Tooltip } from 'ant-design-vue';
-
-import {
-  SettingOutlined,
-  SearchOutlined,
-  MenuFoldOutlined,
-  MenuUnfoldOutlined,
-  FullscreenOutlined,
-  FullscreenExitOutlined,
-  PoweroffOutlined,
-  GithubOutlined,
-  LockOutlined,
-} from '@ant-design/icons-vue';
-
-export default {
-  [Layout.Header.name]: Layout.Header,
-  [Avatar.name]: Avatar,
-  [Menu.name]: Menu,
-  [Tooltip.name]: Tooltip,
-  [Menu.Divider.name]: Menu.Divider,
-  SettingOutlined,
-  Dropdown,
-  LockOutlined,
-  GithubOutlined,
-  SearchOutlined,
-  [Breadcrumb.name]: Breadcrumb,
-  [Breadcrumb.Item.name]: Breadcrumb.Item,
-  MenuFoldOutlined,
-  MenuUnfoldOutlined,
-  FullscreenOutlined,
-  FullscreenExitOutlined,
-  PoweroffOutlined,
-};
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 9d9c685d1..d0da1cea9 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -1,176 +1,180 @@
 <template>
-  <ALayoutHeader class="layout-header">
+  <Layout.Header class="layout-header">
     <div class="left-options">
-      <span class="menu-fold" @click="() => $emit('update:collapsed', !collapsed)">
-        <component :is="collapsed ? 'menu-unfold-outlined' : 'menu-fold-outlined'" />
+      <span class="menu-fold" @click="() => emit('update:collapsed', !collapsed)">
+        <component :is="collapsed ? MenuUnfoldOutlined : MenuFoldOutlined" />
       </span>
-      <a-breadcrumb>
+      <Breadcrumb>
         <template v-for="(routeItem, rotueIndex) in $route.matched" :key="routeItem.name">
-          <a-breadcrumb-item>
+          <Breadcrumb.Item>
             <span>{{ getTitle(routeItem.meta.title) }}</span>
             <template v-if="routeItem.children.length" #overlay>
               <a-menu :selectedKeys="[$route.matched[rotueIndex + 1]?.name]" @click="clickMenuItem">
                 <template v-for="childItem in routeItem.children">
-                  <a-menu-item v-if="!childItem.meta?.hidden" :key="childItem.name">
+                  <a-menu-item v-if="!childItem.meta?.hideInMenu" :key="childItem.name">
                     <span>{{ getTitle(childItem.meta?.title) }}</span>
                   </a-menu-item>
                 </template>
               </a-menu>
             </template>
-          </a-breadcrumb-item>
+          </Breadcrumb.Item>
         </template>
-      </a-breadcrumb>
+      </Breadcrumb>
     </div>
     <div class="right-options">
       <template v-for="item in iconList" :key="item.icon.name">
-        <a-tooltip placement="bottom">
+        <Tooltip placement="bottom">
           <template #title>
             <span>{{ item.tips }}</span>
           </template>
           <component :is="item.icon" v-on="item.eventObject || {}" />
-        </a-tooltip>
+        </Tooltip>
       </template>
       <!--      切换全屏-->
       <component :is="fullscreenIcon" @click="toggleFullScreen" />
       <Dropdown>
-        <a-avatar>{{ username }}</a-avatar>
+        <Avatar>{{ username }}</Avatar>
         <template #overlay>
-          <a-menu>
-            <a-menu-item>
+          <Menu>
+            <Menu.Item>
               <div>个人中心</div>
-            </a-menu-item>
-            <a-menu-divider />
-            <a-menu-item>
+            </Menu.Item>
+            <Menu.Divider />
+            <Menu.Item>
               <div @click.prevent="doLogout"><poweroff-outlined /> 退出登录</div>
-            </a-menu-item>
-          </a-menu>
+            </Menu.Item>
+          </Menu>
         </template>
       </Dropdown>
     </div>
-  </ALayoutHeader>
+  </Layout.Header>
 </template>
 
-<script lang="ts">
-  import { defineComponent, reactive, toRefs, computed, createVNode } from 'vue';
+<script lang="tsx" setup>
+  import { ref, computed } from 'vue';
   import { useRouter, useRoute } from 'vue-router';
-  import components from '@/layout/header/components';
-  import { message, Modal } from 'ant-design-vue';
-  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import {
+    Layout,
+    message,
+    Modal,
+    Dropdown,
+    Menu,
+    Tooltip,
+    Breadcrumb,
+    Avatar,
+  } from 'ant-design-vue';
+  import {
+    QuestionCircleOutlined,
+    SettingOutlined,
+    SearchOutlined,
+    MenuFoldOutlined,
+    MenuUnfoldOutlined,
+    FullscreenOutlined,
+    FullscreenExitOutlined,
+    PoweroffOutlined,
+    GithubOutlined,
+    LockOutlined,
+  } from '@ant-design/icons-vue';
   import { useUserStore } from '@/store/modules/user';
   import { useLockscreenStore } from '@/store/modules/lockscreen';
 
-  export default defineComponent({
-    name: 'PageHeader',
-    components: { ...components },
-    props: {
-      collapsed: {
-        type: Boolean,
-      },
+  defineProps({
+    collapsed: {
+      type: Boolean,
     },
-    emits: ['update:collapsed'],
-    setup() {
-      const userStore = useUserStore();
-      const lockscreenStore = useLockscreenStore();
-
-      const state = reactive({
-        fullscreenIcon: 'FullscreenOutlined',
-      });
-
-      const router = useRouter();
-      const route = useRoute();
-
-      const username = computed(() => userStore.name);
-
-      // 点击菜单
-      const clickMenuItem = ({ key }) => {
-        if (key === route.name) return;
-        if (/http(s)?:/.test(key)) {
-          window.open(key);
-        } else {
-          router.push({ name: key });
+  });
+  const emit = defineEmits(['update:collapsed']);
+
+  const userStore = useUserStore();
+  const lockscreenStore = useLockscreenStore();
+  const fullscreenIcon = ref(FullscreenOutlined);
+
+  const router = useRouter();
+  const route = useRoute();
+  const username = computed(() => userStore.name);
+
+  // 点击菜单
+  const clickMenuItem = ({ key }) => {
+    if (key === route.name) return;
+    if (/http(s)?:/.test(key)) {
+      window.open(key);
+    } else {
+      router.push({ name: key });
+    }
+  };
+
+  // 退出登录
+  const doLogout = () => {
+    Modal.confirm({
+      title: '您确定要退出登录吗？',
+      icon: <QuestionCircleOutlined />,
+      onOk: async () => {
+        // 如果不是rootadmin，则退出登录
+        if (userStore.userInfo.phone !== '13553550634') {
+          // logout({})
+          await userStore.logout();
         }
-      };
-
-      // 退出登录
-      const doLogout = () => {
-        Modal.confirm({
-          title: '您确定要退出登录吗？',
-          icon: createVNode(QuestionCircleOutlined),
-          onOk: async () => {
-            console.log(router, '退出登录');
-            // logout({})
-            await userStore.logout();
-            message.success('成功退出登录');
-            // 移除标签页
-            localStorage.clear();
-            router.replace({
-              name: 'login',
-              query: {
-                redirect: route.fullPath,
-              },
-            });
+        message.success('成功退出登录');
+        // 移除标签页
+        localStorage.clear();
+        router.replace({
+          name: 'login',
+          query: {
+            redirect: route.fullPath,
           },
         });
-      };
-
-      // 切换全屏图标
-      const toggleFullscreenIcon = () =>
-        (state.fullscreenIcon =
-          document.fullscreenElement !== null ? 'FullscreenExitOutlined' : 'FullscreenOutlined');
-
-      // 监听全屏切换事件
-      document.addEventListener('fullscreenchange', toggleFullscreenIcon);
-
-      // 全屏切换
-      const toggleFullScreen = () => {
-        if (!document.fullscreenElement) {
-          document.documentElement.requestFullscreen();
-        } else {
-          if (document.exitFullscreen) {
-            document.exitFullscreen();
-          }
-        }
-      };
+      },
+    });
+  };
+
+  // 切换全屏图标
+  const toggleFullscreenIcon = () => {
+    fullscreenIcon.value =
+      document.fullscreenElement !== null ? FullscreenExitOutlined : FullscreenOutlined;
+  };
+
+  // 监听全屏切换事件
+  document.addEventListener('fullscreenchange', toggleFullscreenIcon);
+
+  // 全屏切换
+  const toggleFullScreen = () => {
+    if (!document.fullscreenElement) {
+      document.documentElement.requestFullscreen();
+    } else {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      }
+    }
+  };
 
-      // 图标列表
-      const iconList = [
-        {
-          icon: 'SearchOutlined',
-          tips: '搜索',
-        },
-        {
-          icon: 'GithubOutlined',
-          tips: 'github',
-          eventObject: {
-            click: () => window.open('https://github.com/buqiyuan/vue3-antd-admin'),
-          },
-        },
-        {
-          icon: 'SettingOutlined',
-          tips: '网站设置',
-        },
-        {
-          icon: 'LockOutlined',
-          tips: '锁屏',
-          eventObject: {
-            click: () => lockscreenStore.setLock(true),
-          },
-        },
-      ];
-      const getTitle = (title) => {
-        return typeof title === 'string' ? title : title?.['zh_CN'];
-      };
-      return {
-        ...toRefs(state),
-        iconList,
-        username,
-        clickMenuItem,
-        getTitle,
-        toggleFullScreen,
-        doLogout,
-      };
+  // 图标列表
+  const iconList = [
+    {
+      icon: SearchOutlined,
+      tips: '搜索',
     },
-  });
+    {
+      icon: GithubOutlined,
+      tips: 'github',
+      eventObject: {
+        click: () => window.open('https://github.com/buqiyuan/vue3-antd-admin'),
+      },
+    },
+    {
+      icon: SettingOutlined,
+      tips: '网站设置',
+    },
+    {
+      icon: LockOutlined,
+      tips: '锁屏',
+      eventObject: {
+        click: () => lockscreenStore.setLock(true),
+      },
+    },
+  ];
+  const getTitle = (title) => {
+    return typeof title === 'string' ? title : title?.['zh_CN'];
+  };
 </script>
 
 <style lang="less" scoped>
diff --git a/src/layout/menu/menu-item.vue b/src/layout/menu/menu-item.vue
index 0f99f4949..6f3a60913 100644
--- a/src/layout/menu/menu-item.vue
+++ b/src/layout/menu/menu-item.vue
@@ -1,5 +1,5 @@
 <template>
-  <template v-if="!props.menuInfo?.meta?.hideMenu">
+  <template v-if="!props.menuInfo?.meta?.hideInMenu">
     <Menu.SubMenu
       v-if="props.menuInfo?.children?.length"
       :key="props.menuInfo?.name"
diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts
index 6ad1bf7a8..d020d0192 100644
--- a/src/router/router-guards.ts
+++ b/src/router/router-guards.ts
@@ -58,7 +58,7 @@ export function createRouterGuards(router: Router) {
     }
   });
 
-  router.afterEach((to, from, failure) => {
+  router.afterEach((to, _, failure) => {
     const tabsViewStore = useTabsViewStore();
 
     document.title = (to?.meta?.title as string) || document.title;
diff --git a/src/router/staticModules/error.ts b/src/router/staticModules/error.ts
index 0e03ef203..1039ddfa6 100644
--- a/src/router/staticModules/error.ts
+++ b/src/router/staticModules/error.ts
@@ -17,7 +17,7 @@ export const errorRoutes = {
   meta: {
     title: '错误页',
     icon: 'EditOutlined',
-    hideMenu: true,
+    hideInMenu: true,
   },
   children: [
     {
diff --git a/src/router/staticModules/redirect.ts b/src/router/staticModules/redirect.ts
index e2a76b1fc..fd46ec4d5 100644
--- a/src/router/staticModules/redirect.ts
+++ b/src/router/staticModules/redirect.ts
@@ -9,7 +9,7 @@ const routes: Array<RouteRecordRaw> = [
     meta: {
       title: '重定向',
       icon: 'SettingOutlined',
-      hideMenu: true,
+      hideInMenu: true,
     },
     children: [
       {
@@ -18,7 +18,7 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@/views/shared/redirect/index.vue'),
         meta: {
           title: '重定向',
-          hideMenu: true,
+          hideInMenu: true,
           keepAlive: false,
         },
       },
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index ee2606898..168053f8f 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -13,6 +13,7 @@ interface UserState {
   // like [ 'sys:user:add', 'sys:user:update' ]
   perms: string[];
   menus: RouteRecordRaw[];
+  userInfo: Partial<API.AdminUserInfo>;
 }
 
 export const useUserStore = defineStore({
@@ -23,6 +24,7 @@ export const useUserStore = defineStore({
     avatar: '',
     perms: [],
     menus: [],
+    userInfo: {},
   }),
   getters: {
     getToken(): string {
@@ -62,6 +64,7 @@ export const useUserStore = defineStore({
         this.perms = perms;
         this.name = userInfo.name;
         this.avatar = userInfo.headImg;
+        this.userInfo = userInfo;
         // 生成路由
         const routes = generatorDynamicRouter(menus);
         this.menus = routes;
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 09be269cf..85bb5e503 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -90,7 +90,7 @@ export const isBase64 = (str: string): boolean => {
 };
 // 对象转JSON
 export const toJSON = (obj) => {
-  return JSON.stringify(obj, (key, value) => {
+  return JSON.stringify(obj, (_, value) => {
     switch (true) {
       case typeof value === 'undefined':
         return 'undefined';
@@ -167,7 +167,7 @@ export const getAsyncPage = (viewPath: string, viewFileName = 'index') => {
  */
 export const toHump = (name) => {
   return name
-    .replace(/[\-\/\_](\w)/g, (all, letter) => {
+    .replace(/[\-\/\_](\w)/g, (_, letter) => {
       return letter.toUpperCase();
     })
     .replace('views', '');
diff --git a/src/views/shared/dashboard/welcome/index.vue b/src/views/shared/dashboard/welcome/index.vue
index 99bd2fc16..19dc856f5 100644
--- a/src/views/shared/dashboard/welcome/index.vue
+++ b/src/views/shared/dashboard/welcome/index.vue
@@ -3,7 +3,7 @@
     <img src="~@/assets/analysis.svg" />
     <Descriptions title="系统信息" bordered>
       <Descriptions.Item key="IP" label="IP">
-        {{ name }}
+        {{ loginIp }}
       </Descriptions.Item>
       <Descriptions.Item v-for="(value, key) in browserInfo" :key="key" :label="key">
         {{ value }}
@@ -30,7 +30,7 @@
   import { useUserStore } from '@/store/modules/user';
   // import performanceMonitor from '@/utils/performanceMonitor'
 
-  const name = useUserStore().name;
+  const loginIp = useUserStore().userInfo?.loginIp;
   // 是否联网
   const { online } = useOnline();
   // 获取电池信息
diff --git a/src/views/shared/demos/form/basic-form/form-schema.ts b/src/views/shared/demos/form/basic-form/form-schema.ts
index b23692500..9c312ae5b 100644
--- a/src/views/shared/demos/form/basic-form/form-schema.ts
+++ b/src/views/shared/demos/form/basic-form/form-schema.ts
@@ -97,7 +97,7 @@ export const schemas: FormItemSchema[] = [
     rules: [
       {
         required: true,
-        validator: async (rule, value) => {
+        validator: async (_, value) => {
           if (!value) {
             return Promise.reject('值不能为空');
           }
diff --git a/src/views/shared/demos/form/rule-form/form-schema.ts b/src/views/shared/demos/form/rule-form/form-schema.ts
index b23692500..9c312ae5b 100644
--- a/src/views/shared/demos/form/rule-form/form-schema.ts
+++ b/src/views/shared/demos/form/rule-form/form-schema.ts
@@ -97,7 +97,7 @@ export const schemas: FormItemSchema[] = [
     rules: [
       {
         required: true,
-        validator: async (rule, value) => {
+        validator: async (_, value) => {
           if (!value) {
             return Promise.reject('值不能为空');
           }
diff --git a/src/views/shared/login/index.vue b/src/views/shared/login/index.vue
index fa2c1c6a0..f89a83a71 100644
--- a/src/views/shared/login/index.vue
+++ b/src/views/shared/login/index.vue
@@ -81,10 +81,13 @@
   setCaptcha();
 
   const handleSubmit = async () => {
-    const { username, password } = state.formInline;
+    const { username, password, verifyCode } = state.formInline;
     if (username.trim() == '' || password.trim() == '') {
       return message.warning('用户名或密码不能为空！');
     }
+    if (!verifyCode) {
+      return message.warning('请输入验证码！');
+    }
     message.loading('登录中...', 0);
     state.loading = true;
     console.log(state.formInline);
diff --git a/tsconfig.json b/tsconfig.json
index a954f28b3..20404fc11 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,43 +2,40 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-    "strict": true,
-    "jsx": "preserve",
-    "importHelpers": true,
     "moduleResolution": "node",
-    "skipLibCheck": true,
-    "esModuleInterop": true,
+    "strict": true,
+    "noLib": false,
+    "forceConsistentCasingInFileNames": true,
     "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
+    "strictFunctionTypes": false,
+    "jsx": "preserve",
+    "baseUrl": ".",
+    "allowJs": true,
     "sourceMap": true,
-    "pretty": true,
+    "esModuleInterop": true,
     "resolveJsonModule": true,
-    "allowJs": true,
-    "checkJs": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "strictPropertyInitialization": false,
-    "downlevelIteration": true,
-    "noUnusedLocals": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "dom",
+      "esnext"
+    ],
     "noImplicitAny": false,
-    "noImplicitThis": true,
-    "removeComments": false,
-    "strictFunctionTypes": false,
-    "baseUrl": ".",
+    "skipLibCheck": true,
+    "removeComments": true,
     "types": [
       "webpack-env"
     ],
-    "typeRoots": ["./node_modules/@types/", "./types"],
+    "typeRoots": [
+      "./node_modules/@types/",
+      "./types"
+    ],
     "paths": {
       "@/*": [
         "src/*"
       ]
     },
-    "lib": [
-      "esnext",
-      "dom",
-      "dom.iterable",
-      "scripthost"
-    ]
   },
   "include": [
     "src/**/*.ts",
@@ -52,4 +49,4 @@
     "node_modules",
     "dist"
   ]
-}
+}
\ No newline at end of file
diff --git a/types/modules.d.ts b/types/modules.d.ts
index 5e654141e..9168ccfa8 100644
--- a/types/modules.d.ts
+++ b/types/modules.d.ts
@@ -1,9 +1,9 @@
 declare module 'mitt' {
-  import mitt from 'mitt'
-  export default mitt
+  import mitt from 'mitt';
+  export default mitt;
 }
 
 declare module 'blueimp-md5' {
-  import md5 from 'blueimp-md5'
-  export default md5
+  import md5 from 'blueimp-md5';
+  export default md5;
 }
diff --git a/types/vue-router.d.ts b/types/vue-router.d.ts
index 7efeab3cc..ed79635ed 100644
--- a/types/vue-router.d.ts
+++ b/types/vue-router.d.ts
@@ -1,30 +1,30 @@
-export {}
+export {};
 
 interface Title18n {
-  zh_CN: string
-  en_US: string
+  zh_CN: string;
+  en_US: string;
 }
 
 declare module 'vue-router' {
   interface RouteMeta extends Record<string | number | symbol, unknown> {
     /** 标题 */
-    title: string | Title18n
+    title: string | Title18n;
     /** 当前路由是否需要权限验证 */
-    isAuth?: boolean
+    isAuth?: boolean;
     /** 当前路由权限 */
-    perms?: string[]
+    perms?: string[];
     /** 是否需要缓存 */
-    keepAlive?: boolean
+    keepAlive?: boolean;
     /** 当前路由keypath */
-    keyPath?: string[]
+    keyPath?: string[];
     /** 是否固定在标签栏 */
-    affix?: boolean
+    affix?: boolean;
     /** 菜单图标 */
-    icon?: string
+    icon?: string;
     /** 当前页面切换动画 */
-    transitionName?: string
+    transitionName?: string;
     /** 不在菜单中显示 */
-    hideMenu?: boolean
-    isLink?: boolean
+    hideInMenu?: boolean;
+    isLink?: boolean;
   }
 }
diff --git a/types/vuex.d.ts b/types/vuex.d.ts
index 3705868f5..c1aacdcdc 100644
--- a/types/vuex.d.ts
+++ b/types/vuex.d.ts
@@ -1,14 +1,14 @@
-import { ComponentCustomProperties } from 'vue'
-import { Store } from 'vuex'
+// import { ComponentCustomProperties } from 'vue';
+import { Store } from 'vuex';
 
 declare module '@vue/runtime-core' {
   // declare your own store states
   interface State {
-    count: number
+    count: number;
   }
 
   // provide typings for `this.$store`
   interface ComponentCustomProperties {
-    $store: Store<State>
+    $store: Store<State>;
   }
 }
diff --git a/vue.config.js b/vue.config.js
index 6d3cbdab6..88e0dee62 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,4 @@
+const { defineConfig } = require('@vue/cli-service');
 const webpack = require('webpack');
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 // const CompressionPlugin = require('compression-webpack-plugin');
@@ -7,13 +8,15 @@ const TerserPlugin = require('terser-webpack-plugin');
 const path = require('path');
 const resolve = (dir) => path.join(__dirname, dir); // 路径
 
+process.env.VUE_APP_VERSION = require('./package.json').version;
+
 const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV);
-const IS_DEV = ['development'].includes(process.env.NODE_ENV);
+// const IS_DEV = ['development'].includes(process.env.NODE_ENV);
 
 // port = 8098 npm run dev OR npm run dev --port = 8098
 const port = process.env.port || process.env.npm_config_port || 8098; // dev port
 
-module.exports = {
+module.exports = defineConfig({
   // lintOnSave: false, //关闭eslint检查
   // publicPath: isDev ? '' : querystring.unescape('<%=request.getContextPath()%>'),
   publicPath: process.env.BASE_URL,
@@ -83,7 +86,13 @@ module.exports = {
       });
   },
   configureWebpack: (config) => {
+    // 开启顶级await
+    config.experiments = {
+      topLevelAwait: true,
+    };
+
     config.resolve.fallback = { path: require.resolve('path-browserify') };
+
     if (IS_PROD) {
       config.plugins.push(
         new TerserPlugin({
@@ -153,13 +162,6 @@ module.exports = {
         },
       };
     }
-    return {
-      devtool: IS_DEV ? 'source-map' : false,
-      experiments: {
-        // lazyCompilation: true,
-        topLevelAwait: true,
-      },
-    };
   },
   devServer: {
     port: port,
@@ -185,4 +187,4 @@ module.exports = {
     },
     onBeforeSetupMiddleware: require('./src/mock/mock-server.js'),
   },
-};
+});