From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/data.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index c8f994d..6c651c6 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -87,9 +87,10 @@
     data:[],
     option: {
       height:'auto',
-      calcHeight: 0,
+      columnBtn:false,
       tip: false,
       searchShow: false,
+      searchShowBtn:false,
       searchMenuSpan: 6,
       border: true,
       index: true,

--
Gitblit v1.9.3