From beadbecb4ec7aaf960b8e46f5c02836bf6c9e976 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 08 四月 2024 16:14:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue | 146 +++++++++++++++++++++++++-----------------------
1 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index 4074c3d..9d7d32f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -1,40 +1,53 @@
<template>
<div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
- <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢║I:type#content?param=xxx杩欑褰㈠紡</div>
- <component v-else :is="asyncComponent"
- :customOptions="customOptions"
- :inDialog="inDialog"
+ <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡</div>
+ <component v-else :is="currentComponent"
+ :btmType="btmType"
+ :content="content"
+ :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'
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: {
+ 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: {
@@ -43,70 +56,61 @@
default: true
},
},
- components:{
-
- },
data() {
return {
- customClass:this.componentVO.customClass, //UI:type#content?param=xxx鎴栬�� 缁勪欢name:type#content?param=xxx
- isError:false, //璺緞瑙ｆ瀽澶辫触
- componentPath:'@/views/base/UIContentViewer' //鑷畾涔変娇鐢ㄧ殑缁勪欢璺緞
+ btmType: '',
+ content: '',
+ urlParams: {},
+ height: '300px',
+ customClass: this.componentVO.customClass, //bs=?type=xxx&context=yyy¶m=zzz 鎴栬�� bs=缁勪欢name?type=xxx&context=yyy¶m=zzz
+ isError: false, //璺緞瑙ｆ瀽澶辫触
+ currentComponent: 'UI',//缁勪欢name
}
},
- computed:{
- customOptions() {
- let componentPath='@/views/base/UIContentViewer';
- if(this.customClass.indexOf(":") <0){
- this.isError=true;
- return ;
+ watch: {
+ sourceData: {
+ handler(newval) {
+ //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
+ console.log(this.areasName);
+ console.log(newval);
}
-
- if(this.customClass.split(':')[0]!='UI' && this.customClass.split(':')[0]!='ui'){
- componentPath='@/views/custom/'+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];
- }
- })
- }
-
- this.componentPath=componentPath;
- return {
- btmType:btmType,
- content:content,
- urlParams: urlParams,
- uiComponentType: this.componentVO.uiComponentType,
- uiComponentTypeText: this.componentVO.uiComponentTypeText,
- uiParseClass: this.componentVO.uiParseClass
- }
- },
- asyncComponent() {
- return import(this.componentPath);
}
},
+ 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 {
+ this.getHeight(el.$parent);
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3