From aaaa99732f520f984a70ee761a82cfa1cccf5aef Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Thu, 23 Nov 2023 01:08:46 -0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=89=A7=E8=A1=8C=E5=8F=B3=E9=94=AE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=92=8C=E5=8F=B3=E9=94=AE=E5=A4=8D=E5=88=B6=E6=97=B6=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/src/components/container/CanvasMenu.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index 42de1355cd..b3de81338a 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -108,10 +108,16 @@ export default { const operations = { del() { - removeNodeById(getCurrent().schema.id) + const curSchemaId = getCurrent().schema?.id + if (curSchemaId) { + removeNodeById(curSchemaId) + } }, copy() { - copyNode(getCurrent().schema.id) + const curSchemaId = getCurrent().schema?.id + if (curSchemaId) { + copyNode(curSchemaId) + } }, config() { useLayout().activeSetting('props') From c407f2c60d71dd165a1b72a14a298f1c38e5500b Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Thu, 23 Nov 2023 01:29:23 -0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=89=A7=E8=A1=8C=E5=8F=B3=E5=BB=BA=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=B6=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/container/CanvasMenu.vue | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index b3de81338a..cbca11eccf 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -108,15 +108,15 @@ export default { const operations = { del() { - const curSchemaId = getCurrent().schema?.id - if (curSchemaId) { - removeNodeById(curSchemaId) + const currentSchemaId = getCurrent().schema?.id + if (currentSchemaId) { + removeNodeById(currentSchemaId) } }, copy() { - const curSchemaId = getCurrent().schema?.id - if (curSchemaId) { - copyNode(curSchemaId) + const currentSchemaId = getCurrent().schema?.id + if (currentSchemaId) { + copyNode(currentSchemaId) } }, config() { @@ -131,17 +131,19 @@ export default { wrap({ value, name }) { const componentName = value || name const { schema, parent } = getCurrent() - const index = parent.children.indexOf(schema) - const wrapSchema = { - componentName, - id: null, - props: {}, - children: [schema] - } + if (schema && parent) { + const index = parent.children.indexOf(schema) + const wrapSchema = { + componentName, + id: null, + props: {}, + children: [schema] + } - parent.children.splice(index, 1, wrapSchema) + parent.children.splice(index, 1, wrapSchema) - getController().addHistory() + getController().addHistory() + } }, createBlock() { if (useCanvas().isSaved()) { From 664cb87755ba1dc85e6cee826f1a369054fd5b6f Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Sat, 25 Nov 2023 00:43:57 -0800 Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96operations?= =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/src/components/container/CanvasMenu.vue | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index cbca11eccf..97bacfc5ba 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -108,16 +108,10 @@ export default { const operations = { del() { - const currentSchemaId = getCurrent().schema?.id - if (currentSchemaId) { - removeNodeById(currentSchemaId) - } + removeNodeById(getCurrent().schema?.id) }, copy() { - const currentSchemaId = getCurrent().schema?.id - if (currentSchemaId) { - copyNode(currentSchemaId) - } + copyNode(getCurrent().schema?.id) }, config() { useLayout().activeSetting('props') From 99db94bb92d1f87473657c793efa43e189e68cc6 Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Sat, 25 Nov 2023 00:50:23 -0800 Subject: [PATCH 4/9] fix: verify operations copy id --- packages/canvas/src/components/container/container.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/canvas/src/components/container/container.js b/packages/canvas/src/components/container/container.js index e65549fefe..10fd4d3419 100644 --- a/packages/canvas/src/components/container/container.js +++ b/packages/canvas/src/components/container/container.js @@ -249,6 +249,9 @@ export const addComponent = (data, position) => { } export const copyNode = (id) => { + if (!id) { + return + } const { node, parent } = getNode(id, true) inserAfter({ parent, node, data: copyObject(node) }) From 0ea09333e1e5222dea7fbe9c257919e001cedf9c Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Sat, 25 Nov 2023 01:18:59 -0800 Subject: [PATCH 5/9] fix: verify operations copy id --- packages/canvas/src/components/container/CanvasMenu.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index df34e23c4e..00b8798fcc 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -114,7 +114,10 @@ export default { removeNodeById(getCurrent().schema?.id) }, copy() { - copyNode(getCurrent().schema?.id) + const currentSchemaId = getCurrent().schema?.id + if (currentSchemaId) { + copyNode(getCurrent().schema?.id) + } }, config() { useLayout().activeSetting('props') From 407bc4eaf25c01d55bdee6adb8979b071580b4bb Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Sat, 25 Nov 2023 01:20:18 -0800 Subject: [PATCH 6/9] fix: verify operations copy id --- packages/canvas/src/components/container/container.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/canvas/src/components/container/container.js b/packages/canvas/src/components/container/container.js index 10fd4d3419..e65549fefe 100644 --- a/packages/canvas/src/components/container/container.js +++ b/packages/canvas/src/components/container/container.js @@ -249,9 +249,6 @@ export const addComponent = (data, position) => { } export const copyNode = (id) => { - if (!id) { - return - } const { node, parent } = getNode(id, true) inserAfter({ parent, node, data: copyObject(node) }) From a50ac01caa7f9d20164a16b53e96c3a008b7464d Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Sun, 26 Nov 2023 17:40:26 -0800 Subject: [PATCH 7/9] fix: copyNode function verify params --- packages/canvas/src/components/container/CanvasMenu.vue | 5 +---- packages/canvas/src/components/container/container.js | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index 00b8798fcc..df34e23c4e 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -114,10 +114,7 @@ export default { removeNodeById(getCurrent().schema?.id) }, copy() { - const currentSchemaId = getCurrent().schema?.id - if (currentSchemaId) { - copyNode(getCurrent().schema?.id) - } + copyNode(getCurrent().schema?.id) }, config() { useLayout().activeSetting('props') diff --git a/packages/canvas/src/components/container/container.js b/packages/canvas/src/components/container/container.js index e65549fefe..10fd4d3419 100644 --- a/packages/canvas/src/components/container/container.js +++ b/packages/canvas/src/components/container/container.js @@ -249,6 +249,9 @@ export const addComponent = (data, position) => { } export const copyNode = (id) => { + if (!id) { + return + } const { node, parent } = getNode(id, true) inserAfter({ parent, node, data: copyObject(node) }) From 4dc4a2d63ccb2fbcd98df0d2c11c61dc36f6da0e Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Mon, 27 Nov 2023 22:44:03 -0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=B8=8D=E5=8F=AF=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95=E9=A1=B9disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/container/CanvasMenu.vue | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index df34e23c4e..3fa0937bd7 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -4,9 +4,12 @@
  • {{ item.name }} @@ -98,7 +101,8 @@ export default { items: [ { name: '文字提示', code: 'wrap', value: 'TinyTooltip' }, { name: '弹出框', code: 'wrap', value: 'TinyPopover' } - ] + ], + code: 'addParent' }, { name: '删除', code: 'del' }, { name: '复制', code: 'copy' }, @@ -107,6 +111,15 @@ export default { const boxVisibility = ref(false) + const actionDisabled = (actionItem) => { + const actions = ['del', 'copy', 'addParent'] + return actions.includes(actionItem.code) && !getCurrent().schema?.id + } + + const onShowChildrenMenu = (menuItem) => { + current.value = !actionDisabled(menuItem) ? menuItem : null + } + // 计算上下文菜单位置，右键时显示，否则关闭 const operations = { @@ -163,7 +176,7 @@ export default { } if (item?.code) { - operations[item.code](item) + operations[item.code]?.(item) closeMenu() } } @@ -175,7 +188,9 @@ export default { boxVisibility, close, current, - menuDom + menuDom, + actionDisabled, + onShowChildrenMenu } } } @@ -198,6 +213,10 @@ export default { .li-item { border-bottom: 1px solid var(--ti-lowcode-canvas-menu-border-color); } + .li-item-disabled { + cursor: not-allowed; + color: var(--ti-lowcode-canvas-menu-item-disabled-color); + } li { & > div { display: flex; From 94077c16ea4e281ab13b1d56bcace99e23417aa2 Mon Sep 17 00:00:00 2001 From: gargameljyh <1954914724@qq.com> Date: Mon, 27 Nov 2023 23:57:04 -0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E7=82=B9=E5=87=BBdisabled=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=A1=B9=20=E4=B8=8D=E5=85=B3=E9=97=AD=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/container/CanvasMenu.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/canvas/src/components/container/CanvasMenu.vue b/packages/canvas/src/components/container/CanvasMenu.vue index 3fa0937bd7..26ce7ce3a4 100644 --- a/packages/canvas/src/components/container/CanvasMenu.vue +++ b/packages/canvas/src/components/container/CanvasMenu.vue @@ -111,15 +111,6 @@ export default { const boxVisibility = ref(false) - const actionDisabled = (actionItem) => { - const actions = ['del', 'copy', 'addParent'] - return actions.includes(actionItem.code) && !getCurrent().schema?.id - } - - const onShowChildrenMenu = (menuItem) => { - current.value = !actionDisabled(menuItem) ? menuItem : null - } - // 计算上下文菜单位置，右键时显示，否则关闭 const operations = { @@ -167,11 +158,20 @@ export default { } } + const actionDisabled = (actionItem) => { + const actions = ['del', 'copy', 'addParent'] + return actions.includes(actionItem.code) && !getCurrent().schema?.id + } + + const onShowChildrenMenu = (menuItem) => { + current.value = !actionDisabled(menuItem) ? menuItem : null + } + const close = () => { boxVisibility.value = false } const doOperation = (item) => { - if (item.check && !item.check?.()) { + if ((item.check && !item.check?.()) || actionDisabled(item)) { return }