高级筛选高度优化处理

PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue

@@ -69,6 +69,7 @@
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
+            :selectMaxHeight="'116px'"
             :rowMaxHeight="rowMaxHeight"
             :totalCount="totalCountForDetail"
             :MaxResultCount="MaxResultCount"
@@ -164,6 +165,7 @@ import searchOverall from "@/components/searchOverall"
 import currenButton from "@/components/currenButton"
 import currenDescriptions from "@/components/currenDescriptions"
 import currenTabs from "@/components/currenTabs"
+import currenTable from "@/components/currenTable"
 import pagination from "@/components/Pagination"
 import rowDrop from "@/components/rowDrop/index.vue"
 import * as allUrlOption from '@/utils/baseData/urlOption'
@@ -175,6 +177,7 @@ export default {
     currenButton,
     currenDescriptions,
     currenTabs,
+    currenTable,
     searchOverall,
     rowDrop
   },
@@ -380,8 +383,8 @@ export default {
   methods: {
     // 明细列表 - 获取明细列表（后端分页）
     getDetailList(data,successFn,errorFn){
-      // 获取明细分页信息
       if(data)this.PageListParams.condition.filters = []
+      // 获取明细分页信息
       let _hasId = false
       this.PageListParams.condition.filters.forEach(item=>{
         if(item.column == this.URLOption_masterId){
@@ -577,7 +580,7 @@ export default {
             this.zdyTableColumns = []
             this.otherData = []
             // this.firstTabs = val.name
-            // 其他自定义tab页 示例
+            // 其他自定义tab页
             // if (item.functionName == 'getListByItemcode') {
             //   let params = {
             //     itemCode: this.propsData.code

PC/InterFace.Dash/src/components/filterForDetailPage/index.vue

@@ -30,6 +30,7 @@
                     :multipleSelection="multipleSelection"
                     :MaxResultCount="PageListParams.MaxResultCount"
                     :setUTableHeight="setUTableHeight"
+                    :selectMaxHeight="'116px'"
                     @topbutton="topbutton"
                     @inlineDialog="inlineDialog"
                     @sortChange="sortChange"
@@ -203,6 +204,10 @@ export default {
         data () {
             return {
                 dialogShow:true,
+                // URLOption_detailList:allUrlOption[this.$route.name].detailListURL,//明细-列表
+                // URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',//明细-查看主表的连接id
+                // URLOption_masterName:allUrlOption[this.$route.name].masterName,//明细-列表//明细-查看主表的连接title名称
+                // URLOption_parent:allUrlOption[this.$route.name].parentURL ? allUrlOption[this.$route.name].parentURL : allUrlOption[this.$route.name].detailURL,//明细-查看主表
                 currenButtonData: [],//头部按钮
                 operaButtons:[],//操作列按钮
                 showParentDialog:false,//显示父级数据弹窗
@@ -315,6 +320,7 @@ export default {
     </script>
     <style lang="scss">
     .filterForDetailPage {
+        
         .mainTable-dialog{
             .el-dialog{
                 height: calc(100% - 100px);

PC/InterFace.Dash/src/components/searchOverall/index.vue

@@ -32,6 +32,7 @@
       <!-- 高级筛选界面 -->
       <div v-if="isShow && isShowMoreList" class="moreListOuter">
         <curren-Form
+          :style="`--navFilterMaxHeight: ${selectMaxHeight};`"
           class="navFilter"
           size="medium"
           labelWidth="0"
@@ -259,6 +260,11 @@ export default {
       }
     },
     props: {
+      // 筛选条件最大高度
+      selectMaxHeight:{
+        type: String,
+        default: '174px'
+      },
       // 筛选遮罩高度
       searchOverallCoverHeight:{
         type: String,

PC/InterFace.Dash/src/components/searchOverall/style/index.scss

@@ -31,7 +31,7 @@
     //  flex-direction: column;
     //  width: 100%;
     //  height: 100%;
-     max-height: 170px;
+     max-height: var(--navFilterMaxHeight);
      overflow: auto;
   
      .el-form {

PC/InterFace.Dash/src/components/tablePagination/index.vue

@@ -25,6 +25,7 @@
       :tableColumns="tableColumns"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :selectMaxHeight="selectMaxHeight"
     >
       <!-- 插槽预留 -->
       <slot name="searchPrimarySlot"></slot>
@@ -48,7 +49,7 @@
         :tableColumns="tableColumns | isTableColumns"
         :isShowIndex="isShowIndex"
         :selectionTable="tableSelection"
-        :setUTableHeight="setUTableHeight || uTableTopHeight"
+        :setUTableHeight="uTableTopHeight"
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
@@ -95,6 +96,11 @@ export default {
       type:String,
       default:'calc(90vh - 280px)'
     },
+    // 筛选条件最大高度
+    selectMaxHeight:{
+      type: String,
+      default: '174px'
+    },
     // 筛选高度
     searchOverallCoverHeight:{
       type: String,
@@ -226,6 +232,7 @@ export default {
       rowDropVisible: false,
       // table 重新渲染所需key
       isUpdate: false,
+      appRemoveHeight:165,
       // 除去table的高度
       uTableTopHeight:165,
       // table外部高度控制，用于点击筛选动画处理
@@ -265,6 +272,8 @@ export default {
     }
   },
   mounted(){
+    this.appRemoveHeight = this.setUTableHeight || 165
+    this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
     
@@ -328,12 +337,12 @@ export default {
         let _margin = 20
         this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
         setTimeout(()=>{
-          this.uTableTopHeight =  minusHeight + 165 + _margin
+          this.uTableTopHeight =  minusHeight + this.appRemoveHeight + _margin
         },0)
       }else{
         this.uTableOuterHeight = this.uTableOuterHeight_init
         setTimeout(()=>{
-          this.uTableTopHeight = 165
+          this.uTableTopHeight = this.appRemoveHeight
         },0)
       }
     }, 

PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue

@@ -69,6 +69,7 @@
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
+            :selectMaxHeight="'116px'"
             :rowMaxHeight="rowMaxHeight"
             :totalCount="totalCountForDetail"
             :MaxResultCount="MaxResultCount"

PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue

@@ -30,6 +30,7 @@
                 :multipleSelection="multipleSelection"
                 :MaxResultCount="PageListParams.MaxResultCount"
                 :setUTableHeight="setUTableHeight"
+                :selectMaxHeight="'116px'"
                 @topbutton="topbutton"
                 @inlineDialog="inlineDialog"
                 @sortChange="sortChange"

PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/index.vue

@@ -32,6 +32,7 @@
     <!-- 高级筛选界面 -->
     <div v-if="isShow && isShowMoreList" class="moreListOuter">
       <curren-Form
+        :style="`--navFilterMaxHeight: ${selectMaxHeight};`"
         class="navFilter"
         size="medium"
         labelWidth="0"
@@ -259,6 +260,11 @@ export default {
     }
   },
   props: {
+    // 筛选条件最大高度
+    selectMaxHeight:{
+      type: String,
+      default: '174px'
+    },
     // 筛选遮罩高度
     searchOverallCoverHeight:{
       type: String,

PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/style/index.scss

@@ -31,7 +31,7 @@
     //  flex-direction: column;
     //  width: 100%;
     //  height: 100%;
-     max-height: 170px;
+     max-height: var(--navFilterMaxHeight);
      overflow: auto;
   
      .el-form {

PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue

@@ -25,6 +25,7 @@
       :tableColumns="tableColumns"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :selectMaxHeight="selectMaxHeight"
     >
       <!-- 插槽预留 -->
       <slot name="searchPrimarySlot"></slot>
@@ -48,7 +49,7 @@
         :tableColumns="tableColumns | isTableColumns"
         :isShowIndex="isShowIndex"
         :selectionTable="tableSelection"
-        :setUTableHeight="setUTableHeight || uTableTopHeight"
+        :setUTableHeight="uTableTopHeight"
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
@@ -95,6 +96,11 @@ export default {
       type:String,
       default:'calc(90vh - 280px)'
     },
+    // 筛选条件最大高度
+    selectMaxHeight:{
+      type: String,
+      default: '174px'
+    },
     // 筛选高度
     searchOverallCoverHeight:{
       type: String,
@@ -226,6 +232,7 @@ export default {
       rowDropVisible: false,
       // table 重新渲染所需key
       isUpdate: false,
+      appRemoveHeight:165,
       // 除去table的高度
       uTableTopHeight:165,
       // table外部高度控制，用于点击筛选动画处理
@@ -265,6 +272,8 @@ export default {
     }
   },
   mounted(){
+    this.appRemoveHeight = this.setUTableHeight || 165
+    this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
     
@@ -328,12 +337,12 @@ export default {
         let _margin = 20
         this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
         setTimeout(()=>{
-          this.uTableTopHeight =  minusHeight + 165 + _margin
+          this.uTableTopHeight =  minusHeight + this.appRemoveHeight + _margin
         },0)
       }else{
         this.uTableOuterHeight = this.uTableOuterHeight_init
         setTimeout(()=>{
-          this.uTableTopHeight = 165
+          this.uTableTopHeight = this.appRemoveHeight
         },0)
       }
     }, 

PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue

@@ -69,6 +69,7 @@
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
+            :selectMaxHeight="'116px'"
             :rowMaxHeight="rowMaxHeight"
             :totalCount="totalCountForDetail"
             :MaxResultCount="MaxResultCount"
@@ -579,7 +580,7 @@ export default {
             this.zdyTableColumns = []
             this.otherData = []
             // this.firstTabs = val.name
-            // 其他自定义tab页 示例
+            // 其他自定义tab页
             // if (item.functionName == 'getListByItemcode') {
             //   let params = {
             //     itemCode: this.propsData.code

PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue

@@ -30,6 +30,7 @@
                     :multipleSelection="multipleSelection"
                     :MaxResultCount="PageListParams.MaxResultCount"
                     :setUTableHeight="setUTableHeight"
+                    :selectMaxHeight="'116px'"
                     @topbutton="topbutton"
                     @inlineDialog="inlineDialog"
                     @sortChange="sortChange"

PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/index.vue

@@ -32,6 +32,7 @@
       <!-- 高级筛选界面 -->
       <div v-if="isShow && isShowMoreList" class="moreListOuter">
         <curren-Form
+          :style="`--navFilterMaxHeight: ${selectMaxHeight};`"
           class="navFilter"
           size="medium"
           labelWidth="0"
@@ -259,6 +260,11 @@ export default {
       }
     },
     props: {
+      // 筛选条件最大高度
+      selectMaxHeight:{
+        type: String,
+        default: '174px'
+      },
       // 筛选遮罩高度
       searchOverallCoverHeight:{
         type: String,

PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/style/index.scss

@@ -31,7 +31,7 @@
     //  flex-direction: column;
     //  width: 100%;
     //  height: 100%;
-     max-height: 170px;
+     max-height: var(--navFilterMaxHeight);
      overflow: auto;
   
      .el-form {

PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue

@@ -25,6 +25,7 @@
       :tableColumns="tableColumns"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :selectMaxHeight="selectMaxHeight"
     >
       <!-- 插槽预留 -->
       <slot name="searchPrimarySlot"></slot>
@@ -48,7 +49,7 @@
         :tableColumns="tableColumns | isTableColumns"
         :isShowIndex="isShowIndex"
         :selectionTable="tableSelection"
-        :setUTableHeight="setUTableHeight || uTableTopHeight"
+        :setUTableHeight="uTableTopHeight"
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
@@ -95,6 +96,11 @@ export default {
       type:String,
       default:'calc(90vh - 280px)'
     },
+    // 筛选条件最大高度
+    selectMaxHeight:{
+      type: String,
+      default: '174px'
+    },
     // 筛选高度
     searchOverallCoverHeight:{
       type: String,
@@ -226,6 +232,7 @@ export default {
       rowDropVisible: false,
       // table 重新渲染所需key
       isUpdate: false,
+      appRemoveHeight:165,
       // 除去table的高度
       uTableTopHeight:165,
       // table外部高度控制，用于点击筛选动画处理
@@ -265,6 +272,8 @@ export default {
     }
   },
   mounted(){
+    this.appRemoveHeight = this.setUTableHeight || 165
+    this.uTableTopHeight = this.appRemoveHeight
     this.uTableOuterHeight =  this.$refs.tablePaginationTableRef.getTableHeight()
     this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
     
@@ -328,12 +337,12 @@ export default {
         let _margin = 20
         this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
         setTimeout(()=>{
-          this.uTableTopHeight =  minusHeight + 165 + _margin
+          this.uTableTopHeight =  minusHeight + this.appRemoveHeight + _margin
         },0)
       }else{
         this.uTableOuterHeight = this.uTableOuterHeight_init
         setTimeout(()=>{
-          this.uTableTopHeight = 165
+          this.uTableTopHeight = this.appRemoveHeight
         },0)
       }
     },