vue2-client 1.15.35 → 1.15.36

package/package.json

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

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

@@ -569,6 +569,17 @@ export default {
   },
   mounted () {
     window.addEventListener('resize', this.handleResize)
+    // 监听 DOM 变化，更实时地响应布局变化
+    this.resizeObserver = new ResizeObserver(() => {
+      this.handleResize()
+    })
+    if (this.$refs.table) {
+      this.resizeObserver.observe(this.$refs.table)
+    }
+    // 监听父容器变化
+    if (this.$el && this.$el.parentElement) {
+      this.resizeObserver.observe(this.$el.parentElement)
+    }
     // 初始化时如果有外部选中值，等待 table 准备好后设置
     if (this.externalSelectedRowKeys && this.externalSelectedRowKeys.length > 0) {
       this.$nextTick(() => {
@@ -582,6 +593,9 @@ export default {
       clearInterval(this.queryTimer)
     }
     window.removeEventListener('resize', this.handleResize)
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+    }
   },
   methods: {
     showTempData () {
@@ -691,9 +705,7 @@ export default {
       this.$forceUpdate()
     },
     handleResize () {
-      debounce(() => {
-        this.setScrollYHeight({})
-      }, 100)()
+      this.setScrollYHeight({})
     },
     isInAModal () {
       let parent = this.$parent
@@ -1130,7 +1142,7 @@ export default {
     },
     setScrollYHeight ({ extraHeight = this.extraHeight, id = this.uniqueId, type = '' }) {
       this.$nextTick(() => {
-        setTimeout(() => {
+        debounce(() => {
           const curDocument = window?.rawDocument || document
           const innerHeight = window?.rawWindow?.innerHeight || window.innerHeight || 0
           if (typeof extraHeight == 'undefined') {
@@ -1146,7 +1158,8 @@ export default {
           // 表格内容距离顶部的距离
           let tHeaderBottom = 0
           if (tHeader) {
-            tHeaderBottom = tHeader.getBoundingClientRect().bottom
+            // 8px是分页器marginTop
+            tHeaderBottom = tHeader.getBoundingClientRect().bottom + 8
           }
           if (tHeaderBottom === 0) {
             this.scrollYHeight = 'calc(100vh - 31rem)'
@@ -1177,7 +1190,7 @@ export default {
           // 窗体高度-表格内容顶部的高度-表格内容底部的高度
           // this.scrollYHeight = document.body.clientHeight - tHeaderBottom - extraHeight
           this.scrollYHeight = `calc(100vh - ${tHeaderBottom + extraHeight}px)`
-        }, 60)
+        }, 100)()
       })
     },
     /**

package/src/layouts/AdminLayout.vue

@@ -145,6 +145,7 @@ export default {
       }
     }
     .admin-layout-main{
+      height: 100%;
       .admin-header{
         top: 0;
         right: 0;
@@ -157,8 +158,9 @@ export default {
     }
     .admin-layout-content{
       padding: 24px;
-      /*overflow-x: hidden;*/
-      min-height: calc(100vh - 64px - 1px);
+      display: flex;
+      flex-direction: column;
+      min-height: auto;
     }
     .setting{
       background-color: @primary-color;

package/src/layouts/tabs/TabsView.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="TabsView">
-    <admin-layout>
+    <admin-layout style="height: 100%;">
       <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" />
       <tabs-head
         v-if="multiPage"
@@ -365,6 +365,7 @@ export default {
 
 <style lang="less">
   #TabsView {
+    height: 100%;
     .tabs-view {
       margin: -16px auto 8px;
       &.head.fixed {
@@ -377,13 +378,6 @@ export default {
         width: 100%;
         margin: 0 auto;
       }
-      > div > div > .ant-card:first-of-type > .ant-card-body {
-        max-height: calc(100vh - 64px - 48px - 24px);
-        overflow-y: auto;
-        &::-webkit-scrollbar {
-          display: none;
-        }
-      }
     }
   }
 </style>

package/src/router/async/router.map.js

@@ -54,14 +54,13 @@ routerResource.example = {
 path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo3.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),