From fe33535eb3cc3285778e8d9d8b03084ea08ce790 Mon Sep 17 00:00:00 2001 From: betterdancing Date: Mon, 15 Apr 2024 18:05:28 -0700 Subject: [PATCH 1/2] =?UTF-8?q?fix(block):=20=E6=96=B0=E5=BB=BA=E5=8C=BA?= =?UTF-8?q?=E5=9D=97=E4=BF=9D=E5=AD=98=E5=90=8E=E5=8F=91=E5=B8=83=E5=8C=BA?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/component/BlockDeployDialog.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue index 33aaf918e4..298ae0a97c 100644 --- a/packages/common/component/BlockDeployDialog.vue +++ b/packages/common/component/BlockDeployDialog.vue @@ -82,7 +82,7 @@ import { FormItem as TinyFormItem } from '@opentiny/vue' import { theme } from '@opentiny/tiny-engine-controller/adapter' -import { useLayout, useNotify, useCanvas } from '@opentiny/tiny-engine-controller' +import { useLayout, useNotify, useCanvas, useBlock } from '@opentiny/tiny-engine-controller' import { constants } from '@opentiny/tiny-engine-utils' import VueMonaco from './VueMonaco.vue' @@ -163,7 +163,7 @@ export default { const { getEditBlock, publishBlock } = getPluginApi(PLUGIN_NAME.BlockManage) if (valid) { const params = { - block: getEditBlock(), + block: getEditBlock() || useBlock().getCurrentBlock(), is_compile: true, deploy_info: formState.deployInfo, version: formState.version, @@ -219,7 +219,7 @@ export default { return } try { - const pageSchema = JSON.parse(state.newCode) + const pageSchema = state.newCode ?? JSON.parse(state.newCode) const setSchema = useCanvas().canvasApi.value.setSchema setSchema?.({ ...pageSchema, componentName: COMPONENT_NAME.Block }) close() From 6a2e431238b13f95432b8c865c4502e38a777d97 Mon Sep 17 00:00:00 2001 From: chilingling Date: Sat, 28 Sep 2024 01:47:29 -0700 Subject: [PATCH 2/2] fix: del useless null check --- packages/common/component/BlockDeployDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue index 298ae0a97c..ecb2a5a464 100644 --- a/packages/common/component/BlockDeployDialog.vue +++ b/packages/common/component/BlockDeployDialog.vue @@ -219,7 +219,7 @@ export default { return } try { - const pageSchema = state.newCode ?? JSON.parse(state.newCode) + const pageSchema = JSON.parse(state.newCode) const setSchema = useCanvas().canvasApi.value.setSchema setSchema?.({ ...pageSchema, componentName: COMPONENT_NAME.Block }) close()