From 02d6ac5bc723b3001d559a87eb8959f6e0e2abba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index a957de2..fdd81b1 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -3,7 +3,7 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside>
- <basic-container style="overflow:hidden;">
+ <basic-container>
<div>
<div>
<div style="display: flex; flex-direction: column;">
@@ -23,6 +23,17 @@
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</div>
</div>
+<!-- 宸︿晶鏍�-->
+ <div style="height: calc(100vh - 230px);overflow: auto">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ class="classifyTree"
+ @node-click="nodeClick"
+ >
+ </avue-tree>
+ </div>
+
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
@@ -69,15 +80,6 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
-<!-- 宸︿晶鏍�-->
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- class="classifyTree"
- style="height: calc(100vh - 230px)"
- @node-click="nodeClick"
- >
- </avue-tree>
</div>
</basic-container>
</el-aside>
@@ -404,7 +406,6 @@
import {mapGetters} from "vuex";
export default {
name: "classifyTrees.vue",
- inject: ["crudTreeData"],
data() {
return {
masterRow: null,
@@ -1630,7 +1631,7 @@
}
.el-aside {
- height: calc(100% - 30px);
+ //height: calc(100% - 30px);
}
.el-main {
--
Gitblit v1.9.3