vue2-client 1.8.155 → 1.8.157

package/package.json

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

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

@@ -229,6 +229,12 @@ export default {
     updateComponents (res, setQueryParams) {
       this.realQueryConfig = res
       if (this.$refs.xTable && this.$refs.xForm && this.$refs.xAddForm) {
+        this.$refs.xForm.init({
+          formItems: res.formJson,
+          serviceName: this.serviceName,
+          getDataParams: this.getDataParams,
+          env: this.env
+        })
         this.$refs.xTable.init({
           queryParams: setQueryParams ? res : null,
           tableColumns: res.columnJson,
@@ -237,14 +243,9 @@ export default {
           viewMode: this.viewMode,
           isTableTemp: this.isTableTemp,
           serviceName: this.serviceName,
-          env: this.env
-        })
-        this.$refs.xForm.init({
-          formItems: res.formJson,
-          serviceName: this.serviceName,
-          getDataParams: this.getDataParams,
-          env: this.env
-        })
+          env: this.env,
+          form: this.$refs.xForm.form
+      })
       }
       this.loading = false
     },

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

@@ -244,6 +244,7 @@ export default {
         tableColumns,
         buttonState,
         title,
+        form,
         serviceName,
         viewMode,
         env = 'prod'
@@ -280,7 +281,7 @@ export default {
       this.scrollXWidth = totalWidth
       // 加载筛选列完成
       this.columnSelectLoaded = true
-      this.setQueryForm({})
+      this.setQueryForm(form || {})
     },
     /**
      * 加载表格数据

package/src/utils/request.js

@@ -207,7 +207,6 @@ function loadInterceptors () {
           if (window.__MICRO_APP_ENVIRONMENT__) {
             logout().then(() => {
               isReloginShow = false
-              location.href = '/login'
             })
           } else {
             notification.open({