From d388bea7bd0e68e3e4bff5fc7f6c1a34f151f0bb Mon Sep 17 00:00:00 2001
From: MTrun <1262327911@qq.com>
Date: Mon, 20 Dec 2021 14:29:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/axios.ts                              |  2 +-
 src/components/Doc/index.vue                  |  2 +-
 src/components/ThemeSelect/index.vue          |  2 +-
 src/components/UserInfo/index.vue             |  4 +-
 src/i18n/index.ts                             |  2 +-
 src/main.ts                                   |  2 +-
 src/plugins/icon.ts                           |  5 +-
 src/settings/designSetting.ts                 |  6 ++
 src/store/modules/designStore/designStore.ts  |  2 +-
 src/store/modules/langStore/langStore.ts      |  2 +-
 src/utils/index.ts                            | 85 ++-----------------
 src/utils/plugin.ts                           | 43 ++++++++++
 src/utils/utils.ts                            | 44 ++++++++++
 src/views/exception/403.vue                   |  2 +-
 src/views/exception/404.vue                   |  2 +-
 src/views/exception/500.vue                   |  2 +-
 src/views/login/index.vue                     |  4 +-
 .../project/items/components/Card/index.vue   |  6 +-
 .../items/components/ModalCard/index.vue      |  2 +-
 .../layout/components/AsideFooter/index.vue   |  2 +-
 20 files changed, 121 insertions(+), 100 deletions(-)
 create mode 100644 src/utils/plugin.ts
 create mode 100644 src/utils/utils.ts

diff --git a/src/api/axios.ts b/src/api/axios.ts
index 2d8b9b65..1eb87d16 100644
--- a/src/api/axios.ts
+++ b/src/api/axios.ts
@@ -1,7 +1,7 @@
 import axios, { AxiosResponse, AxiosRequestConfig } from 'axios'
 import { ResultEnum } from "@/enums/httpEnum"
 import { ErrorPageNameMap } from "@/enums/pageEnum"
