From 9771985b2cae27a50725207727cf27c90d6ad726 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Tue, 27 Feb 2024 15:21:24 +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, 16 insertions(+), 16 deletions(-)

diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json
index b3e0386a..58bb5556 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.123",
+  "version": "8.1.125",
   "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 fbf6677d..e53cbee8 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
@@ -197,7 +197,7 @@
         </template>
         <template v-else> 共 {{ state.pagination.rowsNumber }} 条记录 </template>
       </template>
-      <template v-if="!attrs.hideBottom" #no-data="{ message }">
+      <template v-if="!attrs['hide-bottom']" #no-data="{ message }">
         <div class="full-width row flex-center text-dark q-gutter-sm" :style="`height:` + noDataBottomHeightComputed">
           <q-icon size="2em" :name="IconEnum.提示" />
           <span>
@@ -1092,7 +1092,7 @@ const tableHeightComputed = computed(() => {
     mainPaddingBottom -
     mainContainerPaddingBottom -
     otherHeight;
-  if ((table.rows && table.rows.length > 0) || attrs.hideBottom) {
+  if ((table.rows && table.rows.length > 0) || attrs['hide-bottom']) {
     return {
       height: props.height > 0 ? props.height + 'px' : resultHeight + 'px',
     };
@@ -1179,7 +1179,7 @@ const onResize = () => {
     state.refHeightWidth.middleScrollWidth = tableRef.value.$el.getElementsByClassName('q-table__middle')[0]?.scrollWidth;
     state.refHeightWidth.columnHeadHeight = tableRef.value.$el.getElementsByTagName('thead')[0]?.clientHeight;
     // 判断是否有数据，没数据修改 middleHeight
-    if ((table.rows && table.rows.length > 0) || attrs.hideBottom) {
+    if ((table.rows && table.rows.length > 0) || attrs['hide-bottom']) {
       state.refHeightWidth.middleHeight = tableRef.value.$el.getElementsByClassName('q-table__middle')[0]?.clientHeight;
     } else {
       let scrollHeight = 0;
@@ -1553,7 +1553,7 @@ const stickyHeaderColumn = (time = 500) => {
       state.refHeightWidth.columnHeadHeight = tableRef.value.$el.getElementsByTagName('thead')[0]?.clientHeight;
       state.refHeightWidth.tableTitleWidth = tableRef.value.$el.getElementsByClassName('_table-title')[0]?.clientWidth;
       // 判断是否有数据，没数据修改 middleHeight
-      if ((table.rows && table.rows.length > 0) || attrs.hideBottom) {
+      if ((table.rows && table.rows.length > 0) || attrs['hide-bottom']) {
         state.refHeightWidth.middleHeight = tableRef.value.$el.getElementsByClassName('q-table__middle')[0]?.clientHeight;
       } else {
         let scrollHeight = 0;
@@ -1646,10 +1646,10 @@ const stickyHeaderColumn = (time = 500) => {
   }
   tableRef.value.$el.getElementsByTagName('table')[0].style.setProperty('--tableBodyPadding', bodyPadding);
   tableRef.value.$el.getElementsByTagName('table')[0].style.setProperty('--tableBodyHeight', (denseBodyComputed.value ? 24 : 48) + 'px');
-  if (denseBottomComputed.value && !attrs.hideBottom) {
+  if (denseBottomComputed.value && (!attrs.hasOwnProperty('hide-bottom') || attrs['hide-bottom'] === false)) {
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomHeight', 33 + 'px');
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomButtonHeight', 24 + 'px');
-  } else if (!attrs.hideBottom) {
+  } else if (!attrs.hasOwnProperty('hide-bottom') || attrs['hide-bottom'] === false) {
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomHeight', 50 + 'px');
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomButtonHeight', 40 + 'px');
   }
@@ -2151,9 +2151,9 @@ const instance = getCurrentInstance();
 VueTools.expose2Instance(instance);
 </script>
 
-<style lang="css">
-/* :deep(.q-table__top) {
-  padding: 8px 8px;
+<style scoped lang="css">
+:deep(.q-table__top) {
+  padding: var(--tableTopPadding) var(--tableTopPadding);
 }
 
 :deep(.q-table tr:first-child th:first-child) {
@@ -2186,20 +2186,20 @@ VueTools.expose2Instance(instance);
   min-height: var(--tableBottomButtonHeight);
 }
 
-:deep(.q-field__control q-field__append) {
+:deep(.q-table__control .q-field__control q-field__append) {
   height: var(--tableBottomButtonHeight);
 }
 
-:deep(.q-field__control-container .q-field__native) {
+:deep(.q-table__control .q-field__control-container .q-field__native) {
   min-height: var(--tableBottomButtonHeight);
   padding: 0;
 }
 
-:deep(.q-field__control .q-field__marginal) {
+:deep(.q-table__control .q-field__control .q-field__marginal) {
   height: var(--tableBottomButtonHeight);
-} */
+}
 
-.q-table__top {
+/* .q-table__top {
   padding: var(--tableTopPadding) var(--tableTopPadding);
 }
 
@@ -2244,7 +2244,7 @@ VueTools.expose2Instance(instance);
 
 .q-field__control .q-field__marginal {
   height: var(--tableBottomButtonHeight);
-}
+} */
 
 .sticky-header-column-table thead tr {
   height: var(--tableColumnTitleHeight);