From 0c533575f4f28208e023020b23ed3e81f4aa63db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Mon, 9 Jan 2023 11:12:18 +0800 Subject: [PATCH 1/9] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=8F=90=E4=BE=9B=E7=9A=84=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/settings/designColorRecommend.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/settings/designColorRecommend.json b/src/settings/designColorRecommend.json index 79420979..51ba9739 100644 --- a/src/settings/designColorRecommend.json +++ b/src/settings/designColorRecommend.json @@ -6,6 +6,13 @@ "name": "碧空绿", "pinyin": "bikonlv" }, + { + "CMYK": [73, 17, 20, 1], + "RGB": [102, 169, 201], + "hex": "#66a9c9", + "name": "涧石蓝", + "pinyin": "jianshilan" + }, { "CMYK": [4, 13, 67, 0], "RGB": [248, 223, 114], @@ -19,12 +26,5 @@ "hex": "#3c7eff", "name": "深海蓝", "pinyin": "shenhailan" - }, - { - "CMYK": [59, 12, 19, 0], - "RGB": [138, 188, 209], - "hex": "#8abcd1", - "name": "秋波蓝", - "pinyin": "qiubolan" } ] From 1b6c1a35307686971bfa895df93779839e317768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Mon, 9 Jan 2023 11:25:03 +0800 Subject: [PATCH 2/9] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20JSON=20?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=97=A0=E6=B3=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/utils.ts | 34 +++++++++++++++++++ .../components/ChartsItemBox/index.vue | 5 +-- .../ChartData/hooks/useFile.hooks.ts | 6 ++-- .../EditTools/hooks/useFile.hooks.ts | 6 ++-- .../components/EditTools/utils/index.ts | 6 ++-- .../chart/ContentEdit/hooks/useDrag.hook.ts | 4 +-- src/views/edit/index.vue | 8 ++--- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 51b296ae..dea4b542 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -291,3 +291,37 @@ export const setKeyboardDressShow = (keyCode?: number) => { } } +/** + * * JSON序列化，支持函数和 undefined + * @param data + */ +export const JSONStringify = (data: object) => { + return JSON.stringify( + data, + (key, val) => { + // 处理函数丢失问题 + if (typeof val === 'function') { + return `${val}` + } + // 处理 undefined 丢失问题 + if (typeof val === 'undefined') { + return 'undefined' + } + return val + }, + 2 + ) +} + +/** + * * JSON反序列化，支持函数和 undefined + * @param data + */ +export const JSONParse = (data: string) => { + return JSON.parse(data, (k, v) => { + if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) { + return eval(`(function(){return ${v}})()`) + } + return v + }) +} diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue index 655fe824..dbb9cda7 100644 --- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue +++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue @@ -41,12 +41,13 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d' import { ChartModeEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d' import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore' -import { componentInstall, loadingStart, loadingFinish, loadingError } from '@/utils' +import { componentInstall, loadingStart, loadingFinish, loadingError, JSONStringify } from '@/utils' import { DragKeyEnum } from '@/enums/editPageEnum' import { createComponent } from '@/packages' import { ConfigType, CreateComponentType } from '@/packages/index.d' import { fetchConfigComponent, fetchChartComponent } from '@/packages/index' import omit from 'lodash/omit' + const chartEditStore = useChartEditStore() defineProps({ @@ -70,7 +71,7 @@ const dragStartHandle = (e: DragEvent, item: ConfigType) => { componentInstall(item.chartKey, fetchChartComponent(item)) componentInstall(item.conKey, fetchConfigComponent(item)) // 将配置项绑定到拖拽属性上 - e!.dataTransfer!.setData(DragKeyEnum.DRAG_KEY, JSON.stringify(omit(item, ['image']))) + e!.dataTransfer!.setData(DragKeyEnum.DRAG_KEY, JSONStringify(omit(item, ['image']))) // 修改状态 chartEditStore.setEditCanvas(EditCanvasTypeEnum.IS_CREATE, true) } diff --git a/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts b/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts index 42f38798..08258951 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts +++ b/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts @@ -1,7 +1,7 @@ import { ref, toRef, nextTick } from 'vue' import { UploadCustomRequestOptions } from 'naive-ui' import { FileTypeEnum } from '@/enums/fileTypeEnum' -import { readFile, downloadTextFile } from '@/utils' +import { readFile, downloadTextFile, JSONStringify, JSONParse } from '@/utils' export const useFile = (targetData: any) => { const uploadFileListRef = ref() @@ -23,7 +23,7 @@ export const useFile = (targetData: any) => { nextTick(() => { if (file.file) { readFile(file.file).then((fileData: any) => { - targetData.value.option.dataset = JSON.parse(fileData) + targetData.value.option.dataset = JSONParse(fileData) }) } else { window['$message'].error('导入数据失败，请稍后重试或联系管理员！') @@ -35,7 +35,7 @@ export const useFile = (targetData: any) => { const download = () => { try { window['$message'].success('下载中，请耐心等待...') - downloadTextFile(JSON.stringify(targetData.value.option.dataset), undefined, 'json') + downloadTextFile(JSONStringify(targetData.value.option.dataset), undefined, 'json') } catch (error) { window['$message'].error('下载失败，数据错误！') } diff --git a/src/views/chart/ContentEdit/components/EditTools/hooks/useFile.hooks.ts b/src/views/chart/ContentEdit/components/EditTools/hooks/useFile.hooks.ts index 587b9fe4..d492cc80 100644 --- a/src/views/chart/ContentEdit/components/EditTools/hooks/useFile.hooks.ts +++ b/src/views/chart/ContentEdit/components/EditTools/hooks/useFile.hooks.ts @@ -1,7 +1,7 @@ import { ref, nextTick } from 'vue' import { UploadCustomRequestOptions } from 'naive-ui' import { FileTypeEnum } from '@/enums/fileTypeEnum' -import { readFile, goDialog } from '@/utils' +import { readFile, goDialog, JSONParse } from '@/utils' import { useSync } from '@/views/chart/hooks/useSync.hook' export const useFile = () => { @@ -34,7 +34,7 @@ export const useFile = () => { // 新增 onPositiveCallback: async () => { try { - fileData = JSON.parse(fileData) + fileData = JSONParse(fileData) await updateComponent(fileData, false, true) window['$message'].success('导入成功！') } catch (error) { @@ -45,7 +45,7 @@ export const useFile = () => { // 覆盖 onNegativeCallback: async () => { try { - fileData = JSON.parse(fileData) + fileData = JSONParse(fileData) await updateComponent(fileData, true, true) window['$message'].success('导入成功！') } catch (error) { diff --git a/src/views/chart/ContentEdit/components/EditTools/utils/index.ts b/src/views/chart/ContentEdit/components/EditTools/utils/index.ts index 39876c08..39e7af13 100644 --- a/src/views/chart/ContentEdit/components/EditTools/utils/index.ts +++ b/src/views/chart/ContentEdit/components/EditTools/utils/index.ts @@ -1,5 +1,5 @@ import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' -import { canvasCut, downloadTextFile } from '@/utils' +import { canvasCut, downloadTextFile, JSONStringify } from '@/utils' const chartEditStore = useChartEditStore() // 导出 @@ -9,9 +9,7 @@ export const exportHandle = () => { // 导出数据 downloadTextFile( - JSON.stringify(chartEditStore.getStorageInfo || [], (k, v) => { - return v === undefined ? null : v - }), + JSONStringify(chartEditStore.getStorageInfo || []), undefined, 'json' ) diff --git a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts index b87bdd5f..3aae5547 100644 --- a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts +++ b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts @@ -6,7 +6,7 @@ import { CreateComponentType, CreateComponentGroupType, PickCreateComponentType import { useContextMenu } from '@/views/chart/hooks/useContextMenu.hook' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d' -import { loadingStart, loadingFinish, loadingError, setComponentPosition } from '@/utils' +import { loadingStart, loadingFinish, loadingError, setComponentPosition, JSONParse } from '@/utils' import { throttle, cloneDeep } from 'lodash' const chartEditStore = useChartEditStore() @@ -28,7 +28,7 @@ export const dragHandle = async (e: DragEvent) => { // 修改状态 chartEditStore.setEditCanvas(EditCanvasTypeEnum.IS_CREATE, false) - const dropData: Exclude = JSON.parse(drayDataString) + const dropData: Exclude = JSONParse(drayDataString) // 创建新图表组件 let newComponent: CreateComponentType = await createComponent(dropData) diff --git a/src/views/edit/index.vue b/src/views/edit/index.vue index 42d1e4ab..54186cda 100644 --- a/src/views/edit/index.vue +++ b/src/views/edit/index.vue @@ -38,7 +38,7 @@ import { MonacoEditor } from '@/components/Pages/MonacoEditor' import { SavePageEnum } from '@/enums/editPageEnum' import { getSessionStorageInfo } from '../preview/utils' import type { ChartEditStorageType } from '../preview/index.d' -import { setSessionStorage } from '@/utils' +import { setSessionStorage, JSONStringify, JSONParse } from '@/utils' import { StorageEnum } from '@/enums/storageEnum' import { icon } from '@/plugins' @@ -48,7 +48,7 @@ const content = ref('') // 从sessionStorage 获取数据 async function getDataBySession() { const localStorageInfo: ChartEditStorageType = await getSessionStorageInfo() as unknown as ChartEditStorageType - content.value = JSON.stringify(localStorageInfo, undefined, 2) + content.value = JSONStringify(localStorageInfo) } setTimeout(getDataBySession) @@ -72,7 +72,7 @@ async function importJSON() { // 同步 [画布页失去焦点时同步数据到JSON页，JSON页Ctrl+S 时同步数据到画布页] window.opener.addEventListener(SavePageEnum.CHART, (e: any) => { setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, [e.detail]) - content.value = JSON.stringify(e.detail, undefined, 2) + content.value = JSONStringify(e.detail) }) // 窗口失焦 + 保存 => 同步数据 @@ -90,7 +90,7 @@ async function updateSync() { return window['$message'].error('源窗口已关闭，视图同步失败') } try { - const detail = JSON.parse(content.value) + const detail = JSONParse(content.value) delete detail.id // 保持id不变 window.opener.dispatchEvent(new CustomEvent(SavePageEnum.JSON, { detail })) From 327d23ebac239118fc169e2494d3bf32e2d1d79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Mon, 9 Jan 2023 11:37:57 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20JSON=20?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=97=A0=E6=B3=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/chart/hooks/useSync.hook.ts | 6 +++--- src/views/preview/utils/storage.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts index e18a8b64..387c9870 100644 --- a/src/views/chart/hooks/useSync.hook.ts +++ b/src/views/chart/hooks/useSync.hook.ts @@ -1,6 +1,6 @@ import { onUnmounted } from 'vue'; import html2canvas from 'html2canvas' -import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile } from '@/utils' +import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile, JSONStringify, JSONParse } from '@/utils' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { EditCanvasTypeEnum, ChartEditStoreEnum, ProjectInfoEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d' import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore' @@ -245,7 +245,7 @@ export const useSync = () => { if (res.data) { updateStoreInfo(res.data) // 更新全局数据 - await updateComponent(JSON.parse(res.data.content)) + await updateComponent(JSONParse(res.data.content)) return }else { chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_ID, fetchRouteParamsLocation()) @@ -305,7 +305,7 @@ export const useSync = () => { // 保存数据 let params = new FormData() params.append('projectId', projectId) - params.append('content', JSON.stringify(chartEditStore.getStorageInfo || {})) + params.append('content', JSONStringify(chartEditStore.getStorageInfo || {})) const res= await saveProjectApi(params) if (res && res.code === ResultEnum.SUCCESS) { diff --git a/src/views/preview/utils/storage.ts b/src/views/preview/utils/storage.ts index 94831009..045fac5b 100644 --- a/src/views/preview/utils/storage.ts +++ b/src/views/preview/utils/storage.ts @@ -1,4 +1,4 @@ -import { getSessionStorage, fetchRouteParamsLocation, httpErrorHandle } from '@/utils' +import { getSessionStorage, fetchRouteParamsLocation, httpErrorHandle, JSONParse } from '@/utils' import { ResultEnum } from '@/enums/httpEnum' import { StorageEnum } from '@/enums/storageEnum' import { ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d' @@ -23,7 +23,7 @@ export const getSessionStorageInfo = async () => { // 跳转未发布页 return { isRelease: false } } - return { ...JSON.parse(content), id } + return { ...JSONParse(content), id } } else { httpErrorHandle() } From 13467e569f7580ac30a0d9e659a5583d81fecdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Mon, 9 Jan 2023 19:32:09 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E4=BC=9A=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Charts/Bars/BarCommon/index.ts | 3 +- .../Charts/Bars/BarCrossrange/index.ts | 3 +- .../Charts/Bars/CapsuleChart/index.ts | 3 +- .../Charts/Lines/LineCommon/index.ts | 3 +- .../Charts/Lines/LineGradientSingle/index.ts | 3 +- .../Charts/Lines/LineGradients/index.ts | 3 +- .../Charts/Lines/LineLinearSingle/index.ts | 3 +- .../components/Charts/Maps/MapAmap/index.ts | 3 +- .../components/Charts/Maps/MapBase/index.ts | 5 +-- .../components/Charts/Mores/Funnel/index.ts | 3 +- .../components/Charts/Mores/Heatmap/index.ts | 3 +- .../components/Charts/Mores/Process/index.ts | 4 +- .../components/Charts/Mores/Radar/index.ts | 3 +- .../components/Charts/Mores/TreeMap/index.ts | 3 +- .../Charts/Mores/WaterPolo/index.ts | 3 +- .../components/Charts/Pies/PieCircle/index.ts | 2 +- .../components/Charts/Pies/PieCommon/index.ts | 3 +- .../Charts/Scatters/ScatterCommon/index.ts | 3 +- .../ScatterLogarithmicRegression/index.ts | 3 +- .../Decorates/Borders/Border01/index.ts | 3 +- .../Decorates/Borders/Border02/index.ts | 2 +- .../Decorates/Borders/Border03/index.ts | 3 +- .../Decorates/Borders/Border04/index.ts | 3 +- .../Decorates/Borders/Border05/index.ts | 3 +- .../Decorates/Borders/Border06/index.ts | 3 +- .../Decorates/Borders/Border07/index.ts | 3 +- .../Decorates/Borders/Border08/index.ts | 3 +- .../Decorates/Borders/Border09/index.ts | 3 +- .../Decorates/Borders/Border10/index.ts | 3 +- .../Decorates/Borders/Border11/index.ts | 3 +- .../Decorates/Borders/Border12/index.ts | 3 +- .../Decorates/Borders/Border13/index.ts | 3 +- .../Decorates/Decorates/Decorates01/index.ts | 3 +- .../Decorates/Decorates/Decorates02/index.ts | 3 +- .../Decorates/Decorates/Decorates03/index.ts | 3 +- .../Decorates/Decorates/Decorates04/index.ts | 3 +- .../Decorates/Decorates/Decorates05/index.ts | 2 +- .../Decorates/Decorates/Decorates06/index.ts | 3 +- .../components/Decorates/Mores/Clock/index.ts | 3 +- .../Decorates/Mores/CountDown/index.ts | 3 +- .../Decorates/Mores/FlipperNumber/index.ts | 3 +- .../Decorates/Mores/Number/index.ts | 3 +- .../Decorates/Mores/TimeCommon/index.ts | 3 +- .../Decorates/Mores/TimeCommon/index.vue | 6 +-- .../Decorates/Three/ThreeEarth01/index.ts | 3 +- .../Informations/Mores/Iframe/index.ts | 3 +- .../Informations/Mores/Image/index.ts | 3 +- .../Informations/Mores/Video/index.ts | 3 +- .../Informations/Mores/WordCloud/index.ts | 3 +- .../Informations/Texts/TextBarrage/index.ts | 3 +- .../Informations/Texts/TextCommon/index.ts | 3 +- .../Informations/Texts/TextGradient/index.ts | 3 +- .../Tables/Tables/TableList/index.ts | 3 +- .../Tables/Tables/TableScrollBoard/index.ts | 3 +- src/packages/index.d.ts | 2 +- src/packages/index.ts | 44 +++++++++++++------ .../components/ChartsItemBox/index.vue | 3 +- .../components/ChartsItemImage/index.ts | 3 ++ .../components/ChartsItemImage/index.vue | 24 ++++++++++ .../components/LayersListItem/index.vue | 16 ++++--- 60 files changed, 128 insertions(+), 129 deletions(-) create mode 100644 src/views/chart/ContentCharts/components/ChartsItemImage/index.ts create mode 100644 src/views/chart/ContentCharts/components/ChartsItemImage/index.vue diff --git a/src/packages/components/Charts/Bars/BarCommon/index.ts b/src/packages/components/Charts/Bars/BarCommon/index.ts index a4247970..f142acf9 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.ts +++ b/src/packages/components/Charts/Bars/BarCommon/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/bar_x.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const BarCommonConfig: ConfigType = { categoryName: ChatCategoryEnumName.BAR, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'bar_x.png' } diff --git a/src/packages/components/Charts/Bars/BarCrossrange/index.ts b/src/packages/components/Charts/Bars/BarCrossrange/index.ts index a85f9fe9..8888851e 100644 --- a/src/packages/components/Charts/Bars/BarCrossrange/index.ts +++ b/src/packages/components/Charts/Bars/BarCrossrange/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/bar_y.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const BarCrossrangeConfig: ConfigType = { categoryName: ChatCategoryEnumName.BAR, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'bar_y.png' } diff --git a/src/packages/components/Charts/Bars/CapsuleChart/index.ts b/src/packages/components/Charts/Bars/CapsuleChart/index.ts index a0fc6291..69d75962 100644 --- a/src/packages/components/Charts/Bars/CapsuleChart/index.ts +++ b/src/packages/components/Charts/Bars/CapsuleChart/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/capsule.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const CapsuleChartConfig: ConfigType = { categoryName: ChatCategoryEnumName.BAR, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'capsule.png' } diff --git a/src/packages/components/Charts/Lines/LineCommon/index.ts b/src/packages/components/Charts/Lines/LineCommon/index.ts index 1897682e..bdd99189 100644 --- a/src/packages/components/Charts/Lines/LineCommon/index.ts +++ b/src/packages/components/Charts/Lines/LineCommon/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/line.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const LineCommonConfig: ConfigType = { categoryName: ChatCategoryEnumName.LINE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'line.png' } diff --git a/src/packages/components/Charts/Lines/LineGradientSingle/index.ts b/src/packages/components/Charts/Lines/LineGradientSingle/index.ts index d2ff3e84..69f66502 100644 --- a/src/packages/components/Charts/Lines/LineGradientSingle/index.ts +++ b/src/packages/components/Charts/Lines/LineGradientSingle/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/line_gradient_single.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const LineGradientSingleConfig: ConfigType = { categoryName: ChatCategoryEnumName.LINE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'line_gradient_single.png' } diff --git a/src/packages/components/Charts/Lines/LineGradients/index.ts b/src/packages/components/Charts/Lines/LineGradients/index.ts index aa4273d7..1145dcb0 100644 --- a/src/packages/components/Charts/Lines/LineGradients/index.ts +++ b/src/packages/components/Charts/Lines/LineGradients/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/line_gradient.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const LineGradientsConfig: ConfigType = { categoryName: ChatCategoryEnumName.LINE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'line_gradient.png' } diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/index.ts b/src/packages/components/Charts/Lines/LineLinearSingle/index.ts index 1b774bde..d96ecdaa 100644 --- a/src/packages/components/Charts/Lines/LineLinearSingle/index.ts +++ b/src/packages/components/Charts/Lines/LineLinearSingle/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/line_linear_single.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const LineLinearSingleConfig: ConfigType = { categoryName: ChatCategoryEnumName.LINE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'line_linear_single.png' } diff --git a/src/packages/components/Charts/Maps/MapAmap/index.ts b/src/packages/components/Charts/Maps/MapAmap/index.ts index 02b3998b..27e9579f 100644 --- a/src/packages/components/Charts/Maps/MapAmap/index.ts +++ b/src/packages/components/Charts/Maps/MapAmap/index.ts @@ -1,5 +1,4 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' -import image from '@/assets/images/chart/charts/map_amap.png' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const MapAmapConfig: ConfigType = { @@ -11,5 +10,5 @@ export const MapAmapConfig: ConfigType = { categoryName: ChatCategoryEnumName.MAP, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'map_amap.png' } diff --git a/src/packages/components/Charts/Maps/MapBase/index.ts b/src/packages/components/Charts/Maps/MapBase/index.ts index 5567697e..4010cf38 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.ts +++ b/src/packages/components/Charts/Maps/MapBase/index.ts @@ -1,5 +1,4 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' -import image from '@/assets/images/chart/charts/map.png' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const MapBaseConfig: ConfigType = { @@ -11,5 +10,5 @@ export const MapBaseConfig: ConfigType = { categoryName: ChatCategoryEnumName.MAP, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image - } \ No newline at end of file + image: 'map.png' +} \ No newline at end of file diff --git a/src/packages/components/Charts/Mores/Funnel/index.ts b/src/packages/components/Charts/Mores/Funnel/index.ts index da99c3fb..d553edad 100644 --- a/src/packages/components/Charts/Mores/Funnel/index.ts +++ b/src/packages/components/Charts/Mores/Funnel/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/funnel.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const FunnelConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'funnel.png' } diff --git a/src/packages/components/Charts/Mores/Heatmap/index.ts b/src/packages/components/Charts/Mores/Heatmap/index.ts index 8953153e..d8c833b2 100644 --- a/src/packages/components/Charts/Mores/Heatmap/index.ts +++ b/src/packages/components/Charts/Mores/Heatmap/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/heatmap.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const HeatmapConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'heatmap.png' } diff --git a/src/packages/components/Charts/Mores/Process/index.ts b/src/packages/components/Charts/Mores/Process/index.ts index 093aa03a..c4591ea4 100644 --- a/src/packages/components/Charts/Mores/Process/index.ts +++ b/src/packages/components/Charts/Mores/Process/index.ts @@ -1,5 +1,3 @@ -// 展示图片 -import image from '@/assets/images/chart/charts/process.png' // 公共类型声明 import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' // 当前[信息模块]分类声明 @@ -21,5 +19,5 @@ export const ProcessConfig: ConfigType = { // 包分类 package: PackagesCategoryEnum.CHARTS, // 图片 - image: image + image: 'process.png' } \ No newline at end of file diff --git a/src/packages/components/Charts/Mores/Radar/index.ts b/src/packages/components/Charts/Mores/Radar/index.ts index 35a95ece..d7b9f2f9 100644 --- a/src/packages/components/Charts/Mores/Radar/index.ts +++ b/src/packages/components/Charts/Mores/Radar/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/radar.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const RadarConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'radar.png' } diff --git a/src/packages/components/Charts/Mores/TreeMap/index.ts b/src/packages/components/Charts/Mores/TreeMap/index.ts index 5ccc28c5..614b58d4 100644 --- a/src/packages/components/Charts/Mores/TreeMap/index.ts +++ b/src/packages/components/Charts/Mores/TreeMap/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/tree_map.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const TreeMapConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'tree_map.png' } diff --git a/src/packages/components/Charts/Mores/WaterPolo/index.ts b/src/packages/components/Charts/Mores/WaterPolo/index.ts index 2d1500d2..0fd42de7 100644 --- a/src/packages/components/Charts/Mores/WaterPolo/index.ts +++ b/src/packages/components/Charts/Mores/WaterPolo/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/water_WaterPolo.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const WaterPoloConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'water_WaterPolo.png' } diff --git a/src/packages/components/Charts/Pies/PieCircle/index.ts b/src/packages/components/Charts/Pies/PieCircle/index.ts index 78c8bed7..079bf607 100644 --- a/src/packages/components/Charts/Pies/PieCircle/index.ts +++ b/src/packages/components/Charts/Pies/PieCircle/index.ts @@ -11,5 +11,5 @@ export const PieCircleConfig: ConfigType = { categoryName: ChatCategoryEnumName.PIE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'pie-circle.png' } diff --git a/src/packages/components/Charts/Pies/PieCommon/index.ts b/src/packages/components/Charts/Pies/PieCommon/index.ts index d8394c08..85d9bda3 100644 --- a/src/packages/components/Charts/Pies/PieCommon/index.ts +++ b/src/packages/components/Charts/Pies/PieCommon/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/pie.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const PieCommonConfig: ConfigType = { categoryName: ChatCategoryEnumName.PIE, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'pie.png' } diff --git a/src/packages/components/Charts/Scatters/ScatterCommon/index.ts b/src/packages/components/Charts/Scatters/ScatterCommon/index.ts index 0c1d695f..08a9f043 100644 --- a/src/packages/components/Charts/Scatters/ScatterCommon/index.ts +++ b/src/packages/components/Charts/Scatters/ScatterCommon/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/scatter-multi.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const ScatterCommonConfig: ConfigType = { categoryName: ChatCategoryEnumName.SCATTER, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'scatter-multi.png' } diff --git a/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/index.ts b/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/index.ts index b9674705..3fe75d8e 100644 --- a/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/index.ts +++ b/src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/charts/scatter-logarithmic-regression.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const ScatterLogarithmicRegressionConfig: ConfigType = { categoryName: ChatCategoryEnumName.SCATTER, package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.ECHARTS, - image + image: 'scatter-logarithmic-regression.png' } diff --git a/src/packages/components/Decorates/Borders/Border01/index.ts b/src/packages/components/Decorates/Borders/Border01/index.ts index 396caf56..4cc33f6a 100644 --- a/src/packages/components/Decorates/Borders/Border01/index.ts +++ b/src/packages/components/Decorates/Borders/Border01/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border01.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border01Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border01.png' } diff --git a/src/packages/components/Decorates/Borders/Border02/index.ts b/src/packages/components/Decorates/Borders/Border02/index.ts index b5f72afe..29d4ecde 100644 --- a/src/packages/components/Decorates/Borders/Border02/index.ts +++ b/src/packages/components/Decorates/Borders/Border02/index.ts @@ -10,5 +10,5 @@ export const Border02Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border02.png' } diff --git a/src/packages/components/Decorates/Borders/Border03/index.ts b/src/packages/components/Decorates/Borders/Border03/index.ts index 6574e3a7..0f2759a8 100644 --- a/src/packages/components/Decorates/Borders/Border03/index.ts +++ b/src/packages/components/Decorates/Borders/Border03/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border03.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border03Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border03.png' } diff --git a/src/packages/components/Decorates/Borders/Border04/index.ts b/src/packages/components/Decorates/Borders/Border04/index.ts index 2d34e3c5..42b351c4 100644 --- a/src/packages/components/Decorates/Borders/Border04/index.ts +++ b/src/packages/components/Decorates/Borders/Border04/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border04.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border04Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border04.png' } diff --git a/src/packages/components/Decorates/Borders/Border05/index.ts b/src/packages/components/Decorates/Borders/Border05/index.ts index 7cdfb822..b9c71cd2 100644 --- a/src/packages/components/Decorates/Borders/Border05/index.ts +++ b/src/packages/components/Decorates/Borders/Border05/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border05.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border05Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border05.png' } diff --git a/src/packages/components/Decorates/Borders/Border06/index.ts b/src/packages/components/Decorates/Borders/Border06/index.ts index cb73818e..f32e3be4 100644 --- a/src/packages/components/Decorates/Borders/Border06/index.ts +++ b/src/packages/components/Decorates/Borders/Border06/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border06.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border06Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border06.png' } diff --git a/src/packages/components/Decorates/Borders/Border07/index.ts b/src/packages/components/Decorates/Borders/Border07/index.ts index c9c56853..4d751913 100644 --- a/src/packages/components/Decorates/Borders/Border07/index.ts +++ b/src/packages/components/Decorates/Borders/Border07/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border07.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border07Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border07.png' } diff --git a/src/packages/components/Decorates/Borders/Border08/index.ts b/src/packages/components/Decorates/Borders/Border08/index.ts index 9d52aee1..7096ea1e 100644 --- a/src/packages/components/Decorates/Borders/Border08/index.ts +++ b/src/packages/components/Decorates/Borders/Border08/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border08.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border08Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border08.png' } diff --git a/src/packages/components/Decorates/Borders/Border09/index.ts b/src/packages/components/Decorates/Borders/Border09/index.ts index 0733ba92..45078b02 100644 --- a/src/packages/components/Decorates/Borders/Border09/index.ts +++ b/src/packages/components/Decorates/Borders/Border09/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border09.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border09Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border09.png' } diff --git a/src/packages/components/Decorates/Borders/Border10/index.ts b/src/packages/components/Decorates/Borders/Border10/index.ts index 02f96a73..e059257c 100644 --- a/src/packages/components/Decorates/Borders/Border10/index.ts +++ b/src/packages/components/Decorates/Borders/Border10/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border10.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border10Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border10.png' } diff --git a/src/packages/components/Decorates/Borders/Border11/index.ts b/src/packages/components/Decorates/Borders/Border11/index.ts index eb75beb6..12bc1245 100644 --- a/src/packages/components/Decorates/Borders/Border11/index.ts +++ b/src/packages/components/Decorates/Borders/Border11/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border11.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border11Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border11.png' } diff --git a/src/packages/components/Decorates/Borders/Border12/index.ts b/src/packages/components/Decorates/Borders/Border12/index.ts index 9a9686e0..ecd82162 100644 --- a/src/packages/components/Decorates/Borders/Border12/index.ts +++ b/src/packages/components/Decorates/Borders/Border12/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border12.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border12Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border12.png' } diff --git a/src/packages/components/Decorates/Borders/Border13/index.ts b/src/packages/components/Decorates/Borders/Border13/index.ts index 7f756116..05144893 100644 --- a/src/packages/components/Decorates/Borders/Border13/index.ts +++ b/src/packages/components/Decorates/Borders/Border13/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/border13.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Border13Config: ConfigType = { category: ChatCategoryEnum.BORDER, categoryName: ChatCategoryEnumName.BORDER, package: PackagesCategoryEnum.DECORATES, - image + image: 'border13.png' } diff --git a/src/packages/components/Decorates/Decorates/Decorates01/index.ts b/src/packages/components/Decorates/Decorates/Decorates01/index.ts index 85795892..8e9f760c 100644 --- a/src/packages/components/Decorates/Decorates/Decorates01/index.ts +++ b/src/packages/components/Decorates/Decorates/Decorates01/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/decorates01.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Decorates01Config: ConfigType = { category: ChatCategoryEnum.DECORATE, categoryName: ChatCategoryEnumName.DECORATE, package: PackagesCategoryEnum.DECORATES, - image + image: 'decorates01.png' } diff --git a/src/packages/components/Decorates/Decorates/Decorates02/index.ts b/src/packages/components/Decorates/Decorates/Decorates02/index.ts index 6c4caaca..09e73328 100644 --- a/src/packages/components/Decorates/Decorates/Decorates02/index.ts +++ b/src/packages/components/Decorates/Decorates/Decorates02/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/decorates02.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Decorates02Config: ConfigType = { category: ChatCategoryEnum.DECORATE, categoryName: ChatCategoryEnumName.DECORATE, package: PackagesCategoryEnum.DECORATES, - image + image: 'decorates02.png' } diff --git a/src/packages/components/Decorates/Decorates/Decorates03/index.ts b/src/packages/components/Decorates/Decorates/Decorates03/index.ts index f7dcf43f..a580504a 100644 --- a/src/packages/components/Decorates/Decorates/Decorates03/index.ts +++ b/src/packages/components/Decorates/Decorates/Decorates03/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/decorates03.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Decorates03Config: ConfigType = { category: ChatCategoryEnum.DECORATE, categoryName: ChatCategoryEnumName.DECORATE, package: PackagesCategoryEnum.DECORATES, - image + image: 'decorates01.png' } diff --git a/src/packages/components/Decorates/Decorates/Decorates04/index.ts b/src/packages/components/Decorates/Decorates/Decorates04/index.ts index 5c608583..32c4b839 100644 --- a/src/packages/components/Decorates/Decorates/Decorates04/index.ts +++ b/src/packages/components/Decorates/Decorates/Decorates04/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/decorates04.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const Decorates04Config: ConfigType = { category: ChatCategoryEnum.DECORATE, categoryName: ChatCategoryEnumName.DECORATE, package: PackagesCategoryEnum.DECORATES, - image + image: 'decorates04.png' } diff --git a/src/packages/components/Decorates/Decorates/Decorates05/index.ts b/src/packages/components/Decorates/Decorates/Decorates05/index.ts index 9b3396fc..ba1405d4 100644 --- a/src/packages/components/Decorates/Decorates/Decorates05/index.ts +++ b/src/packages/components/Decorates/Decorates/Decorates05/index.ts @@ -10,5 +10,5 @@ export const Decorates05Config: ConfigType = { category: ChatCategoryEnum.DECORATE, categoryName: ChatCategoryEnumName.DECORATE, package: PackagesCategoryEnum.DECORATES, - image + image: 'decorates05.png' } diff --git a/src/packages/components/Decorates/Decorates/Decorates06/index.ts b/src/packages/components/Decorates/Decorates/Decorates06/index.ts index 3e3dadaa..6667bfa2 100644 --- a/src/packages/components/Decorates/Decorates/Decorates06/index.ts +++ b/src/packages/components/Decorates/Decorates/Decorates06/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/decorates06.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const Decorates06Config: ConfigType = { categoryName: ChatCategoryEnumName.DECORATE, package: PackagesCategoryEnum.DECORATES, chartFrame: ChartFrameEnum.COMMON, - image + image: 'decorates06.png' } diff --git a/src/packages/components/Decorates/Mores/Clock/index.ts b/src/packages/components/Decorates/Mores/Clock/index.ts index 7a0ad487..6048dd00 100644 --- a/src/packages/components/Decorates/Mores/Clock/index.ts +++ b/src/packages/components/Decorates/Mores/Clock/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/clock.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const ClockConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.DECORATES, chartFrame: ChartFrameEnum.STATIC, - image + image: 'clock.png' } diff --git a/src/packages/components/Decorates/Mores/CountDown/index.ts b/src/packages/components/Decorates/Mores/CountDown/index.ts index 6755fdda..58648fcd 100644 --- a/src/packages/components/Decorates/Mores/CountDown/index.ts +++ b/src/packages/components/Decorates/Mores/CountDown/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/countdown.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const CountDownConfig: ConfigType = { category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.DECORATES, - image + image: 'countdown.png' } diff --git a/src/packages/components/Decorates/Mores/FlipperNumber/index.ts b/src/packages/components/Decorates/Mores/FlipperNumber/index.ts index b4fce9cd..5928be54 100644 --- a/src/packages/components/Decorates/Mores/FlipperNumber/index.ts +++ b/src/packages/components/Decorates/Mores/FlipperNumber/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/flipper-number.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const FlipperNumberConfig: ConfigType = { category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.DECORATES, - image + image: 'flipper-number.png' } diff --git a/src/packages/components/Decorates/Mores/Number/index.ts b/src/packages/components/Decorates/Mores/Number/index.ts index ff9a9469..59726cf6 100644 --- a/src/packages/components/Decorates/Mores/Number/index.ts +++ b/src/packages/components/Decorates/Mores/Number/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/number.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const NumberConfig: ConfigType = { category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.DECORATES, - image + image: 'number.png' } diff --git a/src/packages/components/Decorates/Mores/TimeCommon/index.ts b/src/packages/components/Decorates/Mores/TimeCommon/index.ts index 0bdd8924..427d25d2 100644 --- a/src/packages/components/Decorates/Mores/TimeCommon/index.ts +++ b/src/packages/components/Decorates/Mores/TimeCommon/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/time.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const TimeCommonConfig: ConfigType = { category: ChatCategoryEnum.MORE, categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.DECORATES, - image + image: 'time.png' } diff --git a/src/packages/components/Decorates/Mores/TimeCommon/index.vue b/src/packages/components/Decorates/Mores/TimeCommon/index.vue index a8e41763..a2f4d638 100644 --- a/src/packages/components/Decorates/Mores/TimeCommon/index.vue +++ b/src/packages/components/Decorates/Mores/TimeCommon/index.vue @@ -26,7 +26,7 @@ let yearMonthDay = ref('2021-2-3') let nowData = ref('08:00:00') let newData = ref('2021-2-3 08:00:00') let boxShadow = ref('none') - +let timer: any = null const { w, h } = toRefs(props.chartConfig.attr) let { @@ -60,7 +60,7 @@ watch( } ) onMounted(() => { - const timer = setInterval(() => { + timer = setInterval(() => { var datetime = new Date() var year = datetime.getFullYear() var month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1 @@ -81,7 +81,7 @@ onMounted(() => { }, 500) }) onUnmounted(() => { - clearInterval() + clearInterval(timer) }) useChartDataFetch(props.chartConfig, useChartEditStore) diff --git a/src/packages/components/Decorates/Three/ThreeEarth01/index.ts b/src/packages/components/Decorates/Three/ThreeEarth01/index.ts index fbaf4b75..1bb29b93 100644 --- a/src/packages/components/Decorates/Three/ThreeEarth01/index.ts +++ b/src/packages/components/Decorates/Three/ThreeEarth01/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/decorates/threeEarth01.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const ThreeEarth01Config: ConfigType = { categoryName: ChatCategoryEnumName.THREE, package: PackagesCategoryEnum.DECORATES, chartFrame: ChartFrameEnum.STATIC, - image + image: 'threeEarth01.png' } diff --git a/src/packages/components/Informations/Mores/Iframe/index.ts b/src/packages/components/Informations/Mores/Iframe/index.ts index d87036cb..9409eaec 100644 --- a/src/packages/components/Informations/Mores/Iframe/index.ts +++ b/src/packages/components/Informations/Mores/Iframe/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/iframe.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const IframeConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'iframe.png' } diff --git a/src/packages/components/Informations/Mores/Image/index.ts b/src/packages/components/Informations/Mores/Image/index.ts index ad186f30..3be876db 100644 --- a/src/packages/components/Informations/Mores/Image/index.ts +++ b/src/packages/components/Informations/Mores/Image/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/photo.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const ImageConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'photo.png' } diff --git a/src/packages/components/Informations/Mores/Video/index.ts b/src/packages/components/Informations/Mores/Video/index.ts index c10ced02..769cfc50 100644 --- a/src/packages/components/Informations/Mores/Video/index.ts +++ b/src/packages/components/Informations/Mores/Video/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/video.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const VideoConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'video.png' } diff --git a/src/packages/components/Informations/Mores/WordCloud/index.ts b/src/packages/components/Informations/Mores/WordCloud/index.ts index 7eb0c6ed..05949f70 100644 --- a/src/packages/components/Informations/Mores/WordCloud/index.ts +++ b/src/packages/components/Informations/Mores/WordCloud/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/words_cloud.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const WordCloudConfig: ConfigType = { categoryName: ChatCategoryEnumName.MORE, package: PackagesCategoryEnum.INFORMATIONS, chartFrame: ChartFrameEnum.COMMON, - image + image: 'words_cloud.png' } diff --git a/src/packages/components/Informations/Texts/TextBarrage/index.ts b/src/packages/components/Informations/Texts/TextBarrage/index.ts index a93cf259..95e5016f 100644 --- a/src/packages/components/Informations/Texts/TextBarrage/index.ts +++ b/src/packages/components/Informations/Texts/TextBarrage/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/text_barrage.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const TextBarrageConfig: ConfigType = { category: ChatCategoryEnum.TEXT, categoryName: ChatCategoryEnumName.TEXT, package: PackagesCategoryEnum.INFORMATIONS, - image + image: 'text_barrage.png' } diff --git a/src/packages/components/Informations/Texts/TextCommon/index.ts b/src/packages/components/Informations/Texts/TextCommon/index.ts index ffce3131..7adeea94 100644 --- a/src/packages/components/Informations/Texts/TextCommon/index.ts +++ b/src/packages/components/Informations/Texts/TextCommon/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/text_static.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -10,5 +9,5 @@ export const TextCommonConfig: ConfigType = { category: ChatCategoryEnum.TEXT, categoryName: ChatCategoryEnumName.TEXT, package: PackagesCategoryEnum.INFORMATIONS, - image + image: 'text_static.png' } diff --git a/src/packages/components/Informations/Texts/TextGradient/index.ts b/src/packages/components/Informations/Texts/TextGradient/index.ts index 67bd4951..1ab75ac0 100644 --- a/src/packages/components/Informations/Texts/TextGradient/index.ts +++ b/src/packages/components/Informations/Texts/TextGradient/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/informations/text_gradient.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const TextGradientConfig: ConfigType = { categoryName: ChatCategoryEnumName.TEXT, package: PackagesCategoryEnum.INFORMATIONS, chartFrame: ChartFrameEnum.NAIVE_UI, - image + image: 'text_gradient.png' } diff --git a/src/packages/components/Tables/Tables/TableList/index.ts b/src/packages/components/Tables/Tables/TableList/index.ts index 5d40a2bc..51d502f7 100644 --- a/src/packages/components/Tables/Tables/TableList/index.ts +++ b/src/packages/components/Tables/Tables/TableList/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/tables/tables_list.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const TableListConfig: ConfigType = { categoryName: ChatCategoryEnumName.TABLE, package: PackagesCategoryEnum.TABLES, chartFrame: ChartFrameEnum.COMMON, - image + image: 'tables_list.png' } diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/index.ts b/src/packages/components/Tables/Tables/TableScrollBoard/index.ts index 20130987..5ecc6e66 100644 --- a/src/packages/components/Tables/Tables/TableScrollBoard/index.ts +++ b/src/packages/components/Tables/Tables/TableScrollBoard/index.ts @@ -1,4 +1,3 @@ -import image from '@/assets/images/chart/tables/table_scrollboard.png' import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' @@ -11,5 +10,5 @@ export const TableScrollBoardConfig: ConfigType = { categoryName: ChatCategoryEnumName.TABLE, package: PackagesCategoryEnum.TABLES, chartFrame: ChartFrameEnum.COMMON, - image + image: 'table_scrollboard.png' } diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index fbdfa2f5..f431bf75 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -22,7 +22,7 @@ export type ConfigType = { categoryName: string package: string chartFrame?: ChartFrameEnum - image: string | (() => Promise) + image: string } // 数据请求 diff --git a/src/packages/index.ts b/src/packages/index.ts index 25476aa1..d568afcb 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -2,15 +2,11 @@ import { ChartList } from '@/packages/components/Charts/index' import { DecorateList } from '@/packages/components/Decorates/index' import { InformationList } from '@/packages/components/Informations/index' import { TableList } from '@/packages/components/Tables/index' -import { - PackagesCategoryEnum, - PackagesType, - ConfigType, - FetchComFlagType -} from '@/packages/index.d' +import { PackagesCategoryEnum, PackagesType, ConfigType, FetchComFlagType } from '@/packages/index.d' -const configModules = import.meta.globEager("./components/**/config.vue") -const indexModules = import.meta.globEager("./components/**/index.vue") +const configModules = import.meta.globEager('./components/**/config.vue') +const indexModules = import.meta.globEager('./components/**/index.vue') +const imagesModules = import.meta.globEager('../assets/images/chart/**') // * 所有图表 export let packagesList: PackagesType = { @@ -24,7 +20,7 @@ export let packagesList: PackagesType = { * * 获取目标组件配置信息 * @param targetData */ - export const createComponent = async (targetData: ConfigType) => { +export const createComponent = async (targetData: ConfigType) => { const { category, key } = targetData const chart = await import(`./components/${targetData.package}/${category}/${key}/config.ts`) return new chart.default() @@ -36,10 +32,10 @@ export let packagesList: PackagesType = { * @param {FetchComFlagType} flag 标识 0为展示组件, 1为配置组件 */ const fetchComponent = (chartName: string, flag: FetchComFlagType) => { - const module = flag === FetchComFlagType.VIEW ? indexModules: configModules + const module = flag === FetchComFlagType.VIEW ? indexModules : configModules for (const key in module) { const urlSplit = key.split('/') - if(urlSplit[urlSplit.length -2 ] === chartName) { + if (urlSplit[urlSplit.length - 2] === chartName) { return module[key] } } @@ -49,7 +45,7 @@ const fetchComponent = (chartName: string, flag: FetchComFlagType) => { * * 获取展示组件 * @param {ConfigType} dropData 配置项 */ - export const fetchChartComponent = (dropData: ConfigType) => { +export const fetchChartComponent = (dropData: ConfigType) => { const { key } = dropData return fetchComponent(key, FetchComFlagType.VIEW)?.default } @@ -58,7 +54,27 @@ const fetchComponent = (chartName: string, flag: FetchComFlagType) => { * * 获取配置组件 * @param {ConfigType} dropData 配置项 */ - export const fetchConfigComponent = (dropData: ConfigType) => { +export const fetchConfigComponent = (dropData: ConfigType) => { const { key } = dropData return fetchComponent(key, FetchComFlagType.CONFIG)?.default -} \ No newline at end of file +} + +/** + * * 获取图片内容 + * @param {ConfigType} targetData 配置项 + */ +export const fetchImages = async (targetData: ConfigType) => { + // 新数据动态处理 + const { image, package: targetDataPackage } = targetData + // 兼容旧数据 + if (image.includes('@') || image.includes('base64')) return image + + const imageName = image.substring(image.lastIndexOf('/') + 1) + for (const key in imagesModules) { + const urlSplit = key.split('/') + if (urlSplit[urlSplit.length - 1] === imageName) { + return imagesModules[key]?.default + } + } + return '' +} diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue index dbb9cda7..b6b9beeb 100644 --- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue +++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue @@ -22,7 +22,7 @@
- 图表图片 +
@@ -37,6 +37,7 @@ diff --git a/src/views/chart/ContentLayers/components/LayersListItem/index.vue b/src/views/chart/ContentLayers/components/LayersListItem/index.vue index 1d5af943..d77ed451 100644 --- a/src/views/chart/ContentLayers/components/LayersListItem/index.vue +++ b/src/views/chart/ContentLayers/components/LayersListItem/index.vue @@ -5,7 +5,7 @@ class="list-img" object-fit="contain" preview-disabled - :src="image" + :src="imageInfo" :fallback-src="requireErrorImg()" > @@ -20,16 +20,18 @@