vue2-client 1.7.8 → 1.7.10

package/package.json

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

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -147,14 +147,6 @@ export default {
       },
       deep: true
     },
-    fixedQueryForm: {
-      handler () {
-        this.$nextTick(() => {
-          this.refreshTable(true)
-        })
-      },
-      deep: true
-    },
     queryParamsJson: {
       handler () {
         this.getConfigBySource()
@@ -343,6 +335,15 @@ export default {
     refreshTable (toFirstPage = true) {
       this.$refs.xTable.refresh(toFirstPage)
     },
+    /**
+     * 设置固定查询表单
+     */
+    setFixedQueryForm (form, isRefreshTable) {
+      this.fixedQueryForm = form
+      if (isRefreshTable) {
+        this.refreshTable(true)
+      }
+    }
   }
 }
 </script>

package/src/base-client/components/common/XTable/XTable.vue

@@ -129,7 +129,9 @@ export default {
         // 取到表格携带的表单参数
         const requestParameters = Object.assign({}, parameter)
         // 取到父组件传入的表单参数
-        const conditionParams = Object.assign(this.form, this.fixedQueryForm)
+        const conditionParams = {}
+        Object.assign(conditionParams, this.fixedQueryForm)
+        Object.assign(conditionParams, this.form)
         // 如果传了燃气公司字段，则进行数据处理
         if (conditionParams.orgName) {
           requestParameters.orgName = conditionParams.orgName

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/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)
           })

package/vue.config.js

@@ -30,7 +30,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api': {
-        pathRewrite: { '^/api/af-system/': '/rs/' },
+        pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         // pathRewrite: { '^/api': '/' },
         target: local,
         changeOrigin: true