From 8aaa45b4619984e75bfc952e82228f170c985d82 Mon Sep 17 00:00:00 2001
From: NGyuejh <2083483352@qq.com>
Date: 星期五, 29 十二月 2023 11:08:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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--cell-area" ref="leftfixedcellarea">-->
-<!-- <span class="vxe-table--cell-main-area"></span>-->
-<!-- <span class="vxe-table--cell-active-area"></span>-->
-<!-- </div>-->
- <!-- 鍙充晶fixed鍖哄煙鐨勬 -->
-<!-- <div class="vxe-table--cell-area" ref="rightfixedcellarea">-->
-<!-- <span class="vxe-table--cell-main-area"></span>-->
-<!-- <span class="vxe-table--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