dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into v1.18

Browse Source
This commit is contained in:
taojinlong 2023-06-19 17:53:20 +08:00
commit 3c87f876ac
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -112,9 +112,9 @@ public class ExtractDataService {
private Long extractPageSize; private Long extractPageSize;
private static final String shellScript = "result=`curl --location-trusted -u %s:%s -H \"label:%s\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load`\n" + private static final String shellScript = "result=`curl --location-trusted -u %s:%s -H \"label:%s\" -H \"Expect:100-continue\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load`\n" +
"if [ $? -eq 0 ] ; then\n" + "if [ $? -eq 0 ] ; then\n" +
" failstatus=$(echo $result | grep '\"Status\": \"Fail\"')\n" + " failstatus=$(echo $result | grep '\"status\":\"FAILED\"')\n" +
" if [ \"x${failstatus}\" != \"x\" ];then" + " if [ \"x${failstatus}\" != \"x\" ];then" +
" echo $result\n" + " echo $result\n" +
" exit 1\n" + " exit 1\n" +
@ -124,10 +124,10 @@ public class ExtractDataService {
" exit 1\n" + " exit 1\n" +
"fi\n"; "fi\n";
private static final String shellScriptForDeleteFile = "result=`curl --location-trusted -u %s:%s -H \"label:%s\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load`\n" + private static final String shellScriptForDeleteFile = "result=`curl --location-trusted -u %s:%s -H \"label:%s\" -H \"Expect:100-continue\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load`\n" +
"rm -rf %s \n" + "rm -rf %s \n" +
"if [ $? -eq 0 ] ; then\n" + "if [ $? -eq 0 ] ; then\n" +
" failstatus=$(echo $result | grep '\"Status\": \"Fail\"')\n" + " failstatus=$(echo $result | grep '\"status\":\"FAILED\"')\n" +
" if [ \"x${failstatus}\" != \"x\" ];then" + " if [ \"x${failstatus}\" != \"x\" ];then" +
" echo $result\n" + " echo $result\n" +
" exit 1\n" + " exit 1\n" +

2
frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -680,7 +680,7 @@ export default {
component.style[key] = this.format(component.style[key], this.scaleHeight) component.style[key] = this.format(component.style[key], this.scaleHeight)
} }
if (this.needToChangeWidth.includes(key)) { if (this.needToChangeWidth.includes(key)) {
if ((key === 'fontSize' || key === 'activeFontSize') && (this.terminal === 'mobile' || component.type === 'custom')) { if ((key === 'fontSize' || key === 'activeFontSize') && (this.terminal === 'mobile' || ['custom', 'v-text'].includes(component.type))) {
// do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件) // do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件)
} else { } else {
component.style[key] = this.format(component.style[key], this.scaleWidth) component.style[key] = this.format(component.style[key], this.scaleWidth)

2
frontend/src/components/canvas/components/editor/SettingMenu.vue
View File

@ -192,7 +192,6 @@ export default {
'gauge', 'gauge',
'text', 'text',
'label', 'label',
'word-cloud',
'flow-map', 'flow-map',
'bidirectional-bar' 'bidirectional-bar'
], ],
@ -202,7 +201,6 @@ export default {
'gauge', 'gauge',
'text', 'text',
'label', 'label',
'word-cloud',
'flow-map', 'flow-map',
'bidirectional-bar' 'bidirectional-bar'
], ],

3
frontend/src/views/chart/chart/wordCloud/word_cloud.js
View File

@ -38,6 +38,7 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) {
plot.destroy() plot.destroy()
} }
plot = new WordCloud(container, options) plot = new WordCloud(container, options)
plot.off('point:click')
plot.on('point:click', action)
return plot return plot
} }

18
frontend/src/views/chart/components/ChartComponentG2.vue
View File

@ -287,7 +287,7 @@ export default {
} }
} }
if (this.myChart && !equalsAny(chart.type ,'liquid','flow-map') && this.searchCount > 0) { if (this.myChart && !equalsAny(chart.type, 'liquid', 'flow-map') && this.searchCount > 0) {
this.myChart.options.animation = false this.myChart.options.animation = false
} }
if (this.myChart?.options?.legend) { if (this.myChart?.options?.legend) {
@ -319,10 +319,18 @@ export default {
}, },
antVAction(param) { antVAction(param) {
if (this.chart.type === 'treemap') { switch (this.chart.type) {
this.pointParam = param.data.data case 'treemap':
} else { this.pointParam = param.data.data
this.pointParam = param.data break
case 'word-cloud':
this.pointParam = {
data: param.data.data.datum
}
break
default:
this.pointParam = param.data
break
} }
this.linkageActiveParam = { this.linkageActiveParam = {
category: this.pointParam.data.category ? this.pointParam.data.category : 'NO_DATA', category: this.pointParam.data.category ? this.pointParam.data.category : 'NO_DATA',