From 112f7350d5c21a576a7b3fa607d00686c8fbdb1e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 19 Aug 2022 14:58:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86):=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/controller/dataset/DataSetTableTaskController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index 9e6f1a548f..14944e9f4e 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -50,7 +50,7 @@ public class DataSetTableTaskController { } @ApiOperation("批量删除") - @PostMapping("batchDelete/{id}") + @PostMapping("/batchDelete") public void batchDelete(@RequestBody List ids) { dataSetTableTaskService.batchDelete(ids); } From b686c101832b73ea5ec7aca230c70013cc09f14b Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 19 Aug 2022 15:06:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E5=8F=AF=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/CalcChartFieldEdit.vue | 6 +++++- frontend/src/views/dataset/data/CalcFieldEdit.vue | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index 7bd7604af3..c3baf11714 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -209,6 +209,7 @@ :disabled="!fieldForm.name || !fieldForm.originName" type="primary" size="mini" + :loading="loading" @click="saveCalcField" >{{ $t('dataset.confirm') }} @@ -302,7 +303,8 @@ export default { quotaData: [], functionData: [], tableFields: {}, - name2Auto: [] + name2Auto: [], + loading: false } }, computed: { @@ -446,8 +448,10 @@ export default { this.fieldForm.columnIndex = 0 this.fieldForm.chartId = this.param.id } + this.loading = true post('/chart/field/save/' + this.panelInfo.id, { ...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => { this.closeCalcField() + this.loading = false }) }, diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue index a6d85bb8cb..26103b7895 100644 --- a/frontend/src/views/dataset/data/CalcFieldEdit.vue +++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue @@ -171,7 +171,7 @@
{{ $t('dataset.cancel') }} - {{ $t('dataset.confirm') }} + {{ $t('dataset.confirm') }}
@@ -259,7 +259,8 @@ export default { dimensionData: [], quotaData: [], name2Auto: [], - functionData: [] + functionData: [], + loading: false } }, computed: { @@ -396,9 +397,11 @@ export default { this.fieldForm.tableId = this.param.id this.fieldForm.columnIndex = this.tableFields.dimensionList.length + this.tableFields.quotaList.length } + this.loading = true post('/dataset/field/save', { ...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => { localStorage.setItem('reloadDsData', 'true') this.closeCalcField() + this.loading = false }) }, From 0d5ec401029167eceb95eb554f55a1ac539b03af Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 19 Aug 2022 15:18:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E5=8F=AF=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/CalcChartFieldEdit.vue | 3 +++ frontend/src/views/dataset/data/CalcFieldEdit.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index c3baf11714..4f7e3264f9 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -350,6 +350,7 @@ export default { } }, mounted() { + this.loading = false this.$refs.myCm.codemirror.on('keypress', () => { this.$refs.myCm.codemirror.showHint() }) @@ -452,6 +453,8 @@ export default { post('/chart/field/save/' + this.panelInfo.id, { ...this.fieldForm, originName: this.setNameIdTrans('name', 'id', originName) }).then(response => { this.closeCalcField() this.loading = false + }).catch(res => { + this.loading = false }) }, diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue index 26103b7895..009e19f661 100644 --- a/frontend/src/views/dataset/data/CalcFieldEdit.vue +++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue @@ -300,6 +300,7 @@ export default { } }, mounted() { + this.loading = false this.$refs.myCm.codemirror.on('keypress', () => { this.$refs.myCm.codemirror.showHint() }) @@ -402,6 +403,8 @@ export default { localStorage.setItem('reloadDsData', 'true') this.closeCalcField() this.loading = false + }).catch(res => { + this.loading = false }) }, From 61a6b15d11d9bd90382bca127e3b87226dc505f7 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 19 Aug 2022 15:30:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/util.js | 97 +++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 64b297e8cf..912cb1005c 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -669,6 +669,85 @@ export const TYPE_CONFIGS = [ ] } }, + { + render: 'antv', + category: 'chart.chart_type_compare', + value: 'bar-group', + title: 'chart.chart_bar_group', + icon: 'bar-group', + properties: [ + 'color-selector', + 'size-selector-ant-v', + 'label-selector-ant-v', + 'tooltip-selector-ant-v', + 'x-axis-selector-ant-v', + 'y-axis-selector-ant-v', + 'title-selector-ant-v', + 'legend-selector-ant-v' + ], + propertyInner: { + 'color-selector': [ + 'value', + 'colorPanel', + 'customColor', + 'alpha' + ], + 'size-selector-ant-v': [ + 'barDefault', + 'barGap' + ], + 'label-selector-ant-v': [ + 'show', + 'fontSize', + 'color', + 'position-v' + ], + 'tooltip-selector-ant-v': [ + 'show', + 'textStyle' + ], + 'x-axis-selector-ant-v': [ + 'show', + 'position', + 'name', + 'nameTextStyle', + 'splitLine', + 'axisForm', + 'axisLabel' + ], + 'y-axis-selector-ant-v': [ + 'show', + 'position', + 'name', + 'nameTextStyle', + 'axisValue', + 'splitLine', + 'axisForm', + 'axisLabel' + ], + 'title-selector-ant-v': [ + 'show', + 'title', + 'fontSize', + 'color', + 'hPosition', + 'isItalic', + 'isBolder', + 'remarkShow', + 'fontFamily', + 'letterSpace', + 'fontShadow' + ], + 'legend-selector-ant-v': [ + 'show', + 'icon', + 'orient', + 'textStyle', + 'hPosition', + 'vPosition' + ] + } + }, { render: 'antv', category: 'chart.chart_type_compare', @@ -2628,7 +2707,7 @@ export function getColors(chart, colors, reset) { }) } } - } else if (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter') || chart.type.includes('radar')) { + } else if ((chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter') || chart.type.includes('radar') || chart.type.includes('area')) && !chart.type.includes('group')) { if (Object.prototype.toString.call(chart.yaxis) === '[object Array]') { series = JSON.parse(JSON.stringify(chart.yaxis)) } else { @@ -2644,6 +2723,22 @@ export function getColors(chart, colors, reset) { }) } } + } else if (chart.type === 'bar-group') { + // 拿到data中的category，并去重，然后构建seriesColor + const data = chart.data.datas + const s = [] + data.forEach((cur) => { + if (s.indexOf(cur.category) < 0) { + s.push(cur.category) + } + }) + for (let i = 0; i < s.length; i++) { + seriesColors.push({ + name: s[i], + color: colors[i % colors.length], + isCustom: false + }) + } } else { if (chart.data) { const data = chart.data.datas