diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 0bf9e85c..6f69e314 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -4,9 +4,9 @@
-
+
-
+
-
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
+
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
{{ item.data.describe || '' }}
@@ -39,7 +39,7 @@
-
+
@@ -49,9 +49,9 @@
-
+
-
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
+
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
{{ item.data.describe || '' }}
@@ -241,7 +241,7 @@ const article_name_line_height_computer = computed(() => { }); // 轮播高度 const carousel_height_computer = computed(() => { - return new_style.value.name_size * 2 + new_style.value.article_height + 'px'; + return new_style.value.article_height + 'px'; }); const theme_list = [ @@ -414,7 +414,7 @@ const article_theme_class = computed(() => { height: v-bind(carousel_height_computer); .img { width: 100%; - max-height: v-bind(article_item_height); + height: 100%; } .title { height: v-bind(article_name_height_computer); diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue index 00a0ad16..1f06c0fa 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -103,6 +103,7 @@ const base_list = reactive({ { name: '升序(asc)', value: '1' }, ], field_show_list: [ + { name: '文章标题', value: '3' }, { name: '日期时间', value: '0' }, { name: '浏览量', value: '1' }, { name: '描述', value: '2' }, @@ -130,9 +131,9 @@ onMounted(() => { // 主题改变 const theme_change = (val: any) => { if (val == '3' || val == '4') { - form.value.field_show = ['1']; + form.value.field_show = ['1', '3']; } else { - form.value.field_show = ['0', '1']; + form.value.field_show = ['0', '1', '3']; } if (val == '0') { if (data.value.img_radius.radius == props.defaultConfig.img_radius_0 || (data.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { 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 62a0814a..cecfc641 100644 --- a/src/components/model-article-tabs/model-article-tabs-content.vue +++ b/src/components/model-article-tabs/model-article-tabs-content.vue @@ -133,6 +133,7 @@ const base_list = reactive({ { name: '升序(asc)', value: '1' }, ], field_show_list: [ + { name: '文章标题', value: '3' }, { name: '日期时间', value: '0' }, { name: '浏览量', value: '1' }, { name: '描述', value: '2' }, @@ -159,9 +160,9 @@ onMounted(() => { // 监听tabs_theme_list的变化 const article_theme_change = (val: any) => { if (val == '3' || val == '4') { - form.field_show = ['1']; + form.field_show = ['1', '3']; } else { - form.field_show = ['0', '1']; + form.field_show = ['0', '1', '3']; } 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)) { diff --git a/src/components/model-custom/index.vue b/src/components/model-custom/index.vue index 31c7c327..758d2ac5 100644 --- a/src/components/model-custom/index.vue +++ b/src/components/model-custom/index.vue @@ -141,7 +141,11 @@ watchEffect(() => { } // 判断是平移还是整屏滚动 slides_per_group.value = new_style.value.rolling_fashion == 'translation' ? 1 : form.value.data_source_carousel_col; - const num = new_style.value.rolling_fashion == 'translation' ? data_source_content_list.value.length : Math.ceil(data_source_content_list.value.length / form.value.data_source_carousel_col); + let num = 0; + // 轮播图数量 + if (!isEmpty(data_source_content_list.value)) { + num = new_style.value.rolling_fashion == 'translation' ? data_source_content_list.value.length : Math.ceil(data_source_content_list.value.length / form.value.data_source_carousel_col); + } const { padding_top, padding_bottom, margin_bottom, margin_top } = new_style.value.data_style; // 轮播图高度控制 if (form.value.data_source_direction == '2') { diff --git a/src/components/model-data-magic/components/carousel/magic-carousel.vue b/src/components/model-data-magic/components/carousel/magic-carousel.vue index a0237d2a..7e633b7a 100644 --- a/src/components/model-data-magic/components/carousel/magic-carousel.vue +++ b/src/components/model-data-magic/components/carousel/magic-carousel.vue @@ -1,9 +1,9 @@