vue2-client 1.8.282 → 1.8.284

package/package.json

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

package/src/utils/indexedDB.js

@@ -12,17 +12,52 @@ export const indexedDB = {
     // 建立或打开数据库，建立对象存储空间(ObjectStore)
     const self = this
     if (self.db) {
-      callback(self.db)
+      // 尝试开启
+      try {
+        const request = self.db.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
+          key: 'alive',
+          data: true
+        })
+        request.onerror = function (e) {
+          self.openDatabase().then(db => {
+            self.db = db
+            callback(db)
+          }).catch(e => {
+            console.error(e)
+          })
+        }
+        request.onsuccess = function () {
+          callback(self.db)
+        }
+      } catch (e) {
+        self.openDatabase().then(db => {
+          self.db = db
+          callback(db)
+        }).catch(e => {
+          console.error(e)
+        })
+      }
     } else {
+      self.openDatabase().then(db => {
+        self.db = db
+        callback(self.db)
+      }).catch(e => {
+        console.error('打开数据库失败:' + e.message)
+      })
+    }
+  },
+  openDatabase () {
+    const self = this
+    return new Promise((resolve, reject) => {
       const version = 1
       const request = self.indexedDB.open('view', version)
 
       request.onerror = function (e) {
-        console.error('打开数据库失败:' + e.currentTarget.error.message)
+        reject(e.currentTarget.error)
       }
       request.onsuccess = function (e) {
-        self.db = e.target.result
-        callback(self.db)
+        const db = e.target.result
+        resolve(db)
       }
       request.onupgradeneeded = function (e) {
         const db = e.target.result
@@ -33,7 +68,7 @@ export const indexedDB = {
           })
         }
       }
-    }
+    })
   },
   deleteDB: function (dbname) {
     // 删除数据库
@@ -184,6 +219,7 @@ export const indexedDB = {
 
       request.onerror = function () {
         console.error('数据删除失败')
+        callback()
       }
       request.onsuccess = function (event) {
         console.log('已删除存储空间' + 'metaCache' + '中所有记录')
@@ -194,8 +230,12 @@ export const indexedDB = {
     })
   },
   clearCache () {
-    indexedDB.clear(() => {
+    if (this.indexedDB) {
+      this.clear(() => {
+        location.reload()
+      })
+    } else {
       location.reload()
-    })
+    }
   }
 }

package/src/utils/request.js

@@ -5,7 +5,7 @@ import notification from 'ant-design-vue/es/notification'
 import errorCode from '@vue2-client/utils/errorCode'
 import qs from 'qs'
 import { logout } from '@vue2-client/services/user'
-import { V4_LOGIN } from '@vue2-client/services/apiService'
+import { LOGIN, SEARCH, V4_LOGIN } from '@vue2-client/services/apiService'
 
 // 是否显示重新登录
 let isReloginShow
@@ -153,6 +153,10 @@ function loadInterceptors () {
         } else {
           config.headers[ACCESS_TOKEN] = token
         }
+        // 请求v3 时，添加X-Skip-Lua头 避免地方项目 nginx 加密导致请求 不同
+        if ([LOGIN, SEARCH].includes(config.url) || config.url.startsWith('/rs/user')) {
+          config.headers['X-Skip-Lua'] = 1
+        }
       }
     }
     if (!config.headers['Content-Type']) {

package/vue.config.js

@@ -89,6 +89,7 @@ module.exports = {
     }
   },
   configureWebpack: config => {
+    config.devtool = 'source-map'
     // 忽略.md文件
     config.module.rules.push(
       {