From e88c8eb524bc477ec8a3cac2902c55a4e0982ce7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 22 三月 2024 10:02:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/index.vue | 62 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index eeb1065..58df815 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -1,10 +1,42 @@
<template>
- <div>
- <dynamic-table v-if="componentVO.uiComponentType=='table'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-table>
- <dynamic-form v-else-if="componentVO.uiComponentType=='form'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-form>
- <dynamic-tree v-else-if="componentVO.uiComponentType=='tree'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-tree>
- <dynamic-custom v-else-if="componentVO.uiComponentType=='custom'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-custom>
- </div>
+ <dynamic-table v-if="componentVO.uiComponentType=='table'"
+ :key="areasName+'table-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="isShow">
+
+ </dynamic-table>
+ <dynamic-form v-else-if="componentVO.uiComponentType=='form'"
+ :key="areasName+'form-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="isShow">
+
+ </dynamic-form>
+ <dynamic-tree v-else-if="componentVO.uiComponentType=='tree'"
+ :key="areasName+'tree-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="isShow">
+ </dynamic-tree>
+ <dynamic-custom v-else-if="componentVO.uiComponentType=='customer'" :inDialog="inDialog"
+ :key="areasName+'custom-'+componentVO.oid"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="isShow">
+
+ </dynamic-custom>
</template>
<script>
@@ -24,21 +56,27 @@
type: Boolean,
default: false
},
+ areasName:{
+ type:String,
+ default:''
+ },
sourceData:{
//鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
type:Object,
default: {}
},
- dataStore:{
- //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
- type:Array,
- default: []
- },
paramVOS:{
type:Object,
default: {}
- }
+ },
+ isShow: {
+ //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+ type: Boolean,
+ default: true
+ },
},
+ created() {
+ }
}
</script>
--
Gitblit v1.9.3