From 7cad868759cb9fd71ed10f903e52d75063538184 Mon Sep 17 00:00:00 2001
From: zhideyiman <chu1204505056@126.com>
Date: Sun, 3 Sep 2023 02:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +
 src/layouts/components/VabAd/index.vue        |  9 +---
 src/layouts/components/VabAvatar/index.vue    | 36 ++++++----------
 .../components/VabBreadcrumb/index.vue        |  4 +-
 src/layouts/components/VabLogo/index.vue      |  6 +--
 src/layouts/components/VabNavBar/index.vue    |  7 +---
 src/layouts/components/VabThemeBar/index.vue  | 25 +++--------
 src/layouts/index.vue                         | 19 ++-------
 src/styles/element-variables.scss             |  3 +-
 src/styles/spinner/dots.css                   | 42 +++++++------------
 src/styles/variables.scss                     |  8 +---
 11 files changed, 44 insertions(+), 117 deletions(-)

diff --git a/package.json b/package.json
index 707d406..771f714 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
     "build": "vue-cli-service build",
     "build:node18": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "lint": "vue-cli-service lint --fix",
+    "lint:eslint": "eslint {src,mock,library}/**/*.{vue,js,ts} --fix",
+    "lint:prettier": "prettier {src,mock,library}/**/*.{html,vue,css,sass,scss,js,ts,md} --write",
     "clear": "rimraf node_modules&&npm install  --registry=--registry=https://registry.npmmirror.com",
     "image-webpack-loader": "cnpm i image-webpack-loader -D",
     "update": "ncu -u --reject webpack,eslint-plugin-prettier,@vue/eslint-config-prettier,prettier,layouts,sass-loader,sass,screenfull,eslint,chalk,vue,vue-template-compiler,vue-router,vuex,@vue/cli-plugin-babel,@vue/cli-plugin-eslint,@vue/cli-service,eslint-plugin-vue --registry=https://registry.npmmirror.com&&cnpm i",
diff --git a/src/layouts/components/VabAd/index.vue b/src/layouts/components/VabAd/index.vue
index 5ec2551..e72483c 100644
--- a/src/layouts/components/VabAd/index.vue
+++ b/src/layouts/components/VabAd/index.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="vab-ad">
-    <el-carousel
-      v-if="adList"
-      :autoplay="true"
-      :interval="3000"
-      direction="vertical"
-      height="30px"
-      indicator-position="none"
-    >
+    <el-carousel v-if="adList" :autoplay="true" :interval="3000" direction="vertical" height="30px" indicator-position="none">
       <el-carousel-item v-for="(item, index) in adList" :key="index">
         <el-tag type="warning">Ad</el-tag>
         <a :href="item.url" target="_blank">{{ item.title }}</a>
diff --git a/src/layouts/components/VabAvatar/index.vue b/src/layouts/components/VabAvatar/index.vue
index 2a68d17..a44bdb6 100644
--- a/src/layouts/components/VabAvatar/index.vue
+++ b/src/layouts/components/VabAvatar/index.vue
@@ -14,9 +14,7 @@
       <el-dropdown-item command="gitee" divided>码云地址</el-dropdown-item>
       <el-dropdown-item command="pro" divided>pro付费版地址</el-dropdown-item>
       <el-dropdown-item command="plus" divided>plus付费版地址</el-dropdown-item>
-      <el-dropdown-item command="shop" divided>
-        shop-vite付费版地址
-      </el-dropdown-item>
+      <el-dropdown-item command="shop" divided>shop-vite付费版地址</el-dropdown-item>
       <el-dropdown-item command="logout" divided>退出登录</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
@@ -50,37 +48,27 @@
             window.open('https://gitee.com/chu1204505056/vue-admin-better')
             break
           case 'pro':
-            window.open(
-              'https://vue-admin-beautiful.com/admin-pro/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci='
-            )
+            window.open('https://vue-admin-beautiful.com/admin-pro/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci=')
             break
           case 'plus':
-            window.open(
-              'https://vue-admin-beautiful.com/admin-plus/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci='
-            )
+            window.open('https://vue-admin-beautiful.com/admin-plus/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci=')
           case 'shop':
