From bfe591cb1b75115cda6b7ae2567a3db605a0c27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 15 Oct 2024 13:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/magic-cube/index.vue               | 3 ++-
 src/components/model-custom/components/index.vue         | 5 ++++-
 .../model-img-magic/model-img-magic-content.vue          | 9 ++++++++-
 src/config/const/img-magic.ts                            | 2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/common/magic-cube/index.vue b/src/components/common/magic-cube/index.vue
index f3c3de6d..0d9bce3f 100644
--- a/src/components/common/magic-cube/index.vue
+++ b/src/components/common/magic-cube/index.vue
@@ -13,7 +13,7 @@
                     <icon name="close" color="f" size="8"></icon>
                 </div>
                 <template v-if="item.img && !isEmpty(item.img[0] || '') && props.type == 'img'">
-                    <image-empty v-model="item.img[0]" :fit="styleActived == 10 ? 'contain' : 'cover'"></image-empty>
+                    <image-empty v-model="item.img[0]" ></image-empty>
                 </template>
                 <template v-else>
                     <div class="cube-selected-text">
@@ -61,6 +61,7 @@ interface Props {
     cubeWidth: number;
     cubeHeight: number;
     styleActived?: number;
+    img_fit?: string;
 }
 const props = withDefaults(defineProps<Props>(), {
     list: () => [],
diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue
index f6bba971..78cbe588 100644
--- a/src/components/model-custom/components/index.vue
+++ b/src/components/model-custom/components/index.vue
@@ -457,7 +457,7 @@ const drop = (event: any) => {
             },
         };
 
-        diy_data.value.push(newItem);
+        diy_data.value.unshift(newItem);
         set_show_tabs(diy_data.value.length - 1);
     }
 };
@@ -861,4 +861,7 @@ defineExpose({
         }
     }
 }
+.el-input__textarea {
+  resize: none;
+}
 </style>
diff --git a/src/components/model-img-magic/model-img-magic-content.vue b/src/components/model-img-magic/model-img-magic-content.vue
index d8ea15f2..3086da3f 100644
--- a/src/components/model-img-magic/model-img-magic-content.vue
+++ b/src/components/model-img-magic/model-img-magic-content.vue
@@ -10,6 +10,13 @@
                         </div>
                     </div>
                 </el-form-item>
+                <el-form-item label="图片设置">
+                    <el-radio-group v-model="form.img_fit">
+                        <el-radio value="contain">等比缩放</el-radio>
+                        <el-radio value="none">铺满</el-radio>
+                        <el-radio value="cover">等比剪切</el-radio>
+                    </el-radio-group>
+                </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />
             <card-container>
@@ -45,7 +52,7 @@
                         </div>
                     </template>
                     <template v-else>
-                        <magic-cube :key="form.style_actived" :list="form.img_magic_list" :style-actived="form.style_actived" :flag="form.style_actived == 11" :cube-width="cubeWidth" :cube-height="cubeHeight" @selected_click="selected_click"></magic-cube>
+                        <magic-cube :key="form.style_actived" :list="form.img_magic_list" :style-actived="form.style_actived" :flag="form.style_actived == 11" :cube-width="cubeWidth" :cube-height="cubeHeight" :fit="form.img_fit" @selected_click="selected_click"></magic-cube>
                     </template>
                 </el-form-item>
             </card-container>
diff --git a/src/config/const/img-magic.ts b/src/config/const/img-magic.ts
index 43819acc..1a52ff58 100644
--- a/src/config/const/img-magic.ts
+++ b/src/config/const/img-magic.ts
@@ -10,6 +10,7 @@ interface defaultSearch {
     content: {
         style_actived: number;
         img_magic_list: img_magic[];
+        img_fit: string;
     };
     style: {
         radius: number;
@@ -39,6 +40,7 @@ const defaultSearch: defaultSearch = {
                 img_link: {}
             }
         ],
+        img_fit: 'cover',
     },
     style: {
         radius: 0,