From 06272b4e887651be78de34a6483c37870e030fb9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 20 三月 2024 17:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/index.vue | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index d727d74..c027072 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -1,37 +1,39 @@
<template>
- <div>
- <dynamic-table v-if="componentVO.uiComponentType=='table'"
- :inDialog="inDialog"
- :componentVO="componentVO"
- :sourceData="sourceData"
- :areasName="areasName"
- :paramVOS="paramVOS">
+ <dynamic-table v-if="componentVO.uiComponentType=='table'"
+ :key="areasName+'table-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS">
- </dynamic-table>
- <dynamic-form v-else-if="componentVO.uiComponentType=='form'"
- :inDialog="inDialog"
+ </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">
+
+ </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">
+
+ </dynamic-tree>
+ <dynamic-custom v-else-if="componentVO.uiComponentType=='custom'" :inDialog="inDialog"
+ :key="areasName+'custom-'+componentVO.oid"
:componentVO="componentVO"
:sourceData="sourceData"
:areasName="areasName"
:paramVOS="paramVOS">
- </dynamic-form>
- <dynamic-tree v-else-if="componentVO.uiComponentType=='tree'"
- :inDialog="inDialog"
- :componentVO="componentVO"
- :sourceData="sourceData"
- :areasName="areasName"
- :paramVOS="paramVOS">
-
- </dynamic-tree>
- <dynamic-custom v-else-if="componentVO.uiComponentType=='custom'" :inDialog="inDialog"
- :componentVO="componentVO"
- :sourceData="sourceData"
- :areasName="areasName"
- :paramVOS="paramVOS">
-
- </dynamic-custom>
- </div>
+ </dynamic-custom>
</template>
<script>
--
Gitblit v1.9.3