From 6cbf81bf91ddb09b87c1756c4c7d4aa42bb22f4b Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 15 四月 2024 10:33:46 +0800
Subject: [PATCH] 调整接口

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue |  149 ++++++++++++++++++++++++-------------------------
 1 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index 5d85586..522c005 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -1,51 +1,62 @@
 <template>
   <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
-    <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢║I:type#content?param=xxx杩欑褰㈠紡</div>
+    <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"
-               :customOptions="customOptions"
+               :btmType="btmType"
+               :context="context"
                :inDialog="true"
                :key="areasName+'customCom-'+componentVO.oid"
                :componentVO="componentVO"
                :sourceData="sourceData"
                :dataStore="dataStore"
                :areasName="areasName"
-               :paramVOS="paramVOS"></component>
+               :paramVOS="urlParams"></component>
   </div>
 </template>
 
 <script>
+import {queryStringToObject} from '@/util/util'
+import {validatenull} from "@/util/validate";
 export default {
   name: "dynamic-custom",
-  components:{
-    'UI':()=>import('@/views/base/UIContentViewerInDialog'),
-    'test':()=>import('@/components/custom-ui/test'),
-    'test2':()=>import('@/components/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:{
-      //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
-      type:Object,
+    sourceData: {
+      //鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+      type: Object,
       default: {}
     },
-    dataStore:{
+    dataStore: {
       //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
-      type:Array,
+      type: Array,
       default: []
     },
-    paramVOS:{
-      type:Object,
+    paramVOS: {
+      type: Object,
       default: {}
     },
     isShow: {
@@ -56,75 +67,63 @@
   },
   data() {
     return {
-      height:'300px',
-      customClass:this.componentVO.customClass, //UI:type#content?param=xxx鎴栬�� 缁勪欢name:type#content?param=xxx
-      isError:false, //璺緞瑙f瀽澶辫触
+      btmType: '',
+      context: '',
+      urlParams: {},
+      height: '300px',
+      customClass: '', //?type=xxx&context=yyy&param=zzz  鎴栬�� 缁勪欢name?type=xxx&context=yyy&param=zzz
+      isError: false, //璺緞瑙f瀽澶辫触
       currentComponent: 'UI',//缁勪欢name
     }
   },
-  watch:{
-    sourceData:{
+  watch: {
+    sourceData: {
       handler(newval) {
+        //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
         console.log(this.areasName);
         console.log(newval);
       }
     }
   },
-  computed:{
-    customOptions() {
-      if(this.customClass.indexOf(":") <0){
-        this.isError=true;
-        return ;
-      }
-
-      if(this.customClass.split(':')[0]!='UI' && this.customClass.split(':')[0]!='ui'){
-        this.currentComponent=this.customClass.split(':')[0];
-      }
-      let urlParams={};
-      let btmType=''
-      let content=''
-      if(this.customClass.split(':')[1].indexOf("?") <0){
-        btmType=this.customClass.split(':')[1].split('#')[0];
-        content=this.customClass.split(':')[1].split('#')[1];
-      }else {
-        let split1 = this.customClass.split(':')[1].split('?')[0];
-        let split2 = this.customClass.split(':')[1].split('?')[1];
-        btmType=split1.split('#')[0];
-        content=split1.split('#')[1];
-        let paramsArray = split2.split("&");
-        paramsArray.forEach(item=>{
-          var preParam =item.split("=");
-          if(preParam[0]=='btmname'){
-            urlParams['btmType']=preParam[1];
-          }else if(preParam[0]=='imagetype'){
-            urlParams['imageType']=preParam[1];
-            if(preParam[1]=='fileobject'){
-
-            }
-          }else{
-            urlParams[preParam[0]] = preParam[1];
-          }
-        })
-      }
-
-      return {
-        btmType:btmType,
-        content:content,
-        urlParams: urlParams
-      }
-    }
-  },
+  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 {
+  methods: {
+    getHeight(el) {
+      if (el.$el.clientHeight > 50) {
+        this.height = el.$el.clientHeight + 'px';
+      } else {
         this.getHeight(el.$parent);
       }
     }
@@ -132,6 +131,6 @@
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 
 </style>

--
Gitblit v1.9.3