Merge branch 'v1.2.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v1.2.0-ga

src/main.ts

@@ -87,3 +87,6 @@ watchEffect(
 );
 
 export default app;
+
+document.documentElement.addEventListener('contextmenu', ev => ev.preventDefault())
+document.documentElement.addEventListener('click', ev => ev.preventDefault())

src/utils/event.ts

@@ -70,6 +70,7 @@ export const clickListener = (dom: HTMLDivElement, callback: (position: Pos, ev:
 		down(_, ev) {
 			if (ev.button !== button) return;
 			downTime = Date.now();
+			// ev.preventDefault()
 		},
 		up(position, ev) {
 			const prevMove = move
@@ -79,6 +80,7 @@ export const clickListener = (dom: HTMLDivElement, callback: (position: Pos, ev:
 				callback(position, ev)
 			}
 			downTime = 0
+			// ev.preventDefault()
 		},
 	});
 };

src/views/animation/index.vue

@@ -56,7 +56,7 @@ import {
   getAddTLItemTimeByTime,
 } from "@/components/drawing-time-line/check";
 import { Dialog, Message } from "bill/expose-common";
-import { mergeFuns, uuid } from "@/components/drawing/hook";
+import { listener, mergeFuns, uuid } from "@/components/drawing/hook";
 import { title } from "./type";
 import {
   amMap,
@@ -328,26 +328,35 @@ const deleteAm = (am: AnimationModel) => {
 
 let unMount: () => void;
 onUnmounted(
-  clickListener(
-    document.querySelector("#layout-app .scene-canvas") as HTMLDivElement,
-    (pixel) => {
-      const pos = sdk.getPositionByScreen(pixel);
-      if (!focusAM.value) return;
-      unMount && unMount();
-      setTimeout(() => {
-        unMount = useRMenus(pixel, [
-          {
-            label: "移动到这里",
-            icon: "move",
-            handler() {
-              amMap[getAMKey(focusAM.value!)]?.am?.moveModelTo(pixel, pos?.worldPos);
+  mergeFuns([
+    // listener(
+    //   document.querySelector("#layout-app .scene-canvas") as HTMLDivElement,
+    //   "contextmenu",
+    //   (ev) => {
+    //     ev.preventDefault();
+    //   }
+    // ),
+    clickListener(
+      document.querySelector("#layout-app .scene-canvas") as HTMLDivElement,
+      (pixel) => {
+        const pos = sdk.getPositionByScreen(pixel);
+        if (!focusAM.value) return;
+        unMount && unMount();
+        setTimeout(() => {
+          unMount = useRMenus(pixel, [
+            {
+              label: "移动到这里",
+              icon: "move",
+              handler() {
+                amMap[getAMKey(focusAM.value!)]?.am?.moveModelTo(pixel, pos?.worldPos);
+              },
             },
-          },
-        ]);
-      });
-    },
-    2
-  )
+          ]);
+        });
+      },
+      2
+    ),
+  ])
 );
 frameAction.value = "translate";
 </script>