Skip to content

Commit faa17ce

Browse files
xuwei-fit2cloudxuwei-fit2cloud
authored
Merge pull request dataease#13254 from dataease/dev
merge v1.18.26
2 parents b7008d5 + 3f69c53 commit faa17ce

File tree

8 files changed

+34
-43
lines changed

8 files changed

+34
-43
lines changed

‎core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,11 +1003,7 @@ public String wrapSql(String sql) {
10031003
}
10041004

10051005
public String getTotalCount(boolean isTable, String sql, Datasource ds) {
1006-
if (isTable) {
1007-
return "SELECT COUNT(*) from " + String.format(CKConstants.KEYWORD_TABLE, sql);
1008-
} else {
1009-
return "SELECT COUNT(*) from ( " + sqlFix(sql) + " ) DE_COUNT_TEMP";
1010-
}
1006+
return null;
10111007
}
10121008

10131009
@Override

‎core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,12 @@ private static Map<String, Object> transTableNormal(List<ChartViewFieldDTO> fiel
11941194
if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1 || chartViewFieldDTO.getDeType() == 5) {
11951195
d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
11961196
} else if (chartViewFieldDTO.getDeType() == 2 || chartViewFieldDTO.getDeType() == 3) {
1197-
d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(8, RoundingMode.HALF_UP));
1197+
try {
1198+
d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(8, RoundingMode.HALF_UP));
1199+
} catch (NumberFormatException e) {
1200+
d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
1201+
}
1202+
11981203
}
11991204
}
12001205
tableRow.add(d);

‎core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import com.google.gson.Gson;
44
import io.dataease.auth.api.dto.CurrentUserDto;
5-
import io.dataease.auth.service.AuthUserService;
65
import io.dataease.auth.service.ProxyAuthService;
76
import io.dataease.commons.constants.ParamConstants;
8-
import io.dataease.commons.constants.SysLogConstants;
97
import io.dataease.commons.utils.*;
108
import io.dataease.controller.chart.ChartViewController;
119
import io.dataease.controller.request.chart.ChartExtRequest;
@@ -356,19 +354,6 @@ public void reInitExportTask() {
356354
ExportTask record = new ExportTask();
357355
record.setExportStatus("FAILED");
358356
exportTaskMapper.updateByExampleSelective(record, exportTaskExample);
359-
exportTaskExample.clear();
360-
criteria = exportTaskExample.createCriteria();
361-
criteria.andExportMachineNameEqualTo(hostName()).andExportStatusEqualTo("PENDING");
362-
exportTaskMapper.selectByExampleWithBLOBs(exportTaskExample).parallelStream().forEach(exportTask -> {
363-
if (exportTask.getExportFromType().equalsIgnoreCase("dataset")) {
364-
DataSetExportRequest request = new Gson().fromJson(exportTask.getParams(), DataSetExportRequest.class);
365-
startDatasetTask(exportTask, request);
366-
}
367-
if (exportTask.getExportFromType().equalsIgnoreCase("chart")) {
368-
PanelViewDetailsRequest request = new Gson().fromJson(exportTask.getParams(), PanelViewDetailsRequest.class);
369-
startViewTask(exportTask, request);
370-
}
371-
});
372357
}
373358

