From aa9d6b53e9fb77ccae2b2c718f19da282c53580d Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 31 Mar 2025 10:58:12 +0800
Subject: [PATCH] =?UTF-8?q?YT-2006=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBase.vue | 11 +++++++++++
 src/components/rowDrop/index.vue          |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
index 4aa3d3700..48e3390f0 100644
--- a/src/components/XButton/src/ButtonBase.vue
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -1,4 +1,5 @@
 <template>
+  <div ref="buttonRefs">
   <div v-for="(item, index) in Butttondata" :key="index" class="btn-div">
     <el-button
       v-show="!item.hide"
@@ -28,6 +29,7 @@
         :detailAllSchemas="detailAllSchemas"
         @closeRowDrop="closeRowDrop"
         @updataTableColumns="updataTableColumns"
+        :rowDropHeight="rowDropHeight"
       />
       <template #reference>
         <el-button
@@ -45,6 +47,7 @@
       </template>
     </el-popover>
   </div>
+  </div>
   <slot></slot>
 </template>
 <script setup>
@@ -106,6 +109,14 @@ defineExpose({
 const updataTableColumns = (val) => {
   emit('updataTableColumns', val)
 }
+const buttonRefs = ref()
+const rowDropHeight = ref('')
+onMounted(() => {
+  const client = buttonRefs.value.getBoundingClientRect()
+  console.log(999, client.top)
+  rowDropHeight.value = client.top + 'px'
+  // console.log(100,height22)
+})
 </script>
 <style scoped lang="scss">
 .btn-div{
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 747f0f3d3..d49ae8e57 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500"> -->
-    <div class="test_wrapper" @dragover="dragover($event)">
+    <div class="test_wrapper" @dragover="dragover($event)" :style="{maxHeight:`calc(100vh - ${rowDropHeight} - 100px)`}">
       <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">{{  t('ts.全部') }}</el-checkbox>
       <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
         <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
@@ -36,6 +36,10 @@ const props = defineProps({
     type: Object,
     default: null
   },
+  rowDropHeight: {
+    type: String,
+    default: ''
+  },
 })
 const popoverVisible = ref(false)
 const route = useRoute() // 路由信息
@@ -257,7 +261,7 @@ defineExpose({
 </script>
 <style lang="scss" scoped>
 .test_wrapper{
-  max-height: calc(100vh - 350px);
+  // max-height: calc(100vh - 350px);
   overflow-y: auto;
 }
 .footer{