public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 21:08:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 优化模板查询方式，改为异步查询；修复能长传空模板问题

Browse Source
This commit is contained in:
wangjiahao
2021-06-02 17:45:37 +08:00
parent 1255d33d35
commit bd15937f09
11 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml
View File

@@ -8,6 +8,13 @@
<result column="childrenCount" jdbcType="VARCHAR" property="childrenCount"/>
</resultMap>
<sql id="Base_Column_List">
panel_template.id, panel_template.`name`, panel_template.pid, panel_template.`level`, panel_template.node_type, panel_template.create_by, panel_template.create_time, panel_template.template_type
</sql>
<sql id="Blob_Column_List">
panel_template.snapshot, panel_template.template_style, panel_template.template_data, panel_template.dynamic_data
</sql>
<select id="panelTemplate" resultMap="BaseResultMapDTO">
SELECT
panel_template.*,
@@ -32,7 +39,12 @@
<select id="panelTemplateList" resultMap="BaseResultMapDTO">
SELECT
panel_template.*,
<include refid="Base_Column_List" />
,
<if test='withBlobs == "Y"'>
<include refid="Blob_Column_List" />
,
</if>
panel_template.NAME AS label,
ifnull(tempCountInfo.childrenCount,0) as childrenCount
FROM

3
backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java
View File

@@ -12,6 +12,8 @@ import lombok.Data;
public class PanelTemplateRequest extends PanelTemplateWithBLOBs {
private String sort;
private String withBlobs="Y";
private String optType;
private Boolean withChildren = false;
@@ -21,5 +23,6 @@ public class PanelTemplateRequest extends PanelTemplateWithBLOBs {
public PanelTemplateRequest(String pid) {
super.setPid(pid);
withBlobs="N";
}
}

1
backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java
View File

@@ -39,6 +39,7 @@ public class PanelTemplateService {
private ExtPanelTemplateMapper extPanelTemplateMapper;
public List<PanelTemplateDTO> templateList(PanelTemplateRequest panelTemplateRequest) {
panelTemplateRequest.setWithBlobs("N");
List<PanelTemplateDTO> panelTemplateList = extPanelTemplateMapper.panelTemplateList(panelTemplateRequest);
if(panelTemplateRequest.getWithChildren()){
getTreeChildren(panelTemplateList);