From c582f72ea713792a59291aaea86821926b6ce5be Mon Sep 17 00:00:00 2001
From: mtruning <1262327911@qq.com>
Date: Sun, 9 Jan 2022 19:22:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E6=8C=82=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  4 +-
 .../AppProvider.vue}                          |  1 +
 src/components/AppProvider/index.ts           |  3 ++
 src/components/AppleControlBtn/index.vue      | 41 +++++++++++--------
 src/components/Application/index.ts           |  3 --
 src/components/DialogContent/index.vue        | 14 ++-----
 src/components/I18n/index.ts                  |  3 ++
 src/components/I18n/index.vue                 |  7 ++++
 src/components/LoadingContent/index.vue       | 16 +++-----
 src/components/MessageContent/index.vue       | 14 +++----
 src/layout/index.vue                          |  5 ---
 src/main.ts                                   |  6 +--
 src/utils/page.ts                             | 13 ++----
 src/utils/plugin.ts                           | 20 +++++----
 .../chart/components/HeaderLeftBtn/index.vue  | 16 ++++++--
 src/views/login/index.vue                     | 29 +++++--------
 16 files changed, 96 insertions(+), 99 deletions(-)
 rename src/components/{Application/Application.vue => AppProvider/AppProvider.vue} (99%)
 create mode 100644 src/components/AppProvider/index.ts
 delete mode 100644 src/components/Application/index.ts
 create mode 100644 src/components/I18n/index.ts
 create mode 100644 src/components/I18n/index.vue

diff --git a/src/App.vue b/src/App.vue
index f14d247a..a5b01dbc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,6 +6,7 @@
     :theme-overrides="getThemeOverrides"
   >
     <AppProvider>
+      <I18n />
       <router-view />
     </AppProvider>
   </n-config-provider>
@@ -13,8 +14,9 @@
 
 <script lang="ts" setup>
 import { zhCN, dateZhCN, NConfigProvider } from 'naive-ui'
-import { AppProvider } from '@/components/Application'
+import { AppProvider } from '@/components/AppProvider'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
+import { I18n } from '@/components/I18n'
 
 import { getDarkThemeHook, getThemeOverridesHook } from '@/hooks'
 
