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/dynamic-custom.vue |  133 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index ea61245..2358b28 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -1,41 +1,144 @@
 <template>
   <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
-
+    <el-alert
+      class="alert"
+      :closable="false"
+      v-if="isError"
+      title="鑷畾涔夌粍浠堕厤缃俊鎭敊璇紒"
+      type="error"
+      show-icon
+      description="杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢ㄢ�滅粍浠秐ame?param=xxx鈥濓紙鑷畾涔夌粍浠讹級鎴栬�呪��?type=xxx&context=yyy&pparam=zzz鈥濓紙UI寮曟搸锛夎繖2绉嶅舰寮�">
+    </el-alert>
+    <component v-else :is="currentComponent"
+               :btmType="btmType"
+               :context="context"
+               :inDialog="true"
+               :key="areasName+'customCom-'+componentVO.oid"
+               :componentVO="componentVO"
+               :sourceData="sourceData"
+               :dataStore="dataStore"
+               :areasName="areasName"
+               :paramVOS="urlParams"></component>
   </div>
 </template>
 
 <script>
+import {queryStringToObject} from '@/util/util'
+import {validatenull} from "@/util/validate";
 export default {
   name: "dynamic-custom",
-  props:{
-    componentVO:{
-      type:Object,
+  components: {
+    'UI': () => import('@/views/base/UIContentViewerInDialog'),
+    'test': () => import('@/views/custom-ui/test'),
+    'test2': () => import('@/views/custom-ui/test2'),
+  },
+  props: {
+    //ui涓婁笅鏂囩殑涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
+    uiBtmType: {
+      type: String
+    },
+    //ui涓婁笅鏂�
+    uiContext:{
+      type: String
+    },
+    componentVO: {
+      type: Object,
       default: {}
     },
     inDialog: {
       type: Boolean,
       default: false
     },
-    areasName:{
-      type:String,
-      default:''
+    areasName: {
+      type: String,
+      default: ''
     },
-    sourceData:{
-      //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
-      type:Object,
+    sourceData: {
+      //鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+      type: Object,
       default: {}
     },
-    paramVOS:{
-      type:Object,
+    dataStore: {
+      //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
+      type: Array,
+      default: []
+    },
+    paramVOS: {
+      type: Object,
       default: {}
-    }
+    },
+    isShow: {
+      //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+      type: Boolean,
+      default: true
+    },
   },
   data() {
-    return {}
+    return {
+      btmType: '',
+      context: '',
+      urlParams: {},
+      height: '300px',
+      customClass: '', //?type=xxx&context=yyy&param=zzz  鎴栬�� 缁勪欢name?type=xxx&context=yyy&param=zzz
+      isError: false, //璺緞瑙ｆ瀽澶辫触
+      currentComponent: 'UI',//缁勪欢name
+    }
+  },
+  watch: {
+    sourceData: {
+      handler(newval) {
+        //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
+        console.log(this.areasName);
+        console.log(newval);
+      }
+    }
+  },
+  computed: {},
+  created() {
+
+  },
+  mounted() {
+    this.componentVO.customClass.split(';').forEach(item=>{
+      if(item.indexOf('web=')==0){
+        this.customClass=item.split('web=')[1];
+      }
+    })
+    // 濡傛灉璺緞涓瓨鍦� '?'锛屽垯鍙栭棶鍙峰墠闈㈤儴鍒嗙粰 parts
+    if (this.customClass.includes('?')) {
+      this.currentComponent = this.customClass.split("?")[0];
+    } else {
+      this.currentComponent = this.customClass; // 涓嶅瓨鍦� '?' 鏁存潯璺緞灏辨槸 parts
+    }
+    if(validatenull(this.currentComponent)){
+      this.currentComponent='UI';
+    }
+    if (['UI', 'ui'].includes(this.currentComponent) && (this.customClass.indexOf("type=") < 0 || this.customClass.indexOf("context=") < 0)) {
+      this.isError = true;
+      return;
+    }
+    let urlParams = {};
+    if(this.customClass.includes('?')) {
+      urlParams = queryStringToObject(this.customClass);
+    }
+
+    this.btmType = urlParams.type;
+    this.context = urlParams.context;
+    this.urlParams = Object.assign(this.paramVOS, urlParams)
+
+    //this.getHeight(this.$parent);
+  },
+  methods: {
+    getHeight(el) {
+      if (el.$el.clientHeight > 50) {
+        this.height = el.$el.clientHeight + 'px';
+      } else {
+        this.getHeight(el.$parent);
+      }
+    }
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 
 </style>

--
Gitblit v1.9.3