diff --git a/src/settings/systemSetting.ts b/src/settings/systemSetting.ts index 65ccc4b2..ed72c6ed 100644 --- a/src/settings/systemSetting.ts +++ b/src/settings/systemSetting.ts @@ -13,5 +13,5 @@ export const systemSetting = { // 图表拖拽时的吸附距离(px) [SettingStoreEnums.CHART_ALIGN_RANGE]: 10, // 图表工具栏状态(侧边工具状态) - [SettingStoreEnums.CHART_TOOLS_STATUS]: ToolsStatusEnum.ASIDE + [SettingStoreEnums.CHART_TOOLS_STATUS]: ToolsStatusEnum.DOCK } \ No newline at end of file diff --git a/src/store/modules/chartEditStore/chartEditStore.d.ts b/src/store/modules/chartEditStore/chartEditStore.d.ts index da66f285..653fc467 100644 --- a/src/store/modules/chartEditStore/chartEditStore.d.ts +++ b/src/store/modules/chartEditStore/chartEditStore.d.ts @@ -61,6 +61,12 @@ export interface EditCanvasConfigType { [FilterEnum.CONTRAST]: number // 滤镜-不透明度 [FilterEnum.OPACITY]: number + // 变换(暂不使用) + [FilterEnum.ROTATE_Z]: number + [FilterEnum.ROTATE_X]: number + [FilterEnum.ROTATE_Y]: number + [FilterEnum.SKEW_X]: number + [FilterEnum.SKEW_Y]: number // 大屏宽度 [EditCanvasConfigEnum.WIDTH]: number // 大屏高度 diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts index 22e44544..843c942e 100644 --- a/src/store/modules/chartEditStore/chartEditStore.ts +++ b/src/store/modules/chartEditStore/chartEditStore.ts @@ -82,6 +82,12 @@ export const useChartEditStore = defineStore({ brightness: 1, // 透明度 opacity: 1, + // 变换(暂不更改) + rotateZ: 0, + rotateX: 0, + rotateY: 0, + skewX: 0, + skewY: 0, // 默认背景色 background: undefined, backgroundImage: undefined, diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue index faeed373..903342d8 100644 --- a/src/views/chart/ContentEdit/index.vue +++ b/src/views/chart/ContentEdit/index.vue @@ -15,7 +15,10 @@ -
+
{ return chartColors[chartThemeColor] }) +// 背景 +const rangeStyle = computed(() => { + // 设置背景色和图片背景 + const background = chartEditStore.getEditCanvasConfig.background + const backgroundImage = chartEditStore.getEditCanvasConfig.backgroundImage + const selectColor = chartEditStore.getEditCanvasConfig.selectColor + const backgroundColor = background ? background : undefined + + const computedBackground = selectColor + ? { background: backgroundColor } + : { background: `url(${backgroundImage}) no-repeat center/100% !important` } + + // @ts-ignore + return { + ...computedBackground, + width: 'inherit', + height: 'inherit' + } +}) + // 键盘事件 onMounted(() => { useAddKeyboard()