From fce9d4e89a50c0b53faee6f6bfd2c385531fbc4b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 三月 2024 13:45:16 +0800
Subject: [PATCH] 解决冲突代码(原始数据判空)
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index 7603437..be2d99e 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
</div>
</template>
@@ -9,11 +9,23 @@
name: "dynamic-tree",
props:{
componentVO:{
- type: Object,
- default: {},
+ type:Object,
+ default: {}
+ },
+ inDialog: {
+ type: Boolean,
+ default: false
+ },
+ areasName:{
+ type:String,
+ default:''
},
sourceData:{
- //涓婁竴鍖哄煙閫変腑鏁版嵁
+ //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+ type:Object,
+ default: {}
+ },
+ paramVOS:{
type:Object,
default: {}
}
--
Gitblit v1.9.3