From 1fd2669b7f3a8c44d1cad88f50970c5f0fc9a62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 3 Jan 2025 17:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/carousel-indicator/index.vue       | 12 +----
 src/components/common/common-styles/index.vue | 17 ------
 .../model-icon/model-icon-style.vue           |  7 +--
 .../model-image/model-image-style.vue         | 11 +---
 .../model-panel/model-panel-style.vue         |  5 +-
 .../model-text/model-text-style.vue           |  8 +--
 .../model-carousel/model-carousel-styles.vue  | 12 +----
 .../magic-cube-settings/tabs-styles.vue       | 52 +------------------
 .../model-data-magic-styles.vue               | 10 ----
 .../model-nav-group-styles.vue                |  6 +--
 .../model-search/model-search-styles.vue      | 14 +----
 11 files changed, 13 insertions(+), 141 deletions(-)

diff --git a/src/components/common/carousel-indicator/index.vue b/src/components/common/carousel-indicator/index.vue
index 67c83485..5c489d5b 100644
--- a/src/components/common/carousel-indicator/index.vue
+++ b/src/components/common/carousel-indicator/index.vue
@@ -45,7 +45,7 @@
             <slider v-model="form.indicator_bottom" :min="0" :max="100"></slider>
         </el-form-item>
         <el-form-item v-if="form.indicator_style != 'num'" label="圆角">
-            <radius :value="form.indicator_radius" @update:value="indicator_radius_change"></radius>
+            <radius :value="form.indicator_radius"></radius>
         </el-form-item>
     </template>
 </template>
@@ -87,14 +87,4 @@ const color_picker_change = (color: string, type: string) => {
         form.value.color = color;
     }
 };
