From bf5862d52b9b2a75c9060fd978d9880df656100e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com>
Date: Fri, 5 Dec 2025 18:24:05 +0800
Subject: [PATCH] =?UTF-8?q?---=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Drawer/src/components/DrawerFooter.vue | 8 ++++----
 src/components/Form/src/components/Upload.vue         | 4 ++--
 src/components/Page/src/PageWrapper.vue               | 4 ++--
 src/components/Table/src/BasicTable.vue               | 8 +++++---
 src/components/Table/src/components/TableHeader.vue   | 2 +-
 src/layouts/default/tabs/index.less                   | 3 ++-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/Drawer/src/components/DrawerFooter.vue b/src/components/Drawer/src/components/DrawerFooter.vue
index 5b57f0d..dc430c6 100644
--- a/src/components/Drawer/src/components/DrawerFooter.vue
+++ b/src/components/Drawer/src/components/DrawerFooter.vue
@@ -1,15 +1,15 @@
 <template>
     <div :class="prefixCls" :style="getStyle" v-if="showFooter || $slots.footer">
         <template v-if="!$slots.footer">
-            <slot name="insertFooter"></slot>
-            <a-button v-bind="cancelButtonProps" @click="handleClose" class="mr-2" v-if="showCancelBtn">
-                {{ cancelText }}
-            </a-button>
             <slot name="centerFooter"></slot>
             <a-button :type="okType" @click="handleOk" v-bind="okButtonProps" class="mr-2" :loading="confirmLoading" :disabled="confirmLoading" v-if="showOkBtn">
                 {{ okText }}
             </a-button>
             <slot name="appendFooter"></slot>
+            <slot name="insertFooter"></slot>
+            <a-button v-bind="cancelButtonProps" @click="handleClose" class="mr-2" v-if="showCancelBtn">
+                {{ cancelText }}
+            </a-button>
         </template>
 
         <template v-else>
diff --git a/src/components/Form/src/components/Upload.vue b/src/components/Form/src/components/Upload.vue
index c823c4a..4f04420 100644
--- a/src/components/Form/src/components/Upload.vue
+++ b/src/components/Form/src/components/Upload.vue
@@ -361,8 +361,8 @@ import { methodOf } from 'lodash-es';
     const handlePreview = async (file) => {
         const fileUrl = file.response?.data?.fileUrl || file.fileUrl;
         const fileName = file.name || file.fileOrg;
-        const previewUrl = parsePreviewUrl(fileName, fileUrl);
-        previewFile.value = parsePreviewUrl(fileName, fileUrl);
+        const previewUrl = parsePreviewUrl(fileName,fileUrl);
+        previewFile.value = previewUrl;
 
         previewVisible.value = true;
         previewTitle.value = fileName;
diff --git a/src/components/Page/src/PageWrapper.vue b/src/components/Page/src/PageWrapper.vue
index f903d77..c288810 100644
--- a/src/components/Page/src/PageWrapper.vue
+++ b/src/components/Page/src/PageWrapper.vue
@@ -101,7 +101,7 @@
                     return { ...contentStyle };
                 }
 
-                const height = `${unref(contentHeight)}px`;
+                const height = `${unref(contentHeight)+19}px`;
                 return {
                     ...contentStyle,
                     minHeight: height,
@@ -155,7 +155,7 @@
         position: relative;
 
         .@{prefix-cls}-content {
-            margin: 12px 4px 12px 12px;
+            margin: 2px 4px 12px 8px;
         }
 
         .ant-page-header {
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 4d2a43a..af0bf72 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -445,7 +445,8 @@
             }
 
             &-container {
-                height: calc(100% - 100px);
+                //height: calc(100% - 100px);
+                height: calc(100% - 48px);
             }
 
             &-header {
@@ -518,12 +519,13 @@
 
         &-form-has-pagenation {
             .ant-table {
-                height: calc(100% - 38px);
+                height: calc(100% - 34px);
             }
         }
 
         .ant-pagination {
-            margin: 10px 6px 0 0;
+            //margin: 10px 6px 0 0;
+            margin: 2px 6px 0 0;
         }
 
         .ant-table-footer {
diff --git a/src/components/Table/src/components/TableHeader.vue b/src/components/Table/src/components/TableHeader.vue
index c120966..9044d0a 100644
--- a/src/components/Table/src/components/TableHeader.vue
+++ b/src/components/Table/src/components/TableHeader.vue
@@ -1,5 +1,5 @@
 <template>
-    <div style="width: 100%; margin: 20px" :class="{ flex: toolBarWidth + formWidth + 200 < tableWidth }">
+    <div style="width: 100%; margin: 6px" :class="{ flex: toolBarWidth + formWidth + 200 < tableWidth }">
         <div v-if="$slots.headerTop" style="margin: 5px">
             <slot name="headerTop"></slot>
         </div>
diff --git a/src/layouts/default/tabs/index.less b/src/layouts/default/tabs/index.less
index 6b668f2..feb0b3f 100644
--- a/src/layouts/default/tabs/index.less
+++ b/src/layouts/default/tabs/index.less
@@ -48,6 +48,7 @@ html[data-theme='light'] {
                 color: @text-color-base;
                 background-color: @component-background;
                 transition: none;
+                font-size: 14px;
 
                 &:hover {
                     .ant-tabs-tab-remove {
@@ -181,7 +182,7 @@ html[data-theme='light'] {
             width: 100%;
             height: @multiple-height - 2;
             padding-left: 0;
-            font-size: 12px;
+            font-size: 14px;
             cursor: pointer;
             user-select: none;
         }