diff --git a/src/assets/images/chart/informations/iframe.png b/src/assets/images/chart/informations/iframe.png new file mode 100644 index 00000000..72042744 Binary files /dev/null and b/src/assets/images/chart/informations/iframe.png differ diff --git a/src/packages/components/Informations/Mores/Iframe/config.ts b/src/packages/components/Informations/Mores/Iframe/config.ts index 67e50c92..ddb4e5e8 100644 --- a/src/packages/components/Informations/Mores/Iframe/config.ts +++ b/src/packages/components/Informations/Mores/Iframe/config.ts @@ -1,11 +1,12 @@ import { PublicConfigClass } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' import { IframeConfig } from './index' import cloneDeep from 'lodash/cloneDeep' export const option = { // 网站路径 - dataset: "https://www.bilibili.com/", + dataset: "http://www.mtruning.club:81/", // 圆角 borderRadius: 10 } @@ -13,6 +14,7 @@ export const option = { export default class Config extends PublicConfigClass implements CreateComponentType { public key = IframeConfig.key + public attr = { ...chartInitConfig, w: 800, h: 800, zIndex: -1 } public chartConfig = cloneDeep(IframeConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Informations/Mores/Iframe/index.ts b/src/packages/components/Informations/Mores/Iframe/index.ts index 1f7d2817..d87036cb 100644 --- a/src/packages/components/Informations/Mores/Iframe/index.ts +++ b/src/packages/components/Informations/Mores/Iframe/index.ts @@ -1,4 +1,4 @@ -import image from '@/assets/images/chart/informations/photo.png' +import image from '@/assets/images/chart/informations/iframe.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -6,7 +6,7 @@ export const IframeConfig: ConfigType = { key: 'Iframe', chartKey: 'VIframe', conKey: 'VCIframe', - title: 'Iframe', + title: '远程网页', category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, diff --git a/src/packages/components/Informations/Mores/Iframe/index.vue b/src/packages/components/Informations/Mores/Iframe/index.vue index 4fb79275..212f3701 100644 --- a/src/packages/components/Informations/Mores/Iframe/index.vue +++ b/src/packages/components/Informations/Mores/Iframe/index.vue @@ -1,50 +1,49 @@ diff --git a/src/packages/components/Informations/Mores/Image/index.vue b/src/packages/components/Informations/Mores/Image/index.vue index fbea4ae8..fc3b98f4 100644 --- a/src/packages/components/Informations/Mores/Image/index.vue +++ b/src/packages/components/Informations/Mores/Image/index.vue @@ -46,8 +46,7 @@ watch( option.dataset = newData }, { - immediate: true, - deep: false + immediate: true } ) diff --git a/src/packages/components/Informations/Mores/Video/index.ts b/src/packages/components/Informations/Mores/Video/index.ts index ff47d5e8..c10ced02 100644 --- a/src/packages/components/Informations/Mores/Video/index.ts +++ b/src/packages/components/Informations/Mores/Video/index.ts @@ -10,6 +10,6 @@ export const VideoConfig: ConfigType = { category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, - chartFrame: ChartFrameEnum.ECHARTS, + chartFrame: ChartFrameEnum.COMMON, image } diff --git a/src/packages/components/Informations/Mores/index.ts b/src/packages/components/Informations/Mores/index.ts index e4c6d988..8fadc441 100644 --- a/src/packages/components/Informations/Mores/index.ts +++ b/src/packages/components/Informations/Mores/index.ts @@ -3,4 +3,4 @@ import { IframeConfig } from './Iframe/index' import { VideoConfig } from './Video/index' import { WordCloudConfig } from './WordCloud/index' -export default [ImageConfig, VideoConfig, WordCloudConfig,IframeConfig] +export default [WordCloudConfig, ImageConfig, VideoConfig, IframeConfig]