From c1d2051abc8ca88cd07f0d7c56c0dbf8165d5c33 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 18 九月 2025 17:02:22 +0800
Subject: [PATCH] 2025.9.18 数据产品（待完成）
---
src/components/table/FYTable.vue | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/components/table/FYTable.vue b/src/components/table/FYTable.vue
index 478a48d..a85de22 100644
--- a/src/components/table/FYTable.vue
+++ b/src/components/table/FYTable.vue
@@ -1,10 +1,10 @@
<template>
<el-row ref="searchRef">
<FYSearchBar @search="onSearch">
- <template #options>
+ <template #options v-if="$slots.options">
<slot name="options"></slot>
</template>
- <template #buttons>
+ <template #buttons v-if="$slots.buttons">
<slot name="buttons"></slot>
</template>
</FYSearchBar>
@@ -28,7 +28,7 @@
<slot name="options-expand2"></slot>
</div>
<el-table
- id="fyTable"
+ v-bind="$attrs"
ref="tableRef"
:data="tableData"
v-loading="loading"
@@ -40,6 +40,7 @@
:cell-class-name="cellClassName"
@paste="handlePaste"
@sort-change="handleSortChange"
+ :show-overflow-tooltip="true"
border
>
<slot name="table-column" :size="fontSize"></slot>
@@ -68,6 +69,7 @@
* 浣跨敤鏃堕渶瑕佸湪<slot #options>涓坊鍔犺嚜瀹氫箟鏌ヨ閫夐」锛屽湪<slot #table-column>涓坊鍔犺嚜瀹氫箟琛ㄦ牸鍒楋紝鍚屾椂瀹炵幇瑙﹀彂鍑芥暟search
*/
export default {
+ inject: ['contentMaxHeight'],
props: {
rowClassName: undefined,
cellClassName: Function || String,
@@ -85,6 +87,11 @@
default: () => []
},
totalCount: {
+ type: Number,
+ default: 0
+ },
+ // 棰濆鐨勯珮搴︼紝鐢ㄤ簬璁＄畻琛ㄦ牸楂樺害
+ extraHeight: {
type: Number,
default: 0
}
@@ -129,26 +136,16 @@
if (nValue != oValue) {
this.total = nValue;
}
+ },
+ extraHeight: {
+ handler(nValue, oValue) {
+ if (nValue != oValue) {
+ this.tableHeight = this.calcTableHeight();
+ }
+ },
}
},
- 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';
- }
- }
- },
+ computed: {},
methods: {
/**
* 琛ㄦ牸鏁版嵁鏌ヨ锛屼紶閫掍袱缁勫弬鏁帮紝鍒嗛〉淇℃伅鍜屽洖璋冨嚱鏁�
@@ -185,9 +182,9 @@
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)`;
+ const h = h1 + h2 + h3 + h4 + this.extraHeight;
+ return this.contentMaxHeight.value - h + 'px';
+ // return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2)`;
},
tableRowClassName({ row }) {
if (this.rowClassName) {
--
Gitblit v1.9.3