From ebef4e035f5c6a00b291cf50b01ff008fa655609 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 三月 2024 13:46:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/basic-container/main.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Source/ProjectWeb/src/components/basic-container/main.vue b/Source/ProjectWeb/src/components/basic-container/main.vue
index cbe7b61..d061e1f 100644
--- a/Source/ProjectWeb/src/components/basic-container/main.vue
+++ b/Source/ProjectWeb/src/components/basic-container/main.vue
@@ -2,7 +2,7 @@
<div class="basic-container"
:style="styleName"
:class="{'basic-container--block':block}">
- <el-card class="basic-container__card">
+ <el-card class="basic-container__card" :style="cradStyle" :body-style="cardBodyStyle">
<slot></slot>
</el-card>
</div>
@@ -22,6 +22,12 @@
block: {
type: Boolean,
default: false
+ },
+ cradStyle:{
+ type: String
+ },
+ cardBodyStyle:{
+ type: String
}
},
computed: {
@@ -39,6 +45,7 @@
.basic-container {
padding: 10px 6px;
box-sizing: border-box;
+ height: 100%;
&--block {
height: 100%;
.basic-container__card {
@@ -46,6 +53,7 @@
}
}
&__card {
+ height:100%;
width: 100%;
}
&:first-child {
--
Gitblit v1.9.3