From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/index.vue |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/index.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/index.vue
index 1394ac1..5531dcc 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/index.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/index.vue
@@ -70,6 +70,23 @@
                   :isShow="isShow">
 
   </dynamic-custom>
+  <dynamic-ui-parse v-else-if="componentVO.uiComponentType=='uiParse'"
+                    :uiBtmType="uiBtmType"
+                    :uiContext="uiContext"
+                    :inDialog="inDialog"
+                    :canEdit="canEdit"
+                    :actionType="actionType"
+                    :key="areasName+'uiParse-'+componentVO.oid"
+                    :componentVO="componentVO"
+                    :sourceData="sourceData"
+                    :sourceBtmType="sourceBtmType"
+                    :dataStore="dataStore"
+                    :areasName="areasName"
+                    :paramVOS="paramVOS"
+                    @setData="setData"
+                    @setDataStore="setDataStore"
+                    :isShow="isShow">
+  </dynamic-ui-parse>
 </template>
 
 <script>
@@ -77,9 +94,10 @@
 import dynamicForm from "@/components/dynamic-components/dynamic-form"
 import dynamicTree from "@/components/dynamic-components/dynamic-tree"
 import dynamicCustom from "@/components/dynamic-components/dynamic-custom"
+import DynamicUiParse from "@/components/dynamic-components/dynamic-uiParse";
 export default {
   name: "dynamicIndex",
-  components:{dynamicCustom, dynamicTree, dynamicForm, dynamicTable  },
+  components:{DynamicUiParse, dynamicCustom, dynamicTree, dynamicForm, dynamicTable  },
   props:{
     //ui涓婁笅鏂囩殑涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
     uiBtmType: {

--
Gitblit v1.9.3