From 611883d60c285ce00a679787aa8e8185784a0fd7 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 2 Nov 2023 14:38:32 +0800
Subject: [PATCH] bug 77959

---
 src/mixins/SimpleListMixin.js                 | 16 +++++++++++++-
 src/views/system/DepartList.vue               |  8 +------
 src/views/system/DepartUserList.vue           |  2 +-
 src/views/system/DictList.vue                 |  6 ++---
 src/views/system/RoleUserList.vue             | 22 ++++++-------------
 src/views/system/SysCategoryList.vue          |  4 ----
 src/views/system/UserList.vue                 | 11 ++++------
 .../contactManage/ContactManageList.vue       |  2 +-
 .../FriendshipLinkList.vue                    |  2 +-
 .../internalWorkGroup/WorkingGroupList.vue    |  2 +-
 src/views/system/modules/DeptUserInfo.vue     |  9 +++-----
 src/views/system/tags/TagList.vue             |  6 ++---
 src/views/system/tags/modules/AreaModal.vue   |  2 +-
 .../tags/modules/TagContentDictListDrawer.vue |  2 +-
 .../system/tags/pages/ClauseSplittingList.vue |  2 +-
 src/views/system/tags/pages/StandardList.vue  |  2 +-
 src/views/system/tags/pages/TagContent.vue    |  2 +-
 17 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/src/mixins/SimpleListMixin.js b/src/mixins/SimpleListMixin.js
index 568fbcac..995bfad2 100644
--- a/src/mixins/SimpleListMixin.js
+++ b/src/mixins/SimpleListMixin.js
@@ -5,6 +5,7 @@
  */
 import { filterObj } from '@/utils/util'
 import { getAction, postAction } from '@/api/manage'
