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

fix: 修复模板管理中导入模板未存储静态文件的问题

Browse Source
This commit is contained in:
wangjiahao 2022-06-16 11:39:05 +08:00
parent 404f119d75
commit a6744f7b9f
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@ public class PanelTemplateRequest extends PanelTemplateWithBLOBs {
private String withBlobs="Y"; private String withBlobs="Y";
@ApiModelProperty("操作类型") @ApiModelProperty("操作类型")
private String optType; private String optType;
@ApiModelProperty("静态文件")
private String staticResource;
@ApiModelProperty("是否及联") @ApiModelProperty("是否及联")
private Boolean withChildren = false; private Boolean withChildren = false;

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

@ -12,6 +12,7 @@ import io.dataease.plugins.common.base.domain.PanelTemplate;
import io.dataease.plugins.common.base.domain.PanelTemplateExample; import io.dataease.plugins.common.base.domain.PanelTemplateExample;
import io.dataease.plugins.common.base.domain.PanelTemplateWithBLOBs; import io.dataease.plugins.common.base.domain.PanelTemplateWithBLOBs;
import io.dataease.plugins.common.base.mapper.PanelTemplateMapper; import io.dataease.plugins.common.base.mapper.PanelTemplateMapper;
import io.dataease.service.staticResource.StaticResourceService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -35,6 +36,8 @@ public class PanelTemplateService {
private PanelTemplateMapper panelTemplateMapper; private PanelTemplateMapper panelTemplateMapper;
@Resource @Resource
private ExtPanelTemplateMapper extPanelTemplateMapper; private ExtPanelTemplateMapper extPanelTemplateMapper;
@Resource
private StaticResourceService staticResourceService;
public List<PanelTemplateDTO> templateList(PanelTemplateRequest panelTemplateRequest) { public List<PanelTemplateDTO> templateList(PanelTemplateRequest panelTemplateRequest) {
panelTemplateRequest.setWithBlobs("N"); panelTemplateRequest.setWithBlobs("N");
@ -75,6 +78,8 @@ public class PanelTemplateService {
exampleDelete.createCriteria().andPidEqualTo(request.getPid()).andNameEqualTo(request.getName()); exampleDelete.createCriteria().andPidEqualTo(request.getPid()).andNameEqualTo(request.getName());
panelTemplateMapper.deleteByExample(exampleDelete); panelTemplateMapper.deleteByExample(exampleDelete);
} }
//Store static resource into the server
staticResourceService.saveFilesToServe(request.getStaticResource());
panelTemplateMapper.insert(request); panelTemplateMapper.insert(request);
} else { } else {
String nameCheckResult = this.nameCheck(CommonConstants.OPT_TYPE.UPDATE, request.getName(), request.getPid(), request.getId()); String nameCheckResult = this.nameCheck(CommonConstants.OPT_TYPE.UPDATE, request.getName(), request.getPid(), request.getId());

2
frontend/src/views/panel/template/component/TemplateImport.vue
View File

@ -45,6 +45,7 @@ export default {
templateStyle: null, templateStyle: null,
templateData: null, templateData: null,
dynamicData: null, dynamicData: null,
staticResource: null,
snapshot: '' snapshot: ''
} }
} }
@ -120,6 +121,7 @@ export default {
this.templateInfo.templateData = this.importTemplateInfo.panelData this.templateInfo.templateData = this.importTemplateInfo.panelData
this.templateInfo.snapshot = this.importTemplateInfo.snapshot this.templateInfo.snapshot = this.importTemplateInfo.snapshot
this.templateInfo.dynamicData = this.importTemplateInfo.dynamicData this.templateInfo.dynamicData = this.importTemplateInfo.dynamicData
this.templateInfo.staticResource = this.importTemplateInfo.staticResource
this.templateInfo.nodeType = 'template' this.templateInfo.nodeType = 'template'
} }
reader.readAsText(file) reader.readAsText(file)