diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java new file mode 100644 index 0000000000..c671b319b5 --- /dev/null +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java @@ -0,0 +1,41 @@ +package io.dataease.visualization.manage; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.dataease.api.chart.dto.ChartViewDTO; +import io.dataease.exception.DEException; +import io.dataease.template.dao.auto.entity.VisualizationTemplateExtendData; +import io.dataease.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper; +import io.dataease.utils.JsonUtil; +import jakarta.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + + + +/** + * @author : WangJiaHao + * @date : 2023/11/13 13:25 + */ +@Service +public class VisualizationTemplateExtendDataManage { + + @Resource + private VisualizationTemplateExtendDataMapper extendDataMapper; + + public ChartViewDTO getChartDataInfo(Long viewId, ChartViewDTO view) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.ne("view_id",viewId); + List extendDataList = extendDataMapper.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(extendDataList)) { + ChartViewDTO chartViewTemplate = JsonUtil.parse(extendDataList.get(0).getViewDetails(),ChartViewDTO.class); + Map dataInfo = chartViewTemplate.getData(); + view.setData(chartViewTemplate.getData()); + } else { + DEException.throwException("模板缓存数据中未获取指定视图数据:" + viewId); + } + return view; + } +} diff --git a/core/core-frontend/src/views/common/DeResourceCreateOpt.vue b/core/core-frontend/src/views/common/DeResourceCreateOpt.vue index ab8c196726..dfb57f7fab 100644 --- a/core/core-frontend/src/views/common/DeResourceCreateOpt.vue +++ b/core/core-frontend/src/views/common/DeResourceCreateOpt.vue @@ -3,11 +3,11 @@ class="create-dialog" title="从模版新建" v-model="state.dialogShow" - width="600" + width="700" :before-close="close" @submit.prevent > - + {{ t('visualization.copy_template') }} - + {{ t('visualization.upload_template') }} @@ -25,14 +25,14 @@ id="input" ref="files" type="file" - accept=".DET" + accept=".DET2" hidden @change="handleFileChange" /> - {{ state.titleSuf }}{{ t('commons.name') }} + 名称 @@ -204,7 +204,7 @@ const handleFileChange = e => { reader.readAsText(file) } const goFile = () => { - files.value.files.click() + files.value.click() } const close = () => { @@ -221,22 +221,39 @@ defineExpose({ diff --git a/core/core-frontend/src/views/template/index.vue b/core/core-frontend/src/views/template/index.vue index 7b2b2fab36..f1d4d35dca 100644 --- a/core/core-frontend/src/views/template/index.vue +++ b/core/core-frontend/src/views/template/index.vue @@ -1,18 +1,6 @@