From 107edc1584cd8e89a0f85b8fdc120194d1858934 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 25 四月 2024 15:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/index.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index f13ad1d..3ecb0e5 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -1,9 +1,12 @@
<template>
- <dynamic-table v-if="componentVO.uiComponentType=='table'"
+ <dynamic-table v-if="componentVO.uiComponentType=='table' || componentVO.uiComponentType=='TreeTable'"
+ :uiBtmType="uiBtmType"
+ :uiContext="uiContext"
:key="areasName+'table-'+componentVO.oid"
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :sourceBtmType="sourceBtmType"
:dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
@@ -11,23 +14,14 @@
: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'"
+ :uiBtmType="uiBtmType"
+ :uiContext="uiContext"
:key="areasName+'form-'+componentVO.oid"
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :sourceBtmType="sourceBtmType"
:dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
@@ -36,20 +30,27 @@
</dynamic-form>
<dynamic-tree v-else-if="componentVO.uiComponentType=='tree'"
+ :uiBtmType="uiBtmType"
+ :uiContext="uiContext"
:key="areasName+'tree-'+componentVO.oid"
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :sourceBtmType="sourceBtmType"
:dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
@setDataStore="setDataStore"
:isShow="isShow">
</dynamic-tree>
- <dynamic-custom v-else-if="componentVO.uiComponentType=='customer'" :inDialog="inDialog"
+ <dynamic-custom v-else-if="componentVO.uiComponentType=='customer'"
+ :uiBtmType="uiBtmType"
+ :uiContext="uiContext"
+ :inDialog="inDialog"
:key="areasName+'custom-'+componentVO.oid"
:componentVO="componentVO"
:sourceData="sourceData"
+ :sourceBtmType="sourceBtmType"
:dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
@@ -69,6 +70,14 @@
name: "dynamicIndex",
components:{dynamicCustom, dynamicTree, dynamicForm, dynamicTable,dynamicTreeTable },
props:{
+ //ui涓婁笅鏂囩殑涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
+ uiBtmType: {
+ type: String
+ },
+ //ui涓婁笅鏂�
+ uiContext:{
+ type: String
+ },
componentVO:{
type:Object,
default: {}
@@ -86,6 +95,10 @@
type:Object,
default: {}
},
+ //涓婁竴鍖哄煙涓氬姟绫诲瀷
+ sourceBtmType:{
+ type: String
+ },
dataStore:{
//寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
type:Array,
--
Gitblit v1.10.0