diff --git a/src/assets/images/chart/informations/photo_carousel.png b/src/assets/images/chart/informations/photo_carousel.png new file mode 100644 index 00000000..55cde626 Binary files /dev/null and b/src/assets/images/chart/informations/photo_carousel.png differ diff --git a/src/packages/components/Informations/Mores/Carousel/images/carousel.png b/src/packages/components/Informations/Mores/Carousel/images/carousel.png deleted file mode 100644 index 95f366b1..00000000 Binary files a/src/packages/components/Informations/Mores/Carousel/images/carousel.png and /dev/null differ diff --git a/src/packages/components/Informations/Mores/Carousel/images/carousel2.png b/src/packages/components/Informations/Mores/Carousel/images/carousel2.png deleted file mode 100644 index d8a6859f..00000000 Binary files a/src/packages/components/Informations/Mores/Carousel/images/carousel2.png and /dev/null differ diff --git a/src/packages/components/Informations/Mores/Carousel/config.ts b/src/packages/components/Informations/Mores/ImageCarousel/config.ts similarity index 65% rename from src/packages/components/Informations/Mores/Carousel/config.ts rename to src/packages/components/Informations/Mores/ImageCarousel/config.ts index 78a6f284..c49fb619 100644 --- a/src/packages/components/Informations/Mores/Carousel/config.ts +++ b/src/packages/components/Informations/Mores/ImageCarousel/config.ts @@ -1,22 +1,19 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' -import { CarouselConfig } from './index' +import { ImageCarouselConfig } from './index' import cloneDeep from 'lodash/cloneDeep' import logo from '@/assets/logo.png' -// 示例图片资源 -const modules = import.meta.globEager("./images/*"); -const dataset = [logo] -for (var item in modules) { - dataset.push(modules[item].default) -} - export const option = { // 图片资源列表 - dataset: dataset, + dataset: [ + 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel1.jpeg', + 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel2.jpeg', + 'https://naive-ui.oss-cn-beijing.aliyuncs.com/carousel-img/carousel3.jpeg', + ], // 自动播放 autoplay: true, - // 自动播放的间隔(ms) + // 自动播放的间隔(豪秒) interval: 5000, // 每页显示的图片数量 slidesPerview: 1, @@ -41,7 +38,7 @@ export const option = { } export default class Config extends PublicConfigClass implements CreateComponentType { - public key = CarouselConfig.key - public chartConfig = cloneDeep(CarouselConfig) + public key = ImageCarouselConfig.key + public chartConfig = cloneDeep(ImageCarouselConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Informations/Mores/Carousel/config.vue b/src/packages/components/Informations/Mores/ImageCarousel/config.vue similarity index 78% rename from src/packages/components/Informations/Mores/Carousel/config.vue rename to src/packages/components/Informations/Mores/ImageCarousel/config.vue index da3f7492..17c39805 100644 --- a/src/packages/components/Informations/Mores/Carousel/config.vue +++ b/src/packages/components/Informations/Mores/ImageCarousel/config.vue @@ -1,20 +1,16 @@ diff --git a/src/packages/components/Informations/Mores/Carousel/index.ts b/src/packages/components/Informations/Mores/ImageCarousel/index.ts similarity index 54% rename from src/packages/components/Informations/Mores/Carousel/index.ts rename to src/packages/components/Informations/Mores/ImageCarousel/index.ts index fbb8d35c..8ef11656 100644 --- a/src/packages/components/Informations/Mores/Carousel/index.ts +++ b/src/packages/components/Informations/Mores/ImageCarousel/index.ts @@ -1,14 +1,14 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' -import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' -export const CarouselConfig: ConfigType = { - key: 'Carousel', - chartKey: 'VCarousel', - conKey: 'VCCarousel', +export const ImageCarouselConfig: ConfigType = { + key: 'ImageCarousel', + chartKey: 'VImageCarousel', + conKey: 'VCImageCarousel', title: '轮播图', category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, chartFrame: ChartFrameEnum.NAIVE_UI, - image: 'photo.png' + image: 'photo_carousel.png' } diff --git a/src/packages/components/Informations/Mores/Carousel/index.vue b/src/packages/components/Informations/Mores/ImageCarousel/index.vue similarity index 53% rename from src/packages/components/Informations/Mores/Carousel/index.vue rename to src/packages/components/Informations/Mores/ImageCarousel/index.vue index 3018fbc2..42dc1a73 100644 --- a/src/packages/components/Informations/Mores/Carousel/index.vue +++ b/src/packages/components/Informations/Mores/ImageCarousel/index.vue @@ -1,10 +1,28 @@ @@ -28,7 +46,20 @@ const option = shallowReactive({ }) const { w, h } = toRefs(props.chartConfig.attr) -const { autoplay, interval, slidesPerview, direction, draggable, centeredSlides, effect, dotType, dotPlacement, showArrow, showDots, fit } = toRefs(props.chartConfig.option) +const { + autoplay, + interval, + slidesPerview, + direction, + draggable, + centeredSlides, + effect, + dotType, + dotPlacement, + showArrow, + showDots, + fit +} = toRefs(props.chartConfig.option) watch( () => props.chartConfig.option.dataset, diff --git a/src/packages/components/Informations/Mores/index.ts b/src/packages/components/Informations/Mores/index.ts index 0e842ce0..572ab9e0 100644 --- a/src/packages/components/Informations/Mores/index.ts +++ b/src/packages/components/Informations/Mores/index.ts @@ -1,7 +1,7 @@ import { ImageConfig } from './Image/index' +import { ImageCarouselConfig } from './ImageCarousel/index' import { IframeConfig } from './Iframe/index' import { VideoConfig } from './Video/index' import { WordCloudConfig } from './WordCloud/index' -import { CarouselConfig } from './Carousel/index' -export default [WordCloudConfig, ImageConfig, VideoConfig, IframeConfig, CarouselConfig] +export default [ImageConfig, ImageCarouselConfig, VideoConfig, IframeConfig, WordCloudConfig]