diff --git a/src/store/modules/chartEditStore/chartEditStore.d.ts b/src/store/modules/chartEditStore/chartEditStore.d.ts
index 4d8779f2..682deeaf 100644
--- a/src/store/modules/chartEditStore/chartEditStore.d.ts
+++ b/src/store/modules/chartEditStore/chartEditStore.d.ts
@@ -10,7 +10,8 @@ export enum EditCanvasTypeEnum {
SCALE = 'scale',
USER_SCALE = 'userScale',
LOCK_SCALE = 'lockScale',
- Is_Drag= 'isDrag',
+ IS_CREATE = 'isCreate',
+ IS_DRAG= 'isDrag',
}
// 编辑区域
@@ -26,8 +27,10 @@ export type EditCanvasType = {
[EditCanvasTypeEnum.USER_SCALE]: number
// 锁定缩放
[EditCanvasTypeEnum.LOCK_SCALE]: boolean
+ // 初始化创建
+ [EditCanvasTypeEnum.IS_CREATE]: boolean
// 拖拽中
- [EditCanvasTypeEnum.Is_Drag]: boolean
+ [EditCanvasTypeEnum.IS_DRAG]: boolean
}
// 滤镜
@@ -74,15 +77,21 @@ export interface EditCanvasConfigType {
// 坐标轴信息
export enum EditCanvasTypeEnum {
+ START_X = 'startX',
+ START_Y = 'startY',
X = 'x',
Y = 'y'
}
// 鼠标位置
export type MousePositionType = {
- // X 轴
+ // 开始 X
+ [EditCanvasTypeEnum.START_X]: number
+ // 开始 Y
+ [EditCanvasTypeEnum.START_Y]: number
+ // X
[EditCanvasTypeEnum.X]: number
- // y 轴
+ // y
[EditCanvasTypeEnum.Y]: number
}
diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts
index 010b53fd..32a79987 100644
--- a/src/store/modules/chartEditStore/chartEditStore.ts
+++ b/src/store/modules/chartEditStore/chartEditStore.ts
@@ -19,8 +19,8 @@ import {
const chartHistoryStoreStore = useChartHistoryStoreStore()
// 编辑区域内容
-export const useChartEditStoreStore = defineStore({
- id: 'useChartEditStoreStore',
+export const useChartEditStore = defineStore({
+ id: 'useChartEditStore',
state: (): chartEditStoreType => ({
// 画布属性
editCanvas: {
@@ -35,6 +35,8 @@ export const useChartEditStoreStore = defineStore({
userScale: 1,
// 锁定缩放
lockScale: false,
+ // 初始化
+ isCreate: false,
// 拖拽中
isDrag: false
},
@@ -42,6 +44,8 @@ export const useChartEditStoreStore = defineStore({
rightMenuShow: false,
// 鼠标定位
mousePosition: {
+ startX: 0,
+ startY: 0,
x: 0,
y: 0
},
@@ -128,6 +132,13 @@ export const useChartEditStoreStore = defineStore({
setRecordChart(item: RecordChartType | undefined) {
this.recordChart = cloneDeep(item)
},
+ // * 设置鼠标位置
+ setMousePosition(x?: number, y?: number, startX?: number, startY?: number): void {
+ if (startX) this.mousePosition.startX = startX
+ if (startY) this.mousePosition.startY = startY
+ if (x) this.mousePosition.x = x
+ if (y) this.mousePosition.y = y
+ },
// * 找到目标 id 数据下标位置
fetchTargetIndex(): number {
if(!this.getTargetChart.selectId) {
@@ -451,11 +462,6 @@ export const useChartEditStoreStore = defineStore({
}
},
// ----------------
- // * 设置鼠标位置
- setMousePosition(x: number, y: number): void {
- this.mousePosition.x = x
- this.mousePosition.y = y
- },
// * 设置页面变换时候的 Class
setPageSizeClass(): void {
const dom = this.getEditCanvas.editContentDom
diff --git a/src/store/modules/chartLayoutStore/chartLayoutStore.ts b/src/store/modules/chartLayoutStore/chartLayoutStore.ts
index a3931f82..de32435f 100644
--- a/src/store/modules/chartLayoutStore/chartLayoutStore.ts
+++ b/src/store/modules/chartLayoutStore/chartLayoutStore.ts
@@ -2,9 +2,9 @@ import { defineStore } from 'pinia'
import { ChartLayoutType } from './chartLayoutStore.d'
import { setLocalStorage, getLocalStorage } from '@/utils'
import { StorageEnum } from '@/enums/storageEnum'
-import { useChartEditStoreStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-const chartEditStore = useChartEditStoreStore()
+const chartEditStore = useChartEditStore()
const { GO_CHART_LAYOUT_STORE } = StorageEnum
diff --git a/src/views/chart/ContentBox/index.vue b/src/views/chart/ContentBox/index.vue
index aab92681..685915a0 100644
--- a/src/views/chart/ContentBox/index.vue
+++ b/src/views/chart/ContentBox/index.vue
@@ -47,11 +47,11 @@
diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
index 32355265..3be9f875 100644
--- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
+++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
@@ -7,7 +7,7 @@
size="small"
v-model:value="canvasConfig.width"
:validator="validator"
- @update:value="chartEditStoreStore.computedScale"
+ @update:value="chartEditStore.computedScale"
/>