github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-23 19:12:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(工作台): 修复模板市场按照模板类型筛选无效问题

Browse Source
This commit is contained in:
wangjiahao 2025-01-03 17:40:44 +08:00 committed by fit2cloud-chenyw
parent ffa4cd0512
commit 8b65cf2bf2
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java
View File

@ -206,7 +206,7 @@ public class TemplateCenterManage {
MarketApplicationSpecVO spec = marketTemplateV2ItemResult.getApplication().getSpec();
MarketApplicationMetaDataVO metadata = marketTemplateV2ItemResult.getApplication().getMetadata();
if ("Y".equalsIgnoreCase(spec.getSuggest())) {
contents.add(new TemplateMarketDTO(metadata.getName(), spec.getDisplayName(), spec.getScreenshots().get(0).getUrl(), spec.getLinks().get(0).getUrl(), categoriesMap.get(spec.getLabel()), spec.getTemplateType(), useTime.get(spec.getReadmeName()), "Y"));
contents.add(new TemplateMarketDTO(metadata.getName(), spec.getDisplayName(), spec.getScreenshots().get(0).getUrl(), spec.getLinks().get(0).getUrl(), categoriesMap.get(spec.getLabel()), spec.getTemplateType(), useTime.get(spec.getReadmeName()), "Y", spec.getTemplateClassification()));
}
});
}
@ -246,7 +246,7 @@ public class TemplateCenterManage {
v2BaseResponse.getItems().stream().forEach(marketTemplateV2ItemResult -> {
MarketApplicationSpecVO spec = marketTemplateV2ItemResult.getApplication().getSpec();
MarketApplicationMetaDataVO metadata = marketTemplateV2ItemResult.getApplication().getMetadata();
contents.add(new TemplateMarketDTO(metadata.getName(), spec.getDisplayName(), spec.getScreenshots().get(0).getUrl(), spec.getLinks().get(0).getUrl(), categoriesMap.get(spec.getLabel()), spec.getTemplateType(), useTime.get(spec.getReadmeName()), spec.getSuggest()));
contents.add(new TemplateMarketDTO(metadata.getName(), spec.getDisplayName(), spec.getScreenshots().get(0).getUrl(), spec.getLinks().get(0).getUrl(), categoriesMap.get(spec.getLabel()), spec.getTemplateType(), useTime.get(spec.getReadmeName()), spec.getSuggest(), spec.getTemplateClassification()));
if (categoriesMap.get(spec.getLabel()) != null) {
activeCategoriesName.add(categoriesMap.get(spec.getLabel()));
}

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

@ -109,7 +109,11 @@
highlight-current
:current-node-key="state.marketActiveTab"
@node-click="nodeClick"
/>
>
<template #default="{ data }">
<span :title="data.label" class="ed-tree-node__label">{{ data.label }}</span>
</template>
</el-tree>
</div>
<div
v-show="state.networkStatus && state.hasResult"

3
sdk/api/api-base/src/main/java/io/dataease/api/template/TemplateMarketApi.java
View File

@ -1,14 +1,11 @@
package io.dataease.api.template;
import io.dataease.api.template.request.TemplateMarketSearchRequest;
import io.dataease.api.template.response.MarketBaseResponse;
import io.dataease.api.template.response.MarketPreviewBaseResponse;
import io.dataease.api.template.vo.MarketMetaDataVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;

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

@ -62,7 +62,7 @@ public class TemplateMarketDTO implements Comparable<TemplateMarketDTO> {
}
}
public TemplateMarketDTO(String id, String title, String themeRepo, String templateUrl, String categoryName, String templateType, Long recentUseTime, String suggest) {
public TemplateMarketDTO(String id, String title, String themeRepo, String templateUrl, String categoryName, String templateType, Long recentUseTime, String suggest, String classify) {
this.id = id;
this.title = title;
this.metas = new MarketMetasVO(templateUrl);
@ -70,6 +70,9 @@ public class TemplateMarketDTO implements Comparable<TemplateMarketDTO> {
this.templateType = templateType;
this.categories = new ArrayList<>(Arrays.asList(new MarketCategoryVO(categoryName))) ;
this.categoryNames = new ArrayList<>(Arrays.asList(categoryName)) ;
if("DATA".equals(classify)){
this.classify = "app";
}
if (recentUseTime != null) {
this.recentUseTime = recentUseTime;
String name = Translator.get("i18n_template_recent");

2
sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java
View File

@ -22,6 +22,8 @@ public class MarketApplicationSpecVO {
private String label;
private String templateClassification;
private String readmeName;
// 是否推荐