@@ -61,7 +61,7 @@ interface Props {
cubeWidth: number;
cubeHeight: number;
styleActived?: number;
- img_fit?: string;
+ imgFit?: "" | "cover" | "fill" | "contain" | "none" | "scale-down";
}
const props = withDefaults(defineProps
(), {
list: () => [],
@@ -69,7 +69,8 @@ const props = withDefaults(defineProps(), {
type: 'img',
cubeWidth: 390,
cubeHeight: 390,
- styleActived: 0
+ styleActived: 0,
+ imgFit: 'cover'
});
const selected_active = ref(0);
diff --git a/src/components/model-custom/components/index.vue b/src/components/model-custom/components/index.vue
index 78cbe588..b30ebe66 100644
--- a/src/components/model-custom/components/index.vue
+++ b/src/components/model-custom/components/index.vue
@@ -35,7 +35,7 @@
-
+
{{ !isEmpty(item.new_name) ? item.new_name : item.name }}
@@ -861,7 +861,4 @@ defineExpose({
}
}
}
-.el-input__textarea {
- resize: none;
-}
diff --git a/src/components/model-data-magic/components/magic-carousel.vue b/src/components/model-data-magic/components/magic-carousel.vue
index e3df2977..3b7db1d4 100644
--- a/src/components/model-data-magic/components/magic-carousel.vue
+++ b/src/components/model-data-magic/components/magic-carousel.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/components/model-data-magic/components/tabs-content.vue b/src/components/model-data-magic/components/tabs-content.vue
index 09ff62c5..eaa50474 100644
--- a/src/components/model-data-magic/components/tabs-content.vue
+++ b/src/components/model-data-magic/components/tabs-content.vue
@@ -14,6 +14,15 @@
+
+
+
+ 等比缩放
+ 铺满
+ 等比剪切
+
+
+
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue
index e3705521..83283cd8 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -106,6 +106,7 @@ const data_content = {
goods_list:[],
goods_ids: '',
is_show: ['title', 'price'],
+ img_fit: 'cover',
images_list:[
{
carousel_img: [],
diff --git a/src/components/model-img-magic/index.vue b/src/components/model-img-magic/index.vue
index 404206a2..0687505b 100644
--- a/src/components/model-img-magic/index.vue
+++ b/src/components/model-img-magic/index.vue
@@ -6,7 +6,7 @@
@@ -14,7 +14,7 @@
@@ -25,7 +25,7 @@
-
+
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 3086da3f..9ebf9706 100644
--- a/src/components/model-img-magic/model-img-magic-content.vue
+++ b/src/components/model-img-magic/model-img-magic-content.vue
@@ -10,7 +10,7 @@
-