diff --git a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts index cacb2a02..a4ce0828 100644 --- a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts +++ b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts @@ -59,7 +59,7 @@ export const mousedownHandleUnStop = (e: MouseEvent, item?: CreateComponentType chartEditStore.setTargetSelectChart(undefined) } -// * 移动图表 +// * 鼠标事件 export const useMouseHandle = () => { // * Click 事件, 松开鼠标触发 const mouseClickHandle = (e: MouseEvent, item: CreateComponentType | CreateComponentGroupType) => { @@ -70,7 +70,13 @@ export const useMouseHandle = () => { window.$KeyboardActive?.has(WinKeyboard.CTRL_SOURCE_KEY) || window.$KeyboardActive?.has(MacKeyboard.CTRL_SOURCE_KEY) ) { - chartEditStore.setTargetSelectChart(item.id, true) + // 若已选中,则去除 + if(chartEditStore.targetChart.selectId.includes(item.id)) { + const exList = chartEditStore.targetChart.selectId.filter(e => e !== item.id) + chartEditStore.setTargetSelectChart(exList) + } else { + chartEditStore.setTargetSelectChart(item.id, true) + } } } diff --git a/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue b/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue index 2c4adcee..8754e75c 100644 --- a/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue +++ b/src/views/chart/ContentLayers/components/LayersGroupListItem/index.vue @@ -4,7 +4,7 @@ class="root-item-content" :class="{ hover: hover, select: select }" @click="clickHandle($event)" - @mousedown="groupMousedownHandle()" + @mousedown="groupMousedownHandle($event)" @mouseenter="mouseenterHandle(componentGroupData)" @mouseleave="mouseleaveHandle(componentGroupData)" @contextmenu="handleContextMenu($event, componentGroupData, optionsHandle)" @@ -31,7 +31,7 @@ v-for="element in componentGroupData.groupList" :key="element.id" :componentData="element" - @mousedown="mousedownHandle(element)" + @mousedown="mousedownHandle($event, element, componentGroupData.id)" @mouseenter="mouseenterHandle(element)" @mouseleave="mouseleaveHandle(element)" @contextmenu="handleContextMenu($event, componentGroupData, undefined, undefined, pickOptionsList)" @@ -42,7 +42,7 @@