From d01fa9d49a8c8a723493aecb681d4e1f3e25fce5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 14:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue
index 9fdcc29..6cb5437 100644
--- a/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue
@@ -1,20 +1,10 @@
 <template>
-  <div style="width: 100%;height: 100%;">
+  <div style="width: 100%;height: 100%;" >
     <!-- 姝ｅ父鍖哄煙鐨勬 -->
     <div class="vxe-table--cell-area" ref="cellarea">
       <span class="vxe-table--cell-main-area"></span>
       <span class="vxe-table--cell-active-area"></span>
     </div>
-    <!-- 宸︿晶fixed鍖哄煙鐨勬 -->
-<!--    <div class="vxe-table&#45;&#45;cell-area" ref="leftfixedcellarea">-->
-<!--      <span class="vxe-table&#45;&#45;cell-main-area"></span>-->
-<!--      <span class="vxe-table&#45;&#45;cell-active-area"></span>-->
-<!--    </div>-->
-    <!-- 鍙充晶fixed鍖哄煙鐨勬 -->
-<!--    <div class="vxe-table&#45;&#45;cell-area" ref="rightfixedcellarea">-->
-<!--      <span class="vxe-table&#45;&#45;cell-main-area"></span>-->
-<!--      <span class="vxe-table&#45;&#45;cell-active-area"></span>-->
-<!--    </div>-->
     <vxe-grid
         max-height="100%"
         @filter-change="filterChanged"
@@ -22,6 +12,7 @@
         ref="xGrid"
         v-bind="gridOptions"
         v-on="gridEvents"
+        @scroll ="scrollEvnt"
 
     >
 <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -62,6 +53,8 @@
 import {ElMessage} from "element-plus";
 import router from "@/router";
 //prop鎺ユ敹鐖剁粍浠跺嚱鏁�
+
+
 
 let props = defineProps({
   tableProp:{
@@ -111,7 +104,7 @@
   printConfig: {},
   importConfig: {},
   exportConfig: {},
-  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  scrollY:{ enabled: true , gt: 40},//寮�鍚櫄鎷熸粴鍔�
   showOverflow:true,
   columnConfig: {
     resizable: true,

--
Gitblit v1.8.0