Merge pull request #4257 from dataease/pr@dev@refactor_subject-style

refactor: 优化仪表板主题样式

backend/src/main/java/io/dataease/service/panel/PanelGroupExtendDataService.java

@@ -34,7 +34,7 @@ public class PanelGroupExtendDataService {
         if (CollectionUtils.isNotEmpty(extendDataList)) {
             ChartViewDTO chartViewTemplate = gson.fromJson(extendDataList.get(0).getViewDetails(), ChartViewDTO.class);
             Map<String, Object> dataInfo = chartViewTemplate.getData();
-            if (dataInfo.get(transDataKey) != null) {
+            if (dataInfo != null && dataInfo.get(transDataKey) != null) {
                 dataInfo.put("data", dataInfo.get(transDataKey));
                 dataInfo.remove(transDataKey);
             }

backend/src/main/java/io/dataease/service/panel/PanelSubjectService.java

@@ -49,12 +49,25 @@ public class PanelSubjectService {
         if (StringUtils.isEmpty(request.getId())) {
             PanelSubjectExample example = new PanelSubjectExample();
             example.createCriteria().andTypeEqualTo("self");
+            example.setOrderByClause("create_time desc");
             List<PanelSubject> subjectAll = panelSubjectMapper.selectByExample(example);
-            int count = CollectionUtils.isEmpty(subjectAll) ? 0 : subjectAll.size();
+            int count = CollectionUtils.isEmpty(subjectAll) ? 1 : subjectAll.get(0).getCreateNum() + 1;
+            String subjectName = "个人主题" + count;
+            if (!CollectionUtils.isEmpty(subjectAll)) {
+                for (PanelSubject subject : subjectAll) {
+                    if (subjectName.equals(subject.getName())) {
+                        count++;
+                        subjectName = "个人主题" + count;
+                    } else {
+                        break;
+                    }
+                }
+            }
             request.setId(UUID.randomUUID().toString());
             request.setCreateTime(System.currentTimeMillis());
             request.setType("self");
             request.setName("个人主题" + count);
+            request.setCreateNum(count);
             panelSubjectMapper.insertSelective(request);
         } else {
             PanelSubjectExample example = new PanelSubjectExample();

backend/src/main/resources/db/migration/V46__1.18.sql

@@ -644,3 +644,13 @@ INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_typ
                                `copy_from`, `copy_id`)
 VALUES ('e49bf17e-0af8-11ec-a2b0-0242ac130003', '00590a7c-8e7b-45f4-8428-55532be07602', 'i18n_auth_use', 1, 1, 'use',
         '基础权限-使用', 'admin', 1630482464000, NULL, NULL, NULL);
+
+UPDATE `sys_menu`
+SET `permission` = 'app-template:read'
+WHERE `menu_id` = 41;
+UPDATE `sys_menu`
+SET `permission` = 'app-template-market:read'
+WHERE `menu_id` = 203;
+
+ALTER TABLE `panel_subject`
+    ADD COLUMN `create_num` int(13) DEFAULT 0 COMMENT '创建序号' AFTER `details`;