diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index c5cb0a04b..657db9b2a 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -678,7 +678,7 @@ export default { } if (!param.query) delete param.query // 根据panelId获得panel下的所有图表 - this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0').then(response => { + this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => { if (response.code === 200) { response.data.list.forEach((item, index) => { item.isLoaded = false diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue index 71c170b0f..b3970dcd7 100644 --- a/nezha-fronted/src/components/cli/webSSH.vue +++ b/nezha-fronted/src/components/cli/webSSH.vue @@ -16,32 +16,32 @@
- + - + <!––> + <!––> A A A - - - - - - - + <!–大–> + <!––> + <!––> + <!––> + <!–Monosapace–> + <!–Courier New–> + <!––> - - - - - - - - - - +<!– –> +<!– –> +<!– –> +<!–
{{$t('webshell.upload')}}
–> +<!– –> +<!– –> +<!–
{{$t('webshell.download')}}
–> +<!– –> +<!– –> + --> - + @@ -858,11 +858,12 @@ export default { if (this.assetShow) { this.$refs.assetConnect.validate((valid) => { if (valid) { - // this.show(id, host, accountId, port) - const asset = this.assetData.find(item => item.id == this.assetContent.assetId) - this.addConsole(asset.id, asset.manageIp, '', '', 'asset') - this.assetShow = false - this.prevent_opt.save = false + this.$get('asset/asset/' + this.assetContent.assetId).then(res => { + const asset = res.data + this.addConsole(asset.id, asset.manageIp, '', '', 'asset') + this.assetShow = false + this.prevent_opt.save = false + }) } else { this.prevent_opt.save = false } @@ -905,7 +906,7 @@ export default { this.assetContent.assetId = '' this.customConnect = { host: '', - port: '', + port: 22, authType: 1, authUsername: '', authPin: '', diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index e96c2540d..428811a4d 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -205,7 +205,10 @@ const cn = { panelId: 'ID' }, createChartTitle: '新增图表', + createChartTempTitle: '新增图表模板', + createChartByTemp: '通过模板添加图表', editChartTitle: '编辑图表', + editChartTempTitle: '编辑图表模板', // "编辑图表"" chartForm: { chartId: 'ID', chartName: '图表名称', @@ -1322,7 +1325,8 @@ const cn = { unitError: '请选择对应的目录', imgError: '请上传图片', folder: '目录', - selMod: '请个所有节点绑定module' + selMod: '请个所有节点绑定module', + none: '无' }, update: '更新' }, diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index f638b8d72..b3cdb0d62 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -215,8 +215,11 @@ const en = { panelId: 'ID' // ID }, // 图表-侧滑框 - createChartTitle: 'New chart template', // "新增图表" - editChartTitle: 'Edit', // "编辑图表" + createChartTitle: 'New chart', // "新增图表" + createChartTempTitle: 'New chart template', // "新增图表" + createChartByTemp: 'New chart by template', + editChartTitle: 'Edit chart', // "编辑图表"" + editChartTempTitle: 'Edit chart template', // "编辑图表"" chartForm: { chartId: 'ID', chartName: 'Chart Name', @@ -1344,7 +1347,8 @@ const en = { unitError: 'Please select the folder', imgError: 'Please upload pictures', folder: 'Folder', - selMod: 'Please bind module for all nodes' + selMod: 'Please bind module for all nodes', + none: 'None' }, update: '更新' }, diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 741e272a7..deda9f99d 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -35,11 +35,11 @@
{{$t('alert.config.expr')}} - - - - - + + + + +
@@ -146,8 +146,9 @@
- {{$t('dashboard.panel.chartForm.thresholds')}} （0:Ok > … >2:Critical） + {{$t('dashboard.panel.chartForm.thresholds')}} + （0:Ok > … >{{selection.pen.data.valueMapping.length}}:Critical） + （{{selection.pen.data.valueMapping.length}}:Critical > … >0:Ok）
@@ -232,13 +233,13 @@
- - - {{$t('project.topology.link')}} - - - - + + + + + + + @@ -253,7 +254,91 @@
-
+ +
+
X
+
+ + + +
+
+ +
+
Y
+
+ + + +
+
+ +
+
{{$t('project.topology.width')}}
+
+ + + +
+
+ +
+
{{$t('project.topology.height')}}
+
+ + + +
+
+ +
{{$t('project.topology.circularBead')}}（0 - 1）
-
+
{{$t('project.topology.rotate')}}（°）
{{$t('project.topology.animation')}} - - + + + + + + +
@@ -551,7 +636,7 @@ @@ -563,7 +648,8 @@
+ @change="(val)=>{changeAnimatePlay(val,'line')}" + > @@ -1045,7 +1131,8 @@ export default { { id: 1, name: this.$t('project.topology.flow') }, { id: 'beads', name: this.$t('project.topology.beads') }, { id: 'dot', name: this.$t('project.topology.dot') }, - { id: 'comet', name: this.$t('project.topology.comet') } + { id: 'comet', name: this.$t('project.topology.comet') }, + { id: 'custom', name: this.$t('project.topology.none') } ], nodeAnimateOptions: [ { @@ -1071,6 +1158,10 @@ export default { { id: 'fade', name: this.$t('project.topology.fade') + }, + { + id: '', + name: this.$t('project.topology.none') } ], predefineColors: [ @@ -1388,6 +1479,22 @@ export default { this.drowdown = 0 this.onChange() }, + changeAnimatePlay (val, type) { + if (type === 'node') { + if (val === 'custom') { + this.selection.pen.data.animatePlay = false + } else { + this.selection.pen.data.animatePlay = true + } + } else if (type === 'line') { + if (val === 'custom') { + this.selection.pen.data.animatePlay = false + } else { + this.selection.pen.data.animatePlay = true + } + } + this.onChange() + }, onAnimate (val) { // this.selection.pen.animateStart=this.selection.pen.animateStart?Date.now():0; // this.selection.pen.data.animatePlay=this.selection.pen.animatePlay; diff --git a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue index 4401a9830..f9cabbfc0 100644 --- a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue @@ -1,7 +1,7 @@