From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue |  120 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 55 insertions(+), 65 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index a1188ad..9d7d32f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -1,52 +1,53 @@
 <template>
   <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
-    <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡</div>
+    <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡</div>
     <component v-else :is="currentComponent"
-               :btmType="customOptions.btmType"
-               :content="customOptions.content"
+               :btmType="btmType"
+               :content="content"
                :inDialog="true"
                :key="areasName+'customCom-'+componentVO.oid"
                :componentVO="componentVO"
                :sourceData="sourceData"
                :dataStore="dataStore"
                :areasName="areasName"
-               :paramVOS="customOptions.paramVOS"></component>
+               :paramVOS="urlParams"></component>
   </div>
 </template>
 
 <script>
+import {queryStringToObject} from '@/util/util'
 export default {
   name: "dynamic-custom",
-  components:{
-    'UI':()=>import('@/views/base/UIContentViewerInDialog'),
-    'test':()=>import('@/views/custom-ui/test'),
-    'test2':()=>import('@/views/custom-ui/test2'),
+  components: {
+    'UI': () => import('@/views/base/UIContentViewerInDialog'),
+    'test': () => import('@/views/custom-ui/test'),
+    'test2': () => import('@/views/custom-ui/test2'),
   },
-  props:{
-    componentVO:{
-      type:Object,
+  props: {
+    componentVO: {
+      type: Object,
       default: {}
     },
     inDialog: {
       type: Boolean,
       default: false
     },
-    areasName:{
-      type:String,
-      default:''
+    areasName: {
+      type: String,
+      default: ''
     },
-    sourceData:{
+    sourceData: {
       //鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
-      type:Object,
+      type: Object,
       default: {}
     },
-    dataStore:{
+    dataStore: {
       //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
-      type:Array,
+      type: Array,
       default: []
     },
-    paramVOS:{
-      type:Object,
+    paramVOS: {
+      type: Object,
       default: {}
     },
     isShow: {
@@ -57,14 +58,17 @@
   },
   data() {
     return {
-      height:'300px',
-      customClass:this.componentVO.customClass, //bs=?type=xxx&context=yyy&param=zzz  鎴栬�� bs=缁勪欢name?type=xxx&context=yyy&param=zzz
-      isError:false, //璺緞瑙ｆ瀽澶辫触
+      btmType: '',
+      content: '',
+      urlParams: {},
+      height: '300px',
+      customClass: this.componentVO.customClass, //bs=?type=xxx&context=yyy&param=zzz  鎴栬�� bs=缁勪欢name?type=xxx&context=yyy&param=zzz
+      isError: false, //璺緞瑙ｆ瀽澶辫触
       currentComponent: 'UI',//缁勪欢name
     }
   },
-  watch:{
-    sourceData:{
+  watch: {
+    sourceData: {
       handler(newval) {
         //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
         console.log(this.areasName);
@@ -72,52 +76,38 @@
       }
     }
   },
-  computed:{
-    customOptions() {
-      if(this.customClass.indexOf("bs=") <0){
-        this.isError=true;
-        return ;
-      }
-      this.customClass=this.componentVO.customClass.split("bs=")[1];
-      if(this.customClass.indexOf("?") <0 || this.customClass.indexOf("type=") <0 || this.customClass.indexOf("context=") <0){
-        this.isError=true;
-        return ;
-      }
-      if(this.customClass.split('?')[0]!='' && this.customClass.split('?')[0]!='UI' && this.customClass.split('?')[0]!='ui'){
-        this.currentComponent=this.customClass.split('?')[0];
-      }
-      this.customClass=this.componentVO.customClass.split("?")[1].split('&');
-      let urlParams={};
-      let btmType=''
-      let content=''
-      this.customClass.forEach(item=>{
-        var preParam =item.split("=");
-        if(preParam[0]=='type'){
-          btmType=preParam[1];
-        }else if(preParam[0]=='context'){
-          content=preParam[1];
-        }else{
-          urlParams[preParam[0]] = preParam[1];
-        }
-      })
-      return {
-        btmType:btmType,
-        content:content,
-        paramVOS:Object.assign(this.paramVOS,urlParams)
-      }
-    }
-  },
+  computed: {},
   created() {
 
   },
   mounted() {
+    if (this.customClass.indexOf("bs=") < 0) {
+      this.isError = true;
+      return;
+    }
+    this.customClass = this.componentVO.customClass.split("bs=")[1];
+    if (this.customClass.indexOf("?") < 0 || this.customClass.indexOf("type=") < 0 || this.customClass.indexOf("context=") < 0) {
+      this.isError = true;
+      return;
+    }
+    if (this.customClass.split('?')[0] != '' && this.customClass.split('?')[0] != 'UI' && this.customClass.split('?')[0] != 'ui') {
+      this.currentComponent = this.customClass.split('?')[0];
+    }
+    let urlParams = queryStringToObject(this.customClass);
+    let btmType = urlParams.type;
+    let content = urlParams.context;
+
+    this.btmType = btmType;
+    this.content = content;
+    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 {
+  methods: {
+    getHeight(el) {
+      if (el.$el.clientHeight > 50) {
+        this.height = el.$el.clientHeight + 'px';
+      } else {
         this.getHeight(el.$parent);
       }
     }

--
Gitblit v1.9.3