-import { redirectErrorPage } from '@/utils/page'
+import { redirectErrorPage } from '@/utils'
 
 const axiosInstance = axios.create({
   baseURL: import.meta.env.DEV ? import.meta.env.VITE_DEV_PATH : import.meta.env.VITE_PRO_PATH,
diff --git a/src/components/Doc/index.vue b/src/components/Doc/index.vue
index 1ad8e2af..b6985adb 100644
--- a/src/components/Doc/index.vue
+++ b/src/components/Doc/index.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-import { openDoc } from '@/utils/page'
+import { openDoc } from '@/utils'
 import { DocumentText as DocumentTextIcon } from '@vicons/ionicons5'
 
 const handleClick = () => {
diff --git a/src/components/ThemeSelect/index.vue b/src/components/ThemeSelect/index.vue
index ac53cf63..925cce14 100644
--- a/src/components/ThemeSelect/index.vue
+++ b/src/components/ThemeSelect/index.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" setup>
 import { useDesignStore } from '@/store/modules/designStore/designStore'
-import { setHtmlTheme } from '@/utils/style'
+import { setHtmlTheme } from '@/utils'
 import { Moon as MoonIcon, Sunny as SunnyIcon } from '@vicons/ionicons5'
 
 const designStore = useDesignStore()
diff --git a/src/components/UserInfo/index.vue b/src/components/UserInfo/index.vue
index 0cd9dede..dda42f89 100644
--- a/src/components/UserInfo/index.vue
+++ b/src/components/UserInfo/index.vue
@@ -22,8 +22,8 @@
 <script lang="ts" setup>
 import { h, ref } from 'vue'
 import { NAvatar, NText } from 'naive-ui'
-import { renderIcon } from '@/utils/index'
-import { openDoc, logout } from '@/utils/page'
+import { renderIcon } from '@/utils'
+import { openDoc, logout } from '@/utils'
 import {
   Person as PersonIcon,
   LogOutOutline as LogOutOutlineIcon,
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index dbf4cc6d..82ea57c4 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -1,7 +1,7 @@
 //语言
 import { lang } from '@/settings/designSetting'
 import { createI18n } from 'vue-i18n' //引入vue-i18n组件
-import { getLocalStorage } from '@/utils/storage'
+import { getLocalStorage } from '@/utils'
 import { GO_LANG_SELECT } from '@/settings/storageConst'
 import zh from './zh/index'
 import en from './en/index'
diff --git a/src/main.ts b/src/main.ts
index 2dde670e..4537272b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,7 +5,7 @@ import i18n from '@/i18n/index'
 import { setupStore } from '@/store'
 import { setupNaive, setupDirectives, setupCustomComponents } from '@/plugins'
 import { AppProvider } from '@/components/Application'
-import { setHtmlTheme } from '@/utils/style'
+import { setHtmlTheme } from '@/utils'
 
 async function appInit() {
   const appProvider = createApp(AppProvider)
diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts
index a513afe6..8d6c5456 100644
--- a/src/plugins/icon.ts
+++ b/src/plugins/icon.ts
@@ -10,7 +10,8 @@ import {
   ApertureSharp as ApertureSharpIcon,
   DownloadOutline as DownloadIcon,
   Open as OpenIcon,
-  Send as SendIcon
+  Send as SendIcon,
+  InformationCircleOutline as InformationCircleIcon
 } from '@vicons/ionicons5'
 
 // ionicons5 在这里
@@ -39,6 +40,8 @@ const ionicons5 = {
   OpenIcon,
   // 导出
   SendIcon,
+  // 信息
+  InformationCircleIcon
 }
 
 // https://www.xicons.org/#/ 还有很多
diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts
index ee527c37..178ba76b 100644
--- a/src/settings/designSetting.ts
+++ b/src/settings/designSetting.ts
@@ -46,6 +46,12 @@ export const theme = {
   appThemeList
 }
 
+// dialog 图标的大小
+export const dialogIconSize = '20'
+
+// 弹窗是否可以通过点击遮罩关闭
+export const maskClosable = false
+
 // 侧边栏宽度
 export const asideWidth = '270'
 
diff --git a/src/store/modules/designStore/designStore.ts b/src/store/modules/designStore/designStore.ts
index e088426a..89a0b90b 100644
--- a/src/store/modules/designStore/designStore.ts
+++ b/src/store/modules/designStore/designStore.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import { store } from '@/store'
 import { theme } from '@/settings/designSetting'
 import { DesignStateType } from './designStore.d'
-import { setLocalStorage, getLocalStorage } from '@/utils/storage'
+import { setLocalStorage, getLocalStorage } from '@/utils'
 import { GO_Theme_SELECT } from '@/settings/storageConst'
 import { ThemeEnum } from '@/enums/styleEnum'
 
diff --git a/src/store/modules/langStore/langStore.ts b/src/store/modules/langStore/langStore.ts
index a9bfec8d..edecc628 100644
--- a/src/store/modules/langStore/langStore.ts
+++ b/src/store/modules/langStore/langStore.ts
@@ -3,7 +3,7 @@ import { lang } from '@/settings/designSetting'
 import { LangStateType } from './langStore.d'
 import { LangEnum } from '@/enums/styleEnum'
 import i18n from '@/i18n/index'
-import { setLocalStorage } from '@/utils/storage'
+import { setLocalStorage } from '@/utils'
 import { GO_LANG_SELECT } from '@/settings/storageConst'
 
 export const useLangStore = defineStore({
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 8672eadb..f219b6bc 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,80 +1,5 @@
-import { h } from 'vue'
-import { NIcon } from 'naive-ui'
-import screenfull from 'screenfull'
-/**
- * * 生成一个用不重复的ID
- * @param { Number } randomLength
- */
-export function getUUID(randomLength: number) {
-  return Number(
-    Math.random().toString().substr(2, randomLength) + Date.now()
-  ).toString(36)
-}
-
-/**
- * * render 图标
- */
-export const renderIcon = (icon: any) => {
-  return () => h(NIcon, null, { default: () => h(icon) })
-}
-
-/**
- * * render 弹出确认框
- * @param { Function } dialogFn dialog函数，暂时必须从页面传过来
- * @param { Object} params 配置参数
- */
-export const goDialog = (
-  dialogFn: Function,
-  params: {
-    // 基本
-    type: 'delete'
-    message?: string
-    onPositiveCallback?: Function
-    onNegativeCallback?: Function
-    // 渲染函数
-    render?: boolean
-    contentFn?: Function
-    actionFn?: Function
-  }
-) => {
-  const { type, message, onPositiveCallback, onNegativeCallback } = params
-  const tip = {
-    delete: '是否删除此数据'
-  }
-  dialogFn({
-    title: '提示',
-    content: message || tip[type] || '',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      onPositiveCallback && onPositiveCallback()
-    },
-    onNegativeClick: () => {
-      onNegativeCallback && onNegativeCallback()
-    }
-  })
-}
-
-/**
- * * 处理 vite 中无法使用 require 的问题
- * @param name
- * @returns url
- */
-export const requireUrl = (path: string, name: string) => {
-  return new URL(`${path}/${name}`, import.meta.url).href
-}
-
-export const screenfullFn = (isFullscreen?: boolean, isEnabled?: boolean) => {
-  // 是否是全屏
-  if (isFullscreen) return screenfull.isFullscreen
-
-  // 是否支持全屏
-  if (isEnabled) return screenfull.isEnabled
-
-  if (screenfull.isEnabled) {
-    screenfull.toggle()
-    return
-  }
-  // TODO lang
-  window['$message'].warning('您的浏览器不支持全屏功能！')
-}
+export * from '@/utils/utils'
+export * from '@/utils/page'
+export * from '@/utils/storage'
+export * from '@/utils/style'
+export * from '@/utils/plugin'
\ No newline at end of file
diff --git a/src/utils/plugin.ts b/src/utils/plugin.ts
new file mode 100644
index 00000000..94add944
--- /dev/null
+++ b/src/utils/plugin.ts
@@ -0,0 +1,43 @@
+import { icon } from '@/plugins'
+import { dialogIconSize, maskClosable } from '@/settings/designSetting'
+const { InformationCircleIcon } = icon.ionicons5
+import { renderIcon } from '@/utils'
+
+/**
+ * * render 弹出确认框
+ * @param { Function } dialogFn dialog函数，暂时必须从页面传过来
+ * @param { Object} params 配置参数
+ */
+ export const goDialog = (
+  dialogFn: Function,
+  params: {
+    // 基本
+    type: 'delete'
+    message?: string
+    onPositiveCallback?: Function
+    onNegativeCallback?: Function
+    // 渲染函数
+    render?: boolean
+    contentFn?: Function
+    actionFn?: Function
+  }
+) => {
+  const { type, message, onPositiveCallback, onNegativeCallback } = params
+  const tip = {
+    delete: '是否删除此数据'
+  }
+  dialogFn({
+    title: '提示',
+    icon: renderIcon(InformationCircleIcon, { size: dialogIconSize }),
+    content: message || tip[type] || '',
+    positiveText: '确定',
+    negativeText: '取消',
+    maskClosable: maskClosable,
+    onPositiveClick: () => {
+      onPositiveCallback && onPositiveCallback()
+    },
+    onNegativeClick: () => {
+      onNegativeCallback && onNegativeCallback()
+    }
+  })
+}
\ No newline at end of file
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
new file mode 100644
index 00000000..17b94885
--- /dev/null
+++ b/src/utils/utils.ts
@@ -0,0 +1,44 @@
+import { h } from 'vue'
+import { NIcon } from 'naive-ui'
+import screenfull from 'screenfull'
+
+/**
+ * * 生成一个用不重复的ID
+ * @param { Number } randomLength
+ */
+export function getUUID(randomLength: number) {
+  return Number(
+    Math.random().toString().substr(2, randomLength) + Date.now()
+  ).toString(36)
+}
+
+/**
+ * * render 图标
+ */
+export const renderIcon = (icon: any, set = {}) => {
+  return () => h(NIcon, set, { default: () => h(icon) })
+}
+
+/**
+ * * 处理 vite 中无法使用 require 的问题
+ * @param name
+ * @returns url
+ */
+export const requireUrl = (path: string, name: string) => {
+  return new URL(`${path}/${name}`, import.meta.url).href
+}
+
+export const screenfullFn = (isFullscreen?: boolean, isEnabled?: boolean) => {
+  // 是否是全屏
+  if (isFullscreen) return screenfull.isFullscreen
+
+  // 是否支持全屏
+  if (isEnabled) return screenfull.isEnabled
+
+  if (screenfull.isEnabled) {
+    screenfull.toggle()
+    return
+  }
+  // TODO lang
+  window['$message'].warning('您的浏览器不支持全屏功能！')
+}
diff --git a/src/views/exception/403.vue b/src/views/exception/403.vue
index 3ca43dde..ad40812f 100644
--- a/src/views/exception/403.vue
+++ b/src/views/exception/403.vue
@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
 import { PageEnum } from '@/enums/pageEnum'
-import { routerTurnByName } from '@/utils/page'
+import { routerTurnByName } from '@/utils'
 const router = useRouter()
 function goHome() {
   routerTurnByName(PageEnum.BASE_HOME_NAME)
diff --git a/src/views/exception/404.vue b/src/views/exception/404.vue
index 8e96385f..97bdc77d 100644
--- a/src/views/exception/404.vue
+++ b/src/views/exception/404.vue
@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
 import { PageEnum } from '@/enums/pageEnum'
-import { routerTurnByName } from '@/utils/page'
+import { routerTurnByName } from '@/utils'
 const router = useRouter()
 function goHome() {
   routerTurnByName(PageEnum.BASE_HOME_NAME)
diff --git a/src/views/exception/500.vue b/src/views/exception/500.vue
index 3d2fb344..23bc9a7e 100644
--- a/src/views/exception/500.vue
+++ b/src/views/exception/500.vue
@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
 import { PageEnum } from '@/enums/pageEnum'
-import { routerTurnByName } from '@/utils/page'
+import { routerTurnByName } from '@/utils'
 const router = useRouter()
 function goHome() {
   routerTurnByName(PageEnum.BASE_HOME_NAME)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 014cc4aa..b39bd289 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -115,8 +115,8 @@ import { reactive, ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { useMessage } from 'naive-ui'
 import { useI18n } from 'vue-i18n'
-import { requireUrl } from '@/utils/index'
-import { routerTurnByName } from '@/utils/page'
+import { requireUrl } from '@/utils'
+import { routerTurnByName } from '@/utils'
 import shuffle from 'lodash/shuffle'
 import { carouselInterval } from '@/settings/designSetting'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
diff --git a/src/views/project/items/components/Card/index.vue b/src/views/project/items/components/Card/index.vue
index 869604b6..ae7ca0d2 100644
--- a/src/views/project/items/components/Card/index.vue
+++ b/src/views/project/items/components/Card/index.vue
@@ -4,7 +4,7 @@
       <div class="list-content">
         <!-- 顶部按钮 -->
         <n-space class="list-content-top">
-          <AppleControlBtn @close="deleteHanlde" @resize="resizeHandle" />
+          <AppleControlBtn :hidden="['remove']" @close="deleteHanlde" @resize="resizeHandle" />
         </n-space>
         <!-- 中间 -->
         <div class="list-content-img">
@@ -72,7 +72,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { renderIcon, goDialog } from '@/utils/index'
+import { renderIcon, goDialog } from '@/utils'
 import { icon } from '@/plugins'
 import { AppleControlBtn } from '@/components/AppleControlBtn'
 import { useMessage, useDialog } from 'naive-ui'
@@ -163,7 +163,7 @@ const deleteHanlde = () => {
   goDialog(dialog.warning, {
     type: 'delete',
     onPositiveCallback: () => {
-      message.success('确定')
+      message.success('删除成功')
     }
   })
 }
diff --git a/src/views/project/items/components/ModalCard/index.vue b/src/views/project/items/components/ModalCard/index.vue
index 6b778230..5855624f 100644
--- a/src/views/project/items/components/ModalCard/index.vue
+++ b/src/views/project/items/components/ModalCard/index.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script setup lang="ts">
-import { renderIcon } from '@/utils/index'
+import { renderIcon } from '@/utils'
 import { icon } from '@/plugins'
 import { AppleControlBtn } from '@/components/AppleControlBtn'
 const { HammerIcon } = icon.ionicons5
diff --git a/src/views/project/layout/components/AsideFooter/index.vue b/src/views/project/layout/components/AsideFooter/index.vue
index f3a3cc76..3c425e66 100644
--- a/src/views/project/layout/components/AsideFooter/index.vue
+++ b/src/views/project/layout/components/AsideFooter/index.vue
@@ -54,7 +54,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { openDoc, openGiteeSourceCode } from '@/utils/page'
+import { openDoc, openGiteeSourceCode } from '@/utils'
 
 import {
   HelpCircleOutline as HelpOutlineIcon,