From 48e890175d92f1a0eb8c8a5627cc2f8bb945dc6f Mon Sep 17 00:00:00 2001 From: yyc-git <395976266@qq.com> Date: Tue, 12 Mar 2024 16:57:55 +0800 Subject: [PATCH] fix(editor): fix "when switch to element assemble from ap assemble->run quickly, will error" bug reason meta3d-ui-control-codeedit -> getMonaco() return empty because deferLoad not finish solution handle the empty case --- .../meta3d-action-addcomponent/package.json | 2 +- .../meta3d-ui-control-codeedit/package.json | 2 +- .../meta3d-ui-control-codeedit/src/Main.ts | 8 ++++++ doc/jiehuo.org | 26 ++++++++++++++----- .../package.json | 2 +- .../package.json | 2 +- .../meta3d-imgui-webgl1-renderer/package.json | 2 +- .../meta3d-component-script/package.json | 2 +- .../package.json | 2 +- .../components/RunElementVisual.res | 14 +++++----- .../ui/app/enter_app/components/EnterApp.res | 2 +- utils/meta3d-monaco-utils/src/Main.d.ts | 4 ++- 12 files changed, 46 insertions(+), 22 deletions(-) diff --git a/contributes/meta3d-action-addcomponent/package.json b/contributes/meta3d-action-addcomponent/package.json index 5d8475d5c..a5dd6ef49 100755 --- a/contributes/meta3d-action-addcomponent/package.json +++ b/contributes/meta3d-action-addcomponent/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-action-addcomponent", - "version": "1.3.1", + "version": "1.3.2", "publisher": "meta3d", "repoLink": "", "protocol": { diff --git a/contributes/meta3d-ui-control-codeedit/package.json b/contributes/meta3d-ui-control-codeedit/package.json index 6ca0c53df..ea8246bc6 100755 --- a/contributes/meta3d-ui-control-codeedit/package.json +++ b/contributes/meta3d-ui-control-codeedit/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-ui-control-codeedit", - "version": "1.3.1", + "version": "1.3.2", "displayName": "代码编辑", "publisher": "meta3d", "protocol": { diff --git a/contributes/meta3d-ui-control-codeedit/src/Main.ts b/contributes/meta3d-ui-control-codeedit/src/Main.ts index dd170d762..103ec4056 100755 --- a/contributes/meta3d-ui-control-codeedit/src/Main.ts +++ b/contributes/meta3d-ui-control-codeedit/src/Main.ts @@ -114,6 +114,14 @@ export let getContribute: getContributeMeta3Dpublish error - - -* TODO fix: camera group can set near, far -* TODO feat: add arcball component @@ -571,3 +568,18 @@ can add util functions! maintain visible + + + + + + +* TODO small improvement + +** TODO fix: camera group can set near, far + +** TODO feat: add arcball component; can set distance, phi, theta, target, + +** TODO fix: active arcball_forsceneview->publish error + +TODO hidden Arcball Camera For Scene View in sceneTree? diff --git a/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json b/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json index b877833ba..bde38e5dd 100755 --- a/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json +++ b/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-pipeline-webgl1-three-gameviewrender", - "version": "1.3.7", + "version": "1.3.9", "publisher": "meta3d", "protocol": { "name": "meta3d-pipeline-webgl1-three-gameviewrender-protocol" diff --git a/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json b/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json index d99a1b76e..351f42038 100755 --- a/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json +++ b/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-pipeline-webgl1-three-sceneviewrender", - "version": "1.3.1", + "version": "1.3.2", "publisher": "meta3d", "protocol": { "name": "meta3d-pipeline-webgl1-three-sceneviewrender-protocol" diff --git a/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json b/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json index c35386fcd..2aa72cc80 100755 --- a/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json +++ b/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-imgui-webgl1-renderer", - "version": "1.3.1", + "version": "1.3.2", "publisher": "meta3d", "displayName": "imgui-webgl1-renderer", "protocol": { diff --git a/packages/engine-scene/contributes/meta3d-component-script/package.json b/packages/engine-scene/contributes/meta3d-component-script/package.json index e248fb9c0..ab7c522cd 100755 --- a/packages/engine-scene/contributes/meta3d-component-script/package.json +++ b/packages/engine-scene/contributes/meta3d-component-script/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-component-script", - "version": "1.3.1", + "version": "1.3.2", "publisher": "meta3d", "protocol": { "name": "meta3d-component-script-protocol" diff --git a/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json b/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json index cb421ba09..9bbb1082f 100755 --- a/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json +++ b/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-pipeline-webgl1-three-webrender", - "version": "1.3.6", + "version": "1.3.7", "publisher": "meta3d", "protocol": { "name": "meta3d-pipeline-webgl1-three-webrender-protocol" diff --git a/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/run_element_visual/components/RunElementVisual.res b/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/run_element_visual/components/RunElementVisual.res index da737fdad..8c07b4ed8 100755 --- a/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/run_element_visual/components/RunElementVisual.res +++ b/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/run_element_visual/components/RunElementVisual.res @@ -50,9 +50,10 @@ module Method = { ()->Js.Promise.resolve }, _) - ->Js.Promise.catch(e => { - service.console.errorWithExn(. e->Error.promiseErrorToExn, None)->Obj.magic - + ->Js.Promise.catch( + e => { + service.console.errorWithExn(. e->Error.promiseErrorToExn, None)->Obj.magic + }, // (e->Obj.magic)["errorType"] === "script" // ? { // loopFrameID.current = @@ -62,8 +63,9 @@ module Method = { // ()->Js.Promise.resolve // } - // : e->Js.Exn.anyToExnInternal->Js.Promise.reject - }, _) + // : e->Js.Exn.anyToExnInternal->Js.Promise.reject + _, + ) ->ignore } @@ -136,7 +138,7 @@ let make = (~service: AssembleSpaceType.service) => { service.react.useEffect1(. () => { MessageUtils.showCatchedErrorMessage(() => { - switch Meta3dMonacoUtils.Main.getMonaco() { + switch Meta3dMonacoUtils.Main.getMonaco()->Meta3dCommonlib.OptionSt.fromNullable { | None => Meta3dMonacoUtils.Main.deferLoad() ->Js.Promise.catch( diff --git a/platform/frontend/src/external_layer/ui/app/enter_app/components/EnterApp.res b/platform/frontend/src/external_layer/ui/app/enter_app/components/EnterApp.res index 16bb0d045..aa5efadf1 100755 --- a/platform/frontend/src/external_layer/ui/app/enter_app/components/EnterApp.res +++ b/platform/frontend/src/external_layer/ui/app/enter_app/components/EnterApp.res @@ -24,7 +24,7 @@ let make = (~service: FrontendType.service) => { React.useEffect1(() => { MessageUtils.showCatchedErrorMessage(() => { - switch Meta3dMonacoUtils.Main.getMonaco() { + switch Meta3dMonacoUtils.Main.getMonaco()->Meta3dCommonlib.OptionSt.fromNullable { | None => Meta3dMonacoUtils.Main.deferLoad() ->Js.Promise.catch( diff --git a/utils/meta3d-monaco-utils/src/Main.d.ts b/utils/meta3d-monaco-utils/src/Main.d.ts index 346d0d295..44cad3968 100755 --- a/utils/meta3d-monaco-utils/src/Main.d.ts +++ b/utils/meta3d-monaco-utils/src/Main.d.ts @@ -1,3 +1,5 @@ +import { nullable } from "meta3d-commonlib-ts/src/nullable" + export type monaco = any -export function getMonaco(): monaco +export function getMonaco(): nullable