From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/components/basic-container/main.vue | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue
index 4da03f9..43a90ae 100644
--- a/src/components/basic-container/main.vue
+++ b/src/components/basic-container/main.vue
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2025-06-14 15:19:16
* @LastEditors : yuan
- * @LastEditTime : 2025-06-27 14:19:22
+ * @LastEditTime : 2025-06-27 14:34:02
* @FilePath : \src\components\basic-container\main.vue
* @Description :
* Copyright 2025 OBKoro1, All Rights Reserved.
@@ -45,27 +45,21 @@
<style lang="scss" scoped>
.basic-container {
- padding: 10px;
height: 0;
flex: 1;
- display: flex;
- flex-direction: column;
+
+ padding: 10px;
// box-sizing: border-box;
// height: 100%;
.basic-container__card {
- height: 0;
- flex: 1;
- display: flex;
- flex-direction: column;
+ height: 100% !important;
overflow: hidden;
- ::v-deep(.el-card__body) {
- height: 0 !important;
- flex: 1 !important;
+ .el-card__body {
display: flex;
flex-direction: column;
-
+ height: 100% !important;
overflow: hidden;
box-sizing: border-box;
--
Gitblit v1.9.3