From 56fe5da07bf822f86ce4d0e8b32a7941b1451091 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 28 Jun 2025 09:24:25 +0800
Subject: [PATCH] Merge branch 'refs/heads/test' into feature/v3.0.0/帮助中心
---
src/components/basic-container/main.vue | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue
index 6a357d5..43a90ae 100644
--- a/src/components/basic-container/main.vue
+++ b/src/components/basic-container/main.vue
@@ -1,3 +1,13 @@
+<!--
+ * @Author : yuan
+ * @Date : 2025-06-14 15:19:16
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-06-27 14:34:02
+ * @FilePath : \src\components\basic-container\main.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-06-14 15:19:16
+-->
<template>
<div class="basic-container" :style="styleName" :class="{ 'basic-container--block': block }">
<el-card class="basic-container__card">
@@ -23,25 +33,41 @@
},
},
computed: {
- styleName() {
+ styleName () {
return {
borderRadius: `${this.radius}px`,
background: this.background,
- };
+ }
},
},
-};
+}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.basic-container {
- padding: 0 10px;
- box-sizing: border-box;
+ height: 0;
+ flex: 1;
+
+ padding: 10px;
+ // box-sizing: border-box;
// height: 100%;
- .basic-container__card{
+ .basic-container__card {
height: 100% !important;
- overflow: auto;
+ overflow: hidden;
+
+ .el-card__body {
+ display: flex;
+ flex-direction: column;
+ height: 100% !important;
+ overflow: hidden;
+ box-sizing: border-box;
+
+ &>div {
+ height: 0;
+ flex: 1;
+ }
+ }
}
&--block {
--
Gitblit v1.9.3