From a24f5347bfd2331f8a4819b215f79555776534cd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:16:57 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index ce94306..080f0f7 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -110,7 +110,7 @@
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
@node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false"
:default-expanded-keys="expandedKeys"
- style="max-height: 500px;overflow-y: scroll;scrollbar-width: none;">
+ style="height:calc(100% - 30px);overflow-y: scroll;scrollbar-width: none;">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%;">
<el-col :span="21" :class="{sort:node.level>3}">
--
Gitblit v1.9.3