From ebef4e035f5c6a00b291cf50b01ff008fa655609 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 三月 2024 13:46:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/index.vue | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index d727d74..82a3dd4 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -1,37 +1,43 @@
<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"
+ :isShow="isShow">
- </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"
+ :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">
+sssss
+ </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">
+ :paramVOS="paramVOS"
+ :isShow="isShow">
- </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>
@@ -63,8 +69,15 @@
paramVOS:{
type:Object,
default: {}
- }
+ },
+ isShow: {
+ //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+ type: Boolean,
+ default: true
+ },
},
+ created() {
+ }
}
</script>
--
Gitblit v1.9.3