From 65eba03a458413053485b22cf1b5490d6a22d75e Mon Sep 17 00:00:00 2001
From: sc <shencheng@heronshn.com>
Date: Tue, 19 Oct 2021 15:02:25 +0800
Subject: [PATCH] =?UTF-8?q?scTable=20=E9=87=8D=E6=9E=84=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?height=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scTable/index.vue | 36 ++++++++++----------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index a07f499f..93c1fb47 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<div class="scTable" ref="scTableMain" v-loading="loading">
+	<div class="scTable" :style="{'height':_height}" ref="scTableMain" v-loading="loading">
 		<div class="scTable-table">
-			<el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :key="toggleIndex" ref="scTable" :height="tableHeight" @sort-change="sortChange" @filter-change="filterChange">
+			<el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :key="toggleIndex" ref="scTable" height="100%" @sort-change="sortChange" @filter-change="filterChange">
 				<slot></slot>
 				<template v-for="(item, index) in userColumn" :key="index">
 					<el-table-column v-if="!item.hide" :column-key="item.prop" :label="item.label" :prop="item.prop" :width="item.width" :sortable="item.sortable" :fixed="item.fixed" :filters="item.filters" :filter-method="remoteFilter||!item.filters?null:filterHandler">
@@ -18,7 +18,7 @@
 				</template>
 			</el-table>
 		</div>
-		<div class="scTable-page">
+		<div class="scTable-page" v-if="!hidePagination&&!hideDo">
 			<div class="scTable-pagination">
 				<el-pagination v-if="!hidePagination" background :small="true" :layout="paginationLayout" :total="total" :page-size="pageSize" v-model:currentPage="currentPage" @current-change="paginationChange"></el-pagination>
 			</div>
@@ -49,6 +49,7 @@
 			apiObj: { type: Object, default: () => {} },
 			params: { type: Object, default: () => ({}) },
 			data: { type: Object, default: () => {} },
+			height: { type: [String,Number], default: "100%" },
 			rowKey: { type: String, default: "" },
 			column: { type: Object, default: () => {} },
 			remoteSort: { type: Boolean, default: false },
@@ -68,6 +69,11 @@
 				this.refresh();
 			}
 		},
+		computed: {
+			_height() {
+				return Number(this.height)?Number(this.height)+'px':this.height
+			}
+		},
 		data() {
 			return {
 				emptyText: "暂无数据",
@@ -99,28 +105,8 @@
 				this.tableData = this.data;
 				this.total = this.tableData.length
 			}
-			this.$nextTick(() => {
-				this.upTableHeight()
-			})
-			window.addEventListener("resize", this.upTableHeight, true)
-		},
-		unmounted(){
-			window.removeEventListener("resize", this.upTableHeight, true)
-		},
-		activated(){
-			this.$nextTick(() => {
-				this.upTableHeight()
-			})
-			window.addEventListener("resize", this.upTableHeight, true)
-		},
-		deactivated(){
-			window.removeEventListener("resize", this.upTableHeight, true)
 		},
 		methods: {
-			//更新表格高度
-			upTableHeight(){
-				this.tableHeight = (this.$refs.scTableMain.offsetHeight - 50 ) + "px"
-			},
 			//获取列
 			async getCustomColumn(){
 				const userColumn = await config.columnSettingGet(this.tableName, this.column)
@@ -287,8 +273,8 @@
 </script>
 
 <style scoped>
-	.scTable {display:flex;flex-direction:column;height:100%;}
-	.scTable-table {flex:1;}
+	.scTable {}
+	.scTable-table {height: calc(100% - 50px);}
 	.scTable-page {height:50px;display: flex;align-items: center;justify-content: space-between;padding:0 15px;}
 	.scTable-do {white-space: nowrap;}
 </style>