Merge pull request #6951 from dataease/pr@dev-v2@style_UI-UPDATE

style: UI调整
This commit is contained in:
王嘉豪
2023-11-30 23:16:16 +08:00
committed by GitHub
5 changed files with 98 additions and 61 deletions

View File

@@ -1,5 +1,6 @@
package io.dataease.api.template.dto;
import io.dataease.api.template.vo.MarketMetaDataVO;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -13,12 +14,14 @@ import java.util.List;
@NoArgsConstructor
public class TemplateMarketPreviewInfoDTO {
private String categoryType;
private MarketMetaDataVO category;
private Boolean showFlag = true;
List<TemplateMarketDTO> contents;
public TemplateMarketPreviewInfoDTO(String categoryType, List<TemplateMarketDTO> contents) {
this.categoryType = categoryType;
public TemplateMarketPreviewInfoDTO(MarketMetaDataVO category, List<TemplateMarketDTO> contents) {
this.category = category;
this.contents = contents;
}
}

View File

@@ -2,7 +2,9 @@ package io.dataease.api.template.response;
import io.dataease.api.template.dto.TemplateMarketDTO;
import io.dataease.api.template.dto.TemplateMarketPreviewInfoDTO;
import io.dataease.api.template.vo.MarketMetaDataVO;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@@ -11,6 +13,7 @@ import java.util.List;
* @date : 2023/11/6 17:43
*/
@Data
@NoArgsConstructor
public class MarketPreviewBaseResponse {
private String baseUrl;
@@ -18,9 +21,6 @@ public class MarketPreviewBaseResponse {
private List<TemplateMarketPreviewInfoDTO> contents;
public MarketPreviewBaseResponse() {
}
public MarketPreviewBaseResponse(String baseUrl, List<String> categories, List<TemplateMarketPreviewInfoDTO> contents) {
this.baseUrl = baseUrl;
this.categories = categories;