From 941fe1fb23ee97f51a23554073c9dc122810a731 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 26 Feb 2021 12:24:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(fronted):=20=E6=81=A2=E5=A4=8D=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=A2=AB=E8=AF=AF=E5=88=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/router/router.js | 5 +++-- frontend/src/business/store.js | 18 +++++++++++++++++- frontend/src/i18n/zh-CN.js | 5 ++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js index 9239412672..868db4d042 100644 --- a/frontend/src/business/components/common/router/router.js +++ b/frontend/src/business/components/common/router/router.js @@ -2,7 +2,8 @@ import Vue from "vue"; import VueRouter from 'vue-router' import RouterSidebar from "./RouterSidebar"; import Setting from "@/business/components/settings/router"; -import API from "@/business/components/api/router"; +import Chart from "@/business/components/chart/router"; +// import API from "@/business/components/api/router"; // import Performance from "@/business/components/performance/router"; import DataSet from "@/business/components/dataset/router"; import Track from "@/business/components/track/router"; @@ -19,7 +20,7 @@ const router = new VueRouter({ } }, Setting, - API, + Chart, // Performance, DataSet, Track, diff --git a/frontend/src/business/store.js b/frontend/src/business/store.js index 1a5ea8c025..630caf5c4b 100644 --- a/frontend/src/business/store.js +++ b/frontend/src/business/store.js @@ -18,6 +18,21 @@ const Dataset = { } } +const Chart = { + state: { + chartSceneData: "", + chart: "" + }, + mutations: { + setChartSceneData(state, chartSceneData) { + state.chartSceneData = chartSceneData; + }, + setChart(state, chart) { + state.chart = chart; + } + } +} + const Common = { state: { projectId: "" @@ -71,6 +86,7 @@ export default new Vuex.Store({ common: Common, switch: Switch, isReadOnly: IsReadOnly, - dataset: Dataset + dataset: Dataset, + chart: Chart } }) diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 29c513d9b8..fb41d88907 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1607,7 +1607,10 @@ export default { field_origin_name: '原始名', field_check: '选中', update_info: '更新信息', - join_view: '关联视图' + join_view: '关联视图', + text: '文本', + time: '时间', + value: '数值' }, datasource: { create: '新建数据连接', From 43b3d4d46626ace35e7e48bc7aa4964618081c92 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 26 Feb 2021 12:25:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(fronted):=20=E5=88=9B=E5=BB=BA?= =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/components/chart/group/Group.vue | 23 +++++-- .../components/chart/view/TableSelector.vue | 21 ++++-- .../dataset/common/DatasetGroupSelector.vue | 13 +--- .../dataset/common/DatasetTableData.vue | 64 +++++++++++++++++++ .../components/dataset/data/ViewTable.vue | 7 +- frontend/src/i18n/en-US.js | 31 +++++++++ frontend/src/i18n/zh-TW.js | 31 +++++++++ 7 files changed, 168 insertions(+), 22 deletions(-) create mode 100644 frontend/src/business/components/dataset/common/DatasetTableData.vue diff --git a/frontend/src/business/components/chart/group/Group.vue b/frontend/src/business/components/chart/group/Group.vue index d2a4b6f563..a08c349ba9 100644 --- a/frontend/src/business/components/chart/group/Group.vue +++ b/frontend/src/business/components/chart/group/Group.vue @@ -187,12 +187,13 @@ - - - + + +
{{$t('chart.cancel')}} - {{$t('chart.confirm')}} + {{$t('chart.confirm')}}
@@ -239,7 +240,8 @@ export default { {required: true, message: this.$t('commons.input_content'), trigger: 'blur'}, ], }, - selectTableFlag: false + selectTableFlag: false, + table: {} } }, computed: { @@ -487,6 +489,17 @@ export default { selectTable() { this.selectTableFlag = true; + }, + + createChart() { + console.log(this.table); + this.selectTableFlag = false; + // TODO + this.$router.push("/chart"); + }, + + getTable(table) { + this.table = table; } }, } diff --git a/frontend/src/business/components/chart/view/TableSelector.vue b/frontend/src/business/components/chart/view/TableSelector.vue index cc3fdbb773..75dba00c9a 100644 --- a/frontend/src/business/components/chart/view/TableSelector.vue +++ b/frontend/src/business/components/chart/view/TableSelector.vue @@ -1,11 +1,11 @@ @@ -17,19 +17,30 @@ import MsAsideContainer from "../../common/components/MsAsideContainer"; import MsSettingMenu from "../../settings/SettingMenu"; import MsCurrentUser from "../../settings/CurrentUser"; import DatasetGroupSelector from "../../dataset/common/DatasetGroupSelector"; +import DatasetTableData from "../../dataset/common/DatasetTableData"; export default { name: "TableSelector", - components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser, DatasetGroupSelector}, + components: { + DatasetTableData, + MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser, DatasetGroupSelector + }, data() { - return {} + return { + table: {}, + } }, computed: {}, created() { }, mounted() { }, - methods: {} + methods: { + getTable(table) { + this.table = table; + this.$emit("getTable", table); + }, + } } diff --git a/frontend/src/business/components/dataset/common/DatasetGroupSelector.vue b/frontend/src/business/components/dataset/common/DatasetGroupSelector.vue index c9a1db22d7..c9124bdfda 100644 --- a/frontend/src/business/components/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/business/components/dataset/common/DatasetGroupSelector.vue @@ -115,8 +115,7 @@ export default { }, } }, - computed: { - }, + computed: {}, mounted() { this.tree(this.groupForm); this.tableTree(); @@ -175,6 +174,7 @@ export default { if (data.type === 'scene') { this.sceneMode = true; this.currGroup = data; + this.tableTree(); } if (node.expanded) { this.expandedArray.push(data.id); @@ -193,14 +193,7 @@ export default { sceneClick(data, node) { // console.log(data); - this.$store.commit('setTable', null); - this.$store.commit('setTable', data.id); - this.$router.push({ - name: 'table', - params: { - table: data - } - }); + this.$emit("getTable", data); }, } } diff --git a/frontend/src/business/components/dataset/common/DatasetTableData.vue b/frontend/src/business/components/dataset/common/DatasetTableData.vue new file mode 100644 index 0000000000..76a3f20967 --- /dev/null +++ b/frontend/src/business/components/dataset/common/DatasetTableData.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/frontend/src/business/components/dataset/data/ViewTable.vue b/frontend/src/business/components/dataset/data/ViewTable.vue index 02ba760557..00013ecfd4 100644 --- a/frontend/src/business/components/dataset/data/ViewTable.vue +++ b/frontend/src/business/components/dataset/data/ViewTable.vue @@ -10,7 +10,7 @@ {{$t('dataset.edit')}} - + {{$t('dataset.create_view')}} @@ -142,8 +142,11 @@ export default { this.initTableFields(); }, - createView() { + createChart() { + console.log(this.table); this.createViewDialog = true; + // TODO + this.$router.push("/chart"); }, saveEdit() { diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index e1a3868701..6c60772698 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -1520,6 +1520,37 @@ export default { title: 'Auth Source', auth_name_valid: 'Name does not support special characters', }, + chart: { + datalist: '視圖列表', + add_group: '添加分組', + add_scene: '添加場景', + group: '分組', + scene: '場景', + delete: '刪除', + move_to: '移動到', + rename: '重命名', + tips: '提示', + confirm_delete: '確認刪除', + delete_success: '刪除成功', + confirm: '確認', + cancel: '取消', + search: '搜索', + back: '返回', + add_table: '添加表', + process: '進度', + add_chart: '添加視圖', + db_data: '數據庫表', + sql_data: 'SQL數據集', + excel_data: 'Excel數據集', + custom_data: '自助數據集', + pls_slc_tbl_left: '請從左側選視圖', + add_db_table: '添加數據庫表', + pls_slc_data_source: '請選擇數據庫連接', + table: '表', + edit: '編輯', + create_view: '創建試圖', + data_preview: '數據預覽' + }, dataset: { datalist: 'Data List', add_group: 'Add Group', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 6a08adf6d7..5aecd259db 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -1521,6 +1521,37 @@ export default { title: '認證設置', auth_name_valid: '名稱不支持特殊字符', }, + chart: { + datalist: '視圖列表', + add_group: '添加分組', + add_scene: '添加場景', + group: '分組', + scene: '場景', + delete: '刪除', + move_to: '移動到', + rename: '重命名', + tips: '提示', + confirm_delete: '確認刪除', + delete_success: '刪除成功', + confirm: '確認', + cancel: '取消', + search: '搜索', + back: '返回', + add_table: '添加表', + process: '進度', + add_chart: '添加視圖', + db_data: '數據庫表', + sql_data: 'SQL數據集', + excel_data: 'Excel數據集', + custom_data: '自助數據集', + pls_slc_tbl_left: '請從左側選視圖', + add_db_table: '添加數據庫表', + pls_slc_data_source: '請選擇數據庫連接', + table: '表', + edit: '編輯', + create_view: '創建試圖', + data_preview: '數據預覽' + }, dataset: { datalist: '數據列表', add_group: '添加分組',