From 2ee312d3c399ddc62a06189367fa3879fca7daef Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 10 五月 2024 15:35:24 +0800
Subject: [PATCH] UI展示
---
Source/ProjectWeb/src/views/base/UIContentArea.vue | 28 ++++++++++++++++++++++++++--
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 3 ++-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index fce7be6..6dca0c5 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -200,6 +200,7 @@
},
isShow: {
handler(newval) {
+ debugger;
if (newval && this.$el.clientHeight > 50) {
this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
}
@@ -252,7 +253,7 @@
mounted() {
if (this.$el.clientHeight > 50) {
//鐖跺厓绱犻珮搴�-鎸夐挳楂樺害-鍒嗛〉楂樺害
- this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+ this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - 57 -5;
}
},
methods: {
diff --git a/Source/ProjectWeb/src/views/base/UIContentArea.vue b/Source/ProjectWeb/src/views/base/UIContentArea.vue
index d0fc964..4979665 100644
--- a/Source/ProjectWeb/src/views/base/UIContentArea.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentArea.vue
@@ -9,18 +9,24 @@
</template>
<div class="componentVO">
<compoent-index :key="areasName+'componentVO-'+componentVO.oid"
+ :uiBtmType="uiBtmType"
+ :uiContext="uiContext"
:inDialog="inDialog"
+ :canEdit="canEdit"
+ :actionType="actionType"
:componentVO="componentVO"
:sourceData="newSourceData"
+ :sourceBtmType="sourceBtmType"
:dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setData="setData"
@setDataStore="setDataStore"
:isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
</el-collapse>
- <div v-else class="componentVO">
+ <div v-else-if="areaItem.componentVOs.length==1" class="componentVO">
<compoent-index :key="areasName+'componentVO-'+areaItem.componentVOs[0].oid"
:uiBtmType="uiBtmType"
:uiContext="uiContext"
@@ -36,6 +42,15 @@
@setData="setData"
@setDataStore="setDataStore"
:isShow="activeName==(areasName+'-Tab-'+index)?true:false"></compoent-index>
+ </div>
+ <div v-else>
+ <el-alert
+ class="alert"
+ :closable="false"
+ title=""
+ type="info"
+ description="娌℃湁鍙樉绀虹殑鍐呭锛岃鑱旂郴绠$悊浜哄憳妫�鏌ラ厤缃��">
+ </el-alert>
</div>
</el-tab-pane>
</el-tabs>
@@ -64,7 +79,7 @@
</div>
</el-collapse-item>
</el-collapse>
- <div v-else class="componentVO">
+ <div v-else-if="newAreasData[0].componentVOs.length===1" class="componentVO">
<compoent-index :key="areasName+'componentVO-'+newAreasData[0].componentVOs[0].oid"
:uiBtmType="uiBtmType"
:uiContext="uiContext"
@@ -81,6 +96,15 @@
@setDataStore="setDataStore"
:isShow="true"></compoent-index>
</div>
+ <div v-else>
+ <el-alert
+ class="alert"
+ :closable="false"
+ title=""
+ type="info"
+ description="娌℃湁鍙樉绀虹殑鍐呭锛岃鑱旂郴绠$悊浜哄憳妫�鏌ラ厤缃��">
+ </el-alert>
+ </div>
</div>
<div v-else>
<el-alert
--
Gitblit v1.9.3