diff --git a/src/components/LoadingComponent/Skeleton.vue b/src/components/LoadingComponent/Skeleton.vue index fd56b243..dfe881b8 100644 --- a/src/components/LoadingComponent/Skeleton.vue +++ b/src/components/LoadingComponent/Skeleton.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/packages/components/Charts/Bars/BarCommon/index.vue b/src/packages/components/Charts/Bars/BarCommon/index.vue index b8f7cdb5..c6d55638 100644 --- a/src/packages/components/Charts/Bars/BarCommon/index.vue +++ b/src/packages/components/Charts/Bars/BarCommon/index.vue @@ -18,7 +18,6 @@ import config from './config' const props = defineProps({ themeData: { type: Object || String, - default: 'dark', required: true }, chartData: { diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts index 75889dfd..779456d3 100644 --- a/src/plugins/naive.ts +++ b/src/plugins/naive.ts @@ -74,6 +74,9 @@ import { NLoadingBarProvider, NModal, NUpload, + NUploadFileList, + NUploadTrigger, + NUploadDragger, NTree, NSpin, NTimePicker, @@ -163,6 +166,9 @@ const naive = create({ NLoadingBarProvider, NModal, NUpload, + NUploadFileList, + NUploadTrigger, + NUploadDragger, NTree, NSpin, NTimePicker, diff --git a/src/store/modules/chartEditStore/chartEditStore.d.ts b/src/store/modules/chartEditStore/chartEditStore.d.ts index 4d9718d7..2a2f6c79 100644 --- a/src/store/modules/chartEditStore/chartEditStore.d.ts +++ b/src/store/modules/chartEditStore/chartEditStore.d.ts @@ -58,7 +58,7 @@ export interface EditCanvasConfigType { [EditCanvasConfigEnum.UN_OPACITY]: number // 背景色 [EditCanvasConfigEnum.BACKGROUND]?: string - [EditCanvasConfigEnum.BACKGROUND_IAMGE]?: string | ArrayBuffer | null + [EditCanvasConfigEnum.BACKGROUND_IAMGE]?: string | null // 图表主题颜色 [EditCanvasConfigEnum.CHART_THEME]: string // 图表主题颜色 diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts index eef2fd6d..2190f347 100644 --- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts +++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts @@ -1,8 +1,8 @@ -import { reactive, ref } from 'vue' +import { shallowReactive, ref } from 'vue' import { icon } from '@/plugins' import { renderLang, renderIcon } from '@/utils' import { themeColor, setItem, getCharts } from './useLayout.hook' -import { PackagesCategoryEnum, PackagesCategoryName } from '@/packages/index.d' +import { PackagesCategoryEnum, PackagesCategoryName, PackagesType } from '@/packages/index.d' // 图表 import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore' import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d' @@ -17,9 +17,12 @@ const { // 图表 const { getPackagesList } = usePackagesStore() -const menuOptions = reactive<{ - [T: string]: any -}>([]) +const menuOptions = shallowReactive<{ + key: string + icon: ReturnType + label: ReturnType + list: PackagesType +}[]>([]) const packagesListObj = { [PackagesCategoryEnum.CHARTS]: { diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/index.vue index cbaed28a..4bc8c8f6 100644 --- a/src/views/chart/ContentDetails/components/CanvasPage/index.vue +++ b/src/views/chart/ContentDetails/components/CanvasPage/index.vue @@ -29,8 +29,8 @@ > 背景 @@ -95,7 +95,7 @@ - + {