From aa059ff617f0902a1c15443aa517f07bdbc64bea Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:50:03 +0800
Subject: [PATCH] Merge branch 'hc-evalution' of ssh://114.215.109.124:29418/supervision-vue into hc-evalution
---
src/components/table/FYTable.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/src/components/table/FYTable.vue b/src/components/table/FYTable.vue
index e00929f..bec9d06 100644
--- a/src/components/table/FYTable.vue
+++ b/src/components/table/FYTable.vue
@@ -9,18 +9,34 @@
</template>
</FYSearchBar>
</el-row>
- <el-row ref="expandRef">
- <slot name="options-expand"></slot>
+ <el-row ref="expandRef" justify="space-between">
+ <el-col span="22">
+ <slot name="options-expand"></slot>
+ </el-col>
+ <el-col span="2">
+ <el-space :wrap="false">
+ <el-text size="small">瀛椾綋</el-text>
+ <el-radio-group v-model="fontSize" size="small">
+ <el-radio-button value="small">灏�</el-radio-button>
+ <el-radio-button value="default">涓�</el-radio-button>
+ <el-radio-button value="large">澶�</el-radio-button>
+ </el-radio-group>
+ </el-space>
+ </el-col>
</el-row>
+ <div ref="expand2Ref">
+ <slot name="options-expand2"></slot>
+ </div>
<el-table
:data="tableData"
v-loading="loading"
table-layout="fixed"
:row-class-name="tableRowClassName"
:height="tableHeight"
+ :size="fontSize"
border
>
- <slot name="table-column"></slot>
+ <slot name="table-column" :size="fontSize"></slot>
</el-table>
<el-pagination
@@ -51,6 +67,11 @@
pagination: {
type: Boolean,
default: true
+ },
+ // '' | 'small' | 'default' | 'large'
+ size: {
+ type: String,
+ default: 'default'
}
},
data() {
@@ -60,7 +81,8 @@
total: 0,
currentPage: 1,
pageSize: 20,
- loading: false
+ loading: false,
+ fontSize: 'default'
};
},
emits: ['search'],
@@ -73,6 +95,30 @@
pageSize(nValue, oValue) {
if (nValue != oValue) {
this.onSearch();
+ }
+ },
+ size: {
+ handler(nValue, oValue) {
+ if (nValue != oValue) {
+ this.fontSize = nValue;
+ }
+ },
+ immediate: true
+ }
+ },
+ computed: {
+ cTableHeight() {
+ if (this.$refs.searchRef) {
+ const h1 = this.$refs.searchRef.$el.offsetHeight;
+ const h2 = this.$refs.paginationRef ? this.$refs.paginationRef.$el.offsetHeight : 0;
+ const h3 = this.$refs.expandRef.$el.offsetHeight;
+ const h4 = this.$refs.expand2Ref.offsetHeight;
+
+ const h = h1 + h2 + h3 + h4;
+ // return `calc(100vh - ${h1}px - ${h2}px - var(--el-main-padding) * 2 - var(--el-header-height))`;
+ return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2)`;
+ } else {
+ return '500';
}
}
},
@@ -101,7 +147,9 @@
const h1 = this.$refs.searchRef.$el.offsetHeight;
const h2 = this.$refs.paginationRef ? this.$refs.paginationRef.$el.offsetHeight : 0;
const h3 = this.$refs.expandRef.$el.offsetHeight;
- const h = h1 + h2 + h3;
+ const h4 = this.$refs.expand2Ref.offsetHeight;
+
+ const h = h1 + h2 + h3 + h4;
// return `calc(100vh - ${h1}px - ${h2}px - var(--el-main-padding) * 2 - var(--el-header-height))`;
return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2)`;
},
--
Gitblit v1.9.3