-            window.open(
-              'https://vue-admin-beautiful.com/shop-vite/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci='
-            )
+            window.open('https://vue-admin-beautiful.com/shop-vite/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci=')
         }
       },
       personalCenter() {
         this.$router.push('/personalCenter/personalCenter')
       },
       logout() {
-        this.$baseConfirm(
-          '您确定要退出' + this.$baseTitle + '吗?',
-          null,
-          async () => {
-            await this.$store.dispatch('user/logout')
-            if (recordRoute) {
-              const fullPath = this.$route.fullPath
-              this.$router.push(`/login?redirect=${fullPath}`)
-            } else {
-              this.$router.push('/login')
-            }
+        this.$baseConfirm('您确定要退出' + this.$baseTitle + '吗?', null, async () => {
+          await this.$store.dispatch('user/logout')
+          if (recordRoute) {
+            const fullPath = this.$route.fullPath
+            this.$router.push(`/login?redirect=${fullPath}`)
+          } else {
+            this.$router.push('/login')
           }
-        )
+        })
       },
     },
   }
diff --git a/src/layouts/components/VabBreadcrumb/index.vue b/src/layouts/components/VabBreadcrumb/index.vue
index 0259bcc..ee0a61a 100644
--- a/src/layouts/components/VabBreadcrumb/index.vue
+++ b/src/layouts/components/VabBreadcrumb/index.vue
@@ -21,9 +21,7 @@
     },
     methods: {
       getBreadcrumb() {
-        return this.$route.matched.filter(
-          (item) => item.name && item.meta.title
-        )
+        return this.$route.matched.filter((item) => item.name && item.meta.title)
       },
     },
   }
diff --git a/src/layouts/components/VabLogo/index.vue b/src/layouts/components/VabLogo/index.vue
index ec37b30..f381b8f 100644
--- a/src/layouts/components/VabLogo/index.vue
+++ b/src/layouts/components/VabLogo/index.vue
@@ -3,11 +3,7 @@
     <router-link to="/">
       <!-- 这里是logo变更的位置 -->
       <vab-remix-icon v-if="logo" :icon-class="logo" class="logo" />
-      <span
-        :class="{ 'hidden-xs-only': layout === 'horizontal' }"
-        :title="title"
-        class="title"
-      >
+      <span :class="{ 'hidden-xs-only': layout === 'horizontal' }" :title="title" class="title">
         {{ title }}
       </span>
     </router-link>
diff --git a/src/layouts/components/VabNavBar/index.vue b/src/layouts/components/VabNavBar/index.vue
index a48765d..5831db1 100644
--- a/src/layouts/components/VabNavBar/index.vue
+++ b/src/layouts/components/VabNavBar/index.vue
@@ -17,12 +17,7 @@
           <vab-error-log />
           <vab-full-screen-bar @refresh="refreshRoute" />
           <vab-theme-bar class="hidden-xs-only" />
-          <vab-icon
-            :icon="['fas', 'redo']"
-            :pulse="pulse"
-            title="重载所有路由"
-            @click="refreshRoute"
-          />
+          <vab-icon :icon="['fas', 'redo']" :pulse="pulse" title="重载所有路由" @click="refreshRoute" />
           <vab-avatar />
           <!--  <vab-icon
             title="退出系统"
diff --git a/src/layouts/components/VabThemeBar/index.vue b/src/layouts/components/VabThemeBar/index.vue
index e2b32ca..dd9c8ed 100644
--- a/src/layouts/components/VabThemeBar/index.vue
+++ b/src/layouts/components/VabThemeBar/index.vue
@@ -1,10 +1,6 @@
 <template>
   <span v-if="themeBar">
-    <vab-icon
-      :icon="['fas', 'palette']"
-      title="主题配置"
-      @click="handleOpenThemeBar"
-    />
+    <vab-icon :icon="['fas', 'palette']" title="主题配置" @click="handleOpenThemeBar" />
     <div class="theme-bar-setting">
       <div @click="handleOpenThemeBar">
         <vab-icon :icon="['fas', 'palette']" />
@@ -16,13 +12,7 @@
       </div>
     </div>
 
-    <el-drawer
-      :visible.sync="drawerVisible"
-      append-to-body
-      direction="rtl"
-      size="300px"
-      title="主题配置"
-    >
+    <el-drawer :visible.sync="drawerVisible" append-to-body direction="rtl" size="300px" title="主题配置">
       <el-scrollbar style="height: 80vh; overflow: hidden">
         <div class="el-drawer__body">
           <el-form ref="form" :model="theme" label-position="top">
