From 107edc1584cd8e89a0f85b8fdc120194d1858934 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 25 四月 2024 15:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/components/dynamic-components/index.vue |   99 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/index.vue b/Source/ProjectWeb/src/components/dynamic-components/index.vue
index eeb1065..3ecb0e5 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/index.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -1,10 +1,63 @@
 <template>
-  <div>
-    <dynamic-table v-if="componentVO.uiComponentType=='table'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-table>
-    <dynamic-form v-else-if="componentVO.uiComponentType=='form'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-form>
-    <dynamic-tree v-else-if="componentVO.uiComponentType=='tree'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-tree>
-    <dynamic-custom v-else-if="componentVO.uiComponentType=='custom'" :componentVO="componentVO" :sourceData="sourceData"></dynamic-custom>
-  </div>
+  <dynamic-table v-if="componentVO.uiComponentType=='table' || 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">
+
+  </dynamic-table>
+  <dynamic-form v-else-if="componentVO.uiComponentType=='form'"
+                :uiBtmType="uiBtmType"
+                :uiContext="uiContext"
+                :key="areasName+'form-'+componentVO.oid"
+                :inDialog="inDialog"
+                :componentVO="componentVO"
+                :sourceData="sourceData"
+                :sourceBtmType="sourceBtmType"
+                :dataStore="dataStore"
+                :areasName="areasName"
+                :paramVOS="paramVOS"
+                @setDataStore="setDataStore"
+                :isShow="isShow">
+
+  </dynamic-form>
+  <dynamic-tree v-else-if="componentVO.uiComponentType=='tree'"
+                :uiBtmType="uiBtmType"
+                :uiContext="uiContext"
+                :key="areasName+'tree-'+componentVO.oid"
+                :inDialog="inDialog"
+                :componentVO="componentVO"
+                :sourceData="sourceData"
+                :sourceBtmType="sourceBtmType"
+                :dataStore="dataStore"
+                :areasName="areasName"
+                :paramVOS="paramVOS"
+                @setDataStore="setDataStore"
+                :isShow="isShow">
+  </dynamic-tree>
+  <dynamic-custom v-else-if="componentVO.uiComponentType=='customer'"
+                  :uiBtmType="uiBtmType"
+                  :uiContext="uiContext"
+                  :inDialog="inDialog"
+                  :key="areasName+'custom-'+componentVO.oid"
+                  :componentVO="componentVO"
+                  :sourceData="sourceData"
+                  :sourceBtmType="sourceBtmType"
+                  :dataStore="dataStore"
+                  :areasName="areasName"
+                  :paramVOS="paramVOS"
+                  @setDataStore="setDataStore"
+                  :isShow="isShow">
+
+  </dynamic-custom>
 </template>
 
 <script>
@@ -12,10 +65,19 @@
 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 dynamicTreeTable from "@/components/dynamic-components/dynamic-TreeTable"
 export default {
   name: "dynamicIndex",
-  components:{dynamicCustom, dynamicTree, dynamicForm, dynamicTable},
+  components:{dynamicCustom, dynamicTree, dynamicForm, dynamicTable,dynamicTreeTable  },
   props:{
+    //ui涓婁笅鏂囩殑涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
+    uiBtmType: {
+      type: String
+    },
+    //ui涓婁笅鏂�
+    uiContext:{
+      type: String
+    },
     componentVO:{
       type:Object,
       default: {}
@@ -24,10 +86,18 @@
       type: Boolean,
       default: false
     },
+    areasName:{
+      type:String,
+      default:''
+    },
     sourceData:{
       //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
       type:Object,
       default: {}
+    },
+    //涓婁竴鍖哄煙涓氬姟绫诲瀷
+    sourceBtmType:{
+      type: String
     },
     dataStore:{
       //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
@@ -37,8 +107,21 @@
     paramVOS:{
       type:Object,
       default: {}
-    }
+    },
+    isShow: {
+      //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+      type: Boolean,
+      default: true
+    },
   },
+  created() {
+  },
+  methods:{
+    setDataStore(value) {
+      this.$emit("setDataStore", value);
+      this.dataStore = value.dataStore;
+    }
+  }
 }
 </script>
 

--
Gitblit v1.9.3