-// 指示器圆角
-const indicator_radius_change = (radius: radiusStyle) => {
-    form.value.indicator_radius = Object.assign(form.value.indicator_radius, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
-}
 </script>
\ No newline at end of file
diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue
index 0a82d7bb..2abe1a74 100644
--- a/src/components/common/common-styles/index.vue
+++ b/src/components/common/common-styles/index.vue
@@ -116,23 +116,6 @@ const mult_color_picker_event = (arry: color_list[], type: number) => {
     form.value.color_list = arry;
     form.value.direction = type.toString();
 };
-const background_img_style_change = (style: any) => {
-    form.value.background_img_style = style;
-};
-const background_img_change = (arry: uploadList[]) => {
-    form.value.background_img = arry;
-};
-const radius_change = (radius: any) => {
-    form.value = Object.assign(form.value, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
-
-const margin_change = (margin: any) => {
-    form.value = Object.assign(form.value, pick(margin, ['margin', 'margin_top', 'margin_bottom', 'margin_left', 'margin_right']));
-};
-
-const padding_change = (padding: any) => {
-    form.value = Object.assign(form.value, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right']));
-};
 </script>
 <style lang="scss" scoped>
 .common-styles {
diff --git a/src/components/common/custom-module/model-icon/model-icon-style.vue b/src/components/common/custom-module/model-icon/model-icon-style.vue
index a32f937e..3748a1c6 100644
--- a/src/components/common/custom-module/model-icon/model-icon-style.vue
+++ b/src/components/common/custom-module/model-icon/model-icon-style.vue
@@ -63,7 +63,7 @@
                     <mult-color-picker :value="form.color_list" :type="form.direction" @update:value="mult_color_picker_event"></mult-color-picker>
                 </el-form-item>
                 <el-form-item label="圆角">
-                    <radius :value="form.bg_radius" @update:value="bg_radius_change"></radius>
+                    <radius :value="form.bg_radius"></radius>
                 </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />
@@ -117,10 +117,7 @@ const center_height = defineModel('height', { type: Number, default: 0 });
 
 const padding_change = (padding: any) => {
     form.value.icon_padding = Object.assign(form.value.icon_padding, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right']));
-};
-const bg_radius_change = (radius: any) => {
-    form.value.bg_radius = Object.assign(form.value.bg_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
+}
 
 const icon_change = (key: string) => {
     if (key == '2') {
diff --git a/src/components/common/custom-module/model-image/model-image-style.vue b/src/components/common/custom-module/model-image/model-image-style.vue
index 80f66a49..7d0f56a4 100644
--- a/src/components/common/custom-module/model-image/model-image-style.vue
+++ b/src/components/common/custom-module/model-image/model-image-style.vue
@@ -22,7 +22,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="图片圆角">
-                    <radius :value="form.img_radius" @update:value="img_radius_change"></radius>
+                    <radius :value="form.img_radius"></radius>
                 </el-form-item>
                 <el-form-item label="图片宽度">
                     <slider v-model="form.img_width" :max="1000"></slider>
@@ -57,7 +57,7 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="边框圆角">
-                        <radius :value="form.border_radius" @update:value="border_radius_change"></radius>
+                        <radius :value="form.border_radius"></radius>
                     </el-form-item>
                     <el-form-item label="边框粗细">
                         <slider v-model="form.border_size" :max="100"></slider>
@@ -88,13 +88,6 @@ const state = reactive({
 const { diy_data } = toRefs(state);
 const form = ref(diy_data.value.com_data);
 const center_height = defineModel('height', { type: Number, default: 0 });
-
-const img_radius_change = (radius: any) => {
-    form.value.img_radius = Object.assign(form.value.img_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
-const border_radius_change = (radius: any) => {
-    form.value.border_radius = Object.assign(form.value.border_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
 // 数据字段切换时，更新另外一个数据
 const img_src_change = (key: string) => {
     if (key == '2') {
diff --git a/src/components/common/custom-module/model-panel/model-panel-style.vue b/src/components/common/custom-module/model-panel/model-panel-style.vue
index be0e04a0..d1f614fb 100644
--- a/src/components/common/custom-module/model-panel/model-panel-style.vue
+++ b/src/components/common/custom-module/model-panel/model-panel-style.vue
@@ -17,7 +17,7 @@
                     <background-common v-model:color_list="form.color_list" v-model:direction="form.direction" v-model:img_style="form.background_img_style" v-model:img="form.background_img" @mult_color_picker_event="mult_color_picker_event" />
                 </el-form-item>
                 <el-form-item label="圆角">
-                    <radius :value="form.bg_radius" @update:value="bg_radius_change"></radius>
+                    <radius :value="form.bg_radius"></radius>
                 </el-form-item>
                 <el-form-item label="旋转角度">
                     <slider v-model="form.panel_rotate" :max="1000"></slider>
@@ -87,9 +87,6 @@ const { diy_data } = toRefs(state);
 const form = ref(diy_data.value.com_data);
 
 const center_height = defineModel('height', { type: Number, default: 0 });
-const bg_radius_change = (radius: any) => {
-    form.value.bg_radius = Object.assign(form.value.bg_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
 
 const mult_color_picker_event = (arry: color_list[], type: number) => {
     form.value.color_list = arry;
diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue
index 439b6248..d1b01283 100644
--- a/src/components/common/custom-module/model-text/model-text-style.vue
+++ b/src/components/common/custom-module/model-text/model-text-style.vue
@@ -75,9 +75,6 @@
                 <el-form-item label="旋转角度">
                     <slider v-model="form.text_rotate" :max="1000"></slider>
                 </el-form-item>
-                <!-- <el-form-item label="是否置底">
-                    <el-switch v-model="form.bottom_up" active-value="1" inactive-value="0" />
-                </el-form-item> -->
             </card-container>
             <div class="bg-f5 divider-line" />
             <card-container>
@@ -92,7 +89,7 @@
                     <mult-color-picker :value="form.color_list" :type="form.direction" @update:value="mult_color_picker_event"></mult-color-picker>
                 </el-form-item>
                 <el-form-item label="圆角">
-                    <radius :value="form.bg_radius" @update:value="bg_radius_change"></radius>
+                    <radius :value="form.bg_radius"></radius>
                 </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />
@@ -148,9 +145,6 @@ const center_height = defineModel('height', { type: Number, default: 0 });
 const padding_change = (padding: any) => {
     form.value.text_padding = Object.assign(form.value.text_padding, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right']));
 };
-const bg_radius_change = (radius: any) => {
-    form.value.bg_radius = Object.assign(form.value.bg_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
 // 如果历史的字体高度为空，就赋值为文字内容的大小
 onBeforeMount(() => {
     if (typeof form.value.line_text_size != 'number') {
diff --git a/src/components/model-carousel/model-carousel-styles.vue b/src/components/model-carousel/model-carousel-styles.vue
index 36a61250..31436d54 100644
--- a/src/components/model-carousel/model-carousel-styles.vue
+++ b/src/components/model-carousel/model-carousel-styles.vue
@@ -22,7 +22,7 @@
             <card-container>
                 <div class="mb-12">图片设置</div>
                 <el-form-item label="圆角">
-                    <radius :value="form" @update:value="radius_change"></radius>
+                    <radius :value="form"></radius>
                 </el-form-item>
             </card-container>
             <template v-if="['oneDragOne', 'twoDragOne'].includes(new_content.carousel_type)">
@@ -126,21 +126,11 @@ const { form, new_content } = toRefs(state);
 
 const is_video = computed(() => new_content.value.carousel_list.length > 0 && (new_content.value.carousel_list.findIndex((item: any) => item.carousel_video.length > 0)) != -1);
 
-// 图片圆角
-const radius_change = (radius: any) => {
-    form.value = Object.assign(form.value, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
-
 // 内容区域背景渐变设置
 const carousel_content_mult_color_picker_event = (arry: color_list[], type: number) => {
     form.value.carousel_content_color_list = arry;
     form.value.carousel_content_direction = type.toString();
 };
-// 内容区域背景图片设置
-const carousel_content_background_img_change = (arry: uploadList[]) => {
-    form.value.carousel_content_background_img = arry;
-};
-
 const mult_color_picker_event = (arry: color_list[], type: number) => {
     form.value.video_color_list = arry;
     form.value.video_direction = type.toString();
diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
index 3a8f0f86..b75c21e7 100644
--- a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
+++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
@@ -25,7 +25,7 @@
                 </template>
             </template>
             <el-form-item v-if="tabs_content.data_type != 'custom'" :label="tabs_content.data_type != 'video' ? '图片圆角' : '视频圆角'">
-                <radius :key="form.carouselKey" :value="form.img_radius" @update:value="img_radius_change"></radius>
+                <radius :key="form.carouselKey" :value="form.img_radius"></radius>
             </el-form-item>
         </card-container>
         <div class="bg-f5 divider-line" />
@@ -180,7 +180,7 @@
                 <padding :key="form.carouselKey" :value="form.goods_chunk_padding"></padding>
             </el-form-item>
             <el-form-item label="圆角">
-                <radius :key="form.carouselKey" :value="form.goods_radius" @update:value="goods_radius_change"></radius>
+                <radius :key="form.carouselKey" :value="form.goods_radius"></radius>
             </el-form-item>
             <!-- 边框处理 -->
             <border-config v-model:show="form.border_is_show" v-model:color="form.border_color" v-model:style="form.border_style" v-model:size="form.border_size"></border-config>
@@ -226,20 +226,6 @@ const mult_color_picker_event = (arry: string[], type: number) => {
     form.value.color_list = arry;
     form.value.direction = type.toString();
 };
-const chunk_padding_change = (padding: paddingStyle) => {
-    form.value.chunk_padding = Object.assign(form.value.chunk_padding, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right']));
-};
-// 内容圆角
-const img_radius_change = (radius: radiusStyle) => {
-    const data = !isEmpty(form.value.img_radius) ? form.value.img_radius : { radius: 4, radius_top_left: 4, radius_top_right: 4, radius_bottom_left: 4, radius_bottom_right: 4 };
-    form.value.img_radius = Object.assign(data, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
-}
 // 内容底板颜色
 const data_content_mult_color_picker_event = (arry: string[], type: number) => {
     form.value.data_content_style.color_list = arry;
@@ -250,45 +236,11 @@ const data_mult_color_picker_event = (arry: string[], type: number) => {
     form.value.data_color_list = arry;
     form.value.data_direction = type.toString();
 }
-const data_chunk_padding_change = (padding: paddingStyle) => {
-    form.value.data_chunk_padding = Object.assign(form.value.data_chunk_padding, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right']));
-};
-
-const data_chunk_margin_change = (margin: marginStyle) => {
-    form.value.data_chunk_margin = Object.assign(form.value.data_chunk_margin, pick(margin, ['margin', 'margin_top', 'margin_bottom', 'margin_left', 'margin_right']));
-};
-// 内容圆角
-const data_radius_change = (radius: radiusStyle) => {
-    const data = !isEmpty(form.value.data_radius) ? form.value.data_radius : { radius: 4, radius_top_left: 4, radius_top_right: 4, radius_bottom_left: 4, radius_bottom_right: 4 };
-    form.value.data_radius = Object.assign(data, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
-}
-
 // 商品底部颜色
 const goods_mult_color_picker_event = (arry: string[], type: number) => {
     form.value.goods_color_list = arry;
     form.value.goods_direction = type.toString();
 }
-const goods_chunk_padding_change = (padding: paddingStyle) => {
-    form.value.goods_chunk_padding = Object.assign(form.value.goods_chunk_padding, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right']));
-};
-// 内容圆角
-const goods_radius_change = (radius: radiusStyle) => {
-    const data = !isEmpty(form.value.goods_radius) ? form.value.goods_radius : { radius: 4, radius_top_left: 4, radius_top_right: 4, radius_bottom_left: 4, radius_bottom_right: 4 };
-    form.value.goods_radius = Object.assign(data, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
-}
-
 // 商品价格底部颜色
 const goods_price_mult_color_picker_event = (arry: string[], type: number) => {
     form.value.goods_price_color_list = arry;
diff --git a/src/components/model-data-magic/model-data-magic-styles.vue b/src/components/model-data-magic/model-data-magic-styles.vue
index 2b5ffd3c..646e43e8 100644
--- a/src/components/model-data-magic/model-data-magic-styles.vue
+++ b/src/components/model-data-magic/model-data-magic-styles.vue
@@ -34,16 +34,6 @@ const { form } = toRefs(state);
 const common_style_update = (value: any) => {
     form.value.common_style = value;
 };
-// 内容圆角
-const data_radius_change = (radius: any) => {
-    form.value.data_radius = Object.assign(form.value.data_radius, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
-}
 </script>
 <style lang="scss" scoped>
 .topic {
diff --git a/src/components/model-nav-group/model-nav-group-styles.vue b/src/components/model-nav-group/model-nav-group-styles.vue
index b08c9e18..ed5316c2 100644
--- a/src/components/model-nav-group/model-nav-group-styles.vue
+++ b/src/components/model-nav-group/model-nav-group-styles.vue
@@ -14,7 +14,7 @@
             <card-container>
                 <div class="mb-12">图片样式</div>
                 <el-form-item label="图片圆角">
-                    <radius :value="form" @update:value="radius_change"></radius>
+                    <radius :value="form"></radius>
                 </el-form-item>
                 <el-form-item label="图片大小">
                     <slider v-model="form.img_size" :max="100" :min="10"></slider>
@@ -124,10 +124,6 @@ const state = reactive({
 // 如果需要解构，确保使用toRefs
 const { form, data_content } = toRefs(state);
 
-// 图片圆角
-const radius_change = (radius: nav_group_styles) => {
-    form.value = Object.assign(form.value, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
 // 通用样式处理
 const common_styles_update = (val: Object) => {
     form.value.common_style = val;
diff --git a/src/components/model-search/model-search-styles.vue b/src/components/model-search/model-search-styles.vue
index 72829a64..f416275d 100644
--- a/src/components/model-search/model-search-styles.vue
+++ b/src/components/model-search/model-search-styles.vue
@@ -20,7 +20,7 @@
                         <background-common v-model:color_list="form.search_botton_color_list" v-model:direction="form.search_botton_direction" v-model:img_style="form.search_botton_background_img_style" v-model:img="form.search_botton_background_img" @mult_color_picker_event="mult_color_picker_event" />
                     </el-form-item>
                     <el-form-item label="按钮圆角">
-                        <radius :value="form.search_button_radius" @update:value="button_radius_change"></radius>
+                        <radius :value="form.search_button_radius"></radius>
                     </el-form-item>
                 </card-container>
                 <div class="bg-f5 divider-line" />
@@ -42,7 +42,7 @@
                     <color-picker v-model="form.search_bg_color" default-color="#fff"></color-picker>
                 </el-form-item>
                 <el-form-item label="框体圆角">
-                    <radius :value="form.search_border_radius" @update:value="border_radius_change"></radius>
+                    <radius :value="form.search_border_radius"></radius>
                 </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />
@@ -95,16 +95,6 @@ const emit = defineEmits(['update:value']);
 const common_styles_update = (val: Object) => {
     form.value.common_style = val;
 };
-
-// 按钮圆角
-const button_radius_change = (radius: any) => {
-    form.value.search_button_radius = Object.assign(form.value.search_button_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
-// 搜索框圆角
-const border_radius_change = (radius: any) => {
-    form.value.search_border_radius = Object.assign(form.value.search_border_radius, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
-};
-
 const mult_color_picker_event = (arry: color_list[], type: number) => {
     form.value.search_botton_color_list = arry;
     form.value.search_botton_direction = type.toString();