From 8b65cf2bf2eb32f55c55e2c5fab25a9d8bd464ed Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 3 Jan 2025 17:40:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/template/manage/TemplateCenterManage.java | 4 ++-- core/core-frontend/src/views/template-market/index.vue | 6 +++++- .../java/io/dataease/api/template/TemplateMarketApi.java | 3 --- .../io/dataease/api/template/dto/TemplateMarketDTO.java | 5 ++++- .../dataease/api/template/vo/MarketApplicationSpecVO.java | 2 ++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java index f116cdf500..4793de3c25 100644 --- a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java @@ -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())); } diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue index 11e97d151d..b73744189b 100644 --- a/core/core-frontend/src/views/template-market/index.vue +++ b/core/core-frontend/src/views/template-market/index.vue @@ -109,7 +109,11 @@ highlight-current :current-node-key="state.marketActiveTab" @node-click="nodeClick" - /> + > + +
{ } } - 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 { 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"); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java index a91e7c9f89..ea4070370b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketApplicationSpecVO.java @@ -22,6 +22,8 @@ public class MarketApplicationSpecVO { private String label; + private String templateClassification; + private String readmeName; // 是否推荐