vue2-client 1.7.6 → 1.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",

package/src/bootstrap.js

@@ -3,6 +3,7 @@ import { loadRoutes, loadGuards, setAppOptions } from '@vue2-client/utils/router
 import { loadInterceptors } from '@vue2-client/utils/request'
 import guards from '@vue2-client/router/guards'
 import interceptors from '@vue2-client/utils/axios-interceptors'
+import { getConfig } from '@vue2-client/services/api'
 
 /**
  * 启动引导方法
@@ -12,8 +13,15 @@ import interceptors from '@vue2-client/utils/axios-interceptors'
  * @param i18n 应用的 vue-i18n 实例
  * @param i18n 应用的 message 实例
  */
-function bootstrap ({ router, store, i18n, message }) {
+async function bootstrap ({ router, store, i18n, message }) {
   Vue.$store = store
+  // 获取系统配置
+  await getConfig('webConfig', undefined, res => {
+    localStorage.setItem(process.env.VUE_APP_WEB_CONFIG_KEY, JSON.stringify(res))
+    if (res.setting) {
+      Vue.$store.commit('setting/setSetting', res.setting)
+    }
+  })
   // 设置应用配置
   setAppOptions({ router, store, i18n })
   // 加载 axios 拦截器

package/src/layouts/CommonLayout.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="common-layout">
+    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
     <div class="content"><slot></slot></div>
     <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
   </div>
@@ -8,12 +9,18 @@
 <script>
 import PageFooter from '@vue2-client/layouts/footer/PageFooter'
 import { mapState } from 'vuex'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
 
 export default {
   name: 'CommonLayout',
   components: { PageFooter },
   computed: {
     ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
+  },
+  methods: {
+    clearCache () {
+      indexedDB.clearCache()
+    }
   }
 }
 </script>
@@ -30,6 +37,13 @@ export default {
   background-position-x: center;
   background-position-y: 110px;
   background-size: 100%;
+  .top {
+    padding: 5px 10px;
+    text-align: right;
+    .clearCacheBtn {
+      color: #fff !important;
+    }
+  }
   .content{
     padding: 32px 0;
     flex: 1;

package/src/layouts/header/AdminHeader.vue

@@ -12,7 +12,7 @@
       </div>
       <div :class="['admin-header-right', headerTheme]">
         <component class="header-item" :is="dynamicComponents['HeaderSearch']" @active="val => searchActive = val"/>
-        <a-tooltip class="header-item" placement="bottom" title="清理查询缓存" >
+        <a-tooltip class="header-item" placement="bottom" title="清理缓存" >
           <a @click="handleToClearCache">
             <a-icon type="reload" />
           </a>
@@ -115,11 +115,9 @@ export default {
     handleToClearCache () {
       Modal.confirm({
         title: '信息',
-        content: '您确定要清除查询配置缓存吗？',
+        content: '您确定要清除缓存吗？',
         onOk: () => {
-          indexedDB.clear(() => {
-            location.reload()
-          })
+          indexedDB.clearCache()
         },
         onCancel () {}
       })

package/src/main.js

@@ -11,10 +11,11 @@ Vue.use(Vuex)
 const store = new Vuex.Store({ modules })
 const router = new Router(routerOptions)
 
-bootstrap({ router, store, i18n, message })
-new Vue({
-  router,
-  store,
-  i18n,
-  render: h => h(App)
-}).$mount('#app')
+bootstrap({ router, store, i18n, message }).then(() => {
+  new Vue({
+    router,
+    store,
+    i18n,
+    render: h => h(App)
+  }).$mount('#app')
+})

package/src/pages/login/Login.vue

@@ -64,7 +64,6 @@ import { positions } from '@vue2-client/mock/common'
 import { timeFix } from '@vue2-client/utils/util'
 import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
-import { getConfig } from '@vue2-client/services/api'
 
 export default {
   name: 'Login',
@@ -76,14 +75,6 @@ export default {
       form: this.$form.createForm(this)
     }
   },
-  async created () {
-    await getConfig('webConfig', undefined, res => {
-      localStorage.setItem(process.env.VUE_APP_WEB_CONFIG_KEY, JSON.stringify(res))
-      if (res.setting) {
-        this.$store.commit('setting/setSetting', res.setting)
-      }
-    })
-  },
   computed: {
     ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible', 'routeName', 'defaultAvatarUrl'])
   },

package/src/utils/indexedDB.js

@@ -144,5 +144,10 @@ export const indexedDB = {
         }
       }
     })
+  },
+  clearCache () {
+    indexedDB.clear(() => {
+      location.reload()
+    })
   }
 }