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

Merge branch 'dev-v2' into pr@dev-v2_dzz

Browse Source
This commit is contained in:
dataeaseShu 2023-12-05 14:13:04 +08:00
commit 1cd3b6f068
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-backend/src/main/resources/mybatis/ExtVisualizationTemplateMapper.xml
View File

@ -20,6 +20,7 @@
<resultMap id="BaseResultMapDTO" type="io.dataease.api.template.dto.TemplateManageDTO" <resultMap id="BaseResultMapDTO" type="io.dataease.api.template.dto.TemplateManageDTO"
extends="BaseResultMap"> extends="BaseResultMap">
<result column="recent_use_time" jdbcType="BIGINT" property="recentUseTime" />
<result column="label" jdbcType="VARCHAR" property="label"/> <result column="label" jdbcType="VARCHAR" property="label"/>
<result column="childrenCount" jdbcType="VARCHAR" property="childrenCount"/> <result column="childrenCount" jdbcType="VARCHAR" property="childrenCount"/>
</resultMap> </resultMap>
@ -50,10 +51,12 @@
vt.create_time, vt.create_time,
vt.template_type, vt.template_type,
vt.SNAPSHOT, vt.SNAPSHOT,
vtcm.category_id vtcm.category_id,
cor.time as 'recent_use_time'
FROM FROM
visualization_template vt visualization_template vt
LEFT JOIN visualization_template_category_map vtcm ON vt.id = vtcm.template_id LEFT JOIN visualization_template_category_map vtcm ON vt.id = vtcm.template_id
left JOIN core_opt_recent cor on cor.resource_type=6 and vt.id= cor.resource_name
ORDER BY ORDER BY
vt.create_time DESC vt.create_time DESC
</select> </select>

1
core/core-frontend/src/views/dashboard/index.vue
View File

@ -71,6 +71,7 @@ onMounted(() => {
if (createType === 'template') { if (createType === 'template') {
const deTemplateDataStr = wsCache.get(`de-template-data`) const deTemplateDataStr = wsCache.get(`de-template-data`)
const deTemplateData = JSON.parse(deTemplateDataStr) const deTemplateData = JSON.parse(deTemplateDataStr)
wsCache.delete('de-template-data')
dvMainStore.setComponentData(JSON.parse(deTemplateData['componentData'])) dvMainStore.setComponentData(JSON.parse(deTemplateData['componentData']))
dvMainStore.setCanvasStyle(JSON.parse(deTemplateData['canvasStyleData'])) dvMainStore.setCanvasStyle(JSON.parse(deTemplateData['canvasStyleData']))
dvMainStore.setCanvasViewInfo(deTemplateData['canvasViewInfo']) dvMainStore.setCanvasViewInfo(deTemplateData['canvasViewInfo'])

1
core/core-frontend/src/views/data-visualization/index.vue
View File

@ -201,6 +201,7 @@ onMounted(() => {
// 从模板新建 // 从模板新建
if (createType === 'template') { if (createType === 'template') {
const deTemplateDataStr = wsCache.get(`de-template-data`) const deTemplateDataStr = wsCache.get(`de-template-data`)
wsCache.delete('de-template-data')
const deTemplateData = JSON.parse(deTemplateDataStr) const deTemplateData = JSON.parse(deTemplateDataStr)
dvMainStore.setComponentData(JSON.parse(deTemplateData['componentData'])) dvMainStore.setComponentData(JSON.parse(deTemplateData['componentData']))
dvMainStore.setCanvasStyle(JSON.parse(deTemplateData['canvasStyleData'])) dvMainStore.setCanvasStyle(JSON.parse(deTemplateData['canvasStyleData']))

1
core/core-frontend/src/views/template-market/index.vue
View File

@ -405,6 +405,7 @@ const apply = () => {
decompression(state.dvCreateForm) decompression(state.dvCreateForm)
.then(response => { .then(response => {
state.curApplyTemplate.recentUseTime = Date.now() state.curApplyTemplate.recentUseTime = Date.now()
state.curApplyTemplate.categoryNames.push('最近使用')
state.loading = false state.loading = false
const templateData = response.data const templateData = response.data
// do create // do create

4
sdk/api/api-base/src/main/java/io/dataease/api/template/dto/TemplateMarketDTO.java
View File

@ -46,11 +46,13 @@ public class TemplateMarketDTO implements Comparable<TemplateMarketDTO> {
this.categories = manageDTO.getCategoryNames().stream().map(category->new MarketCategoryVO(category)).collect(Collectors.toList()); this.categories = manageDTO.getCategoryNames().stream().map(category->new MarketCategoryVO(category)).collect(Collectors.toList());
this.categoryNames = manageDTO.getCategoryNames(); this.categoryNames = manageDTO.getCategoryNames();
this.metas = new MarketMetasVO(manageDTO.getSnapshot()); this.metas = new MarketMetasVO(manageDTO.getSnapshot());
this.templateType = "dataV".equalsIgnoreCase(manageDTO.getTemplateType()) ? "SCREEN" : "PANEL"; this.templateType = "dataV".equalsIgnoreCase(manageDTO.getDvType()) ? "SCREEN" : "PANEL";
this.thumbnail = manageDTO.getSnapshot(); this.thumbnail = manageDTO.getSnapshot();
this.source = "manage"; this.source = "manage";
if (manageDTO.getRecentUseTime() != null) { if (manageDTO.getRecentUseTime() != null) {
this.recentUseTime = manageDTO.getRecentUseTime(); this.recentUseTime = manageDTO.getRecentUseTime();
this.categories.add(new MarketCategoryVO("最近使用"));
this.categoryNames.add("最近使用");
} }
} }