From d05892bd4b7e7402a628322cd90d67de2efe58b9 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 15 Apr 2021 11:55:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(frontend):=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=81=E8=A7=86=E5=9B=BE=E5=90=8D=E7=A7=B0=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E9=BC=A0=E6=A0=87hover=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E4=B8=8E=E5=85=B6=E5=85=B3=E8=81=94=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=20=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AD=89?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/zh.js | 7 +- frontend/src/views/chart/view/ChartEdit.vue | 24 ++- .../dataset/common/DatasetChartDetail.vue | 165 ++++++++++++++++++ frontend/src/views/dataset/data/ViewTable.vue | 28 ++- 4 files changed, 215 insertions(+), 9 deletions(-) create mode 100644 frontend/src/views/dataset/common/DatasetChartDetail.vue diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 2d30594db3..017ac5e402 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -779,9 +779,14 @@ export default { showRow: '显示行', add_excel_table: '添加Excel数据集', add_custom_table: '添加自助数据集', - upload_file: '上传文件' + upload_file: '上传文件', + detail: '详情', + type: '类型', + create_by: '创建者', + create_time: '创建时间' }, datasource: { + datasource: '数据源', create: '新建数据连接', type: '类型', please_choose_type: '请选择数据源类型', diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 5c866a932a..0999de64b8 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -2,7 +2,16 @@ {{ vId }} - {{ view.name }} + + + {{ view.name }} + {{ $t('chart.close') }} @@ -229,6 +238,7 @@ import QuotaItem from '../components/drag-item/QuotaItem' import FilterItem from '../components/drag-item/FilterItem' import ChartComponent from '../components/ChartComponent' import bus from '@/utils/bus' +import DatasetChartDetail from '../../dataset/common/DatasetChartDetail' // shape attr,component style import { @@ -255,7 +265,7 @@ import QuotaFilterEditor from '../components/filter/QuotaFilterEditor' export default { name: 'ChartEdit', - components: { QuotaFilterEditor, BackgroundColorSelector, FilterItem, XAxisSelector, YAxisSelector, TooltipSelector, LabelSelector, LegendSelector, TitleSelector, SizeSelector, ColorSelector, ChartComponent, QuotaItem, DimensionItem, draggable }, + components: { DatasetChartDetail, QuotaFilterEditor, BackgroundColorSelector, FilterItem, XAxisSelector, YAxisSelector, TooltipSelector, LabelSelector, LegendSelector, TitleSelector, SizeSelector, ColorSelector, ChartComponent, QuotaItem, DimensionItem, draggable }, data() { return { table: {}, @@ -296,7 +306,8 @@ export default { name: [ { required: true, message: this.$t('commons.input_content'), trigger: 'change' } ] - } + }, + tabStatus: false } }, computed: { @@ -577,6 +588,13 @@ export default { }, resetRename() { // this.itemForm = {} + }, + + showTab() { + this.tabStatus = true + }, + hideTab() { + this.tabStatus = false } } } diff --git a/frontend/src/views/dataset/common/DatasetChartDetail.vue b/frontend/src/views/dataset/common/DatasetChartDetail.vue new file mode 100644 index 0000000000..01a59215c6 --- /dev/null +++ b/frontend/src/views/dataset/common/DatasetChartDetail.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index f737ac8b96..8343a438ff 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -3,9 +3,18 @@ {{ tableId }} - - {{ table.name }} - + + + + {{ table.name }} + + {{ $t('dataset.edit_sql') }} @@ -81,10 +90,11 @@ import { getTable, getPreviewData, fieldList, batchEdit } from '@/api/dataset/dataset' import TabDataPreview from './TabDataPreview' import UpdateInfo from './UpdateInfo' +import DatasetChartDetail from '../common/DatasetChartDetail' export default { name: 'ViewTable', - components: { UpdateInfo, TabDataPreview }, + components: { DatasetChartDetail, UpdateInfo, TabDataPreview }, data() { return { createViewDialog: false, @@ -98,7 +108,8 @@ export default { tableFields: [], tableViewRowForm: { row: 1000 - } + }, + tabStatus: false } }, computed: { @@ -173,6 +184,13 @@ export default { reSearch(val) { this.tableViewRowForm = val this.initPreviewData() + }, + + showTab() { + this.tabStatus = true + }, + hideTab() { + this.tabStatus = false } } }