bill 2 gadi atpakaļ
vecāks
revīzija
36f54971a7

+ 10 - 8
src/views/scene/covers/fixPoint.vue

@@ -21,6 +21,7 @@ import activeIcon from "./icon/point_f_s.png";
 import { Pos3D } from "@/sdk";
 import { FixPoint, FixType } from "@/store/fixPoint";
 import { getFix3d } from "../fixManage";
+import { useAsyncSDK } from "@/hook";
 
 const props = defineProps<{
   data: FixPoint;
@@ -35,14 +36,15 @@ const emit = defineEmits<{
 }>();
 
 const isPure = !("type" in props.data) || props.data.type === FixType.POINT;
-const fix3d = getFix3d(props.data);
-
-if (fix3d) {
-  fix3d.bus.on("selectGraph", (select) => (select ? emit("focus") : emit("blur")));
-  fix3d.bus.on("selected", (select) =>
-    select ? emit("focusMeasure") : emit("blurMeasure")
-  );
-}
+setTimeout(() => {
+  const fix3d = getFix3d(props.data);
+  if (fix3d) {
+    fix3d.bus.on("selectGraph", (select) => (select ? emit("focus") : emit("blur")));
+    fix3d.bus.on("selected", (select) =>
+      select ? emit("focusMeasure") : emit("blurMeasure")
+    );
+  }
+});
 </script>
 
 <style scoped lang="scss">

+ 5 - 5
src/views/scene/fixManage.ts

@@ -7,8 +7,6 @@ import { Message } from "@kankan/components/expose-common";
 import { ref, nextTick, shallowRef, watch, watchEffect } from "vue";
 import { goto } from "./menus/data";
 
-let sdk: SDK;
-useAsyncSDK().then((a) => (sdk = a));
 const fix3ds: { [key in string]: FixPoint3D } = {};
 
 let basePointId: string;
@@ -152,7 +150,6 @@ export const getFix3d = (data: FixPoint) => {
     return;
   }
   if (args.measure) {
-    console.log("create", data, args);
     let basePoint: BasePoint;
     let baseId = data.baseId || basePointId;
     if (
@@ -166,6 +163,7 @@ export const getFix3d = (data: FixPoint) => {
   }
 
   console.log("create", args);
+  let sdk: SDK = useSDK();
   const fix3d = sdk.scene.createFixPoint(args);
   if (drawstatus.value === DrawStatus.ing) {
     drawingFix3d.value.push(fix3d);
@@ -178,12 +176,14 @@ export const getFix3d = (data: FixPoint) => {
   }
 
   if (args.graph) {
-    fix3d.bus.on("graphChange", ({ path, center }) => {
-      Object.assign(data, { line: path, pos: center });
+    fix3d.bus.on("graphChange", (data) => {
+      console.error(data);
+      // Object.assign(data, { line: path, pos: center });
     });
   }
   fix3ds[data.id] = fix3d;
   fixJoinBase(data, fix3d);
+  return fix3d;
 };
 
 export const quitMeasure = (data: FixPoint) => {

+ 3 - 1
src/views/scene/menus/actions.ts

@@ -199,9 +199,11 @@ const menuActions = {
         type: FixType.GRAPH,
         measure: measureMode.value,
         lines: undefined,
+        points: [],
       });
       drawstatus.value = DrawStatus.ing;
-      getFix3d(data).bus.on("graphDrawComplete", (complete) => {
+      const fix3d = getFix3d(data);
+      fix3d.bus.on("graphDrawComplete", (complete) => {
         trackBaseIng.value = false;
         if (complete) {
           const len = fixPoints.value.push(data);