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

Merge pull request #10090 from dataease/pr@dev-v2_export_data

Browse Source 
fix: 修复系统变量显示问题
This commit is contained in:
taojinlong 2024-06-04 19:08:05 +08:00 committed by GitHub
commit 6462fadf87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -175,7 +175,7 @@ public class ChartDataManage {
FilterTreeObj fieldCustomFilter = view.getCustomFilter();
List<ChartViewFieldDTO> drill = new ArrayList<>(view.getDrillFields());
DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null);
DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null);
if (table == null) {
DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds"));
}

4
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
View File

@ -371,6 +371,10 @@ public class DatasetGroupManage {
return dto;
}
public DatasetGroupInfoDTO getDatasetGroupInfoDTO(Long id, String type) throws Exception {
return get(id, type);
}
public DatasetGroupInfoDTO get(Long id, String type) throws Exception {
CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id);
if (coreDatasetGroup == null) {

12
core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java
View File

@ -20,8 +20,10 @@ public class DeWebSocketHandlerDecorator extends WebSocketHandlerDecorator {
public void afterConnectionEstablished(WebSocketSession session) throws Exception {
Optional.ofNullable(session.getPrincipal()).ifPresent(principal -> {
String name = principal.getName();
Long userId = Long.parseLong(name);
WsUtil.onLine(userId);
if(name != null){
Long userId = Long.parseLong(name);
WsUtil.onLine(userId);
}
});
super.afterConnectionEstablished(session);
}
@ -30,8 +32,10 @@ public class DeWebSocketHandlerDecorator extends WebSocketHandlerDecorator {
public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception {
Optional.ofNullable(session.getPrincipal()).ifPresent(principal -> {
String name = principal.getName();
Long userId = Long.parseLong(name);
WsUtil.offLine(userId);
if(name != null){
Long userId = Long.parseLong(name);
WsUtil.offLine(userId);
}
});
super.afterConnectionClosed(session, closeStatus);

1
core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
View File

@ -190,7 +190,6 @@ const callbackExport = () => {
const downLoadAll = () => {
if (multipleSelection.value.length === 0) {
tableData.value.forEach(item => {
console.log(item.id)
downloadFile(item.id)
.then(res => {
const blob = new Blob([res], { type: 'application/vnd.ms-excel' })