From 3c42205a6e2530f1239a98f8b5fab65ccbeec775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 28 Aug 2024 17:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/common-styles/index.vue | 12 ++++++++++--
 src/components/page-settings/page-styles.vue  |  5 +----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue
index 169322fe..4c5a8a98 100644
--- a/src/components/common/common-styles/index.vue
+++ b/src/components/common/common-styles/index.vue
@@ -28,13 +28,13 @@
                 <el-form-item label="内边距">
                     <padding :value="form" @update:value="padding_change"></padding>
                 </el-form-item>
-                <el-form-item label="外边距">
+                <el-form-item v-if="isMargin" label="外边距">
                     <margin :value="form" @update:value="margin_change"></margin>
                 </el-form-item>
                 <el-form-item label="圆角">
                     <radius :value="form" @update:value="radius_change"></radius>
                 </el-form-item>
-                <el-form-item label="阴影设置">
+                <el-form-item v-if="isShadow" label="阴影设置">
                     <div class="flex-col gap-10 w">
                         <el-form-item label="颜色" label-width="45">
                             <color-picker v-model="form.box_shadow_color" @update:value="box_shadow_color_event"></color-picker>
@@ -63,6 +63,14 @@ const props = defineProps({
     value: {
         type: Object,
         default: () => ({}),
+    },
+    isMargin: {
+        type: Boolean,
+        default: true,
+    },
+    isShadow: {
+        type: Boolean,
+        default: true,
     }
 });
 // 初始化表单数据
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index cf4dc49d..726c7660 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -52,7 +52,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
-        <common-styles class="styles-height" :value="form.common_style" @update:value="common_styles_update" />
+        <common-styles :value="form.common_style" :is-margin="false" :is-shadow="false" @update:value="common_styles_update" />
     </div>
 </template>
 <script setup lang="ts">
@@ -79,8 +79,5 @@ const mult_color_picker_event = (arry: string[], type: number) => {
 <style lang="scss" scoped>
 .styles {
     width: 100%;
-    .styles-height {
-        min-height: calc(100vh - 16.8rem);
-    }
 }
 </style>