From be7a7fb2dceddc1ddebe38c57a4c38a119faf8f5 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 28 May 2021 15:45:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E9=9D=A2=E7=A7=AF?= =?UTF-8?q?=E5=A0=86=E5=8F=A0=E5=9B=BE=E8=BF=9B=E5=85=A5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9D=A2=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 908eab34ff..4f48f557c8 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -98,7 +98,7 @@
@@ -430,7 +430,7 @@ export default { return true }) }, - save(getData) { + save(getData, trigger) { const view = JSON.parse(JSON.stringify(this.view)) view.id = this.view.id view.sceneId = this.view.sceneId @@ -471,6 +471,12 @@ export default { view.yaxis.splice(1, view.yaxis.length) } } + if (view.type === 'line' && trigger === 'chart') { + view.customAttr.size.lineArea = false + } + if (view.type === 'line-stack' && trigger === 'chart') { + view.customAttr.size.lineArea = true + } view.xaxis = JSON.stringify(view.xaxis) view.yaxis = JSON.stringify(view.yaxis) view.customAttr = JSON.stringify(view.customAttr) From 1361ac02b174d3d4435e520427c3c2d61d0e1820 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 28 May 2021 16:04:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=EF=BC=8C=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E9=A2=84=E8=A7=88=E5=89=8D100=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- frontend/src/views/dataset/common/DatasetTableData.vue | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 226822e2bb..13380b8087 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -677,7 +677,8 @@ export default { quota_show: 'Quota Show', title_limit: 'Title cannot be greater than 50 characters', filter_condition: 'Filter Condition', - filter_field_can_null: 'Filter field must choose' + filter_field_can_null: 'Filter field must choose', + preview_100_data: 'Preview 100 rows' }, dataset: { sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 6f8cae65d9..54b35c9451 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -677,7 +677,8 @@ export default { quota_show: '指標顯示', title_limit: '標題不能大於50個字符', filter_condition: '過濾條件', - filter_field_can_null: '過濾字段必填' + filter_field_can_null: '過濾字段必填', + preview_100_data: '預覽前100條記錄' }, dataset: { sheet_warn: '有多個sheet頁面，默認抽取第一個', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 4f706be994..9bdde09246 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -677,7 +677,8 @@ export default { quota_show: '指标显示', title_limit: '标题不能大于50个字符', filter_condition: '过滤条件', - filter_field_can_null: '过滤字段必填' + filter_field_can_null: '过滤字段必填', + preview_100_data: '预览前100条记录' }, dataset: { sheet_warn: '有多个Sheet页，默认抽取第一个', diff --git a/frontend/src/views/dataset/common/DatasetTableData.vue b/frontend/src/views/dataset/common/DatasetTableData.vue index e8e627b26d..383b0e89e9 100644 --- a/frontend/src/views/dataset/common/DatasetTableData.vue +++ b/frontend/src/views/dataset/common/DatasetTableData.vue @@ -18,6 +18,7 @@ :resizable="true" /> + {{ $t('chart.preview_100_data') }} @@ -57,8 +58,8 @@ export default { initData() { this.resetData() if (this.table.id) { - this.table.row = 10 - post('/dataset/table/getPreviewData/1/10', this.table).then(response => { + this.table.row = 100 + post('/dataset/table/getPreviewData/1/100', this.table).then(response => { this.fields = response.data.fields this.data = response.data.data const datas = this.data From b4e503612aeb491fdc27a5d642ea732233e08e75 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 28 May 2021 16:12:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=EF=BC=8C=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8Bicon=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/dataset/common/DatasetTableData.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/dataset/common/DatasetTableData.vue b/frontend/src/views/dataset/common/DatasetTableData.vue index 383b0e89e9..89b2e73dde 100644 --- a/frontend/src/views/dataset/common/DatasetTableData.vue +++ b/frontend/src/views/dataset/common/DatasetTableData.vue @@ -14,11 +14,17 @@ :key="field.dataeaseName" min-width="200px" :field="field.dataeaseName" - :title="field.name" :resizable="true" - /> + > + + - {{ $t('chart.preview_100_data') }} + {{ $t('chart.preview_100_data') }} From 1965ff3eabc1016c7456e61926b46e14883d0c4b Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 28 May 2021 16:31:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(frontend):=E6=88=90=E5=8A=9F=E3=80=81?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=80=81=E9=94=99=E8=AF=AF=E7=AD=89=E8=89=B2?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9=E4=B8=8Eelement-ui=EF=BC=8Cfit2clou?= =?UTF-8?q?d-ui=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8E=9F=E5=85=88=E7=9A=84?= =?UTF-8?q?=E5=A4=AA=E4=BA=AE=EF=BC=9B=E8=A7=92=E8=89=B2i18n=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/variables.scss | 6 +++--- frontend/src/views/system/role/index.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss index 3272b606f7..4dfe4ad8d9 100644 --- a/frontend/src/styles/variables.scss +++ b/frontend/src/styles/variables.scss @@ -5,9 +5,9 @@ /* theme color */ $--color-primary: #0a7be0; -$--color-success: #13ce66; -$--color-warning: #ffba00; -$--color-danger: #ff4949; +$--color-success: #67C23A; +$--color-warning: #E6A23C; +$--color-danger: #F56C6C; // $--color-info: #1E1E1E; $--button-font-weight: 400; diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue index a4c7d7c521..e04aae98c6 100644 --- a/frontend/src/views/system/role/index.vue +++ b/frontend/src/views/system/role/index.vue @@ -251,13 +251,13 @@ export default { this.$refs.menu.setCheckedKeys(this.menuIds) }, handleDelete(row) { - this.$confirm(this.$t('commons.confirm_delete') + ': ' + row.name + '？', this.$t('role.tips'), { + this.$confirm(this.$t('role.confirm_delete') + ': ' + row.name + '？', this.$t('role.tips'), { confirmButtonText: this.$t('commons.confirm'), cancelButtonText: this.$t('commons.cancel'), type: 'warning' }).then(() => { delRole(row.roleId).then(res => { - this.$success(this.$t('commons.modify_success')) + this.$success(this.$t('commons.delete_success')) this.search() }) }).catch(() => {