From d5d7f913589aac09957d1922c20da9d0e0681543 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 11 四月 2024 11:24:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index 0c3e379..4cc211c 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -1,6 +1,6 @@
<template>
<div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
- <dynamic-button :butttonList="componentVO.buttons" :selectList="checkDatas" type="tree"></dynamic-button>
+ <dynamic-button v-if="componentVO.buttons && componentVO.buttons.length>0" :butttonList="componentVO.buttons" :selectList="checkDatas" type="tree" style="margin-bottom: 10px;"></dynamic-button>
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterText">
@@ -75,6 +75,7 @@
if(newval) {
this.$emit("setDataStore", {
area: this.areasName,
+ type:this.componentVO.uiComponentType,
dataStore:newval
});
}
@@ -83,8 +84,7 @@
sourceData:{
handler(newval) {
//婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
- console.log(this.areasName);
- console.log(newval);
+ this.initData();
}
}
},
@@ -105,6 +105,9 @@
this.initData();
},
mounted() {
+ if(this.componentVO.buttons && this.componentVO.buttons.length>0){
+ this.$children[2].$el.style.height = 'calc(100% - 50px - '+this.$children[0].$el.clientHeight+'px - 10px)';
+ }
},
methods: {
filterNode(value, data) {
--
Gitblit v1.9.3