From 5fbfc19daae6017e0522b281b39ab102a685c06d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 11:06:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/PIMTable/PIMTable.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index d1b778d..fb472fb 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -207,8 +207,8 @@
</el-table-column>
</el-table>
<pagination
- v-show="total > 0"
- :total="total"
+ v-if="page.total > 0"
+ :total="page.total"
:layout="page.layout"
:page="page.current"
:limit="page.size"
@@ -245,7 +245,7 @@
},
height: {
type: [Number, String],
- default: "calc(100vh - 18.5em)",
+ default: "calc(100vh - 22em)",
},
expandRowKeys: {
type: Array,
--
Gitblit v1.9.3