diff --git a/src/components/Application/Application.vue b/src/components/AppProvider/AppProvider.vue
similarity index 99%
rename from src/components/Application/Application.vue
rename to src/components/AppProvider/AppProvider.vue
index bceb38aa..60fa281f 100644
--- a/src/components/Application/Application.vue
+++ b/src/components/AppProvider/AppProvider.vue
@@ -24,4 +24,5 @@ import {
 import { MessageContent } from '@/components/MessageContent'
 import { DialogContent } from '@/components/DialogContent'
 import { LoadingContent } from '@/components/LoadingContent'
+
 </script>
diff --git a/src/components/AppProvider/index.ts b/src/components/AppProvider/index.ts
new file mode 100644
index 00000000..07a3344e
--- /dev/null
+++ b/src/components/AppProvider/index.ts
@@ -0,0 +1,3 @@
+import AppProvider from './AppProvider.vue';
+
+export { AppProvider };
diff --git a/src/components/AppleControlBtn/index.vue b/src/components/AppleControlBtn/index.vue
index 26684db0..b377dda4 100644
--- a/src/components/AppleControlBtn/index.vue
+++ b/src/components/AppleControlBtn/index.vue
@@ -53,23 +53,28 @@ const filterBtnList = computed(() => {
 const isFull = computed(() => {
   return props.narrow && screenfullFn(true)
 })
-const btnList = [
-  {
-    title: '关闭',
-    key: 'close',
-    icon: CloseIcon
-  },
-  {
-    title: '缩小',
-    key: 'remove',
-    icon: RemoveIcon
-  },
-  {
-    title: isFull ? '缩小' : '放大',
-    key: props.narrow ? 'fullResize' : 'resize',
-    icon: ResizeIcon
-  }
-]
+
+const btnList: {
+  title: string,
+  key: "close" | "remove" | "resize" | "fullResize",
+  icon: any
+}[] = [
+    {
+      title: '关闭',
+      key: 'close',
+      icon: CloseIcon
+    },
+    {
+      title: '缩小',
+      key: 'remove',
+      icon: RemoveIcon
+    },
+    {
+      title: isFull ? '缩小' : '放大',
+      key: props.narrow ? 'fullResize' : 'resize',
+      icon: ResizeIcon
+    }
+  ]
 
 const handleClick = (key: 'close' | 'remove' | 'resize' | 'fullResize') => {
   if (key === 'fullResize') screenfullFn()
@@ -80,7 +85,7 @@ const handleClick = (key: 'close' | 'remove' | 'resize' | 'fullResize') => {
 </script>
 
 <style lang="scss" scoped>
-@include go('apple-control-btn') {
+@include go("apple-control-btn") {
   display: flex;
   &:hover {
     .btn {
diff --git a/src/components/Application/index.ts b/src/components/Application/index.ts
deleted file mode 100644
index 5cea04a6..00000000
--- a/src/components/Application/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import AppProvider from './Application.vue';
-
-export { AppProvider };
diff --git a/src/components/DialogContent/index.vue b/src/components/DialogContent/index.vue
index b35b1ef4..474267e0 100644
--- a/src/components/DialogContent/index.vue
+++ b/src/components/DialogContent/index.vue
@@ -1,12 +1,6 @@
 <template></template>
-<script lang="ts">
-  import { useDialog } from 'naive-ui';
-
-  export default {
-    name: 'DialogContent',
-    setup() {
-      //挂载在 window 方便与在js中使用
-      window['$dialog'] = useDialog();
-    },
-  };
+<script lang="ts" setup>
+import { useDialog } from 'naive-ui';
+//挂载在 window 方便与在js中使用
+window['$dialog'] = useDialog();
 </script>
diff --git a/src/components/I18n/index.ts b/src/components/I18n/index.ts
new file mode 100644
index 00000000..579f8478
--- /dev/null
+++ b/src/components/I18n/index.ts
@@ -0,0 +1,3 @@
+import I18n from './index.vue';
+
+export { I18n };
diff --git a/src/components/I18n/index.vue b/src/components/I18n/index.vue
new file mode 100644
index 00000000..65b11cb0
--- /dev/null
+++ b/src/components/I18n/index.vue
@@ -0,0 +1,7 @@
+<template></template>
+
+<script lang="ts" setup>
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+window['$t'] = t
+</script>
diff --git a/src/components/LoadingContent/index.vue b/src/components/LoadingContent/index.vue
index 323217d0..42d8d06c 100644
--- a/src/components/LoadingContent/index.vue
+++ b/src/components/LoadingContent/index.vue
@@ -1,12 +1,8 @@
-<script lang="ts">
-import { useLoadingBar } from 'naive-ui'
+<template></template>
 
-export default {
-  name: 'LoadingContent',
-  setup() {
-    // 挂载在 window 方便与在js中使用
-    window['$loading'] = useLoadingBar()
-    window['$loading'].finish()
-  }
-}
+<script lang="ts" setup>
+import { useLoadingBar } from 'naive-ui'
+// 挂载在 window 方便与在js中使用
+window['$loading'] = useLoadingBar()
+window['$loading'].finish()
 </script>
diff --git a/src/components/MessageContent/index.vue b/src/components/MessageContent/index.vue
index d2c97290..b6e1ca54 100644
--- a/src/components/MessageContent/index.vue
+++ b/src/components/MessageContent/index.vue
@@ -1,11 +1,7 @@
-<script lang="ts">
-  import { useMessage } from 'naive-ui';
+<template></template>
 
-  export default {
-    name: 'MessageContent',
-    setup() {
-      //挂载在 window 方便与在js中使用
-      window['$message'] = useMessage();
-    },
-  };
+<script lang="ts" setup>
+import { useMessage } from 'naive-ui';
+//挂载在 window 方便与在js中使用
+window['$message'] = useMessage();
 </script>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index f1bd3a1c..a97388e2 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -4,9 +4,4 @@
 
 <script lang="ts" setup>
 import { MainView } from '@/layout/components/Main/index'
-import { useI18n } from 'vue-i18n'
-const { t } = useI18n()
-
-window['$t'] = t
-
 </script>
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 4537272b..2a07c89a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,7 @@ import router, { setupRouter } from '@/router'
 import i18n from '@/i18n/index'
 import { setupStore } from '@/store'
 import { setupNaive, setupDirectives, setupCustomComponents } from '@/plugins'
-import { AppProvider } from '@/components/Application'
+import { AppProvider } from '@/components/AppProvider/index'
 import { setHtmlTheme } from '@/utils'
 
 async function appInit() {
@@ -24,11 +24,11 @@ async function appInit() {
   // 挂载状态管理
   setupStore(app)
 
-  // 优先挂载一下 Provider 解决路由守卫，Axios中可使用，Dialog，Message 等之类组件
+  // 解决路由守卫，Axios中可使用，Dialog，Message 等全局组件
   appProvider.mount('#appProvider', true)
 
   // 挂载路由
-  await setupRouter(app)
+  setupRouter(app)
 
   // 路由准备就绪后挂载APP实例
   await router.isReady()
diff --git a/src/utils/page.ts b/src/utils/page.ts
index c7de2709..7c705088 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -136,16 +136,9 @@ export const fetchRouteParams = () => {
 }
 
 /**
- * * 是否需要确认
+ * * 回到主页面
  * @param confirm
  */
-export const goHome = (confirm?: boolean, message?: string) => {
-  if (confirm) {
-    goDialog({
-      message,
-      onPositiveCallback: () => {
-        routerTurnByName(PageEnum.BASE_HOME_NAME)
-      },
-    })
-  }
+export const goHome = <T extends typeof goDialog>(confirm: boolean, params: T) => {
+  routerTurnByName(PageEnum.BASE_HOME_NAME)
 }
diff --git a/src/utils/plugin.ts b/src/utils/plugin.ts
index 718afb12..3e61650b 100644
--- a/src/utils/plugin.ts
+++ b/src/utils/plugin.ts
@@ -14,7 +14,10 @@ export const goDialog = (
   params: {
     // 基本
     type?: DialogEnum
+    // 提示
     message?: string
+    // 点击遮罩是否关闭
+    isMaskClosable?: boolean
     // 回调
     onPositiveCallback: Function
     onNegativeCallback?: Function
@@ -28,32 +31,33 @@ export const goDialog = (
   const {
     type,
     message,
+    isMaskClosable,
     onPositiveCallback,
     onNegativeCallback,
     promise,
     promiseResCallback,
-    promiseRejCallback
+    promiseRejCallback,
   } = params
 
   const typeObj = {
     // 自定义
     delete: {
       fn: dialogFn || window['$dialog'].warning,
-      message: message || '是否删除此数据?'
+      message: message || '是否删除此数据?',
     },
     // 原有
     warning: {
       fn: window['$dialog'].warning,
-      message: message || '是否执行此操作?'
+      message: message || '是否执行此操作?',
     },
     error: {
       fn: window['$dialog'].error,
-      message: message || '是否执行此操作?'
+      message: message || '是否执行此操作?',
     },
     success: {
       fn: window['$dialog'].success,
-      message: message || '是否执行此操作?'
-    }
+      message: message || '是否执行此操作?',
+    },
   }
 
   const d: DialogReactive = (typeObj as any)[type || DialogEnum.warning]['fn']({
@@ -63,7 +67,7 @@ export const goDialog = (
     positiveText: '确定',
     negativeText: '取消',
     // 是否通过遮罩关闭
-    maskClosable: maskClosable,
+    maskClosable: isMaskClosable || maskClosable,
     onPositiveClick: async () => {
       // 执行异步
       if (promise && onPositiveCallback) {
@@ -81,6 +85,6 @@ export const goDialog = (
     },
     onNegativeClick: async () => {
       onNegativeCallback && onNegativeCallback(d)
-    }
+    },
   })
 }
diff --git a/src/views/chart/components/HeaderLeftBtn/index.vue b/src/views/chart/components/HeaderLeftBtn/index.vue
index e71c28a2..1065a158 100644
--- a/src/views/chart/components/HeaderLeftBtn/index.vue
+++ b/src/views/chart/components/HeaderLeftBtn/index.vue
@@ -1,6 +1,6 @@
 <template>
   <n-space class="header-left-btn" :size="25">
-    <n-button size="small" quaternary #icon @click="goHome(true, '返回将不会保存任何操作')">
+    <n-button size="small" quaternary #icon @click="goHomeHandle()">
       <n-icon :depth="3">
         <HomeIcon />
       </n-icon>
@@ -25,7 +25,7 @@
 
 <script setup lang="ts">
 import { toRefs, Ref, reactive } from 'vue'
-import { renderIcon, routerTurnByName, goHome } from '@/utils'
+import { renderIcon, goDialog, goHome } from '@/utils'
 import { icon } from '@/plugins'
 const { LayersIcon, BarChartIcon, PrismIcon, HomeIcon } = icon.ionicons5
 import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore'
@@ -61,11 +61,19 @@ const btnList = reactive<ItemType[]>([
   }
 ])
 
-
-
 const clickHandle = (item: ItemType) => {
   setItem(item.key, !item.select)
 }
+
+const goHomeHandle = () => {
+  goDialog({
+    message: '返回将不会保存任何操作',
+    isMaskClosable: true,
+    onPositiveCallback: goHome,
+  })
+
+}
+
 </script>
 <style lang="scss" scoped>
 .header-left-btn {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 13922cf9..82c43f69 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -38,11 +38,7 @@
           <n-collapse-transition :appear="true" :show="show">
             <n-card class="login-account-card" :title="$t('login.desc')">
               <div class="login-account-top">
-                <img
-                  class="login-account-top-logo"
-                  src="~@/assets/images/logo.png"
-                  alt="logo"
-                />
+                <img class="login-account-top-logo" src="~@/assets/images/logo.png" alt="logo" />
               </div>
               <n-form
                 ref="formRef"
@@ -67,7 +63,7 @@
                   <n-input
                     v-model:value="formInline.password"
                     type="password"
-                    show-password-toggle
+                    show-password-on="click"
                     :placeholder="$t('global.form_password')"
                   >
                     <template #prefix>
@@ -80,9 +76,7 @@
                 <n-form-item>
                   <div class="flex justify-between">
                     <div class="flex-initial">
-                      <n-checkbox v-model:checked="autoLogin">
-                        {{ $t('login.form_auto') }}
-                      </n-checkbox>
+                      <n-checkbox v-model:checked="autoLogin">{{ $t('login.form_auto') }}</n-checkbox>
                     </div>
                   </div>
                 </n-form-item>
@@ -93,9 +87,7 @@
                     size="large"
                     :loading="loading"
                     block
-                  >
-                    {{ $t('login.form_button') }}
-                  </n-button>
+                  >{{ $t('login.form_button') }}</n-button>
                 </n-form-item>
               </n-form>
             </n-card>
@@ -125,7 +117,7 @@ import { Footer } from '@/layout/components/Footer'
 import { PageEnum } from '@/enums/pageEnum'
 import { icon } from '@/plugins'
 
-const { ChatboxEllipsesIcon, LockClosedOutlineIcon } = icon.ionicons5
+const { PersonOutlineIcon, LockClosedOutlineIcon } = icon.ionicons5
 
 interface FormState {
   username: string
@@ -139,6 +131,7 @@ const autoLogin = ref(true)
 const show = ref(false)
 const showBg = ref(false)
 const designStore = useDesignStore()
+
 const t = window['$t']
 
 onMounted(() => {
@@ -206,10 +199,10 @@ const handleSubmit = (e: Event) => {
     if (!errors) {
       const { username, password } = formInline
       loading.value = true
-      message.success(`${t('login.login_success')}！`)
+      message.success(`${t('login.login_success')}!`)
       routerTurnByName(PageEnum.BASE_HOME_NAME, true)
     } else {
-      message.error(`${t('login.login_message')}！`)
+      message.error(`${t('login.login_message')}!`)
     }
   })
 }
@@ -233,7 +226,7 @@ $carousel-image-height: 60vh;
 @include go(login-box) {
   height: $go-login-height;
   overflow: hidden;
-  @include background-image('background-image');
+  @include background-image("background-image");
   &-header {
     display: flex;
     justify-content: space-between;
@@ -274,7 +267,7 @@ $carousel-image-height: 60vh;
 
       &-card {
         @extend .go-background-filter;
-        @include filter-bg-color('filter-color');
+        @include filter-bg-color("filter-color");
         box-shadow: 0 0 20px 5px rgba(40, 40, 40, 0.5);
       }
 
@@ -302,7 +295,7 @@ $carousel-image-height: 60vh;
     align-items: center;
     width: $--max-width;
     height: 100vh;
-    background: url('@/assets/images/login/login-bg.png') no-repeat 0 -120px;
+    background: url("@/assets/images/login/login-bg.png") no-repeat 0 -120px;
     .bg-slot {
       width: $carousel-width;
     }