From beadbecb4ec7aaf960b8e46f5c02836bf6c9e976 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 08 四月 2024 16:14:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/index.vue | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index 6e8006d..f13ad1d 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -4,18 +4,34 @@
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="isShow">
</dynamic-table>
+ <dynamicTreeTable v-else-if="componentVO.uiComponentType=='TreeTable'"
+ :key="areasName+'table-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :dataStore="dataStore"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ @setDataStore="setDataStore"
+ :isShow="isShow">
+
+ </dynamicTreeTable>
<dynamic-form v-else-if="componentVO.uiComponentType=='form'"
:key="areasName+'form-'+componentVO.oid"
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="isShow">
</dynamic-form>
@@ -24,16 +40,20 @@
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="isShow">
</dynamic-tree>
- <dynamic-custom v-else-if="componentVO.uiComponentType=='custom'" :inDialog="inDialog"
+ <dynamic-custom v-else-if="componentVO.uiComponentType=='customer'" :inDialog="inDialog"
:key="areasName+'custom-'+componentVO.oid"
:componentVO="componentVO"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="isShow">
</dynamic-custom>
@@ -44,9 +64,10 @@
import dynamicForm from "@/components/dynamic-components/dynamic-form"
import dynamicTree from "@/components/dynamic-components/dynamic-tree"
import dynamicCustom from "@/components/dynamic-components/dynamic-custom"
+import dynamicTreeTable from "@/components/dynamic-components/dynamic-TreeTable"
export default {
name: "dynamicIndex",
- components:{dynamicCustom, dynamicTree, dynamicForm, dynamicTable},
+ components:{dynamicCustom, dynamicTree, dynamicForm, dynamicTable,dynamicTreeTable },
props:{
componentVO:{
type:Object,
@@ -65,6 +86,11 @@
type:Object,
default: {}
},
+ dataStore:{
+ //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
+ type:Array,
+ default: []
+ },
paramVOS:{
type:Object,
default: {}
@@ -76,6 +102,12 @@
},
},
created() {
+ },
+ methods:{
+ setDataStore(value) {
+ this.$emit("setDataStore", value);
+ this.dataStore = value.dataStore;
+ }
}
}
</script>
--
Gitblit v1.9.3