From 3cde0af661df78931d2c763e0ed6a85ac50f3e4b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 27 Aug 2024 17:24:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=87=E7=AB=A0=E9=A3=8E=E6=A0=BC=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=9B=BE=E7=89=87=E5=9C=86=E8=A7=92=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20sws=202024-08-27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-article-tabs-content.vue            | 29 +++++++++++++++++--
 .../model-article-tabs-setting.vue            |  9 ++++--
 .../model-article-tabs-styles.vue             | 25 ++++++++++++++++
 .../components/main/default/article-list.ts   |  2 +-
 .../components/main/default/article-tabs.ts   |  2 +-
 5 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 43b4343c..19fde939 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -96,7 +96,15 @@ const props = defineProps({
     tabStyle: {
         type: Object,
         default: () => ({}),
-    }
+    },
+    defaultConfig: {
+        type: Object,
+        default: () => ({
+            // 图片不同风格下的圆角
+            img_radius_0: 4,
+            img_radius_1: 0,
+        }),
+    },
 });
 const form = reactive(props.value);
 const base_list = reactive({
@@ -158,6 +166,23 @@ const article_theme_change = (val: any) => {
     } else {
         form.field_show = ['0', '1'];
     }
+    if (val == '0') {
+        if (styles.img_radius.radius == props.defaultConfig.img_radius_0 || (styles.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) {
+            styles.img_radius.radius = props.defaultConfig.img_radius_0;
+            styles.img_radius.radius_bottom_left = props.defaultConfig.img_radius_0;
+            styles.img_radius.radius_bottom_right = props.defaultConfig.img_radius_0;
+            styles.img_radius.radius_top_left = props.defaultConfig.img_radius_0;
+            styles.img_radius.radius_top_right = props.defaultConfig.img_radius_0;
+        }
+    } else {
+        if (styles.img_radius.radius == props.defaultConfig.img_radius_0 || (styles.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) {
+            styles.img_radius.radius = props.defaultConfig.img_radius_1;
+            styles.img_radius.radius_bottom_left = props.defaultConfig.img_radius_1;
+            styles.img_radius.radius_bottom_right = props.defaultConfig.img_radius_1;
+            styles.img_radius.radius_top_left = props.defaultConfig.img_radius_1;
+            styles.img_radius.radius_top_right = props.defaultConfig.img_radius_1;
+        }
+    }
 };
 
 // 开启关闭链接
@@ -216,7 +241,7 @@ const url_value_dialog_call_back = (item: any[]) => {
 };
 
 const styles = reactive(props.tabStyle);
-const tabs_theme_change = (val: string | number | boolean | undefined):void => {
+const tabs_theme_change = (val: string | number | boolean | undefined): void => {
     styles.tabs_color_checked = tabs_style(styles.tabs_color_checked, val);
 };
 </script>
diff --git a/src/components/model-article-tabs/model-article-tabs-setting.vue b/src/components/model-article-tabs/model-article-tabs-setting.vue
index 4a3db026..95475382 100644
--- a/src/components/model-article-tabs/model-article-tabs-setting.vue
+++ b/src/components/model-article-tabs/model-article-tabs-setting.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="setting-content">
         <template v-if="type == '1'">
-            <model-article-tabs-content :value="value.content" :tab-style="value.style"></model-article-tabs-content>
+            <model-article-tabs-content :value="value.content" :tab-style="value.style" :default-config="data_config"></model-article-tabs-content>
         </template>
         <template v-else-if="type == '2'">
-            <model-article-tabs-styles :value="value.style" :content="value.content"></model-article-tabs-styles>
+            <model-article-tabs-styles :value="value.style" :content="value.content" :default-config="data_config"></model-article-tabs-styles>
         </template>
     </div>
 </template>
@@ -19,4 +19,9 @@ const props = defineProps({
         default: () => ({}),
     },
 });
+const data_config = reactive({
+    // 图片不同风格下的圆角
+    img_radius_0: 4,
+    img_radius_1: 0,
+});
 </script>
diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue
index f4dc5fd9..2ae8a3e4 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -67,6 +67,14 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    defaultConfig: {
+        type: Object,
+        default: () => ({
+            // 图片不同风格下的圆角
+            img_radius_0: 4,
+            img_radius_1: 0,
+        }),
+    },
 });
 // 默认值
 const state = reactive({
@@ -76,6 +84,23 @@ const state = reactive({
 // 如果需要解构，确保使用toRefs
 const { form, data } = toRefs(state);
 const theme = computed(() => data.value.theme);
+if (theme.value == '0') {
+    if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) {
+        form.value.img_radius.radius = props.defaultConfig.img_radius_0;
+        form.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_0;
+        form.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_0;
+        form.value.img_radius.radius_top_left = props.defaultConfig.img_radius_0;
+        form.value.img_radius.radius_top_right = props.defaultConfig.img_radius_0;
+    }
+} else {
+    if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) {
+        form.value.img_radius.radius = props.defaultConfig.img_radius_1;
+        form.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_1;
+        form.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_1;
+        form.value.img_radius.radius_top_left = props.defaultConfig.img_radius_1;
+        form.value.img_radius.radius_top_right = props.defaultConfig.img_radius_1;
+    }
+}
 const font_weight = reactive([
     { name: '加粗', value: '500' },
     { name: '正常', value: '400' },
diff --git a/src/layout/components/main/default/article-list.ts b/src/layout/components/main/default/article-list.ts
index 6fe317c6..bf2b84ee 100644
--- a/src/layout/components/main/default/article-list.ts
+++ b/src/layout/components/main/default/article-list.ts
@@ -71,7 +71,7 @@ const defaultArticleList: DefaultArticleList = {
             radius_bottom_left: 8,
             radius_bottom_right: 8,
         },
-        // 图片圆角
+        // 图片圆角 ---- 除了风格一圆角是4，其他都是0
         img_radius: {
             radius: 4,
             radius_top_left: 4,
diff --git a/src/layout/components/main/default/article-tabs.ts b/src/layout/components/main/default/article-tabs.ts
index 7abd8ec5..af5d236c 100644
--- a/src/layout/components/main/default/article-tabs.ts
+++ b/src/layout/components/main/default/article-tabs.ts
@@ -97,7 +97,7 @@ const defaultArticleTabs: DefaultArticleTabs = {
             radius_bottom_left: 8,
             radius_bottom_right: 8,
         },
-        // 图片圆角
+        // 图片圆角 ---- 除了风格一圆角是4，其他都是0
         img_radius: {
             radius: 4,
             radius_top_left: 4,