diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index a10a0cd1ac..791bad46ee 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -112,9 +112,9 @@ public class ExtractDataService { 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" + - " failstatus=$(echo $result | grep '\"Status\": \"Fail\"')\n" + + " failstatus=$(echo $result | grep '\"status\":\"FAILED\"')\n" + " if [ \"x${failstatus}\" != \"x\" ];then" + " echo $result\n" + " exit 1\n" + @@ -124,10 +124,10 @@ public class ExtractDataService { " exit 1\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" + "if [ $? -eq 0 ] ; then\n" + - " failstatus=$(echo $result | grep '\"Status\": \"Fail\"')\n" + + " failstatus=$(echo $result | grep '\"status\":\"FAILED\"')\n" + " if [ \"x${failstatus}\" != \"x\" ];then" + " echo $result\n" + " exit 1\n" + diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue index f86aff4576..513570607f 100644 --- a/frontend/src/components/canvas/components/editor/Preview.vue +++ b/frontend/src/components/canvas/components/editor/Preview.vue @@ -680,7 +680,7 @@ export default { component.style[key] = this.format(component.style[key], this.scaleHeight) } 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 和 过滤组件) } else { component.style[key] = this.format(component.style[key], this.scaleWidth) diff --git a/frontend/src/components/canvas/components/editor/SettingMenu.vue b/frontend/src/components/canvas/components/editor/SettingMenu.vue index 2df0ee17ee..797dcb83e8 100644 --- a/frontend/src/components/canvas/components/editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/editor/SettingMenu.vue @@ -192,7 +192,6 @@ export default { 'gauge', 'text', 'label', - 'word-cloud', 'flow-map', 'bidirectional-bar' ], @@ -202,7 +201,6 @@ export default { 'gauge', 'text', 'label', - 'word-cloud', 'flow-map', 'bidirectional-bar' ], diff --git a/frontend/src/views/chart/chart/wordCloud/word_cloud.js b/frontend/src/views/chart/chart/wordCloud/word_cloud.js index f33f1f3f85..81d507af5c 100644 --- a/frontend/src/views/chart/chart/wordCloud/word_cloud.js +++ b/frontend/src/views/chart/chart/wordCloud/word_cloud.js @@ -38,6 +38,7 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) { plot.destroy() } plot = new WordCloud(container, options) - + plot.off('point:click') + plot.on('point:click', action) return plot } diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 82c2b3394d..2c32934575 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -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 } if (this.myChart?.options?.legend) { @@ -319,10 +319,18 @@ export default { }, antVAction(param) { - if (this.chart.type === 'treemap') { - this.pointParam = param.data.data - } else { - this.pointParam = param.data + switch (this.chart.type) { + case 'treemap': + this.pointParam = param.data.data + break + case 'word-cloud': + this.pointParam = { + data: param.data.data.datum + } + break + default: + this.pointParam = param.data + break } this.linkageActiveParam = { category: this.pointParam.data.category ? this.pointParam.data.category : 'NO_DATA',