center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1834 from dataease/v1.8

Browse Source 
V1.8
This commit is contained in:
王嘉豪 2022-02-25 18:38:45 +08:00 committed by GitHub
commit 55962a5be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -131,7 +131,7 @@ public class PanelGroupService {
panelGroupMapper.insertSelective(newDefaultPanel); panelGroupMapper.insertSelective(newDefaultPanel);
} else if ("copy".equals(request.getOptType())) { } else if ("copy".equals(request.getOptType())) {
try { try {
this.panelGroupCopy(request, null, true); panelId = this.panelGroupCopy(request, null, true);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
LOGGER.error("更新panelView出错panelId：{}", request.getId()); LOGGER.error("更新panelView出错panelId：{}", request.getId());

2
backend/src/main/resources/db/migration/V32__1.8.sql
View File

@ -365,7 +365,7 @@ ALTER TABLE `datasource`
ALTER TABLE `panel_view` ALTER TABLE `panel_view`
ADD COLUMN `copy_from_panel` varchar(255) NULL AFTER `position`, 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_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`; ADD COLUMN `copy_id` varchar(255) NULL COMMENT '本次复制的执行ID' AFTER `copy_from`;
ALTER TABLE `panel_view_linkage` ALTER TABLE `panel_view_linkage`