From b12ea16fa2d9440e9680127d126a4f3af450afd2 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 18:36:19 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style

---
 src/components/makepager/CommonFormTableView.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index e5a99d1..c569190 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -10,7 +10,7 @@
       <el-table
         :data="tableList.tableData"
         style="width: 100%"
-        :height="isinventory || islistingrules ? 'calc(100% - 0px)' : ''"
+        :class="{ setHeight: isinventory || islistingrules }"
         :header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
         :row-class-name="tableRowClassName"
         @row-click="tableRowClick"

--
Gitblit v1.8.0