From 54eebd0867379c1943da60d679a42d512a324d27 Mon Sep 17 00:00:00 2001 From: betterdancing Date: Wed, 24 Apr 2024 11:35:03 -0700 Subject: [PATCH 1/4] =?UTF-8?q?fix(block-diff):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E5=8F=91=E5=B8=83=E6=98=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E4=BF=9D=E5=AD=98=E6=97=B6schema=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/component/BlockDeployDialog.vue | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue index f5aa6c96cd..b4c9ff0939 100644 --- a/packages/common/component/BlockDeployDialog.vue +++ b/packages/common/component/BlockDeployDialog.vue @@ -49,7 +49,7 @@ :modal="false" :fullscreen="true" :append-to-body="true" - title="Schema 本地与线上差异" + title="Schema 线上与本地差异" > { - const pageSchema = JSON.parse(state.newCode) - setSchema(pageSchema) - - close() + if (state.newCode) { + try { + const pageSchema = JSON.parse(state.newCode) + setSchema(pageSchema) + close() + } catch (err) { + useNotify({ + type: 'error', + message: '代码静态检查有错误，请先修改后再保存' + }) + } + } else { + close() + } } return { From 13a0b1e622155fe8fff653e85ad7a77725bf68ed Mon Sep 17 00:00:00 2001 From: betterdancing Date: Sun, 28 Apr 2024 20:30:52 -0700 Subject: [PATCH 2/4] =?UTF-8?q?fix(block-diff):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E5=8F=91=E5=B8=83=E6=98=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E4=BF=9D=E5=AD=98=E6=97=B6schema=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/component/BlockDeployDialog.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue index b4c9ff0939..9d6c691a1a 100644 --- a/packages/common/component/BlockDeployDialog.vue +++ b/packages/common/component/BlockDeployDialog.vue @@ -212,19 +212,19 @@ export default { } const save = () => { - if (state.newCode) { - try { - const pageSchema = JSON.parse(state.newCode) - setSchema(pageSchema) - close() - } catch (err) { - useNotify({ - type: 'error', - message: '代码静态检查有错误，请先修改后再保存' - }) - } - } else { + if (!state.newCode) { + close() + return + } + try { + const pageSchema = JSON.parse(state.newCode) + setSchema(pageSchema) close() + } catch (err) { + useNotify({ + type: 'error', + message: '代码静态检查有错误，请先修改后再保存' + }) } } From 86ef666240e3897cff0ff335bfd10da3d6b74afc Mon Sep 17 00:00:00 2001 From: betterdancing Date: Mon, 29 Apr 2024 15:22:02 -0700 Subject: [PATCH 3/4] =?UTF-8?q?fix(block-diff):=20=E5=8C=BA=E5=9D=97?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=9F=A5=E7=9C=8B=E5=B7=AE=E5=BC=82=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9schema?= =?UTF-8?q?=E7=9A=84componentName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 9d6c691a1a..b369c5831c 100644 --- a/packages/common/component/BlockDeployDialog.vue +++ b/packages/common/component/BlockDeployDialog.vue @@ -218,7 +218,7 @@ export default { } try { const pageSchema = JSON.parse(state.newCode) - setSchema(pageSchema) + setSchema({ ...pageSchema, componentName: state.code.componentName }) close() } catch (err) { useNotify({ From cc7c24bfe9ca2d8b54e2292679d66889fa1f917f Mon Sep 17 00:00:00 2001 From: betterdancing Date: Tue, 30 Apr 2024 10:51:32 -0700 Subject: [PATCH 4/4] =?UTF-8?q?fix(block-diff):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E5=8F=91=E5=B8=83=E6=98=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E4=BF=9D=E5=AD=98=E6=97=B6schema=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/component/BlockDeployDialog.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue index b369c5831c..5a6e194829 100644 --- a/packages/common/component/BlockDeployDialog.vue +++ b/packages/common/component/BlockDeployDialog.vue @@ -84,6 +84,7 @@ import { import { theme } from '@opentiny/tiny-engine-controller/adapter' import { useLayout, useNotify } from '@opentiny/tiny-engine-controller' import { getSchema, setSchema } from '@opentiny/tiny-engine-canvas' +import { constants } from '@opentiny/tiny-engine-utils' import VueMonaco from './VueMonaco.vue' export default { @@ -106,6 +107,7 @@ export default { }, emits: ['update:visible'], setup(props, { emit, attrs }) { + const { COMPONENT_NAME } = constants const formState = reactive({ deployInfo: '', version: '', @@ -218,7 +220,7 @@ export default { } try { const pageSchema = JSON.parse(state.newCode) - setSchema({ ...pageSchema, componentName: state.code.componentName }) + setSchema({ ...pageSchema, componentName: COMPONENT_NAME.Block }) close() } catch (err) { useNotify({