From 15cdb8295fbdb68540c3475a89c49144ee600c4d Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Tue, 29 Apr 2025 10:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=87=E9=95=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportComponent/MergeSourceModal/index.vue           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/demo/layer/BatchProcessingModal/ImportComponent/MergeSourceModal/index.vue b/src/views/demo/layer/BatchProcessingModal/ImportComponent/MergeSourceModal/index.vue
index d67770f..e66ca26 100644
--- a/src/views/demo/layer/BatchProcessingModal/ImportComponent/MergeSourceModal/index.vue
+++ b/src/views/demo/layer/BatchProcessingModal/ImportComponent/MergeSourceModal/index.vue
@@ -6,15 +6,15 @@
   <div class="modal-content">
     <div class="cue-span">检测到以下数据存在冲突：</div>
     <div class="comparison-div">
-      <div style="flex: 1;padding-right: 10px;" >
+      <div style="flex: 1;padding-right: 10px;min-width: 0;overflow: hidden;" >
         <div class="table-title">原数据</div>
         <a-table rowKey="Id" ref="oldTable" :row-selection="oldRowSelection" :dataSource="props.originData" :columns="columns"
-          :scroll="{ y: 472 }" :footer="null"  />
+          :scroll="{  x: 'max-content',y: 500 }" :pagination="false"  />
       </div>
-      <div style="flex: 1;padding-left: 10px;" >
+      <div style="flex: 1;padding-left: 10px;min-width: 0;overflow: hidden;" >
         <div class="table-title">新数据</div>
         <a-table rowKey="Id" ref="newTable" :row-selection="newRowSelection" :dataSource="props.nowData" :columns="columns"
-          :scroll="{ y: 472 }" :footer="null"  />
+          :scroll="{  x: 'max-content',y: 500 }" :pagination="false"  />
       </div>
     </div>
     <div class="footer">
@@ -159,6 +159,7 @@ onUnmounted(() => {
   }
   .comparison-div{
     display: flex;
+    margin-bottom: 30px;
     .table-title{
       font-size: 20px;
       margin-bottom: 10px;