From 79523e343e596cd16d73b2aeb2b5bd40a29e1418 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Tue, 28 Nov 2023 17:50:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8C=87=E6=A0=87/=E7=BB=B4=E5=BA=A6=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=9C=AA=E6=AD=A3=E7=A1=AE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/lang/en.js | 2 +- core/frontend/src/lang/tw.js | 2 +- core/frontend/src/lang/zh.js | 2 +- core/frontend/src/views/chart/view/ChartEdit.vue | 4 +++- .../view-3dpie-frontend/src/views/highcharts/3dpie/data.vue | 2 +- .../src/views/echarts/map/buddle/data.vue | 2 +- .../view-chartmix-frontend/src/views/antv/chartmix/data.vue | 2 +- .../view-racebar-frontend/src/views/antv/racebar/data.vue | 2 +- .../view-sankey-frontend/src/views/antv/sankey/data.vue | 2 +- .../view-symbolmap-frontend/src/views/antv/symbolmap/data.vue | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index 6d05550059..be6b4ca743 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -1586,7 +1586,7 @@ export default { gauge_axis_label: 'Axis Label', word_size_range: 'Word Size Range', word_spacing: 'Word Spacing', - axis_multi_select_tip: 'Hold down the Ctrl or Shift key and click to select more than one' + axis_multi_select_tip: 'Hold down the Ctrl/Cmd or Shift key and click to select more than one' }, dataset: { scope_edit: 'Effective only when editing', diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index 6a70f7023d..c441734b79 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -1578,7 +1578,7 @@ export default { gauge_axis_label: '刻度標籤', word_size_range: '字號區間', word_spacing: '文字間隔', - axis_multi_select_tip: '按住 Ctrl 鍵或者 Shift 鍵再點擊可多選' + axis_multi_select_tip: '按住 Ctrl/Cmd 鍵或者 Shift 鍵再點擊可多選' }, dataset: { scope_edit: '僅編輯時生效', diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index 67ccaa248d..47258ecad2 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -1578,7 +1578,7 @@ export default { gauge_axis_label: '刻度标签', word_size_range: '字号区间', word_spacing: '文字间隔', - axis_multi_select_tip: '按住 Ctrl 键或者 Shift 键再点击可多选' + axis_multi_select_tip: '按住 Ctrl/Cmd 键或者 Shift 键再点击可多选' }, dataset: { scope_edit: '仅编辑时生效', diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue index 8ddd9d4276..62b2206e3d 100644 --- a/core/frontend/src/views/chart/view/ChartEdit.vue +++ b/core/frontend/src/views/chart/view/ChartEdit.vue @@ -183,6 +183,7 @@ class="item-dimension father group-dimension" @click.exact="singleSelect(index, dimensionData, selectedDimension, 'lastDimensionIndex')" @click.ctrl="multiSelect(index, dimensionData, selectedDimension, 'lastDimensionIndex')" + @click.meta="multiSelect(index, dimensionData, selectedDimension, 'lastDimensionIndex')" @click.shift="rangeSelect(index, dimensionData, selectedDimension, 'lastDimensionIndex')" > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) } diff --git a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/views/highcharts/3dpie/data.vue b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/views/highcharts/3dpie/data.vue index 85b4001746..b897dc2928 100644 --- a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/views/highcharts/3dpie/data.vue +++ b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/views/highcharts/3dpie/data.vue @@ -289,7 +289,7 @@ export default { }, dragCheckType(list, type) { if (list && list.length > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) } diff --git a/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/views/echarts/map/buddle/data.vue b/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/views/echarts/map/buddle/data.vue index 1f7a036ee7..483cee6b40 100644 --- a/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/views/echarts/map/buddle/data.vue +++ b/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/src/views/echarts/map/buddle/data.vue @@ -353,7 +353,7 @@ export default { }, dragCheckType(list, type) { if (list && list.length > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) } diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue index 1b29819827..d4ec306f10 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue @@ -363,7 +363,7 @@ export default { }, dragCheckType(list, type) { if (list && list.length > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) } diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue index 5c2d04e8c2..8dfcf47bd3 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue @@ -390,7 +390,7 @@ export default { }, dragCheckType(list, type) { if (list && list.length > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) } diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue index a5690d6feb..e97b1e73ef 100644 --- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue +++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue @@ -362,7 +362,7 @@ export default { }, dragCheckType(list, type) { if (list && list.length > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) } diff --git a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/data.vue b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/data.vue index 395c85646a..6a8570609a 100644 --- a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/data.vue +++ b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/data.vue @@ -333,7 +333,7 @@ export default { }, dragCheckType(list, type) { if (list && list.length > 0) { - for (let i = 0; i < list.length; i++) { + for (let i = list.length - 1; i >= 0; i--) { if (list[i].groupType !== type) { list.splice(i, 1) }