feat(editor): update publish: close publish modal after publish; show publish... info;

Author: yyc-git

contributes/meta3d-action-mod-career-add-careerfeature/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-career-add-careerfeature",
-    "version": "1.3.17",
+    "version": "1.3.18",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-career-add-careerfeature-protocol"

contributes/meta3d-action-mod-career-add-careerfeature/src/Main.ts

@@ -65,10 +65,8 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                 info: api.nullable.return("加载中...")
             })
 
-            setTimeout(() => {
-                let meta3dState = api.readState()
-
-                _buildAllDefaultCareerFeatures(api).then(data => {
+            api.flow.deferExec((meta3dState) => {
+                return _buildAllDefaultCareerFeatures(api).then(data => {
                     let allDefaultCareerFeatures = api.immutable.createListOfData(data)
 
                     return api.action.setActionState(meta3dState, actionName, {
@@ -82,8 +80,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                             info: api.nullable.getEmpty()
                         })
                     })
-                    .then(api.writeState)
-            }, 0)
+            })
 
             let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
 

contributes/meta3d-action-mod-career-publish-to-game/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-mod-career-publish-to-game",
-    "version": "1.3.38",
+    "version": "1.3.46",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-action-mod-career-publish-to-game-protocol"

contributes/meta3d-action-mod-career-publish-to-game/src/Main.ts

@@ -8,6 +8,7 @@ import { actionName as addCareerFeatureActionName, characterType, state as addCa
 import { actionName as selectCharacterTypeActionName, state as selectCharacterTypeState } from "meta3d-action-mod-career-selectcharactertype-protocol"
 import { actionName as loadModPreviewActionName, state as loadModPreviewState } from "meta3d-action-mod-career-load-modpreview-protocol"
 import { actionName as loadCareerPreviewActionName, state as loadCareerPreviewState } from "meta3d-action-mod-career-load-careerpreview-protocol"
+import { actionName as infoActionName, state as infoState } from "meta3d-action-mod-career-info-protocol"
 
 //TODO duplicate
 let _isCharacterTypeEqual = (characterType1: characterType, characterType2: characterType) => {
@@ -116,17 +117,33 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         return _isCharacterTypeEqual(d.characterType, characterType_)
                     })
 
-                    let assetIconBase64 = api.action.getActionState<loadModPreviewState>(meta3dState, loadModPreviewActionName).preview
-                    let careerIconBase64 = api.action.getActionState<loadCareerPreviewState>(meta3dState, loadCareerPreviewActionName).preview
-
-                    let state = api.action.getActionState<state>(meta3dState, actionName)
+                    let assetIconBase64 = api.nullable.getWithDefault(
+                        api.action.getActionState<loadModPreviewState>(meta3dState, loadModPreviewActionName).preview,
+                        ""
+                    )
+                    let careerIconBase64 = api.nullable.getWithDefault(
+                        api.action.getActionState<loadCareerPreviewState>(meta3dState, loadCareerPreviewActionName).preview,
+                        ""
+                    )
 
                     console.log("publish mod")
 
-                    return _base64ToUint8Array(assetIconBase64).then(uint8Array => {
-                        return api.backend.publishMod(
-                            // "local",
-                            ` {
+
+                    meta3dState = api.action.setActionState<state>(meta3dState, actionName, {
+                        ...api.action.getActionState<state>(meta3dState, actionName),
+                        isShowModal: false
+                    })
+                    meta3dState = api.action.setActionState<infoState>(meta3dState, infoActionName, {
+                        ...api.action.getActionState<infoState>(meta3dState, infoActionName),
+                        info: api.nullable.return("正在发布中...")
+                    })
+
+                    api.flow.deferExec((meta3dState) => {
+                        return _base64ToUint8Array(assetIconBase64).then(uint8Array => {
+                            let state = api.action.getActionState<state>(meta3dState, actionName)
+
+                            return api.backend.publishMod(
+                                ` {
     "name": "${_buildUniqueName(state)}",
     "mod": {
         "protocolName": "career-protocol",
@@ -139,26 +156,31 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
         ]
     }
                         }`,
-                            `${state.readme}`,
-                            _buildDistFileContent(state, characterType_, features),
-                            [
+                                `${state.readme}`,
+                                _buildDistFileContent(state, characterType_, features),
                                 [
-                                    `./${_buildIconId(state)}.png`,
-                                    uint8Array
+                                    [
+                                        `./${_buildIconId(state)}.png`,
+                                        uint8Array
+                                    ],
                                 ],
-                            ],
-                            careerIconBase64
-                        ).then(_ => {
-                            console.log("publish success")
-
-                            // meta3dState = api.action.setActionState<state>(meta3dState, actionName, {
-                            //     ...state,
-                            //     version: state.version + 1
-                            // })
-
-                            return meta3dState
+                                careerIconBase64
+                            )
+                                .then(() => {
+                                    meta3dState = api.action.setActionState<infoState>(meta3dState, infoActionName, {
+                                        ...api.action.getActionState<infoState>(meta3dState, infoActionName),
+                                        info: api.nullable.getEmpty()
+                                    })
+
+                                    return meta3dState
+                                })
                         })
+                            .catch(e => {
+                                api.message.error(e)
+                            })
                     })
+
+                    return Promise.resolve(meta3dState)
                 }, (meta3dState) => {
                     return Promise.resolve(meta3dState)
                 }))

contributes/meta3d-ui-control-modal/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-modal",
-    "version": "1.3.1",
+    "version": "1.3.5",
     "publisher": "meta3d",
     "displayName": "模态框",
     "repoLink": "https://github.com/Meta3D-Technology/Meta3D/tree/master/contributes/meta3d-ui-control-modal",

defaults/meta3d-commonlib/lib/bs/.bsdeps

@@ -18,4 +18,4 @@ src\log	0x1.a5a64897c2f18p+30
 src\copy	0x1.a5a64897c0e59p+30
 src\contract	0x1.a5a64897bfdf9p+30
 ===
-D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe	0x1.a5e5ad7507ef9p+30
+D:\Github\Meta3D\node_modules\rescript\win32\rescript.exe	0x1.a5e61fd3d796dp+30

defaults/meta3d-commonlib/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(99071971)
-#Done(99072795)
+#Start(106391664)
+#Done(106392359)