diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 1e00b88d08..a687fc8d5a 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 2352f89100..a8b24afed5 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 e206e2cb63..e0246ec79d 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/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/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) diff --git a/frontend/src/views/dataset/common/DatasetTableData.vue b/frontend/src/views/dataset/common/DatasetTableData.vue index e8e627b26d..89b2e73dde 100644 --- a/frontend/src/views/dataset/common/DatasetTableData.vue +++ b/frontend/src/views/dataset/common/DatasetTableData.vue @@ -14,10 +14,17 @@ :key="field.dataeaseName" min-width="200px" :field="field.dataeaseName" - :title="field.name" :resizable="true" - /> + > + + + {{ $t('chart.preview_100_data') }} @@ -57,8 +64,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 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(() => {