diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 1c3158f6f8..561bc72dcf 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -754,16 +754,22 @@ public class ChartDataManage { public void saveChartViewFromVisualization(String checkData, Long sceneId, Map chartViewsInfo) { if (!MapUtils.isEmpty(chartViewsInfo)) { + List disuseChartIdList = new ArrayList<>(); chartViewsInfo.forEach((key, chartViewDTO) -> { - if (checkData.indexOf(chartViewDTO.getId() + "") > -1) { + if (checkData.contains(chartViewDTO.getId() + "")) { try { chartViewDTO.setSceneId(sceneId); chartViewManege.save(chartViewDTO); } catch (Exception e) { DEException.throwException(e); } + } else { + disuseChartIdList.add(chartViewDTO.getId()); } }); + if (CollectionUtils.isNotEmpty(disuseChartIdList)) { + chartViewManege.disuse(disuseChartIdList); + } } } } diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index fe70b75566..5f20b8780d 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -26,6 +26,7 @@ import io.dataease.extensions.datasource.model.SQLObj; import io.dataease.extensions.view.dto.*; import io.dataease.extensions.view.filter.FilterTreeObj; import io.dataease.i18n.Translator; +import io.dataease.license.config.XpackInteract; import io.dataease.utils.BeanUtils; import io.dataease.utils.IDUtils; import io.dataease.utils.JsonUtil; @@ -98,6 +99,9 @@ public class ChartViewManege { coreChartViewMapper.deleteById(id); } + @XpackInteract(value = "chartViewManage") + public void disuse(List chartIdList) {} + @Transactional public void deleteBySceneId(Long sceneId, List chartIds) { QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 449b1651e9..ee6b72d807 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2788,6 +2788,8 @@ export default { name: '告警名称', grid_title: '告警管理', grid: '告警列表', - record: '告警记录' + record: '告警记录', + module_name: '阈值告警', + setting: '阈值告警设置' } } diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue index a8c6bc3cfe..74dc1e66bc 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue @@ -20,6 +20,7 @@ import { storeToRefs } from 'pinia' import { BASE_VIEW_CONFIG } from '../util/chart' import { cloneDeep, defaultsDeep } from 'lodash-es' import BubbleAnimateCfg from '@/views/chart/components/editor/editor-senior/components/BubbleAnimateCfg.vue' +import { XpackComponent } from '@/components/plugin' const dvMainStore = dvMainStoreWithOut() const { nowPanelTrackInfo, nowPanelJumpInfo, dvInfo, componentData } = storeToRefs(dvMainStore) @@ -282,6 +283,13 @@ const isDataEaseBi = computed(() => appStore.getIsDataEaseBi) /> + +