From 926d1a1a4f06271cb39de001d74c68832fc004c7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 26 三月 2024 17:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index 65f7a43..40c33d6 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -13,9 +13,13 @@
</template>
<script>
-
export default {
name: "dynamic-custom",
+ components:{
+ 'UI':()=>import('@/views/base/UIContentViewerInDialog'),
+ 'test':()=>import('@/components/custom-ui/test'),
+ 'test2':()=>import('@/components/custom-ui/test2'),
+ },
props:{
componentVO:{
type:Object,
@@ -44,27 +48,23 @@
default: true
},
},
- components:{
- 'my-dynamic-component': ()=>import('@/views/base/UIContentViewerInDialog')
- },
data() {
return {
+ height:'300px',
customClass:this.componentVO.customClass, //UI:type#content?param=xxx鎴栬�� 缁勪欢name:type#content?param=xxx
isError:false, //璺緞瑙ｆ瀽澶辫触
- currentComponent: 'my-dynamic-component',
- componentPath:'@/views/base/UIContentViewerInDialog' //鑷畾涔変娇鐢ㄧ殑缁勪欢璺緞
+ currentComponent: 'UI',//缁勪欢name
}
},
computed:{
customOptions() {
- let componentPath='@/views/base/UIContentViewerInDialog';
if(this.customClass.indexOf(":") <0){
this.isError=true;
return ;
}
if(this.customClass.split(':')[0]!='UI' && this.customClass.split(':')[0]!='ui'){
- componentPath='@/views/custom/'+this.customClass.split(':')[0];
+ this.currentComponent=this.customClass.split(':')[0];
}
let urlParams={};
let btmType=''
@@ -93,23 +93,27 @@
})
}
- this.componentPath=componentPath;
return {
btmType:btmType,
content:content,
- urlParams: urlParams,
- uiComponentType: this.componentVO.uiComponentType,
- uiComponentTypeText: this.componentVO.uiComponentTypeText,
- uiParseClass: this.componentVO.uiParseClass
+ urlParams: urlParams
}
- },
- asyncComponent() {
- return import(this.componentPath);
}
},
created() {
- // debugger;
- // this.components["my-dynamic-component"] = import(this.componentPath);
+
+ },
+ mounted() {
+ //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