From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/file/main.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 9866551..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 || 300"
                ref="crud"
                @row-del="rowDel"
                @search-change="searchChange"
@@ -88,7 +87,7 @@
       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: false,

--
Gitblit v1.9.3