bianjiang 2 years ago
parent
commit
6b12c3bab6

+ 1 - 1
src/controllers/natsController.ts

@@ -1,5 +1,5 @@
+import { Empty, StringCodec, connect } from "nats.ws";
 import { queenApi } from "queenjs";
-import { connect, StringCodec, Empty, ErrorCode } from "nats.ws";
 
 export class BusController {
   _params = new URLSearchParams(decodeURIComponent(location.search));

+ 1 - 1
src/modules/list/actions/canvas.ts

@@ -1,8 +1,8 @@
 // import item from "@/pages/website/routes/list/item";
 import { cloneDeep } from "lodash";
 import ListModule from "..";
-import { ShowItem, ColDataType } from "../objects/item";
 import { InitCanvasDragEvent, ListDraw } from "../objects/canvas";
+import { ShowItem } from "../objects/item";
 
 export default ListModule.action({
   async initListCanvasData(wWidth: number, wHeight: number) {

+ 12 - 8
src/pages/frame3d/routes/frame3d/index.tsx

@@ -71,7 +71,17 @@ export default defineComponent({
     const dialogId = query.dialogid;
     const packRef = ref();
     const state = reactive({ loaded: false, loading: true });
-
+    window.addEventListener("message", (e: any) => {
+      try {
+        const msgData = JSON.parse(e.data);
+        if (msgData.type == "data") {
+          packRef.value = msgData.data;
+          state.loaded = true;
+        }
+      } catch (e) {
+        console.log(e);
+      }
+    });
     onMounted(async () => {
       // const res = await actions.loadPack3d({ meshId: meshId } as any);
       // packRef.value = res?.data;
@@ -88,13 +98,7 @@ export default defineComponent({
       document.addEventListener("touchend", () => {
         window.parent.postMessage(JSON.stringify({ type: "end", dialogId }));
       });
-      window.addEventListener("message", (e) => {
-        debugger;
-        console.log(e);
-        const data = JSON.parse(e.data);
-        packRef.value = data;
-        state.loaded = true;
-      });
+      window.parent.postMessage(JSON.stringify({ type: "ready" }));
     });
 
     return () => {

+ 9 - 5
src/pages/website/routes/list/dialog.tsx

@@ -90,11 +90,15 @@ export default defineComponent({
     });
     const initEvent = () => {
       window.addEventListener("message", (e) => {
-        const data = JSON.parse(e.data);
-        if (data.type == "start") {
-          messageCloseEnd(data.dialogId);
-        } else {
-          messageCloseStart(data.dialogId);
+        try {
+          const data = JSON.parse(e.data);
+          if (data.type == "start") {
+            messageCloseEnd(data.dialogId);
+          } else {
+            messageCloseStart(data.dialogId);
+          }
+        } catch (e) {
+          console.log(e);
         }
       });
     };

+ 14 - 1
src/pages/website/routes/list/item.tsx

@@ -21,6 +21,7 @@ export default defineComponent({
     //   spin: false,
     // });
     const moveRef = ref<HTMLElement>();
+    const ifRef = ref<HTMLIFrameElement>();
     // const editorRef = ref<HTMLElement>();
     onMounted(() => {
       // if (props.data.desc) {
@@ -34,7 +35,18 @@ export default defineComponent({
       moveRef.value?.addEventListener("mousedown", (e) => {
         emit("move", true);
       });
-      // window.opener.postMessage(JSON.stringify(props.data));
+      window.addEventListener("message", (e) => {
+        try {
+          const data = JSON.parse(e.data);
+          if (data.type == "ready") {
+            ifRef.value?.contentWindow?.postMessage(
+              JSON.stringify({ type: "data", data: props.data })
+            );
+          }
+        } catch (e) {
+          console.log(e);
+        }
+      });
     });
     // const descTigger = () => {
     //   state.descShow = !state.descShow;
@@ -91,6 +103,7 @@ export default defineComponent({
 
           <div class={"view_3d"}>
             <iframe
+              ref={ifRef}
               src={
                 "./frame3d.html#/?id=" +
                 props.data?.meshId +