@@ -128,9 +118,7 @@
         if (!this.handleIsMobile()) this.changeLayout(layout)
         this.changeHeader(header)
         this.changeTabsBar(tabsBar)
-        document.getElementsByTagName(
-          'body'
-        )[0].className = `vue-admin-beautiful-theme-${name}`
+        document.getElementsByTagName('body')[0].className = `vue-admin-beautiful-theme-${name}`
         this.drawerVisible = false
       },
       handleSaveTheme() {
@@ -138,9 +126,7 @@
       },
       handleSetDfaultTheme() {
         let { name } = this.theme
-        document
-          .getElementsByTagName('body')[0]
-          .classList.remove(`vue-admin-beautiful-theme-${name}`)
+        document.getElementsByTagName('body')[0].classList.remove(`vue-admin-beautiful-theme-${name}`)
         localStorage.removeItem('vue-admin-beautiful-theme')
         this.$refs['form'].resetFields()
         Object.assign(this.$data, this.$options.data())
@@ -153,8 +139,7 @@
         location.reload()
       },
       handleGetCode() {
-        const url =
-          'https://github.com/chuzhixin/vue-admin-beautiful/tree/master/src/views'
+        const url = 'https://github.com/chuzhixin/vue-admin-beautiful/tree/master/src/views'
         let path = this.$route.path + '/index.vue'
         if (path === '/vab/menu1/menu1-1/menu1-1-1/index.vue') {
           path = '/vab/nested/menu1/menu1-1/menu1-1-1/index.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 5d0b3f0..ca8a59e 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -10,10 +10,7 @@
     >
       <div :class="header === 'fixed' ? 'fixed-header' : ''">
         <vab-top-bar />
-        <div
-          v-if="tabsBar === 'true' || tabsBar === true"
-          :class="{ 'tag-view-show': tabsBar }"
-        >
+        <div v-if="tabsBar === 'true' || tabsBar === true" :class="{ 'tag-view-show': tabsBar }">
           <div class="vab-main">
             <vab-tabs-bar />
           </div>
@@ -32,11 +29,7 @@
       }"
       class="layout-container-vertical"
     >
-      <div
-        v-if="device === 'mobile' && collapse === false"
-        class="mask"
-        @click="handleFoldSideBar"
-      />
+      <div v-if="device === 'mobile' && collapse === false" class="mask" @click="handleFoldSideBar" />
       <vab-side-bar />
       <div :class="collapse ? 'is-collapse-main' : ''" class="vab-main">
         <div :class="header === 'fixed' ? 'fixed-header' : ''">
@@ -108,8 +101,7 @@
           'storage',
           (e) => {
             if (e.key === tokenName || e.key === null) window.location.reload()
-            if (e.key === tokenName && e.value === null)
-              window.location.reload()
+            if (e.key === tokenName && e.value === null) window.location.reload()
           },
           false
         )
@@ -132,10 +124,7 @@
             this.$store.dispatch('settings/changeLayout', this.oldLayout)
           }
 
-          this.$store.dispatch(
-            'settings/toggleDevice',
-            isMobile ? 'mobile' : 'desktop'
-          )
+          this.$store.dispatch('settings/toggleDevice', isMobile ? 'mobile' : 'desktop')
         }
       },
     },
diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss
index 178346e..6c5b334 100644
--- a/src/styles/element-variables.scss
+++ b/src/styles/element-variables.scss
@@ -5,8 +5,7 @@
 $--all-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 $--fade-transition: opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 $--fade-linear-transition: opacity 200ms linear;
-$--md-fade-transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1),
-opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
+$--md-fade-transition: transform 300ms cubic-bezier(0.23, 1, 0.32, 1), opacity 300ms cubic-bezier(0.23, 1, 0.32, 1);
 $--border-transition-base: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 $--color-transition-base: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 
diff --git a/src/styles/spinner/dots.css b/src/styles/spinner/dots.css
index e52c52c..f9e9de7 100644
--- a/src/styles/spinner/dots.css
+++ b/src/styles/spinner/dots.css
@@ -8,75 +8,61 @@
   text-indent: -9999px;
   background: transparent;
   border-radius: 100%;
