vue2-client 1.8.209 → 1.8.211

package/package.json

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

package/src/App.vue

@@ -122,7 +122,7 @@ export default {
           }
           themeUtil.changeThemeColor(themeStore.themeColor, themeScheme)
         }
-      }catch (e){
+      } catch (e) {
       }
     },
     setLanguage (lang) {

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

@@ -219,6 +219,7 @@ export default {
     },
     toggleAdvanced () {
       this.advanced = !this.advanced
+      this.$emit('toggleAdvanced')
     },
     toggleVisible () {
       this.visible = !this.visible

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

@@ -31,6 +31,7 @@
           </div>
           <x-form
             ref="xForm"
+            @toggleAdvanced="toggleAdvanced"
             @onSubmit="onSearchSubmit">
             <slot name="formBtnExpand"></slot>
           </x-form>
@@ -442,16 +443,18 @@ export default {
     afterDelete (res) {
       this.$emit('afterDelete', res)
     },
+    /**
+     * 更多条件是否展示
+     */
+    toggleAdvanced () {
+      this.$refs.xTable.setScrollYHeight({})
+    },
     /**
      * 查询表单部分显示/隐藏切换
      */
     toggleIsFormShow () {
-      const visible = this.$refs.xForm.toggleVisible()
-      let height = visible ? 'default' : 'calc(100vh - 27rem)'
-      if (!visible && window.__MICRO_APP_ENVIRONMENT__) {
-        height = 'calc(100vh - 23.5rem)'
-      }
-      this.$refs.xTable.setScrollYHeight(height)
+      this.$refs.xForm.toggleVisible()
+      this.$refs.xTable.setScrollYHeight({})
     },
     /**
      * 选择列事件

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

@@ -138,7 +138,7 @@ export default {
         this.uploading = false
       })
     },
-    handleRemove() {
+    handleRemove () {
       this.fileList = []
       this.uploading = false
     }

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

@@ -55,6 +55,7 @@
     </a-row>
     <s-table
       ref="table"
+      id="XTable"
       :alert="true"
       :columns="tableColumns"
       :data="loadData"
@@ -310,7 +311,7 @@ export default {
         }
       }
       // 设置表格高度为固定值
-      this.setScrollYHeight('default')
+      this.setScrollYHeight({ type: 'default' })
       // 横向滚动长度大于所有宽度，才能实现固定表头
       this.scrollXWidth = totalWidth
       // 加载筛选列完成
@@ -379,14 +380,37 @@ export default {
         this.$refs.table.refresh(bool)
       })
     },
-    setScrollYHeight (value) {
-      if (value === 'default') {
-        value = 'calc(100vh - 31rem)'
-        if (window.__MICRO_APP_ENVIRONMENT__) {
-          value = 'calc(100vh - 27.5rem)'
+    setScrollYHeight ({ extraHeight = 80, id = 'XTable', type = '' }) {
+      this.$nextTick(() => {
+        if (typeof extraHeight == 'undefined') {
+          //  默认底部分页32 + 边距48
+          extraHeight = 48 + 32
         }
-      }
-      this.scrollYHeight = value
+        let tHeader = null
+        console.log(document.getElementById(id))
+        if (id) {
+          tHeader = document.getElementById(id) ? document.getElementById(id).getElementsByClassName('ant-table-thead')[0] : null
+        } else {
+          tHeader = document.getElementsByClassName('ant-table-thead')[0]
+        }
+        // 表格内容距离顶部的距离
+        let tHeaderBottom = 0
+        if (tHeader) {
+          console.log(tHeader.getBoundingClientRect())
+          tHeaderBottom = tHeader.getBoundingClientRect().bottom
+        }
+        if (tHeaderBottom === 0) {
+            this.scrollYHeight = 'calc(100vh - 31rem)'
+            if (window.__MICRO_APP_ENVIRONMENT__) {
+              this.scrollYHeight = 'calc(100vh - 28.5rem)'
+            }
+            return
+        }
+        // 窗体高度-表格内容顶部的高度-表格内容底部的高度
+        // this.scrollYHeight = document.body.clientHeight - tHeaderBottom - extraHeight
+        console.log(`calc(100vh - ${tHeaderBottom + extraHeight}px)`)
+        this.scrollYHeight = `calc(100vh - ${tHeaderBottom + extraHeight}px)`
+      })
     },
     /**
      * 格式化日期

package/vue.config.js

@@ -56,7 +56,7 @@ module.exports = {
       '/api': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
-        target: gateway,
+        target: revenue,
         changeOrigin: true
       },
       '/resource': {