From 974394f7a0496fa8e37dd326b6f9313e14caa708 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 26 Jun 2025 17:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/all_setting_styles' into all_setting_styles
---
src/components/basic-container/main.vue | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue
index e98f520..051d2fe 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-25 16:56:30
+ * @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,20 +33,42 @@
},
},
computed: {
- styleName() {
+ styleName () {
return {
borderRadius: `${this.radius}px`,
background: this.background,
- };
+ }
},
},
-};
+}
</script>
<style lang="scss">
.basic-container {
- padding: 10px 6px;
- box-sizing: border-box;
+ height: 0;
+ flex: 1;
+
+ padding: 10px;
+ // box-sizing: border-box;
+ // height: 100%;
+
+ .basic-container__card {
+ height: 100% !important;
+ 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 {
height: 100%;
--
Gitblit v1.9.3