374359
private String hostName() {
@@ -403,7 +388,7 @@ private void startViewTask(ExportTask exportTask, PanelViewDetailsRequest reques
403388
String dataPath = exportData_path + exportTask.getId();
404389
File directory = new File(dataPath);
405390
boolean isCreated = directory.mkdir();
406-
CurrentUserDto user = proxyAuthService.queryCacheUserDto(exportTask.getUserId());
391+
CurrentUserDto user = AuthUtils.getUser();
407392
Future future = scheduledThreadPoolExecutor.submit(() -> {
408393
AuthUtils.setUser(user);
409394
try {
@@ -558,14 +543,6 @@ private void startViewTask(ExportTask exportTask, PanelViewDetailsRequest reques
558543
outputStream.flush();
559544
}
560545
wb.close();
561-
562-
if (ObjectUtils.isNotEmpty(user)) {
563-
String viewId = request.getViewId();
564-
ChartViewWithBLOBs chartViewWithBLOBs = chartViewService.get(viewId);
565-
String pid = chartViewWithBLOBs.getSceneId();
566-
DeLogUtils.save(SysLogConstants.OPERATE_TYPE.EXPORT, SysLogConstants.SOURCE_TYPE.VIEW, viewId, pid, null, null);
567-
}
568-
569546
exportTask.setExportPogress("100");
570547
exportTask.setExportStatus("SUCCESS");
571548

@@ -602,8 +579,7 @@ private void startDatasetTask(ExportTask exportTask, DataSetExportRequest reques
602579
String dataPath = exportData_path + exportTask.getId();
603580
File directory = new File(dataPath);
604581
boolean isCreated = directory.mkdir();
605-
CurrentUserDto user = proxyAuthService.queryCacheUserDto(exportTask.getUserId());
606-
582+
CurrentUserDto user = AuthUtils.getUser();
607583
Future future = scheduledThreadPoolExecutor.submit(() -> {
608584
AuthUtils.setUser(user);
609585
try {

‎core/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dataease",
3-
"version": "1.18.25",
3+
"version": "1.18.26",
44
"description": "dataease front",
55
"private": true,
66
"scripts": {

‎core/frontend/src/views/chart/chart/pie/pie_antv.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export function basePieOptionAntV(container, chart, action) {
3232
tooltip: tooltip,
3333
legend: legend,
3434
animation: false,
35+
autoFit: false,
3536
pieStyle: {
3637
lineWidth: 0
3738
},

‎core/frontend/src/views/chart/components/ChartComponentG2.vue

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<div
3535
:id="chartId"
3636
ref="chart"
37-
style="width: 100%;overflow: hidden;"
38-
:style="{height:chartHeight}"
37+
style="overflow: hidden;"
38+
:style="{height:chartHeight, width: chartWidth}"
3939
/>
4040
</div>
4141
</template>
@@ -118,6 +118,7 @@ export default {
118118
dynamicAreaCode: null,
119119
borderRadius: '0px',
120120
chartHeight: '100%',
121+
chartWidth: '100%',
121122
title_class: {
122123
margin: '0 0',
123124
width: '100%',
@@ -170,10 +171,11 @@ export default {
170171
},
171172
beforeDestroy() {
172173
if (this.myChart?.container) {
173-
if (typeof this.myChart.container.getAttribute === 'function') {
174+
if (this.myChart.container?.getAttribute?.('size-sensor-id')) {
174175
clear(this.myChart.container)
175176
}
176177
}
178+
this.resizeObserver?.disconnect()
177179
this.myChart?.clear?.()
178180
this.myChart?.unbindSizeSensor?.()
179181
this.myChart?.unbind?.()
@@ -244,6 +246,7 @@ export default {
244246
this.initTitle()
245247
this.calcHeightRightNow(this.drawView)
246248
window.addEventListener('resize', this.chartResize)
249+
this.initResizeObserver()
247250
},
248251
async drawView() {
249252
const chart = JSON.parse(JSON.stringify(this.chart))
@@ -304,7 +307,7 @@ export default {
304307
this.myChart = await baseFlowMapOption(this.chartId, chart, this.antVAction)
305308
} else if (chart.type === 'bidirectional-bar') {
306309
this.myChart = baseBidirectionalBarOptionAntV(this.chartId, chart, this.antVAction)
307-
} else if (chart.type === 'stock-line'){
310+
} else if (chart.type === 'stock-line') {
308311
this.myChart = stockLineOptionAntV(this.chartId, chart, this.antVAction)
309312
}
310313
@@ -389,11 +392,11 @@ export default {
389392
}
390393
}
391394
},
392-
chartResize() {
395+
chartResize(callback) {
393396
this.resizeTimer && clearTimeout(this.resizeTimer)
394397
this.resizeTimer = setTimeout(() => {
395-
this.calcHeightRightNow()
396-
}, 100)
398+
this.calcHeightRightNow(callback)
399+
}, 300)
397400
},
398401
trackClick(trackAction) {
399402
const idTypeMap = this.chart.data.fields.reduce((pre, next) => {
@@ -503,18 +506,28 @@ export default {
503506
calcHeightRightNow(callback) {
504507
this.$nextTick(() => {
505508
if (this.$refs.chartContainer) {
506-
const { offsetHeight } = this.$refs.chartContainer
509+
const { offsetHeight, offsetWidth } = this.$refs.chartContainer
507510
let titleHeight = 0
508511
if (this.$refs.title) {
509512
titleHeight = this.$refs.title.offsetHeight
510513
}
511514
this.chartHeight = (offsetHeight - titleHeight) + 'px'
515+
this.chartWidth = offsetWidth + 'px'
512516
this.$nextTick(() => callback?.())
513517
}
514518
})
515519
},
516520
initRemark() {
517521
this.remarkCfg = getRemark(this.chart)
522+
},
523+
initResizeObserver() {
524+
const manualResizeCharts = ['pie', 'pie-donut']
525+
if (manualResizeCharts.includes(this.chart.type)) {
526+
this.resizeObserver = new ResizeObserver(() => {
527+
this.chartResize(this.drawView)
528+
})
529+
this.resizeObserver.observe(this.$refs.chart)
530+
}
518531
}
519532
}
520533
}

‎core/mobile/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dataease-mobile",
3-
"version": "1.18.25",
3+
"version": "1.18.26",
44
"private": true,
55
"scripts": {
66
"serve": "npm run dev:h5",

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<packaging>pom</packaging>
1010

1111
<properties>
12-
<dataease.version>1.18.25</dataease.version>
12+
<dataease.version>1.18.26</dataease.version>
1313
<poi.version>4.1.1</poi.version>
1414
<xmlbeans.version>3.1.0</xmlbeans.version>
1515
<tomcat.version>9.0.64</tomcat.version>

0 commit comments

Comments
 (0)