From a775f6c5dca18326a311d535fa779b318171dd1a Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Thu, 27 Aug 2020 13:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BE=A7=E8=BE=B9=E6=A0=8F=E8=8F=9C=E5=8D=95=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=AB=98=E4=BA=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/api/file/index.js                     |  9 ++++
 vue/src/component/UploadFile/index.vue        |  9 ++--
 vue/src/config/index.js                       | 53 +++++++++++--------
 vue/src/layout/component/TagsView/index.vue   |  3 +-
 vue/src/layout/mixin/actionOnSelectMenu.js    |  8 ++-
 .../layout/mixin/decideRouterTransition.js    | 10 ++--
 vue/src/mixin/docDetailMixin.js               |  4 +-
 vue/src/router/index.js                       |  4 +-
 vue/src/store/module/resource.js              |  4 +-
 vue/src/store/module/tagsView.js              |  3 +-
 vue/src/util/file.js                          | 30 ++++-------
 vue/src/util/index.js                         |  2 -
 vue/src/util/storage.js                       |  8 ++-
 vue/src/view/userCenter/indexPage.vue         |  4 +-
 14 files changed, 83 insertions(+), 68 deletions(-)
 create mode 100644 vue/src/api/file/index.js

diff --git a/vue/src/api/file/index.js b/vue/src/api/file/index.js
new file mode 100644
index 0000000..0d46d26
--- /dev/null
+++ b/vue/src/api/file/index.js
@@ -0,0 +1,9 @@
+import {GetApi} from "@/api/request"
+
+export const getToken = new GetApi(
+    '/file/getToken',
+    null,
+    promise => promise.then(({data}) => data)
+)
+
+export const deleteUpload = new GetApi('/file/delete', url => ({params: {url: encodeURIComponent(url)}}))
diff --git a/vue/src/component/UploadFile/index.vue b/vue/src/component/UploadFile/index.vue
index 452a5b7..36b6209 100644
--- a/vue/src/component/UploadFile/index.vue
+++ b/vue/src/component/UploadFile/index.vue
@@ -56,11 +56,12 @@
 * success、remove事件中的file.url均不带七牛云外链前缀
 * */
 import axios from 'axios'
-import {attachmentPrefix} from '@/config'
+import {deleteUpload} from '@/api/file'
+import {file as fileConfig} from '@/config'
 import {debounce, isEmpty} from '@/util'
 import {elError} from "@/util/message"
 import {isImage, isDoc, isPdf, isPpt, isRar, isXls, isTxt, isZip} from "@/util/validate"
