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 | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index c027072..58df815 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -5,7 +5,8 @@
:componentVO="componentVO"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS">
+ :paramVOS="paramVOS"
+ :isShow="isShow">
</dynamic-table>
<dynamic-form v-else-if="componentVO.uiComponentType=='form'"
@@ -14,7 +15,8 @@
:componentVO="componentVO"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS">
+ :paramVOS="paramVOS"
+ :isShow="isShow">
</dynamic-form>
<dynamic-tree v-else-if="componentVO.uiComponentType=='tree'"
@@ -23,15 +25,16 @@
:componentVO="componentVO"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS">
-
+ :paramVOS="paramVOS"
+ :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"
:areasName="areasName"
- :paramVOS="paramVOS">
+ :paramVOS="paramVOS"
+ :isShow="isShow">
</dynamic-custom>
</template>
@@ -65,8 +68,15 @@
paramVOS:{
type:Object,
default: {}
- }
+ },
+ isShow: {
+ //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+ type: Boolean,
+ default: true
+ },
},
+ created() {
+ }
}
</script>
--
Gitblit v1.9.3