From 79922b6ebd65da78965dfd92f6086270cbcdd89d Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Mon, 8 Apr 2024 17:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BC=98=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 io.sc.platform.core.frontend/package.json     |  2 +-
 .../src/platform/components/grid/WGrid.vue    | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json
index 443b72e8..5e3ea39b 100644
--- a/io.sc.platform.core.frontend/package.json
+++ b/io.sc.platform.core.frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.1.158",
+  "version": "8.1.159",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "//main": "库的主文件",
   "main": "dist/platform-core.js",
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index 9e22bd90..db2861e6 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -1173,6 +1173,7 @@ const noDataTrHeightComputed = () => {
 
   availableHeight -= state.refHeightWidth.titleTotalHeight;
   availableHeight -= state.refHeightWidth.middleScrollWidth - state.refHeightWidth.middleWidth > 0 ? 15 : 0;
+  availableHeight -= 1; //无数据增加的title行，下边框所占边框
 
   const style = {
     height: props.height > 0 ? props.height + 'px' : availableHeight > 0 ? availableHeight + 'px' : '0px',
@@ -1354,6 +1355,8 @@ const onRequest = async (ops: any) => {
       }
       state.pagination.rowsNumber = responseData.totalElements;
       table.rows = responseData.content;
+    } else {
+      table.rows = [];
     }
   } else if (resp && resp.data && props.tree) {
     const responseData = resp.data;
@@ -1376,6 +1379,8 @@ const onRequest = async (ops: any) => {
         table.rows = responseData.content;
       }
     }
+  } else {
+    table.rows = [];
   }
   state.pagination.sortBy = ops.pagination.sortBy;
   state.pagination.descending = ops.pagination.descending;
@@ -2282,12 +2287,12 @@ VueTools.expose2Instance(instance);
   padding: var(--tableTopPadding) var(--tableTopPadding);
 }
 
-:deep(.q-table tr:first-child th:first-child) {
+/* :deep(.q-table tr:first-child th:first-child) {
   border-left: 1px solid var(--tableBorderColor);
-}
-:deep(.q-table tr td:first-child) {
+} */
+/* :deep(.q-table tr td:first-child) {
   border-left: 1px solid var(--tableBorderColor);
-}
+} */
 :deep(.q-table__middle .q-table th) {
   padding: var(--tableHeaderPadding) 8px;
   border-left-width: 0px;
@@ -2303,9 +2308,18 @@ VueTools.expose2Instance(instance);
   border-top-width: 0px;
   border-bottom-width: 1px;
 }
+/* :deep(.q-table__middle .q-table tr:last-child td) {
+  border-bottom-width: 0px;
+} */
 
 :deep(.q-table__bottom) {
   min-height: var(--tableBottomHeight);
+  border-color: rgba(0, 0, 0, 0.12);
+  border-style: solid;
+  border-top-width: 0px;
+  border-left-width: 1px;
+  border-right-width: 1px;
+  border-bottom-width: 1px;
 }
 
 :deep(.q-table__control .q-field__control) {
@@ -2325,6 +2339,14 @@ VueTools.expose2Instance(instance);
   height: var(--tableBottomButtonHeight);
 }
 
+:deep(.q-table__card .q-table__middle) {
+  border-color: rgba(0, 0, 0, 0.12);
+  border-style: solid;
+  border-left-width: 1px;
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+}
+
 /* .q-table__top {
   padding: var(--tableTopPadding) var(--tableTopPadding);
 }