From 2f1d2636adbd763d729c5836aa720fe8844ba9f3 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期五, 14 七月 2023 18:01:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/file/main.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 44b5166..2391abf 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -7,7 +7,6 @@
:before-open="beforeOpen"
:permission="permissionList"
v-model="form"
- :height="options.height || 200"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@@ -88,10 +87,10 @@
hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload,
option: {
- height:(this.options.tableHeight?this.options.tableHeight:'auto'),
+ height:(this.options.tableHeight?this.options.tableHeight:'200'),
calcHeight: 30,
tip: false,
- searchShow: true,
+ searchShow: false,
searchMenuSpan: 6,
border: true,
index: true,
--
Gitblit v1.9.3