From 3c6b732f577a4411fc1d75575b8f52afbbc5d946 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 09 四月 2024 09:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 0750e3d..d927238 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -39,7 +39,7 @@
         {{ item.name }}
       </el-button>
     </div>
-    <div v-else-if="type === 'tree'">
+    <div v-else-if="type === 'tree'" class="tree-buttons">
       <el-button v-for="item in basicButtonList"
                  :key="item.oid"
                  :icon="item.paramVOS.webUiButtonIcon"
@@ -251,7 +251,7 @@
     basicButtonList() {
       const basicColumn = this.butttonList;
 
-      if (this.type === 'form') {
+      if (this.type === 'form' || this.type=='tree') {
         return basicColumn;
       } else if (this.type === 'table' || this.type === 'TreeTable') {
         const top = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�

--
Gitblit v1.9.3