Merge branch 'xj' of http://192.168.0.115:3000/bill/public-fuse into xj

src/store/scene.ts

@@ -131,19 +131,25 @@ export const uploadModelScene = async (
   file: File,
   progressCallback: (progress: number) => void
 ) => {
+  let done = false;
   await axios<undefined>({
     method: "POST",
     url: uploadModel,
     data: { file },
     onUploadProgress(event: any) {
-      const p = Math.round((event.loaded / event.total) * 100);
-      if (p === 100) {
-        progressCallback(0);
-      } else {
-        progressCallback(p || 0);
+      if (!done) {
+        const p = Math.round((event.loaded / event.total) * 100);
+        if (p === 100) {
+          progressCallback(0);
+        } else {
+          progressCallback(p || 0);
+        }
+        console.log("进度：", p);
       }
     },
   });
+  console.log("上传完成");
+  done = true;
   progressCallback(0);
 };
 export const getModelSceneStatus = async (scene: ModelScene) => {

src/view/case/draw/c.ts

@@ -0,0 +1,3 @@
+import { ref } from "vue";
+
+export const inputIng = ref(false);

src/view/case/draw/eshape.vue

@@ -21,6 +21,7 @@
 import { computed, onMounted, onUnmounted, ref } from "vue";
 import { BoardShape, compass, title } from "./board";
 import { components } from "./edit-shape";
+import { inputIng } from "./c";
 
 const props = defineProps<{ shape: BoardShape }>();
 const emit = defineEmits<{
@@ -33,7 +34,6 @@ const editComponent = computed(() => {
     return components[type];
   }
 });
-const inputIng = ref(false);
 
 const delHandler = () => {
   props.shape.delete();

src/view/case/draw/header.vue

@@ -45,6 +45,7 @@
 import { BoardType } from "@/store/caseFile";
 import { BoardTypeDesc } from "@/constant/caseFile";
 import { onMounted, onUnmounted } from "vue";
+import { inputIng } from "./c";
 
 const props = defineProps<{
   type: BoardType;
@@ -67,10 +68,12 @@ const keydownHandler = (ev: KeyboardEvent) => {
   } else if (["Control", "Ctrl"].includes(ev.key)) {
     const downKey = ev.key;
     const secondaryHandler = (ev: KeyboardEvent) => {
-      if (ev.key.toUpperCase() === "Y" && !props.forwardDisabled) {
-        emit("forward");
-      } else if (ev.key.toUpperCase() === "Z" && !props.backDisabled) {
-        emit("back");
+      if (!inputIng.value) {
+        if (ev.key.toUpperCase() === "Y" && !props.forwardDisabled) {
+          emit("forward");
+        } else if (ev.key.toUpperCase() === "Z" && !props.backDisabled) {
+          emit("back");
+        }
       }
     };
     window.addEventListener("keydown", secondaryHandler);