From 1b2642c615001b3435a9e99e478517a917f656af Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 26 四月 2024 17:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/index.vue | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index 28e8724..3ecb0e5 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -1,5 +1,5 @@
<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"
@@ -14,20 +14,6 @@
:isShow="isShow">
</dynamic-table>
- <dynamicTreeTable v-else-if="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"
- @setDataStore="setDataStore"
- :isShow="isShow">
- </dynamicTreeTable>
<dynamic-form v-else-if="componentVO.uiComponentType=='form'"
:uiBtmType="uiBtmType"
:uiContext="uiContext"
--
Gitblit v1.9.3