+import { mapGetters } from 'vuex'
 
 export const SimpleListMixin = {
   data () {
@@ -45,7 +46,20 @@ export const SimpleListMixin = {
       /* 高级查询条件 */
       superQueryParams: '',
       /** 高级查询拼接方式 */
-      superQueryMatchType: 'and'
+      superQueryMatchType: 'and',
+      isBackTitle: false // 是否是详情页有返回的标题
+    }
+  },
+  computed: {
+    ...mapGetters(['defaultHeight']),
+    yScrollHeight () {
+      /**
+       * 前几个使用变量是为了配合iframe嵌套，算出页面显示范围的高度
+       * 48px：分页器的高度
+       * 48px：a-card的padding（上24+下24）
+       * 54px：表头行的高度
+       */
+      return `calc(100vh - ${this.defaultHeight['user-info-height']} - ${this.defaultHeight['breadcrumb-height']} - ${this.defaultHeight.oneLineSearchHeight} - ${this.defaultHeight.oneLineOperationHeight} - 48px - 48px - 54px - ${this.isBackTitle ? '56px' : '0px'})`
     }
   },
   created () {
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 399fa4ea..86952f76 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -1,5 +1,5 @@
 <template xmlns:background-color="http://www.w3.org/1999/xhtml">
-  <a-row :gutter="10">
+  <a-row :gutter="10" style="width: 100%;">
     <a-col :md="12" :sm="24">
       <a-card :bordered="false">
 
@@ -15,12 +15,6 @@
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-          <a-alert type="info" :showIcon="true">
-            <div slot="message">
-              {{ $t('depart.currentSelection') }}：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
-              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">{{ $t('depart.deselect') }}</a>
-            </div>
-          </a-alert>
           <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" :placeholder="$t('depart.enterDepartmentName')" />
           <!-- 树-->
           <a-col :md="10" :sm="24">
diff --git a/src/views/system/DepartUserList.vue b/src/views/system/DepartUserList.vue
index 721a48f0..2ff33a80 100644
--- a/src/views/system/DepartUserList.vue
+++ b/src/views/system/DepartUserList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-row :gutter="10">
+  <a-row :gutter="10" style="width: 100%;">
     <a-col :md="8" :sm="24">
       <a-card :bordered="false">
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index d32e3cca..e26e5c27 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -41,7 +41,7 @@
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
       >
@@ -53,7 +53,7 @@
       </j-table>
     </div>
     <dict-modal ref="modalForm" @ok="modalFormOk"></dict-modal>  <!-- 字典类型 -->
-    <dict-item-list ref="dictItemList"></dict-item-list>
+    <dict-item-list v-show="false" ref="dictItemList"></dict-item-list>
     <dict-delete-list ref="dictDeleteList" @refresh="() =>loadData()"></dict-delete-list>
   </a-card>
 </template>
@@ -213,6 +213,6 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style lang="less" scoped>
   @import '~@assets/less/common.less';
 </style>
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 1283bcdf..d2cf1fe8 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-row :gutter="10">
+  <a-row :gutter="10" style="width: 100%">
     <a-col :md="leftColMd" :sm="24" style="margin-bottom: 20px">
       <a-card :bordered="false">
         <!-- 查询区域 -->
@@ -40,17 +40,11 @@
 <!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
         </div>
 
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon">
-          </i> {{$t('selected')}} <a><b>{{ selectedRowKeys1.length }}</b></a>{{$t('term')}}
-          <a style="margin-left: 24px" @click="onClearSelected1">{{$t('empty')}}</a>
-        </div>
-
         <div style="margin-top: 15px">
           <a-table
             :components="drag(columns,'columns')"
-            style="height:500px"
             ref="table"
+            style="max-height: 500px"
             size="middle"
             bordered
             rowKey="id"
@@ -58,6 +52,7 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
+            :scroll="{x: '100%', y: yScrollHeight}"
             :rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
             @change="handleTableChange">
           <span slot="action" slot-scope="text, record">
@@ -135,22 +130,18 @@
         </div>
         <!-- table区域-begin -->
         <div>
-          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-            <i class="anticon anticon-info-circle ant-alert-icon"></i> {{ $t('selected') }} <a style="font-weight: 600">{{
-            selectedRowKeys2.length }}</a>{{ $t('term') }}
-            <a style="margin-left: 24px" @click="onClearSelected2">{{ $t('empty') }}</a>
-          </div>
           <a-table
             :components="drag(columns2,'columns2')"
-            style="height:500px"
             ref="table2"
             bordered
+            style="max-height: 500px"
             size="middle"
             rowKey="id"
             :columns="columns2"
             :dataSource="dataSource2"
             :pagination="ipagination2"
             :loading="loading2"
+            :scroll="{x: '100%', y: yScrollHeight}"
             :rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
             @change="handleTableChange2">
            <span slot="action" slot-scope="text, record">
@@ -536,7 +527,8 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
   /** Button按钮间距 */
   .ant-btn {
     margin-left: 8px
diff --git a/src/views/system/SysCategoryList.vue b/src/views/system/SysCategoryList.vue
index cb4b439d..1a2201bc 100644
--- a/src/views/system/SysCategoryList.vue
+++ b/src/views/system/SysCategoryList.vue
@@ -18,10 +18,6 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
 
       <a-table
         ref="table"
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 604ec665..59f4a2d3 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -118,14 +118,9 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>{{ $t('selected') }}&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>{{ $t('term') }}&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">{{ $t('empty') }}</a>
-      </div>
-
       <j-table
         :can-drag="true"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         ref="table"
         size="middle"
         rowKey="id"
@@ -452,5 +447,7 @@ export default {
 
 }
 </script>
-<style scoped>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+
 </style>
diff --git a/src/views/system/contactManage/ContactManageList.vue b/src/views/system/contactManage/ContactManageList.vue
index 84ed349b..ed6a1c62 100644
--- a/src/views/system/contactManage/ContactManageList.vue
+++ b/src/views/system/contactManage/ContactManageList.vue
@@ -32,7 +32,7 @@
     <div>
       <j-table
         :can-drag="true"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         ref="table"
         rowKey="id"
         :columns="columns"
diff --git a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
index 0fec1a28..d508a70b 100644
--- a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
+++ b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
@@ -36,7 +36,7 @@
     <div>
       <j-table
         :can-drag="true"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         ref="table"
         rowKey="id"
         :columns="columns"
diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue
index bb735a3b..0da6dacf 100644
--- a/src/views/system/internalWorkGroup/WorkingGroupList.vue
+++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue
@@ -122,7 +122,7 @@
       <div>
         <j-table
           :can-drag="true"
-          :scroll="{x: '100%'}"
+          :scroll="{x: '100%', y: yScrollHeight}"
           ref="table"
           rowKey="id"
           :columns="columns"
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index a415016d..3102cd1a 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -40,11 +40,6 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
 
       <a-table
         ref="table"
@@ -55,6 +50,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
+        :scroll="{x: '100%', y: yScrollHeight}"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
@@ -302,7 +298,8 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
   /** Button按钮间距 */
   .ant-btn {
     margin-left: 3px
diff --git a/src/views/system/tags/TagList.vue b/src/views/system/tags/TagList.vue
index eb2b91b8..815c208b 100644
--- a/src/views/system/tags/TagList.vue
+++ b/src/views/system/tags/TagList.vue
@@ -27,13 +27,13 @@ export default {
     TagContent
   },
   methods: {
-    callback() {
+    callback () {
 
     }
   }
 }
 </script>
 
-<style scoped>
-
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
 </style>
diff --git a/src/views/system/tags/modules/AreaModal.vue b/src/views/system/tags/modules/AreaModal.vue
index 59797564..0de41b51 100644
--- a/src/views/system/tags/modules/AreaModal.vue
+++ b/src/views/system/tags/modules/AreaModal.vue
@@ -34,7 +34,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <div slot="action" class="table-action"  slot-scope="{text, record}">
diff --git a/src/views/system/tags/modules/TagContentDictListDrawer.vue b/src/views/system/tags/modules/TagContentDictListDrawer.vue
index 139d5b93..61a4cd14 100644
--- a/src/views/system/tags/modules/TagContentDictListDrawer.vue
+++ b/src/views/system/tags/modules/TagContentDictListDrawer.vue
@@ -52,7 +52,7 @@
         :dataSource="dataSource"
         :pagination="attributeType === TagsAttributeTypeEnums.TREE.value ? false : ipagination"
         :loading="loading"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <div slot="action" class="table-action" slot-scope="{text, record}">
diff --git a/src/views/system/tags/pages/ClauseSplittingList.vue b/src/views/system/tags/pages/ClauseSplittingList.vue
index dc85e8d6..5b4338c9 100644
--- a/src/views/system/tags/pages/ClauseSplittingList.vue
+++ b/src/views/system/tags/pages/ClauseSplittingList.vue
@@ -39,7 +39,7 @@
     :dataSource="dataSource"
     :pagination="ipagination"
     :loading="loading"
-    :scroll="{x: '100%'}"
+    :scroll="{x: '100%', y: yScrollHeight}"
     :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
     @change="handleTableChange">
     <div slot="action" class="table-action"  slot-scope="{text, record}">
diff --git a/src/views/system/tags/pages/StandardList.vue b/src/views/system/tags/pages/StandardList.vue
index 0bf4174d..ff370bea 100644
--- a/src/views/system/tags/pages/StandardList.vue
+++ b/src/views/system/tags/pages/StandardList.vue
@@ -53,7 +53,7 @@
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
       >
diff --git a/src/views/system/tags/pages/TagContent.vue b/src/views/system/tags/pages/TagContent.vue
index e1ea2f6d..eadcd0c1 100644
--- a/src/views/system/tags/pages/TagContent.vue
+++ b/src/views/system/tags/pages/TagContent.vue
@@ -50,7 +50,7 @@
       :pagination="ipagination"
       :loading="loading"
       :columns="columns"
-      :scroll="{x: '100%'}"
+      :scroll="{x: '100%', y: yScrollHeight}"
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       @change="handleTableChange"
     >