Sfoglia il codice sorgente

fix: 修改右键问题

mtrun 3 anni fa
parent
commit
8110173d8a

+ 2 - 2
src/views/chart/ContentEdit/hooks/useDrag.hook.ts

@@ -12,7 +12,7 @@ import { loadingStart, loadingFinish, loadingError } from '@/utils'
 import throttle from 'lodash/throttle'
 
 const chartEditStore = useChartEditStore()
-const { onClickoutside } = useContextMenu()
+const { onClickOutSide } = useContextMenu()
 
 // * 拖拽到编辑区域里
 export const handleDrag = async (e: DragEvent) => {
@@ -74,7 +74,7 @@ export const useMouseHandle = () => {
     e.preventDefault()
     e.stopPropagation()
 
-    onClickoutside()
+    onClickOutSide()
     chartEditStore.setTargetSelectChart(item.id)
     const scale = chartEditStore.getEditCanvas.scale
     const width = chartEditStore.getEditCanvasConfig.width

+ 8 - 4
src/views/chart/hooks/useContextMenu.hook.ts

@@ -127,7 +127,7 @@ const handleContextMenu = (
   // 挑选选项列表
   pickOptionsList?: MenuEnum[],
   // 自定义列表
-  defaultOptions?: MenuOptionsItemType[]
+  selfOptions?: MenuOptionsItemType[]
 ) => {
   e.stopPropagation()
   e.preventDefault()
@@ -138,7 +138,7 @@ const handleContextMenu = (
   chartEditStore.setRightMenuShow(false)
 
   // * 设置默认选项
-  if(defaultOptions) menuOptions.value = defaultOptions || defaultOptions
+  if(selfOptions) menuOptions.value = selfOptions || defaultOptions
  
   if (!item) {
     menuOptions.value = pickOption(menuOptions.value, defaultNoItemKeys)
@@ -164,8 +164,12 @@ const handleContextMenu = (
  * @returns
  */
 export const useContextMenu = () => {
+
+  // 设置默认项
+  menuOptions.value = defaultOptions
+
   // * 失焦
-  const onClickoutside = () => {
+  const onClickOutSide = () => {
     chartEditStore.setRightMenuShow(false)
   }
 
@@ -190,7 +194,7 @@ export const useContextMenu = () => {
   return {
     menuOptions,
     handleContextMenu,
-    onClickoutside,
+    onClickOutSide,
     handleMenuSelect,
     mousePosition: chartEditStore.getMousePosition,
   }

+ 2 - 2
src/views/chart/index.vue

@@ -29,7 +29,7 @@
     :y="mousePosition.y"
     :options="menuOptions"
     :show="chartEditStore.getRightMenuShow"
-    :on-clickoutside="onClickoutside"
+    :on-clickoutside="onClickOutSide"
     @select="handleMenuSelect"
   ></n-dropdown>
 </template>
@@ -67,7 +67,7 @@ const ContentConfigurations = loadAsyncComponent(() =>
 // 右键
 const {
   menuOptions,
-  onClickoutside,
+  onClickOutSide,
   mousePosition,
   handleMenuSelect
 } = useContextMenu()