feat(editor): fix import event, load glb: if cancel, should return to…

… page
Meta3D-Technology · Oct 27, 2023 · 745d186 · 745d186
1 parent 5d92c6a
commit 745d186
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/contributes/meta3d-action-import-event/package.json b/contributes/meta3d-action-import-event/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-import-event",
-    "version": "0.18.0",
+    "version": "0.18.1",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "displayName": "meta3d-action-import-event",
     "repoLink": "",

diff --git a/contributes/meta3d-action-import-event/src/Main.ts b/contributes/meta3d-action-import-event/src/Main.ts
@@ -65,7 +65,7 @@ export let getContribute: getContributeMeta3D<actionContribute<clickUIData, stat
             return new Promise<meta3dState>((resolve, reject) => {
                 let eventSourcingService = api.getExtensionService<eventSourcingService>(meta3dState, "meta3d-event-sourcing-protocol")
 
-                importFile((file:any, result:any) => {
+                importFile((file: any, result: any) => {
                     if (!file.name.includes(".arraybuffer")) {
                         reject(new Error("文件后缀名应该是.arraybuffer"))
                     }
@@ -74,11 +74,13 @@ export let getContribute: getContributeMeta3D<actionContribute<clickUIData, stat
                         name: eventName,
                         inputData: [result as ArrayBuffer]
                     }))
-                }, (event:Event, file:any) => {
+                }, (event: Event, file: any) => {
                     reject(new Error(`读取${file.name}错误`))
-                }, (loaded:number, total:number) => {
+                }, (loaded: number, total: number) => {
                     // TODO show progress message
                     console.log(`loading ${loaded / total} %`)
+                }, () => {
+                    resolve(meta3dState)
                 })
             })
         },

diff --git a/contributes/meta3d-action-load-glb/package.json b/contributes/meta3d-action-load-glb/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-load-glb",
-    "version": "0.18.1",
+    "version": "0.18.2",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "repoLink": "",
     "protocol": {

diff --git a/contributes/meta3d-action-load-glb/src/Main.ts b/contributes/meta3d-action-load-glb/src/Main.ts
@@ -80,6 +80,8 @@ export let getContribute: getContributeMeta3D<actionContribute<loadGlbUIData, st
                 }, (loaded: number, total: number) => {
                     // TODO show progress message
                     console.log(`loading ${loaded / total} %`)
+                }, () => {
+                    resolve(meta3dState)
                 })
             })
         },

diff --git a/doc/0.19.0.org b/doc/0.19.0.org
@@ -389,7 +389,7 @@ set event
 
 
 
-* TODO fix: import event, load glb: if not import, should return to page instead of empty
+* DONE fix: import event, load glb: if not import, should return to page instead of empty
 
 
 

diff --git a/utils/meta3d-file-ts-utils/src/ImportFileUtils.ts b/utils/meta3d-file-ts-utils/src/ImportFileUtils.ts
@@ -1,9 +1,13 @@
-export let importFile = (onloadFunc:any, onerrorFunc:any, onprogressFunc:any) => {
+export let importFile = (onloadFunc: any, onerrorFunc: any, onprogressFunc: any, oncancelFunc: any) => {
     let input = document.createElement('input')
     input.setAttribute('type', "file")
     input.style.visibility = 'hidden'
 
     input.onchange = (event) => {
+        if ((event.target as any).files.length == 0) {
+            oncancelFunc()
+        }
+
         let file = (event.target as any).files[0]
 
         let reader = new FileReader()
@@ -23,6 +27,10 @@ export let importFile = (onloadFunc:any, onerrorFunc:any, onprogressFunc:any) =>
         reader.readAsArrayBuffer(file)
     }
 
+    input.oncancel = (event) => {
+        oncancelFunc()
+    }
+
     document.body.appendChild(input)
     input.click()
     document.body.removeChild(input)