From 9c7ad6f04ac3b2275b5d03189e69f452c50d6f3d Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 25 Feb 2022 17:44:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E8=A7=86=E5=9B=BE=E8=A2=AB=E5=88=A0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V32__1.8.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql index 3ffa33fe71..61f01b28b8 100644 --- a/backend/src/main/resources/db/migration/V32__1.8.sql +++ b/backend/src/main/resources/db/migration/V32__1.8.sql @@ -365,7 +365,7 @@ ALTER TABLE `datasource` ALTER TABLE `panel_view` ADD COLUMN `copy_from_panel` varchar(255) NULL AFTER `position`, ADD COLUMN `copy_from_view` varchar(255) NULL AFTER `copy_from_panel`, -ADD COLUMN `copy_from` varchar(255) NOT NULL COMMENT '如果有复制 最近一次的复制来源id' AFTER `copy_from_view`, +ADD COLUMN `copy_from` varchar(255) NULL COMMENT '如果有复制 最近一次的复制来源id' AFTER `copy_from_view`, ADD COLUMN `copy_id` varchar(255) NULL COMMENT '本次复制的执行ID' AFTER `copy_from`; ALTER TABLE `panel_view_linkage` From 04730cb4ac7713b8c821c1d2c173f8d0c3545a79 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 25 Feb 2022 17:47:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20flyway=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8B=93=E5=B1=95=E6=8F=92=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V32__1.8.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql index 61f01b28b8..5153b77c38 100644 --- a/backend/src/main/resources/db/migration/V32__1.8.sql +++ b/backend/src/main/resources/db/migration/V32__1.8.sql @@ -315,7 +315,7 @@ ALTER TABLE `chart_view` ADD COLUMN `is_plugin` bit(1) NULL COMMENT '是否插件' AFTER `chart_type`; -INSERT INTO `my_plugin` VALUES (2, '视图默认插件', 'default', 0, 20000, 'view', '默认视图插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'deplugin-view-backend', NULL); +INSERT INTO `my_plugin` VALUES (2, '视图默认插件', 'default', 0, 20000, 'view', '默认视图插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'dataease-extensions-backend', NULL); SET NAMES utf8mb4; From 1e407b49bb9638543f53ec85a7ebb1ddeff53014 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 25 Feb 2022 18:28:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E5=A0=86?= =?UTF-8?q?=E5=8F=A0=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=9F=B1=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/shape-attr/SizeSelector.vue | 2 +- frontend/src/views/chart/view/ChartEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue index 5fe74d9514..0a96d990d7 100644 --- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue @@ -8,7 +8,7 @@ - + diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index be24d248c7..6a28dce9ff 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -622,7 +622,7 @@ /> From 0ef9e7a001479ec61281db8628fbdaf96d7b3651 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 25 Feb 2022 18:36:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=90=8E=E6=89=93=E5=BC=80=E7=9A=84=E6=98=AF=E6=97=A7?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/panel/PanelGroupService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index d5ece3cc9e..aedb1af684 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -131,7 +131,7 @@ public class PanelGroupService { panelGroupMapper.insertSelective(newDefaultPanel); } else if ("copy".equals(request.getOptType())) { try { - this.panelGroupCopy(request, null, true); + panelId = this.panelGroupCopy(request, null, true); } catch (Exception e) { e.printStackTrace(); LOGGER.error("更新panelView出错panelId：{}", request.getId());