From cc2e420b6bb35bd2965b9944775cd882e6f17428 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 2 Aug 2023 14:30:20 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3023=20fix=EF=BC=9Aproject=20topology=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bottomBox/tabs/dashboardTab.vue | 2 + .../common/popBox/topToolMoreOptions.vue | 63 ++++++++++++++++--- .../project/meta2d/js/meta2dMainCalc.js | 3 + .../common/project/meta2d/meta2dHeader.vue | 38 +++++++++-- .../common/project/meta2d/meta2dMain.vue | 1 + .../page/config/template/chartTemp.vue | 1 + .../page/config/template/dashboardTemp.vue | 1 + .../components/page/dashboard/dashboard.vue | 1 + 8 files changed, 96 insertions(+), 14 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index 3a88d6588..9a420ff89 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -29,6 +29,7 @@ class="top-tool-export margin-r-10" export-file-name="asset-charts" export-url="/visual/dashboard/export" + :only-json="true" @afterImport="getTableData" :link="obj" :showLock="from === fromRoute.asset" @@ -60,6 +61,7 @@ class="top-tool-export margin-r-10" export-file-name="endpoint-charts" export-url="/visual/dashboard/export" + :only-json="true" @afterImport="getTableData" @export="exportType" @panelLockChange="panelLockChange" diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index ad0bdac00..058ff7656 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -45,13 +45,13 @@
- +
{{$t('overall.dragFileTip')}}，{{$t('overall.or')}} {{$t('overall.clickUpload')}}
-
{{!isDashboard?$t('overall.importSupport'):$t('overall.supportJson')}}
+
{{!onlyJson?$t('overall.importSupport'):$t('overall.supportJson')}}
-
+
{{$t('overall.existed')}} @@ -75,10 +75,10 @@
-
+
@@ -108,7 +108,7 @@
{{$t('export.records')}} - + {{item.name}} ({{deleteObjs.length}}) @@ -117,7 +117,7 @@
{{$t('export.fileFormat')}} - {{item.name}} + {{item.name}}
@@ -272,8 +272,14 @@ export default { type: String, default: '' }, + isTopo: { + type: Boolean, default: false + }, deleteObjs: Array, - type: String + type: String, + onlyJson: { + type: Boolean, default: false + } }, computed: { language () { return this.$store.getters.getLanguage }, @@ -404,6 +410,10 @@ export default { }) }, importExcel () { + if (this.isTopo) { + this.importTopo() + return + } if (this.importFile && this.importFile.raw) { this.prevent_opt.import = true const form = new FormData() @@ -442,6 +452,38 @@ export default { this.$message.error(this.$t('tip.noImportFile')) } }, + importTopo () { + if (this.importFile && this.importFile.raw) { + let reader = new FileReader()// 新建一个FileReader + reader.readAsText(this.importFile.raw, 'UTF-8')// 读取文件 + reader.onload = (evt) => { // 读取完文件之后会回来这里 + let fileString = evt.target.result // 读取文件内容 + fileString = JSON.parse(fileString) + console.log(fileString) + if (!fileString.topo) { + this.$message.error(this.$t('IMPORT_FORMAT_ERROR', { 0: '' })) + return + } + try { + this.$post(this.importUrl, fileString).then(response => { + if (response.code == 200 && response.msg == 'success') { + this.$message.success(this.$t('overall.result.success')) + this.importBox.show = false + this.$emit('afterImport') + } else { + this.$message.error(response.msg) + } + this.prevent_opt.import = false + reader = null + }) + } catch (e) { + this.$message.error(this.$t('IMPORT_FORMAT_ERROR',{ 0: '' })) + } + } + } else { + this.$message.error(this.$t('tip.noImportFile')) + } + }, exportMenuHandler (show) { if (show) { clearTimeout(timeout) @@ -703,13 +745,16 @@ export default { this.importBox.show = true this.importBox.type = type - if (this.assetOrEndpoint) { + if (this.assetOrEndpoint || this.isTopo) { this.importBox.record = 'current' } // isDashboard 只支持JSON if (this.isDashboard) { this.importBox.format = 3 } + if (this.onlyJson) { + this.importBox.format = 3 + } if (type == 2 && (!this.showCur)) { this.exportCur() return diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index de4021f6f..63dbfc2f5 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -149,6 +149,9 @@ export default { }) }) }, + reloadProject () { + this.$emit('reload') + }, nodeInit (pen, name) { // 初始化节点参数 if (pen.data && pen.data.params) { return diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue index 36d981d54..7ee88e8ac 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue @@ -19,9 +19,32 @@ :use-chart-unit="false" class="pickTime margin-r-10"> - + + + @@ -57,13 +80,15 @@ import { deepClone } from '@meta2d/core' import bus from '@/libs/bus' import topologyTopTool from '@/components/common/project/meta2d/topologyTopTool' import meta2dMainOther from '@/components/common/project/meta2d/meta2dMain' +import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions' export default { name: 'meta2dHeader', mixins: [topoUtil], components: { topologyTopTool, - meta2dMainOther + meta2dMainOther, + topToolMoreOptions }, props: { meta2dId: {}, @@ -227,8 +252,11 @@ export default { } this.$emit('exitEdit', true) }, + afterImport () { + this.$emit('reloadProject') + }, reload () { - + this.$emit('reloadProject') } } } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 523a3fd17..d979b6026 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -10,6 +10,7 @@ @edit="beforeEdit" @exitEdit="exitEdit" @reload="reload" + @reloadProject="reloadProject" @saveChart="saveChart" @getNodesArr="getNodesArr" /> diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue index 5baf9e2f0..f9ef0b88c 100644 --- a/nezha-fronted/src/components/page/config/template/chartTemp.vue +++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue @@ -20,6 +20,7 @@ id="expression-template-list" export-url="/visual/dashboard/export" import-url="/visual/dashboard/import" + :only-json="true" export-file-name="chart-temp" :params="searchLabel" :params2="{ diff --git a/nezha-fronted/src/components/page/config/template/dashboardTemp.vue b/nezha-fronted/src/components/page/config/template/dashboardTemp.vue index 6f9a7309c..8584d4598 100644 --- a/nezha-fronted/src/components/page/config/template/dashboardTemp.vue +++ b/nezha-fronted/src/components/page/config/template/dashboardTemp.vue @@ -20,6 +20,7 @@ id="dashboard-template-list" export-url="/visual/dashboard/export" import-url="/visual/dashboard/import" + :only-json="true" export-file-name="dashboard-temp" :params="searchLabel" :paramsType="'template'" diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue index b30750cd2..264c4ab98 100644 --- a/nezha-fronted/src/components/page/dashboard/dashboard.vue +++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue @@ -78,6 +78,7 @@ export-file-name="chart" export-url="/visual/dashboard/export" import-url="/visual/dashboard/import" + :only-json="true" @export="exportType" @afterImport="afterImport" >