vue2-client 1.7.7 → 1.7.9

package/package.json

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

package/src/base-client/plugins/AppData.js

@@ -1,5 +1,6 @@
 import { manageApi, post } from '@vue2-client/services/api'
 import { handleTree } from '@vue2-client/utils/util'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
 
 const GetAppDataService = {
   install (Vue) {
@@ -34,20 +35,18 @@ const GetAppDataService = {
   },
   // 返回树形省市区
   async getDivisionsOhChinaForTree () {
-    let list = this.getDivisionsOhChinaForList()
     // 获取省市区数据
-    if (!list) {
-      await post(manageApi.getDivisionsOhChina, {}).then((res) => {
-        list = res
-        // localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
-      })
-    }
-    return handleTree(list, 'code', 'parentcode')
-  },
-  // 返回列表省市区
-  getDivisionsOhChinaForList () {
-    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
-    return JSON.parse(str)
+    return new Promise((resolve, reject) => {
+      try {
+        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, res => {
+          resolve(res)
+        }, processRes => {
+          return handleTree(processRes, 'code', 'parentcode')
+        })
+      } catch (e) {
+        reject(e)
+      }
+    })
   },
   getDictionaryList (key) {
     const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)

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/utils/indexedDB.js

@@ -92,7 +92,7 @@ export const indexedDB = {
       }
     })
   },
-  getByWeb: function (key, url, params, callback) {
+  getByWeb: function (key, url, params, callback, process) {
     const self = this
     self.openDB((res) => {
       // 根据存储空间的键找到对应数据
@@ -105,6 +105,9 @@ export const indexedDB = {
         const result = e.target.result
         if (!result && url) {
           post(url, params).then((res) => {
+            if (process) {
+              res = process(res)
+            }
             self.add(key, res)
             callback(res)
           })
@@ -144,5 +147,10 @@ export const indexedDB = {
         }
       }
     })
+  },
+  clearCache () {
+    indexedDB.clear(() => {
+      location.reload()
+    })
   }
 }