diff --git a/src/components/LoadingComponent/index.ts b/src/components/LoadingComponent/index.ts index 5f8c69de..434d7dd9 100644 --- a/src/components/LoadingComponent/index.ts +++ b/src/components/LoadingComponent/index.ts @@ -1,3 +1,12 @@ -import LoadingComponent from './index.vue'; +import type { App } from 'vue' +import LoadingComponent from './index.vue' +import AsyncLoading from './index.vue' -export { LoadingComponent }; +// 正常组件 +export { LoadingComponent } + +// 异步 +AsyncLoading.install = (app: App): void => { + app.component('AsyncLoading', AsyncLoading) +} +export { AsyncLoading } diff --git a/src/components/LoadingComponent/index.vue b/src/components/LoadingComponent/index.vue index 9d36943b..259559a2 100644 --- a/src/components/LoadingComponent/index.vue +++ b/src/components/LoadingComponent/index.vue @@ -1,6 +1,6 @@ diff --git a/src/packages/components/Chart/Bars/BarCommon/index.ts b/src/packages/components/Chart/Bars/BarCommon/index.ts index aa094bbf..cdf8c9a6 100644 --- a/src/packages/components/Chart/Bars/BarCommon/index.ts +++ b/src/packages/components/Chart/Bars/BarCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const BarCommonConfig: ConfigType = { - key: 'BarCommon', + key: 'VBarCommon', title: '柱状图', category: ChatCategoryEnum.BAR, node: BarCommon, diff --git a/src/packages/components/Chart/Bars/BarCrossrange/index.ts b/src/packages/components/Chart/Bars/BarCrossrange/index.ts index de724b0c..3abfd8cd 100644 --- a/src/packages/components/Chart/Bars/BarCrossrange/index.ts +++ b/src/packages/components/Chart/Bars/BarCrossrange/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const BarCrossrangefig: ConfigType = { - key: 'BarCrossrange', + key: 'VBarCrossrange', title: '横向柱状图', category: ChatCategoryEnum.BAR, node: BarCrossrange, diff --git a/src/packages/components/Chart/Lines/LineCommon/index.ts b/src/packages/components/Chart/Lines/LineCommon/index.ts index 4d1ad1f3..a83f7c53 100644 --- a/src/packages/components/Chart/Lines/LineCommon/index.ts +++ b/src/packages/components/Chart/Lines/LineCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const LineCommonConfig: ConfigType = { - key: 'LineCommon', + key: 'VLineCommon', title: '折线图', category: ChatCategoryEnum.LINE, node: LineCommon, diff --git a/src/packages/components/Chart/Lines/LineGradientSingle/index.ts b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts index 2efbe40e..3f30d1cd 100644 --- a/src/packages/components/Chart/Lines/LineGradientSingle/index.ts +++ b/src/packages/components/Chart/Lines/LineGradientSingle/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const LineGradientSingleConfig: ConfigType = { - key: 'LineGradientSingle', + key: 'VLineGradientSingle', title: '折线面积图', category: ChatCategoryEnum.LINE, node: LineGradientSingle, diff --git a/src/packages/components/Chart/Lines/LineGradients/index.ts b/src/packages/components/Chart/Lines/LineGradients/index.ts index 75e34a6b..948246ed 100644 --- a/src/packages/components/Chart/Lines/LineGradients/index.ts +++ b/src/packages/components/Chart/Lines/LineGradients/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const LineGradientsConfig: ConfigType = { - key: 'LineGradientSingle', + key: 'VLineGradientSingle', title: '折线面积图', category: ChatCategoryEnum.LINE, node: LineGradients, diff --git a/src/packages/components/Chart/Maps/MapChine/index.ts b/src/packages/components/Chart/Maps/MapChine/index.ts index b3894352..85816e43 100644 --- a/src/packages/components/Chart/Maps/MapChine/index.ts +++ b/src/packages/components/Chart/Maps/MapChine/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const MapChineConfig: ConfigType = { - key: 'MapChine', + key: 'VMapChine', title: '北京地图', category: ChatCategoryEnum.MAP, node: MapChine, diff --git a/src/packages/components/Chart/Mores/Funnel/index.ts b/src/packages/components/Chart/Mores/Funnel/index.ts index 99bf9f30..b7e15f76 100644 --- a/src/packages/components/Chart/Mores/Funnel/index.ts +++ b/src/packages/components/Chart/Mores/Funnel/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const FunnelConfig: ConfigType = { - key: 'Funnel', + key: 'VFunnel', title: '漏斗图', category: ChatCategoryEnum.MORE, node: Funnel, diff --git a/src/packages/components/Chart/Mores/Heatmap/index.ts b/src/packages/components/Chart/Mores/Heatmap/index.ts index a8d04710..257c3ac2 100644 --- a/src/packages/components/Chart/Mores/Heatmap/index.ts +++ b/src/packages/components/Chart/Mores/Heatmap/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const HeatmapConfig: ConfigType = { - key: 'Heatmap', + key: 'VHeatmap', title: '热力图', category: ChatCategoryEnum.MORE, node: Heatmap, diff --git a/src/packages/components/Chart/Mores/Point/index.ts b/src/packages/components/Chart/Mores/Point/index.ts index 78415499..ef6fe4a6 100644 --- a/src/packages/components/Chart/Mores/Point/index.ts +++ b/src/packages/components/Chart/Mores/Point/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const PointConfig: ConfigType = { - key: 'Point', + key: 'VPoint', title: '热力图', category: ChatCategoryEnum.MORE, node: Point, diff --git a/src/packages/components/Chart/Mores/Radar/index.ts b/src/packages/components/Chart/Mores/Radar/index.ts index 96c885f4..b6222191 100644 --- a/src/packages/components/Chart/Mores/Radar/index.ts +++ b/src/packages/components/Chart/Mores/Radar/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const RadarConfig: ConfigType = { - key: 'Radar', + key: 'VRadar', title: '雷达', category: ChatCategoryEnum.MORE, node: Radar, diff --git a/src/packages/components/Chart/Mores/TreeMap/index.ts b/src/packages/components/Chart/Mores/TreeMap/index.ts index af944cd2..f17a0ec1 100644 --- a/src/packages/components/Chart/Mores/TreeMap/index.ts +++ b/src/packages/components/Chart/Mores/TreeMap/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TreeMapConfig: ConfigType = { - key: 'TreeMap', + key: 'VTreeMap', title: '树形分布', category: ChatCategoryEnum.MORE, node: TreeMap, diff --git a/src/packages/components/Chart/Mores/Variable/index.ts b/src/packages/components/Chart/Mores/Variable/index.ts index 4a0aabc9..5339ec68 100644 --- a/src/packages/components/Chart/Mores/Variable/index.ts +++ b/src/packages/components/Chart/Mores/Variable/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const VariableConfig: ConfigType = { - key: 'Variable', + key: 'VVariable', title: '折线面积图', category: ChatCategoryEnum.MORE, node: Variable, diff --git a/src/packages/components/Chart/Pies/PieCommon/index.ts b/src/packages/components/Chart/Pies/PieCommon/index.ts index 6b41e4ae..918ca0f6 100644 --- a/src/packages/components/Chart/Pies/PieCommon/index.ts +++ b/src/packages/components/Chart/Pies/PieCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const PieCommonConfig: ConfigType = { - key: 'PieCommon', + key: 'VPieCommon', title: '计量图', category: ChatCategoryEnum.PIE, node: PieCommon, diff --git a/src/packages/components/Decorate/Mores/Number/index.ts b/src/packages/components/Decorate/Mores/Number/index.ts index a46fefa2..1694355b 100644 --- a/src/packages/components/Decorate/Mores/Number/index.ts +++ b/src/packages/components/Decorate/Mores/Number/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const NumberConfig: ConfigType = { - key: 'Number', + key: 'VNumber', title: '数字翻牌', category: ChatCategoryEnum.MORE, node: Number, diff --git a/src/packages/components/Decorate/Mores/Time/index.ts b/src/packages/components/Decorate/Mores/Time/index.ts index d25efaa2..fae7cbdb 100644 --- a/src/packages/components/Decorate/Mores/Time/index.ts +++ b/src/packages/components/Decorate/Mores/Time/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TimeConfig: ConfigType = { - key: 'Time', + key: 'VTime', title: '时间', category: ChatCategoryEnum.MORE, node: Time, diff --git a/src/packages/components/Decorate/Mores/Weather/index.ts b/src/packages/components/Decorate/Mores/Weather/index.ts index b446d297..6f91f799 100644 --- a/src/packages/components/Decorate/Mores/Weather/index.ts +++ b/src/packages/components/Decorate/Mores/Weather/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const WeatherConfig: ConfigType = { - key: 'Weather', + key: 'VWeather', title: '天气', category: ChatCategoryEnum.MORE, node: Weather, diff --git a/src/packages/components/Decorate/Mores/WeatherTime/index.ts b/src/packages/components/Decorate/Mores/WeatherTime/index.ts index 061df0c6..dc8c9a6b 100644 --- a/src/packages/components/Decorate/Mores/WeatherTime/index.ts +++ b/src/packages/components/Decorate/Mores/WeatherTime/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const WeatherTimeConfig: ConfigType = { - key: 'WeatherTime', + key: 'VWeatherTime', title: '天气和时间', category: ChatCategoryEnum.MORE, node: WeatherTime, diff --git a/src/packages/components/Decorate/borders/borderCommon/index.ts b/src/packages/components/Decorate/borders/borderCommon/index.ts index 37ab5a64..c9fc5999 100644 --- a/src/packages/components/Decorate/borders/borderCommon/index.ts +++ b/src/packages/components/Decorate/borders/borderCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const BorderCommonConfig: ConfigType = { - key: 'BorderCommon', + key: 'VBorderCommon', title: '边框', category: ChatCategoryEnum.BORDER, node: BorderCommon, diff --git a/src/packages/components/Information/Mores/Image/index.ts b/src/packages/components/Information/Mores/Image/index.ts index f5ee7c4d..db9dd515 100644 --- a/src/packages/components/Information/Mores/Image/index.ts +++ b/src/packages/components/Information/Mores/Image/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const ImageConfig: ConfigType = { - key: 'Image', + key: 'VImage', title: '图片', category: ChatCategoryEnum.MORE, node: Image, diff --git a/src/packages/components/Information/Mores/TextCloud/index.ts b/src/packages/components/Information/Mores/TextCloud/index.ts index da00ca94..56aab195 100644 --- a/src/packages/components/Information/Mores/TextCloud/index.ts +++ b/src/packages/components/Information/Mores/TextCloud/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TextCloudConfig: ConfigType = { - key: 'TextCloud', + key: 'VTextCloud', title: '词云', category: ChatCategoryEnum.MORE, node: TextCloud, diff --git a/src/packages/components/Information/Texts/TextCommon/index.ts b/src/packages/components/Information/Texts/TextCommon/index.ts index d1117c08..b3f29fab 100644 --- a/src/packages/components/Information/Texts/TextCommon/index.ts +++ b/src/packages/components/Information/Texts/TextCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TextCommonConfig: ConfigType = { - key: 'Text', + key: 'VText', title: '文字', category: ChatCategoryEnum.TEXT, node: TextCommon, diff --git a/src/packages/components/Information/Titles/TitleBevelAngle/index.ts b/src/packages/components/Information/Titles/TitleBevelAngle/index.ts index bc50127f..184d2c4c 100644 --- a/src/packages/components/Information/Titles/TitleBevelAngle/index.ts +++ b/src/packages/components/Information/Titles/TitleBevelAngle/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TitleBevelAngleConfig: ConfigType = { - key: 'TitleBevelAngle', + key: 'VTitleBevelAngle', title: '斜角标题', category: ChatCategoryEnum.TITLE, node: TitleBevelAngle, diff --git a/src/packages/components/Information/Titles/TitleCommon/index.ts b/src/packages/components/Information/Titles/TitleCommon/index.ts index 0698bfe7..84d34396 100644 --- a/src/packages/components/Information/Titles/TitleCommon/index.ts +++ b/src/packages/components/Information/Titles/TitleCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TitleCommonConfig: ConfigType = { - key: 'Text', + key: 'VText', title: '普通标题', category: ChatCategoryEnum.TITLE, node: TitleCommon, diff --git a/src/packages/components/Information/Titles/TitlePro/index.ts b/src/packages/components/Information/Titles/TitlePro/index.ts index 5708d8ee..2889bb43 100644 --- a/src/packages/components/Information/Titles/TitlePro/index.ts +++ b/src/packages/components/Information/Titles/TitlePro/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../../index.d' export const TitleProConfig: ConfigType = { - key: 'TitlePro', + key: 'VTitlePro', title: '中心标题', category: ChatCategoryEnum.TITLE, node: TitlePro, diff --git a/src/packages/components/Tables/TableCategory/index.ts b/src/packages/components/Tables/TableCategory/index.ts index b2b48dda..70ecda18 100644 --- a/src/packages/components/Tables/TableCategory/index.ts +++ b/src/packages/components/Tables/TableCategory/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../index.d' export const TableCategoryConfig: ConfigType = { - key: 'TableCategory', + key: 'VTableCategory', title: '归类表格', category: ChatCategoryEnum.table, node: TableCategory, diff --git a/src/packages/components/Tables/tableCommon/index.ts b/src/packages/components/Tables/tableCommon/index.ts index d565c9a9..85c9e95b 100644 --- a/src/packages/components/Tables/tableCommon/index.ts +++ b/src/packages/components/Tables/tableCommon/index.ts @@ -4,7 +4,7 @@ import { ConfigType } from '@/packages/index.d' import { ChatCategoryEnum } from '../index.d' export const TableCommonConfig: ConfigType = { - key: 'TableCommon', + key: 'VTableCommon', title: '表格', category: ChatCategoryEnum.table, node: TableCommon, diff --git a/src/packages/echarts/index.d.ts b/src/packages/echarts/index.d.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/packages/echarts/index.ts b/src/packages/echarts/index.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/store/modules/chartLayoutStore/chartLayoutStore.ts b/src/store/modules/chartLayoutStore/chartLayoutStore.ts index 1da99a32..0a4b421e 100644 --- a/src/store/modules/chartLayoutStore/chartLayoutStore.ts +++ b/src/store/modules/chartLayoutStore/chartLayoutStore.ts @@ -58,7 +58,7 @@ export const useChartLayoutStore = defineStore({ ;(this as any)[key] = value setLocalStorage(GO_CHART_LAYOUT_STORE, this.$state) }, - setFilter(key: T, value: boolean): void { + setFilter(key: T, value: boolean): void { ;(this.filter as any)[key] = value setLocalStorage(GO_CHART_LAYOUT_STORE, this.$state) }, diff --git a/src/utils/componets.ts b/src/utils/componets.ts new file mode 100644 index 00000000..018b7007 --- /dev/null +++ b/src/utils/componets.ts @@ -0,0 +1,14 @@ +import { defineAsyncComponent, AsyncComponentLoader } from 'vue' +import { AsyncLoading } from '@/components/LoadingComponent' + +/** + * * 异步加载组件 + * @param loader + * @returns + */ +export const loadAsyncComponent = (loader: AsyncComponentLoader) => + defineAsyncComponent({ + loader, + loadingComponent: AsyncLoading, + delay: 20, + }) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 30a95681..d06de4e0 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -4,7 +4,7 @@ import screenfull from 'screenfull' import debounce from 'lodash/debounce' /** - * * 生成一个用不重复的ID + * * 生成一个不重复的ID * @param { Number } randomLength */ export function getUUID(randomLength: number) { diff --git a/src/views/chart/components/ContentDetails/index.vue b/src/views/chart/components/ContentDetails/index.vue index 7d63ffe1..f0b2969e 100644 --- a/src/views/chart/components/ContentDetails/index.vue +++ b/src/views/chart/components/ContentDetails/index.vue @@ -1,76 +1,100 @@ diff --git a/src/views/chart/components/HeaderLeftBtn/index.vue b/src/views/chart/components/HeaderLeftBtn/index.vue index 8d23d88e..b16d7a32 100644 --- a/src/views/chart/components/HeaderLeftBtn/index.vue +++ b/src/views/chart/components/HeaderLeftBtn/index.vue @@ -8,19 +8,9 @@ - + @@ -69,6 +59,15 @@ const btnList = reactive([ } ]) + +// store 描述的是展示的值,所以和 ContentDetails 的 collapsed 是相反的 +const styleHandle = (item: ItemType) => { + if (item.key === ChartLayoutStoreEnums.DETAILS) { + return item.select ? '' : 'success' + } + return item.select ? 'success' : '' +} + const clickHandle = (item: ItemType) => { setItem(item.key, !item.select) } diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue index 0f563c7e..1c46625f 100644 --- a/src/views/chart/index.vue +++ b/src/views/chart/index.vue @@ -15,7 +15,6 @@ - @@ -29,7 +28,6 @@ import { HeaderRightBtn } from './components/HeaderRightBtn/index' import { HeaderTitle } from './components/HeaderTitle/index' import { ContentLayers } from './components/ContentLayers/index' import { ContentCharts } from './components/ContentCharts/index' -import { ContentDrag } from './components/ContentDrag/index' import { ContentDetails } from './components/ContentDetails/index'