Merge pull request #1834 from dataease/v1.8

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());

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`