vue2-client 1.7.9 → 1.7.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.7.9",
+  "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/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