-import {preview, deleteUpload, download, upload, autoCompleteUrl} from "@/util/file"
+import {preview, download, upload, autoCompleteUrl} from "@/util/file"
 
 const typeMapper = [
     {test: isImage}, {test: isDoc, type: 'doc'}, {test: isPdf, type: 'pdf'}, {test: isPpt, type: 'ppt'},
@@ -159,9 +160,9 @@ export default {
 
             //区分是否为本次新上传，以及是否上传成功
             //若不是新上传的
-            if (!file.raw) this.$emit('remove', {url: file.downloadUrl.replace(attachmentPrefix, '')})
+            if (!file.raw) this.$emit('remove', {url: file.downloadUrl.replace(fileConfig.storePrefix, '')})
             //判断是否上传成功（有可能是正在上传）
-            else if (file.response && !file.response.err) deleteUpload(file.raw.key)
+            else if (file.response && !file.response.err) deleteUpload.request(file.raw.key)
 
             this.$refs.upload.handleRemove(file)
             const index = this.data.findIndex(i => i.downloadUrl === file.downloadUrl)
diff --git a/vue/src/config/index.js b/vue/src/config/index.js
index d228f6a..acb3cd4 100644
--- a/vue/src/config/index.js
+++ b/vue/src/config/index.js
@@ -14,12 +14,6 @@ module.exports = {
     //全局axios的baseUrl、devServer的路由前缀
     apiPrefix: '/api',
 
-    //路由模式，['hash','history']
-    routerMode: 'history',
-
-    //是否使用由后端返回的数据作为路由
-    useBackendRoute: false,
-
     //是否在开发时使用mock，为true时不会启动websocket和代理
     useMock: false,
 
@@ -32,23 +26,36 @@ module.exports = {
     //是否使用错误日志捕捉，暂时没啥用
     errorLog: true,
 
-    //storage的相关键名
-    sessionUserKey: 'GCC-SESS-USER',
-    localResourceKey: 'GCC-LOCAL-PERM',
-    localPersonalSettingsKey: 'GCC-LOCAL-PERSONAL-SETTINGS',
-
-    //路由切换时的过渡动画名称,关联transition.css
-    rightSideRouteTransition: 'left-out',
-    leftSideRouteTransition: 'right-out',
-
-    //七牛云上传地址
-    attachmentUploadUrl: 'https://upload.qiniup.com',
-
-    //附件上传后的存储地址前缀
-    attachmentPrefix: 'https://static.toesbieya.cn/',
-
-    //文件预览接口前缀
-    filePreviewPrefix: isDev ? 'http://localhost:8012' : 'https://preview.toesbieya.cn',
+    //路由配置
+    route: {
+        //路由模式，['hash','history']
+        mode: 'history',
+
+        //是否使用由后端返回的数据作为路由
+        useBackendDataAsRoute: false,
+
+        //路由过渡动画设置，关联transition.css
+        animate: {
+            //当未启用多页签时的路由动画
+            default: 'el-fade-in-linear',
+            //要访问的tab顺序高于上一个访问的tab时的路由动画
+            next: 'left-out',
+            //要访问的tab顺序不高于上一个访问的tab时的路由动画
+            prev: 'right-out',
+        }
+    },
+
+    //文件配置
+    file: {
+        //上传地址
+        uploadUrl:'https://upload.qiniup.com',
+
+        //上传后的存储地址前缀
+        storePrefix: 'https://static.toesbieya.cn/',
+
+        //预览地址前缀
+        previewPrefix: isDev ? 'http://localhost:8012' : 'https://preview.toesbieya.cn',
+    },
 
     //省市地区json数据请求地址
     regionDataUrl: `${contextPath}static/json/region-pca.json`
diff --git a/vue/src/layout/component/TagsView/index.vue b/vue/src/layout/component/TagsView/index.vue
index d3d3b2e..1dd6449 100644
--- a/vue/src/layout/component/TagsView/index.vue
+++ b/vue/src/layout/component/TagsView/index.vue
@@ -30,6 +30,7 @@
 <script type="text/jsx">
 import shortcutMixin from '@/layout/mixin/shortcut'
 import decideRouterTransitionMixin from '@/layout/mixin/decideRouterTransition'
+import {route as routeConfig} from '@/config'
 import ContextMenu from "@/component/ContextMenu"
 import ContextMenuItem from "@/component/ContextMenu/item"
 import ScrollPane from './ScrollPane'
@@ -170,7 +171,7 @@ export default {
 
     beforeDestroy() {
         //销毁前将路由动画改为fade
-        this.$store.commit('tagsView/transitionName', 'el-fade-in-linear')
+        this.$store.commit('tagsView/transitionName', routeConfig.animate.default)
     },
 
     mounted() {
diff --git a/vue/src/layout/mixin/actionOnSelectMenu.js b/vue/src/layout/mixin/actionOnSelectMenu.js
index 6f7953b..e01935c 100644
--- a/vue/src/layout/mixin/actionOnSelectMenu.js
+++ b/vue/src/layout/mixin/actionOnSelectMenu.js
@@ -5,7 +5,13 @@ export default {
         actionOnSelectMenu(fullPath, refreshWhenSame = true) {
             //外部链接时打开新窗口
             if (isExternal(fullPath)) {
-                return window.open(fullPath)
+                window.open(fullPath)
+                //当是从侧边栏打开时，重置高亮菜单
+                const menu = this.$refs.menu
+                if (menu && menu.updateActiveIndex) {
+                    menu.updateActiveIndex(this.activeMenu)
+                }
+                return
             }
 
             //触发的菜单路径是当前路由时，根据参数判断是否进行刷新
diff --git a/vue/src/layout/mixin/decideRouterTransition.js b/vue/src/layout/mixin/decideRouterTransition.js
index 3f05dc4..ba8a4b0 100644
--- a/vue/src/layout/mixin/decideRouterTransition.js
+++ b/vue/src/layout/mixin/decideRouterTransition.js
@@ -1,14 +1,18 @@
-import {leftSideRouteTransition as left, rightSideRouteTransition as right} from '@/config'
+import {route as routeConfig} from '@/config'
+
+const {animate} = routeConfig
 
 export default {
     methods: {
         //根据访问的tab页的左右顺序来确定路由动画
         decideRouteTransition(to, from) {
-            let transitionName = right
+            let transitionName = animate.prev
 
             const fromIndex = this.visitedViews.findIndex(i => i.path === from.path)
             const toIndex = this.visitedViews.findIndex(i => i.path === to.path)
-            if (fromIndex < toIndex) transitionName = left
+
+            //新开tab也认为顺序高于上一个tab
+            if (toIndex === -1 || fromIndex < toIndex) transitionName = animate.next
 
             this.$store.commit('tagsView/transitionName', transitionName)
         },
diff --git a/vue/src/mixin/docDetailMixin.js b/vue/src/mixin/docDetailMixin.js
index c494676..fe00a66 100644
--- a/vue/src/mixin/docDetailMixin.js
+++ b/vue/src/mixin/docDetailMixin.js
@@ -9,7 +9,7 @@ import FormCard from '@/component/AbstractForm/FormCard'
 import UploadFile from '@/component/UploadFile'
 import {isEmpty, mergeObj} from '@/util'
 import {auth} from "@/util/auth"
-import {deleteUpload} from "@/util/file"
+import {deleteUpload} from "@/api/file"
 import {elAlert, elConfirm, elPrompt, elSuccess} from "@/util/message"
 import {closeCurrentPage} from "@/util/route"
 
@@ -245,7 +245,7 @@ export default {
                 deleteArr.push(...this.form.uploadImageList.map(i => i.url))
             }
             if (deleteArr.length > 0) {
-                deleteUpload(deleteArr).catch(e => ({}))
+                deleteUpload.request(deleteArr).catch(e => ({}))
             }
 
             return closeCurrentPage(this.getTablePageUrl())
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index c938678..b33fd3f 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -15,7 +15,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import {pathToRegexp} from 'path-to-regexp'
 import NProgress from 'nprogress'
-import {contextPath, routerMode, title} from '@/config'
+import {contextPath, route as routeConfig, title} from '@/config'
 import defaultRoutes from '@/router/define'
 import store from "@/store"
 import {stringifyRoutes, parseRoutes, generateRoutes} from './util'
@@ -31,7 +31,7 @@ const whiteList = transformWhiteList(['/login', '/register', '/404', '/403'])
 
 const router = new Router({
     base: contextPath,
-    mode: routerMode,
+    mode: routeConfig.mode,
     scrollBehavior: () => ({y: 0}),
     routes: defaultRoutes
 })
diff --git a/vue/src/store/module/resource.js b/vue/src/store/module/resource.js
index 2f2d30d..ef4e7a1 100644
--- a/vue/src/store/module/resource.js
+++ b/vue/src/store/module/resource.js
@@ -1,5 +1,5 @@
 import path from 'path'
-import {useBackendRoute} from '@/config'
+import {route as routeConfig} from '@/config'
 import {addDynamicRoutes} from '@/router'
 import {getDynamicRoutes} from '@/router/define'
 import {parseRoutes, metaExtend} from "@/router/util"
@@ -85,7 +85,7 @@ const actions = {
 //将后台返回的数据转换为合法的route数组
 function transformOriginRouteData(data) {
     if (!Array.isArray(data)) return []
-    if (!useBackendRoute) return getDynamicRoutes()
+    if (!routeConfig.useBackendDataAsRoute) return getDynamicRoutes()
     data = JSON.parse(JSON.stringify(data))
     data = data.filter(i => {
         if (i.type === 3 || !i.enable) {
diff --git a/vue/src/store/module/tagsView.js b/vue/src/store/module/tagsView.js
index f851f58..d9be232 100644
--- a/vue/src/store/module/tagsView.js
+++ b/vue/src/store/module/tagsView.js
@@ -1,3 +1,4 @@
+import {route as routeConfig} from '@/config'
 import {createMutations} from "@/util"
 
 const state = {
@@ -8,7 +9,7 @@ const state = {
     cachedViews: [],
 
     //路由过渡动画名称
-    transitionName: 'el-fade-in-linear'
+    transitionName: routeConfig.animate.default
 }
 
 const mutations = {
diff --git a/vue/src/util/file.js b/vue/src/util/file.js
index 5899bb8..d5edcd4 100644
--- a/vue/src/util/file.js
+++ b/vue/src/util/file.js
@@ -1,5 +1,6 @@
 import request from "@/api/request"
-import {attachmentUploadUrl, attachmentPrefix, filePreviewPrefix} from '@/config'
+import {getToken} from "@/api/file"
+import {file as fileConfig} from '@/config'
 import {isEmpty, timeFormat} from "@/util"
 import {isTxt} from "@/util/validate"
 
@@ -18,21 +19,16 @@ export function preview(url) {
     if (isTxt(url)) return window.open(url)
 
     const connectChar = url.includes('?') ? '&' : '?'
-    url = url + connectChar + 'fullfilename=' + url.replace(attachmentPrefix, '')
+    url = url + connectChar + 'fullfilename=' + url.replace(fileConfig.storePrefix, '')
     const anchor = document.createElement('a')
     anchor.style.opacity = '0'
-    anchor.href = `${filePreviewPrefix}/onlinePreview?url=${encodeURIComponent(url)}`
+    anchor.href = `${fileConfig.previewPrefix}/onlinePreview?url=${encodeURIComponent(url)}`
     anchor.target = '_blank'
     document.body.appendChild(anchor)
     anchor.click()
     document.body.removeChild(anchor)
 }
 
-//获取七牛云直传需要的token
-export function getToken() {
-    return request.get('/file/getToken').then(({data}) => data.data)
-}
-
 //下载文件
 export function download(url, name) {
     const href = typeof url === 'object' ? window.URL.createObjectURL(url) : url
@@ -48,29 +44,25 @@ export function download(url, name) {
     if (typeof url === 'object') window.URL.revokeObjectURL(url)
 }
 
-//删除已上传的文件
-export function deleteUpload(url) {
-    return request.get('/file/delete?url=' + encodeURIComponent(url))
-}
-
 //七牛云直传
 export function upload(blob, filename, options = {}) {
-    return getToken()
+    return getToken
+        .request()
         .then(token => {
-            if (!options.generateKey) options.generateKey = defaultOptions.generateKey
-
+            if (!options.generateKey) {
+                options.generateKey = defaultOptions.generateKey
+            }
             const param = new FormData()
             param.append('token', token)
             param.append('key', options.generateKey(filename))
             param.append('file', blob, filename)
-            return request.post(attachmentUploadUrl, param, {...defaultOptions, ...options})
+            return request.post(fileConfig.uploadUrl, param, {...defaultOptions, ...options})
         })
-        .then(({data}) => data)
 }
 
 //自动补全附件链接前缀
 export function autoCompleteUrl(url) {
     if (isEmpty(url)) return ''
     if (['http', 'https'].some(i => url.startsWith(i))) return url
-    return attachmentPrefix + url
+    return fileConfig.storePrefix + url
 }
diff --git a/vue/src/util/index.js b/vue/src/util/index.js
index 5104281..913c40e 100644
--- a/vue/src/util/index.js
+++ b/vue/src/util/index.js
@@ -1,5 +1,3 @@
-import {timePass} from "@/filter"
-
 export function isEmpty(...str) {
     return str.some(i => i === undefined || i === null || i === '')
 }
diff --git a/vue/src/util/storage.js b/vue/src/util/storage.js
index ab36c9e..6113304 100644
--- a/vue/src/util/storage.js
+++ b/vue/src/util/storage.js
@@ -1,7 +1,9 @@
-import {sessionUserKey, localPersonalSettingsKey, localResourceKey} from '@/config'
 import {isEmpty} from "@/util"
 import {unzip, zip} from "@/util/secret"
 
+const sessionUserKey = 'GCC-SESS-USER'
+const localPersonalSettingsKey = 'GCC-LOCAL-PERSONAL-SETTINGS'
+
 export function isUserExist() {
     return !isEmpty(sessionStorage.getItem(sessionUserKey))
 }
@@ -49,10 +51,6 @@ function removeUser() {
     sessionStorage.removeItem(sessionUserKey)
 }
 
-function removeLocalResource() {
-    localStorage.removeItem(localResourceKey)
-}
-
 function removeLocalPersonalSettings() {
     localStorage.removeItem(localPersonalSettingsKey)
 }
diff --git a/vue/src/view/userCenter/indexPage.vue b/vue/src/view/userCenter/indexPage.vue
index ff5de40..365ac7b 100644
--- a/vue/src/view/userCenter/indexPage.vue
+++ b/vue/src/view/userCenter/indexPage.vue
@@ -17,9 +17,7 @@
                     </el-tab-pane>
 
                     <transition mode="out-in" name="el-fade-in-linear">
-                        <keep-alive exclude="user-account">
-                            <component :is="activeTab"/>
-                        </keep-alive>
+                        <component :is="activeTab"/>
                     </transition>
                 </el-tabs>
             </el-card>