diff --git a/package.json b/package.json index f24144f4..8cc295e7 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,8 @@ "@types/crypto-js": "^4.1.1", "@types/keymaster": "^1.6.30", "@types/lodash": "^4.14.184", + "@vicons/fluent": "^0.12.0", + "@vicons/tabler": "^0.12.0", "animate.css": "^4.1.1", "axios": "^1.4.0", "color": "^4.2.3", diff --git a/src/api/http.ts b/src/api/http.ts index 8ca6ff18..e7b45d1c 100644 --- a/src/api/http.ts +++ b/src/api/http.ts @@ -185,7 +185,6 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req const res = fn(global) // @ts-ignore data = JSON.stringify(res, null, 2) - console.log(data) } else { data = translateStr(targetRequestParams.Body['json']) diff --git a/src/api/path/business.api.ts b/src/api/path/business.api.ts index 4e2da4e2..76aed621 100644 --- a/src/api/path/business.api.ts +++ b/src/api/path/business.api.ts @@ -25,10 +25,10 @@ export function getToken() { } } -export const publicInterface = async (paramType:string, interfaceType:string, paramData:any) =>{ +export const publicInterface = async (paramType:string, interfaceType:string, paramData:unknown) =>{ try { const access_token = getToken() - const res = await http(RequestHttpEnum.POST)(paramType, { + const res = await http(RequestHttpEnum.POST)(paramType, { access_token, type: interfaceType, data: paramData diff --git a/src/assets/images/chart/themesandlayouts/theme1.png b/src/assets/images/chart/themesandlayouts/theme1.png new file mode 100644 index 00000000..2339ca1c Binary files /dev/null and b/src/assets/images/chart/themesandlayouts/theme1.png differ diff --git a/src/enums/eventEnum.ts b/src/enums/eventEnum.ts index ca2a835d..c330a423 100644 --- a/src/enums/eventEnum.ts +++ b/src/enums/eventEnum.ts @@ -50,7 +50,9 @@ export const excludeParseEventKeyList = [ BaseEvent.ON_MOUSE_ENTER, BaseEvent.ON_MOUSE_LEAVE, //过滤器 - 'filter' + 'filter', + //body-json处理 + 'handler', ] // 内置字符串函数键值列表 export const excludeParseEventValueList = [ diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index 7ae4c07c..8eb47d90 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -72,8 +72,6 @@ export const useChartDataFetch = ( clearInterval(fetchInterval) const fetchFn = async () => { - console.log(1234, JSON.parse(JSON.stringify(toRaw(targetComponent.request)))) - console.log(1234, JSON.parse(JSON.stringify(toRaw(chartEditStore.getRequestGlobalConfig)))) const res = await customizeHttp(toRaw(targetComponent.request), toRaw(chartEditStore.getRequestGlobalConfig)) if (res) { try { diff --git a/src/packages/components/Charts/Lines/LineWithDataZoom/api.ts b/src/packages/components/Charts/Lines/LineWithDataZoom/api.ts index 4841face..4e637f5a 100644 --- a/src/packages/components/Charts/Lines/LineWithDataZoom/api.ts +++ b/src/packages/components/Charts/Lines/LineWithDataZoom/api.ts @@ -92,7 +92,7 @@ export const requestConfig = { "requestDataType": 1, "requestHttpType": RequestHttpEnum.POST, "requestUrl": "/api/goview/dcim/dems/statistic", - "requestInterval": 5, + "requestInterval": 15, "requestIntervalUnit": RequestHttpIntervalEnum.SECOND, "requestContentType": 0, "requestParamsBodyType": RequestBodyEnum.JSON, diff --git a/src/packages/components/Charts/Lines/LineWithDataZoom/config.ts b/src/packages/components/Charts/Lines/LineWithDataZoom/config.ts index 83c4612e..23e59fb7 100644 --- a/src/packages/components/Charts/Lines/LineWithDataZoom/config.ts +++ b/src/packages/components/Charts/Lines/LineWithDataZoom/config.ts @@ -183,7 +183,7 @@ export const option = { } ], dataset: {...dataJson}, - series: [seriesItem] + series: Array(8).fill({}).map(_ => cloneDeep(seriesItem)) } // setInterval(async() => { diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/VCircle.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/VCircle.vue new file mode 100644 index 00000000..cacaf740 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/VCircle.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/config.ts b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/config.ts new file mode 100644 index 00000000..2bf35369 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/config.ts @@ -0,0 +1,21 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { ComprehensivePUEConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +import logo from '@/assets/logo.png' + +export const option = { + // 图片路径 + dataset: logo, + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + public key = ComprehensivePUEConfig.key + public chartConfig = cloneDeep(ComprehensivePUEConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/config.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/config.vue new file mode 100644 index 00000000..d1759a1d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.ts b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.ts new file mode 100644 index 00000000..a5c52679 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const ComprehensivePUEConfig: ConfigType = { + key: 'ComprehensivePUE', + chartKey: 'VComprehensivePUE', + conKey: 'VCComprehensivePUE', + title: '综合PUE', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'photo.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue new file mode 100644 index 00000000..5fa187e9 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts new file mode 100644 index 00000000..d375dc11 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.ts @@ -0,0 +1,21 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { DeviceAlarmOverviewConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +import logo from '@/assets/logo.png' + +export const option = { + // 图片路径 + dataset: logo, + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + public key = DeviceAlarmOverviewConfig.key + public chartConfig = cloneDeep(DeviceAlarmOverviewConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue new file mode 100644 index 00000000..d1759a1d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.ts b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.ts new file mode 100644 index 00000000..431f431d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const DeviceAlarmOverviewConfig: ConfigType = { + key: 'DeviceAlarmOverview', + chartKey: 'VDeviceAlarmOverview', + conKey: 'VCDeviceAlarmOverview', + title: '当前设备告警概况', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'photo.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue new file mode 100644 index 00000000..d4fbbe5d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/config.ts b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/config.ts new file mode 100644 index 00000000..a38658c2 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/config.ts @@ -0,0 +1,21 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { RealTimeTrafficConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +import logo from '@/assets/logo.png' + +export const option = { + // 图片路径 + dataset: logo, + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + public key = RealTimeTrafficConfig.key + public chartConfig = cloneDeep(RealTimeTrafficConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/config.vue b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/config.vue new file mode 100644 index 00000000..d1759a1d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.ts b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.ts new file mode 100644 index 00000000..b7bc16d0 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const RealTimeTrafficConfig: ConfigType = { + key: 'RealTimeTraffic', + chartKey: 'VRealTimeTraffic', + conKey: 'VCRealTimeTraffic', + title: '采集流量实时监测', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'photo.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue new file mode 100644 index 00000000..c84fd552 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/components/BorderBox.vue b/src/packages/components/CustomComponents/CustomComponents/components/BorderBox.vue new file mode 100644 index 00000000..78fdd41b --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/components/BorderBox.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/index.ts b/src/packages/components/CustomComponents/CustomComponents/index.ts new file mode 100644 index 00000000..22e48d63 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/index.ts @@ -0,0 +1,5 @@ +import { ComprehensivePUEConfig } from './ComprehensivePUE' +import { DeviceAlarmOverviewConfig } from './DeviceAlarmOverview' +import { RealTimeTrafficConfig } from './RealTimeTraffic' + +export default [ ComprehensivePUEConfig, DeviceAlarmOverviewConfig, RealTimeTrafficConfig ] diff --git a/src/packages/components/CustomComponents/index.d.ts b/src/packages/components/CustomComponents/index.d.ts new file mode 100644 index 00000000..12b3f775 --- /dev/null +++ b/src/packages/components/CustomComponents/index.d.ts @@ -0,0 +1,7 @@ +export enum ChatCategoryEnum { + CUSTOMCOMPONENTS = 'CustomComponents', +} + +export enum ChatCategoryEnumName { + CUSTOMCOMPONENTS = '自定义组件', +} diff --git a/src/packages/components/CustomComponents/index.ts b/src/packages/components/CustomComponents/index.ts new file mode 100644 index 00000000..e437a6d9 --- /dev/null +++ b/src/packages/components/CustomComponents/index.ts @@ -0,0 +1,3 @@ +import CustomComponents from './CustomComponents' + +export const CustomComponentsList = [...CustomComponents] diff --git a/src/packages/components/ThemesAndLayouts/Themes/Theme1/config.ts b/src/packages/components/ThemesAndLayouts/Themes/Theme1/config.ts new file mode 100644 index 00000000..be2fccb1 --- /dev/null +++ b/src/packages/components/ThemesAndLayouts/Themes/Theme1/config.ts @@ -0,0 +1,21 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { Theme1Config } from './index' +import cloneDeep from 'lodash/cloneDeep' +import bakground from '@/assets/customComponents/theme1/backgrond.jpg' + +export const option = { + // 图片路径 + dataset: bakground, + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + public key = Theme1Config.key + public chartConfig = cloneDeep(Theme1Config) + public option = cloneDeep(option) +} diff --git a/src/packages/components/ThemesAndLayouts/Themes/Theme1/config.vue b/src/packages/components/ThemesAndLayouts/Themes/Theme1/config.vue new file mode 100644 index 00000000..83836728 --- /dev/null +++ b/src/packages/components/ThemesAndLayouts/Themes/Theme1/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/ThemesAndLayouts/Themes/Theme1/index.ts b/src/packages/components/ThemesAndLayouts/Themes/Theme1/index.ts new file mode 100644 index 00000000..7b249073 --- /dev/null +++ b/src/packages/components/ThemesAndLayouts/Themes/Theme1/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum,ChatCategoryEnumName } from '@/packages/components/ThemesAndLayouts/index.d' + +export const Theme1Config: ConfigType = { + key: 'Theme1', + chartKey: 'VTheme1', + conKey: 'VCTheme1', + title: '主题1', + category: ChatCategoryEnum.THEMES, + categoryName: ChatCategoryEnumName.THEMES, + package: PackagesCategoryEnum.THEMESANDLAYOUTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'theme1.png' +} diff --git a/src/packages/components/ThemesAndLayouts/Themes/Theme1/index.vue b/src/packages/components/ThemesAndLayouts/Themes/Theme1/index.vue new file mode 100644 index 00000000..49d629c8 --- /dev/null +++ b/src/packages/components/ThemesAndLayouts/Themes/Theme1/index.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/src/packages/components/ThemesAndLayouts/Themes/index.ts b/src/packages/components/ThemesAndLayouts/Themes/index.ts new file mode 100644 index 00000000..52a3fa6a --- /dev/null +++ b/src/packages/components/ThemesAndLayouts/Themes/index.ts @@ -0,0 +1,3 @@ +import { Theme1Config } from './Theme1/index' + +export default [Theme1Config] diff --git a/src/packages/components/ThemesAndLayouts/index.ts b/src/packages/components/ThemesAndLayouts/index.ts new file mode 100644 index 00000000..67e91740 --- /dev/null +++ b/src/packages/components/ThemesAndLayouts/index.ts @@ -0,0 +1,3 @@ +import Themes from './Themes' + +export const ThemesAndLayoutsList = [...Themes] diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index 3be43105..6e6ff7ba 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -1,6 +1,7 @@ import { BaseEvent, EventLife, InteractEvents, InteractEventOn, InteractActionsType } from '@/enums/eventEnum' import type { GlobalThemeJsonType } from '@/settings/chartThemes/index' import type { RequestConfigType } from '@/store/modules/chartEditStore/chartEditStore.d' +import {CustomComponentsList} from "@/packages/components/CustomComponents/index"; export enum ChartFrameEnum { // 支持 dataset 的 echarts 框架 @@ -177,7 +178,9 @@ export enum PackagesCategoryEnum { INFORMATIONS = 'Informations', PHOTOS = 'Photos', ICONS = 'Icons', - DECORATES = 'Decorates' + DECORATES = 'Decorates', + THEMESANDLAYOUTS = 'ThemesAndLayouts', + CUSTOMCOMPONENTS = 'CustomComponents', } // 包分类名称 @@ -187,7 +190,9 @@ export enum PackagesCategoryName { INFORMATIONS = '信息', PHOTOS = '图片', ICONS = '图标', - DECORATES = '小组件' + DECORATES = '小组件', + THEMESANDLAYOUTS = '主题', + CUSTOMCOMPONENTS = '自定义组件', } // 获取组件 @@ -204,4 +209,6 @@ export type PackagesType = { [PackagesCategoryEnum.PHOTOS]: ConfigType[] [PackagesCategoryEnum.ICONS]: ConfigType[] [PackagesCategoryEnum.DECORATES]: ConfigType[] + [PackagesCategoryEnum.THEMESANDLAYOUTS]: ConfigType[] + [PackagesCategoryEnum.CUSTOMCOMPONENTS]: ConfigType[] } diff --git a/src/packages/index.ts b/src/packages/index.ts index fd551313..63515051 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -4,6 +4,8 @@ import { InformationList } from '@/packages/components/Informations/index' import { TableList } from '@/packages/components/Tables/index' import { PhotoList } from '@/packages/components/Photos/index' import { IconList } from '@/packages/components/Icons/index' +import { ThemesAndLayoutsList } from '@/packages/components/ThemesAndLayouts/index' +import { CustomComponentsList } from '@/packages/components/CustomComponents/index' import { PackagesCategoryEnum, PackagesType, ConfigType, FetchComFlagType } from '@/packages/index.d' const configModules: Record = import.meta.glob('./components/**/config.vue', { @@ -23,7 +25,9 @@ export let packagesList: PackagesType = { [PackagesCategoryEnum.TABLES]: TableList, [PackagesCategoryEnum.DECORATES]: DecorateList, [PackagesCategoryEnum.PHOTOS]: PhotoList, - [PackagesCategoryEnum.ICONS]: IconList + [PackagesCategoryEnum.ICONS]: IconList, + [PackagesCategoryEnum.THEMESANDLAYOUTS]: ThemesAndLayoutsList, + [PackagesCategoryEnum.CUSTOMCOMPONENTS]: CustomComponentsList, } // 组件缓存, 可以大幅度提升组件加载速度 diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index f6864210..b98cab0f 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -103,9 +103,14 @@ import { Carbon3DSoftware as Carbon3DSoftwareIcon, Filter as FilterIcon, FilterEdit as FilterEditIcon, - Laptop as LaptopIcon + Laptop as LaptopIcon, + AreaCustom as AreaCustomIcon, } from '@vicons/carbon' +import { + Apps20Regular as Apps20RegularIcon +} from '@vicons/fluent' + const ionicons5 = { // 新增 AddIcon, @@ -303,12 +308,20 @@ const carbon = { FilterIcon, FilterEditIcon, // 图层 - LaptopIcon + LaptopIcon, + // 自定义 + AreaCustomIcon, +} + +const fluent = { + // 主题 + Apps20RegularIcon } // https://www.xicons.org/#/ 还有很多 export const icon = { ionicons5, - carbon + carbon, + fluent } diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 16ba9431..12fc68e4 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -293,6 +293,7 @@ export const JSONStringify = (data: T) => { export const evalFn = (fn: string) => { var Fun = Function // 一个变量指向Function，防止前端编译工具报错 + console.log(fn) return new Fun('return ' + fn)() } @@ -311,8 +312,10 @@ export const JSONParse = (data: string) => { } // 还原函数值 if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) { + console.log(k, v) return evalFn(`(function(){return ${v}})()`) } else if (typeof v === 'string' && v.indexOf && v.indexOf('return ') > -1) { + console.log(k, v) const baseLeftIndex = v.indexOf('(') if (baseLeftIndex > -1) { const newFn = `function ${v.substring(baseLeftIndex)}` @@ -349,4 +352,4 @@ export const addWindowUnload = () => { return () => { window.onbeforeunload = null } -} \ No newline at end of file +} diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue index f3f96e39..09cebe6b 100644 --- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue +++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue @@ -131,6 +131,7 @@ const dblclickHandle = async (item: ConfigType) => { chartEditStore.setTargetSelectChart(newComponent.id) loadingFinish() } catch (error) { + console.log(error) loadingError() window['$message'].warning(`图表正在研发中, 敬请期待...`) } diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts index 539087ec..5061043e 100644 --- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts +++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts @@ -7,7 +7,8 @@ import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore' import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d' // 图标 const { AirPlaneOutlineIcon, ImageIcon, BarChartIcon } = icon.ionicons5 -const { TableSplitIcon, RoadmapIcon, SpellCheckIcon, GraphicalDataFlowIcon } = icon.carbon +const { TableSplitIcon, RoadmapIcon, SpellCheckIcon, GraphicalDataFlowIcon, AreaCustomIcon } = icon.carbon +const { Apps20RegularIcon } = icon.fluent // 图表 export type MenuOptionsType = { @@ -41,6 +42,14 @@ const packagesListObj = { [PackagesCategoryEnum.ICONS]: { icon: renderIcon(AirPlaneOutlineIcon), label: PackagesCategoryName.ICONS + }, + [PackagesCategoryEnum.THEMESANDLAYOUTS]: { + icon: renderIcon(Apps20RegularIcon), + label: PackagesCategoryName.THEMESANDLAYOUTS + }, + [PackagesCategoryEnum.CUSTOMCOMPONENTS]: { + icon: renderIcon(AreaCustomIcon), + label: PackagesCategoryName.CUSTOMCOMPONENTS } } @@ -61,6 +70,13 @@ export const useAsideHook = () => { list: packagesStore.getPackagesList[val] }) } + menuOptions.sort((a, b) => { + if(a.key === 'ThemesAndLayouts') return -1 + else if(b.key === 'ThemesAndLayouts') return 1 + if(a.key === 'CustomComponents') return -1 + else if(b.key === 'CustomComponents') return 1 + else return 0 + }) } handlePackagesList() diff --git a/src/views/chart/ContentCharts/index.vue b/src/views/chart/ContentCharts/index.vue index b0e4cc6f..4c4687f1 100644 --- a/src/views/chart/ContentCharts/index.vue +++ b/src/views/chart/ContentCharts/index.vue @@ -92,7 +92,7 @@ $topHeight: 40px; display: flex; flex-direction: column; padding: 6px 12px !important; - font-size: 14px !important; + font-size: 12px !important; } .n-menu-item-content__icon { font-size: 18px !important; diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue index 60de3a08..dac63e40 100644 --- a/src/views/chart/ContentEdit/index.vue +++ b/src/views/chart/ContentEdit/index.vue @@ -190,6 +190,8 @@ const rangeStyle = computed(() => { } }) +console.log(chartEditStore.getComponentList) + onMounted(() => { // 键盘事件 useAddKeyboard() diff --git a/src/views/preview/utils/storage.ts b/src/views/preview/utils/storage.ts index 45186129..15b5d5b6 100644 --- a/src/views/preview/utils/storage.ts +++ b/src/views/preview/utils/storage.ts @@ -26,6 +26,7 @@ export const getSessionStorageInfo = async () => { // 跳转未发布页 return { isRelease: false } } + console.log(content) const parseData = { ...JSONParse(content), id } const { editCanvasConfig, requestGlobalConfig, componentList } = parseData chartEditStore.editCanvasConfig = editCanvasConfig