From 06272b4e887651be78de34a6483c37870e030fb9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 20 三月 2024 17:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/basic-container/main.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Source/ProjectWeb/src/components/basic-container/main.vue b/Source/ProjectWeb/src/components/basic-container/main.vue
index 934935c..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" :style="cradStyle">
+ <el-card class="basic-container__card" :style="cradStyle" :body-style="cardBodyStyle">
<slot></slot>
</el-card>
</div>
@@ -24,6 +24,9 @@
default: false
},
cradStyle:{
+ type: String
+ },
+ cardBodyStyle:{
type: String
}
},
@@ -50,6 +53,7 @@
}
}
&__card {
+ height:100%;
width: 100%;
}
&:first-child {
--
Gitblit v1.9.3