-  box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px,
-  #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
+  box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
   transform-origin: 50% 50%;
   animation: dots-loader 5s infinite ease-in-out;
 }
 
 @keyframes dots-loader {
   0% {
-    box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px,
-    #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
+    box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
   }
 
   8.33% {
-    box-shadow: #f86 14px -14px 0 7px, #fc6 14px -14px 0 7px,
-    #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
+    box-shadow: #f86 14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
   }
 
   16.67% {
-    box-shadow: #f86 14px 14px 0 7px, #fc6 14px 14px 0 7px, #6d7 14px 14px 0 7px,
-    #4ae -14px 14px 0 7px;
+    box-shadow: #f86 14px 14px 0 7px, #fc6 14px 14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
   }
 
   25% {
-    box-shadow: #f86 -14px 14px 0 7px, #fc6 -14px 14px 0 7px,
-    #6d7 -14px 14px 0 7px, #4ae -14px 14px 0 7px;
+    box-shadow: #f86 -14px 14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px 14px 0 7px, #4ae -14px 14px 0 7px;
   }
 
   33.33% {
-    box-shadow: #f86 -14px -14px 0 7px, #fc6 -14px 14px 0 7px,
-    #6d7 -14px -14px 0 7px, #4ae -14px -14px 0 7px;
+    box-shadow: #f86 -14px -14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae -14px -14px 0 7px;
   }
 
   41.67% {
-    box-shadow: #f86 14px -14px 0 7px, #fc6 -14px 14px 0 7px,
-    #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
+    box-shadow: #f86 14px -14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
   }
 
   50% {
-    box-shadow: #f86 14px 14px 0 7px, #fc6 -14px 14px 0 7px,
-    #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
+    box-shadow: #f86 14px 14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
   }
 
   58.33% {
-    box-shadow: #f86 -14px 14px 0 7px, #fc6 -14px 14px 0 7px,
-    #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
+    box-shadow: #f86 -14px 14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
   }
 
   66.67% {
-    box-shadow: #f86 -14px -14px 0 7px, #fc6 -14px -14px 0 7px,
-    #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
+    box-shadow: #f86 -14px -14px 0 7px, #fc6 -14px -14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
   }
 
   75% {
-    box-shadow: #f86 14px -14px 0 7px, #fc6 14px -14px 0 7px,
-    #6d7 14px -14px 0 7px, #4ae 14px -14px 0 7px;
+    box-shadow: #f86 14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px -14px 0 7px, #4ae 14px -14px 0 7px;
   }
 
   83.33% {
-    box-shadow: #f86 14px 14px 0 7px, #fc6 14px -14px 0 7px,
-    #6d7 14px 14px 0 7px, #4ae 14px 14px 0 7px;
+    box-shadow: #f86 14px 14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae 14px 14px 0 7px;
   }
 
   91.67% {
-    box-shadow: #f86 -14px 14px 0 7px, #fc6 14px -14px 0 7px,
-    #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
+    box-shadow: #f86 -14px 14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
   }
 
   100% {
-    box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px,
-    #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
+    box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
   }
 }
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 9f6b7cb..4a4dad1 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -55,10 +55,7 @@ $base-tag-item-height: 34px;
 //菜单li标签的高度
 $base-menu-item-height: 50px;
 //app-main的高度
-$base-app-main-height: calc(
-  100vh - #{$base-nav-bar-height} - #{$base-tabs-bar-height} - #{$base-padding} -
-  #{$base-padding} - 55px - 55px
-);
+$base-app-main-height: calc(100vh - #{$base-nav-bar-height} - #{$base-tabs-bar-height} - #{$base-padding} - #{$base-padding} - 55px - 55px);
 //纵向布局时左侧导航未折叠时的宽度
 $base-left-menu-width: 256px;
 //纵向布局时左侧导航未折叠时右侧内容的宽度
@@ -68,8 +65,7 @@ $base-left-menu-width-min: 65px;
 //纵向布局时左侧导航已折叠时右侧内容的宽度
 $base-right-content-width-min: calc(100% - #{$base-left-menu-width-min});
 //默认动画
-$base-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s,
-background 0s, color 0s, font-size 0s;
+$base-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, background 0s, color 0s, font-size 0s;
 //默认动画长
 $base-transition-time: 0.3s;