From b0fec9019ac3be66790dde95dad2370ffa65b83d Mon Sep 17 00:00:00 2001 From: ouyang Date: Fri, 28 Feb 2025 12:08:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9handleTinyGridColumnsSlot?= =?UTF-8?q?s=E6=96=B9=E6=B3=95=E4=B8=AD=E5=88=A4=E6=96=ADnode.props.column?= =?UTF-8?q?s=E6=98=AF=E5=90=A6=E4=B8=BA=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/canvas/DesignCanvas/src/api/useCanvas.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js index 07b1fad6c7..1743d95558 100644 --- a/packages/canvas/DesignCanvas/src/api/useCanvas.js +++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js @@ -74,7 +74,8 @@ const rootSchema = ref([ ]) const handleTinyGridColumnsSlots = (node) => { - for (const columnItem of node.props?.columns || []) { + let columns = node.props?.columns && Array.isArray(node.props?.columns) ? node.props.columns : [] + for (const columnItem of columns) { if (!columnItem?.slots) { continue } From dca2255fe3b61301fbaa9d41f411235844c63309 Mon Sep 17 00:00:00 2001 From: ouyang Date: Mon, 3 Mar 2025 10:58:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/canvas/DesignCanvas/src/api/useCanvas.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js index 1743d95558..58fac1cdda 100644 --- a/packages/canvas/DesignCanvas/src/api/useCanvas.js +++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js @@ -74,7 +74,7 @@ const rootSchema = ref([ ]) const handleTinyGridColumnsSlots = (node) => { - let columns = node.props?.columns && Array.isArray(node.props?.columns) ? node.props.columns : [] + let columns = Array.isArray(node.props?.columns) ? node.props.columns : [] for (const columnItem of columns) { if (!columnItem?.slots) { continue