From 2150fa71d19bd540f90ae1b2673f364093345753 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 20 Jun 2023 16:59:46 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2895=20fix=EF=BC=9A=20Tooltip.title=20&=20T?= =?UTF-8?q?ooltip.Legends.Alias=20=E6=94=AF=E6=8C=81=20=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/chart/chart/chartStat.vue | 6 +-- .../chart/chart/chartTimeSeries.vue | 2 +- .../src/components/chart/chartFormat.js | 4 +- .../src/components/chart/chartHeaderMixin.js | 4 +- .../src/components/chart/chartList.vue | 40 ++++++++-------- .../src/components/chart/chartMixin.js | 4 +- .../src/components/chart/panelChart.vue | 10 ++-- nezha-fronted/src/components/cli/console.vue | 24 +++++----- .../src/components/cli/fileDirectory.vue | 8 ++-- .../src/components/cli/webSSHNew.vue | 48 +++++++++---------- .../common/ChartDiagram/diagram.vue | 8 ++-- .../common/alert/alertMessageInfoTab.vue | 4 +- .../common/bottomBox/tabs/dashboardTab.vue | 18 +++---- .../common/bottomBox/tabs/rolesTab.vue | 2 +- .../common/bottomBox/tabs/scrapeEndpoint.vue | 2 +- .../src/components/common/deleteButton.vue | 4 +- .../src/components/common/mixin/dataList.js | 6 +-- .../common/mixin/detailViewMixin.js | 2 +- .../components/common/mixin/mainMixinFun.js | 41 ++++++++++++++++ .../common/panel/panelVariables.vue | 10 ++-- .../src/components/common/playlist.vue | 2 +- .../common/popBox/selectDashboard.vue | 2 +- .../common/popBox/topToolMoreOptions.vue | 6 +-- .../project/meta2d/CanvasContextMenu.vue | 2 +- .../project/meta2d/js/meta2dMainCalc.js | 7 ++- .../common/project/meta2d/js/topoUtil.js | 41 ---------------- .../common/project/meta2d/meta2dData.vue | 6 +-- .../common/project/meta2d/meta2dElement.vue | 42 +++++++++------- .../common/project/meta2d/meta2dTooltip.vue | 19 ++++++-- .../common/project/meta2d/topologyTopTool.vue | 2 +- .../common/project/newTopologyL5.vue | 2 +- .../components/common/project/topologyL5.vue | 8 ++-- .../common/project/topologyMixin.js | 2 +- .../common/rightBox/alertRuleBox.vue | 4 +- .../common/rightBox/batchEditEndpoint.vue | 2 +- .../common/rightBox/chart/chartConfig.vue | 4 +- .../common/rightBox/chart/chartRightBox.vue | 4 +- .../common/rightBox/chartTempBox.vue | 2 +- .../common/rightBox/dashboardTempBox.vue | 6 +-- .../components/common/rightBox/panelBox.vue | 4 +- .../common/rightBox/playlistBox.vue | 2 +- .../components/common/searchBox/searchBox.vue | 10 ++-- .../src/components/common/timePicker.vue | 10 ++-- .../src/components/page/alert/alertRule.vue | 2 +- .../src/components/page/asset/asset.vue | 2 +- .../src/components/page/config/backups.vue | 2 +- .../page/config/template/chartTemp.vue | 2 +- .../page/config/template/dashboardTemp.vue | 6 +-- .../components/page/config/terminalLog.vue | 2 +- .../src/components/page/config/user.vue | 2 +- .../components/page/dashboard/dashboard.vue | 20 ++++---- .../integration-tabs/dashboard.vue | 4 +- .../page/monitor/endpoint/endpointList.vue | 2 +- .../page/monitor/module/moduleList.vue | 2 +- nezha-fronted/src/entrance/app/main.js | 4 +- .../src/entrance/exportHtml/exportHtml.js | 2 +- nezha-fronted/src/libs/bus.js | 2 +- 57 files changed, 256 insertions(+), 234 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index 738b93f71..d4dd85e67 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -445,9 +445,9 @@ export default { } }, statMouseEnter (that, e) { - this.tooltip.title = this.$loadsh.cloneDeep(that.legend) - this.tooltip.value = this.$loadsh.cloneDeep(that.showValue) - this.tooltip.mapping = this.$loadsh.cloneDeep(that.mapping) + this.tooltip.title = this.$lodash.cloneDeep(that.legend) + this.tooltip.value = this.$lodash.cloneDeep(that.showValue) + this.tooltip.mapping = this.$lodash.cloneDeep(that.mapping) this.tooltip.show = true this.$nextTick(() => { const windowWidth = window.innerWidth// 窗口宽度 diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index d19ebe1ba..1eac4e2d5 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -226,7 +226,7 @@ export default { datas = [...datas, ...data.values] }) }) - const timeSorted = this.$loadsh.sortBy(datas, function (o) { return o[0] }) + const timeSorted = this.$lodash.sortBy(datas, function (o) { return o[0] }) const valueSorted = datas.sort((a, b) => { const a1 = isNaN(a[1]) || !a[1] ? 0 : Number(a[1]) const b1 = isNaN(b[1]) || !b[1] ? 0 : Number(b[1]) diff --git a/nezha-fronted/src/components/chart/chartFormat.js b/nezha-fronted/src/components/chart/chartFormat.js index e34c029c3..f809ab9d5 100644 --- a/nezha-fronted/src/components/chart/chartFormat.js +++ b/nezha-fronted/src/components/chart/chartFormat.js @@ -39,8 +39,8 @@ export default { const labelValue = display.replace(/(\{\{.+?\}\})/g, function (i) { const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2) let value = null - if (self.$loadsh.get(myParams, label)) { - value = self.$loadsh.get(myParams, label) + if (self.$lodash.get(myParams, label)) { + value = self.$lodash.get(myParams, label) } // return value || label return value || '' diff --git a/nezha-fronted/src/components/chart/chartHeaderMixin.js b/nezha-fronted/src/components/chart/chartHeaderMixin.js index 4395aa410..289464548 100644 --- a/nezha-fronted/src/components/chart/chartHeaderMixin.js +++ b/nezha-fronted/src/components/chart/chartHeaderMixin.js @@ -62,7 +62,7 @@ export default { this.dropdownMenuShow = false }, duplicate () { - const obj = this.$loadsh.cloneDeep(this.chartInfo) + const obj = this.$lodash.cloneDeep(this.chartInfo) obj.elements = obj.oldElements delete obj.oldElements this.$store.dispatch('dispatchEditChart', { @@ -109,7 +109,7 @@ export default { confirmReg.push(item) } }) - confirmReg = this.$loadsh.orderBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题 + confirmReg = this.$lodash.orderBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题 return item.name.length }, 'desc') if (confirmReg.length) { diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 14697890e..1111e4bdd 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -512,11 +512,11 @@ export default { } this.showHidden = {} this.dataList.forEach(item => { - const visibility = this.$loadsh.get(item, 'param.enable.visibility', false) - const varName = this.$loadsh.get(item, 'param.visibility.varName') - const operator = this.$loadsh.get(item, 'param.visibility.operator') - const varValue = this.$loadsh.get(item, 'param.visibility.varValue') - const result = this.$loadsh.get(item, 'param.visibility.result') + const visibility = this.$lodash.get(item, 'param.enable.visibility', false) + const varName = this.$lodash.get(item, 'param.visibility.varName') + const operator = this.$lodash.get(item, 'param.visibility.operator') + const varValue = this.$lodash.get(item, 'param.visibility.varValue') + const result = this.$lodash.get(item, 'param.visibility.result') // 相反结果 若result为show则contraryResult为hidden const contraryResult = result === 'show' ? 'hidden' : 'show' // 是否启用显示隐藏功能 @@ -557,15 +557,15 @@ export default { } } if (flag === true) { - this.$loadsh.set(this.showHidden, item.id + '.visibility', result) + this.$lodash.set(this.showHidden, item.id + '.visibility', result) } else { - this.$loadsh.set(this.showHidden, item.id + '.visibility', contraryResult) + this.$lodash.set(this.showHidden, item.id + '.visibility', contraryResult) } // 隐藏图表的悬浮文字赋值 - if (this.$loadsh.get(this.showHidden[item.id], 'visibility') === 'hidden') { + if (this.$lodash.get(this.showHidden[item.id], 'visibility') === 'hidden') { const hiddenText = `“${varName}=${varValue}”Hidden` - this.$loadsh.set(this.showHidden, item.id + '.hiddenText', hiddenText) + this.$lodash.set(this.showHidden, item.id + '.hiddenText', hiddenText) } } }) @@ -576,13 +576,13 @@ export default { } for (let i = 0; i < this.copyDataList.length; i++) { const item = this.copyDataList[i] - if ((this.$loadsh.get(this.showHidden[item.id], 'visibility') && this.$loadsh.get(this.showHidden[item.id], 'visibility') === 'hidden') && item.id !== -2) { + if ((this.$lodash.get(this.showHidden[item.id], 'visibility') && this.$lodash.get(this.showHidden[item.id], 'visibility') === 'hidden') && item.id !== -2) { this.copyDataList.splice(i, 1) i-- } } this.tempList.forEach(item => { - if ((!this.$loadsh.get(this.showHidden[item.id], 'visibility') || this.$loadsh.get(this.showHidden[item.id], 'visibility') === 'show') && item.id !== -2 && !this.copyDataList.find(chart => chart.id === item.id)) { + if ((!this.$lodash.get(this.showHidden[item.id], 'visibility') || this.$lodash.get(this.showHidden[item.id], 'visibility') === 'show') && item.id !== -2 && !this.copyDataList.find(chart => chart.id === item.id)) { this.copyDataList.push(item) } }) @@ -615,21 +615,21 @@ export default { } this.$nextTick(() => { // 先让数组根据 y 排序 之后直接判断顺序 即可判断 Group 是否相邻 - let arr = this.$loadsh.cloneDeep(this.copyDataList) - arr = this.$loadsh.orderBy(arr, function (item) { + let arr = this.$lodash.cloneDeep(this.copyDataList) + arr = this.$lodash.orderBy(arr, function (item) { return item.y }) const variablesRepeat = {} for (let index = 0; index < arr.length; index++) { // 遍历找出所有需要 repeat的group 按照 name进行多次的分组 const item = arr[index] - const repeatVariable = this.$loadsh.get(item.param.repeat, 'variable') - const repeatEnable = this.$loadsh.get(item.param.enable, 'repeat') - const visibility = this.$loadsh.get(this.showHidden[item.id], 'visibility') !== 'hidden' + const repeatVariable = this.$lodash.get(item.param.repeat, 'variable') + const repeatEnable = this.$lodash.get(item.param.enable, 'repeat') + const visibility = this.$lodash.get(this.showHidden[item.id], 'visibility') !== 'hidden' if (item.type === 'group' && repeatVariable && repeatEnable && visibility) { const itemPrev = arr[index - 1] - const repeatPrevVariable = this.$loadsh.get(itemPrev.param.repeat, 'variable') - const repeatPrevEnable = this.$loadsh.get(itemPrev.param.enable, 'repeat') - const itemVisibility = this.$loadsh.get(this.showHidden[itemPrev.id], 'visibility') !== 'hidden' + const repeatPrevVariable = this.$lodash.get(itemPrev.param.repeat, 'variable') + const repeatPrevEnable = this.$lodash.get(itemPrev.param.enable, 'repeat') + const itemVisibility = this.$lodash.get(this.showHidden[itemPrev.id], 'visibility') !== 'hidden' if (itemPrev && itemPrev.type === 'group' && repeatPrevVariable === repeatVariable && repeatPrevEnable && itemVisibility) { const arr = variablesRepeat[repeatVariable] arr[arr.length - 1].repeatArr.push(item) @@ -656,7 +656,7 @@ export default { group.repeatArr.forEach(item => { if (subIndex > 0) { // 复制数据 重新设置id - const repeatItem = this.$loadsh.cloneDeep(item) + const repeatItem = this.$lodash.cloneDeep(item) repeatItem.id = item.id + '-' + 'repeat-' + subIndex repeatItem.i = repeatItem.id repeatItem.repeatIndex = subIndex diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index b50b15c3f..4dba5a829 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -246,8 +246,8 @@ export default { return label } let value = null - if (params && self.$loadsh.get(myParams, label)) { - value = self.$loadsh.get(myParams, label) + if (params && self.$lodash.get(myParams, label)) { + value = self.$lodash.get(myParams, label) } if (label) { const reg = new RegExp(label + '=".+?"', 'g') diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index 70e5901eb..fe2df651d 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -204,7 +204,7 @@ export default { this.chartInfo.oldElements = this.chartInfo.elements ? JSON.parse(JSON.stringify(this.chartInfo.elements)) : [] } // eslint-disable-next-line vue/no-mutating-props - this.chartInfo.elements = this.$loadsh.cloneDeep(this.chartInfo.oldElements.filter(item => item.state)) // 处理不显示的表达式 + this.chartInfo.elements = this.$lodash.cloneDeep(this.chartInfo.oldElements.filter(item => item.state)) // 处理不显示的表达式 // eslint-disable-next-line vue/no-mutating-props this.chartInfo.elements = this.chartInfo.elements.map((item, index) => { // 处理表达式的变量 // group图表设置repeat的表达式替换 @@ -403,9 +403,9 @@ export default { if (this.from === fromRoute.chartTemp || this.from === fromRoute.dashboardTemp) { let tempData if (this.chartInfo.type === 'assetInfo') { - tempData = this.$loadsh.cloneDeep(assetInfoData.data) + tempData = this.$lodash.cloneDeep(assetInfoData.data) } else if (this.chartInfo.type === 'endpointInfo') { - tempData = this.$loadsh.cloneDeep(endpointInfoData.data) + tempData = this.$lodash.cloneDeep(endpointInfoData.data) } else { tempData = [chartTempData.data.result] } @@ -659,7 +659,7 @@ export default { confirmReg.push(item) } }) - confirmReg = this.$loadsh.orderBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题 + confirmReg = this.$lodash.orderBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题 return item.name.length }, 'desc') if (confirmReg.length) { @@ -873,7 +873,7 @@ export default { }, variablesArr: { handler (n) { - const elements = this.$loadsh.cloneDeep(this.chartInfo.oldElements) || [] + const elements = this.$lodash.cloneDeep(this.chartInfo.oldElements) || [] const variables = elements.map((element) => { return this.variablesReplace(element.expression) }) diff --git a/nezha-fronted/src/components/cli/console.vue b/nezha-fronted/src/components/cli/console.vue index 8d07e1758..a5161ac44 100644 --- a/nezha-fronted/src/components/cli/console.vue +++ b/nezha-fronted/src/components/cli/console.vue @@ -173,18 +173,18 @@ export default { height: this.terminal.height, cols: this.terminal.cols, rows: this.terminal.rows, - host: this.$loadsh.get(this.terminal, 'custom.host', ''), - port: this.$loadsh.get(this.terminal, 'custom.port', ''), - assetId: this.$loadsh.get(this.terminal, 'assetId', ''), - accountId: this.$loadsh.get(this.terminal, 'accountId', ''), - authProtocol: this.$loadsh.get(this.terminal, 'custom.authProtocol', ''), - authProtocolPort: this.$loadsh.get(this.terminal, 'custom.authProtocolPort', ''), - authType: this.$loadsh.get(this.terminal, 'custom.authType', ''), - authUsername: this.$loadsh.get(this.terminal, 'custom.authUsername', ''), - authPin: this.$loadsh.get(this.terminal, 'custom.authPin', ''), - authPriKey: this.$loadsh.get(this.terminal, 'custom.authPriKey', ''), - authUserTip: this.$loadsh.get(this.terminal, 'custom.authUserTip', ''), - authPinTip: this.$loadsh.get(this.terminal, 'custom.authPinTip', '') + host: this.$lodash.get(this.terminal, 'custom.host', ''), + port: this.$lodash.get(this.terminal, 'custom.port', ''), + assetId: this.$lodash.get(this.terminal, 'assetId', ''), + accountId: this.$lodash.get(this.terminal, 'accountId', ''), + authProtocol: this.$lodash.get(this.terminal, 'custom.authProtocol', ''), + authProtocolPort: this.$lodash.get(this.terminal, 'custom.authProtocolPort', ''), + authType: this.$lodash.get(this.terminal, 'custom.authType', ''), + authUsername: this.$lodash.get(this.terminal, 'custom.authUsername', ''), + authPin: this.$lodash.get(this.terminal, 'custom.authPin', ''), + authPriKey: this.$lodash.get(this.terminal, 'custom.authPriKey', ''), + authUserTip: this.$lodash.get(this.terminal, 'custom.authUserTip', ''), + authPinTip: this.$lodash.get(this.terminal, 'custom.authPinTip', '') } this.$post('/terminal/login', params).then(res => { if (res.code == 200) { diff --git a/nezha-fronted/src/components/cli/fileDirectory.vue b/nezha-fronted/src/components/cli/fileDirectory.vue index c9b8a8b82..9615830c1 100644 --- a/nezha-fronted/src/components/cli/fileDirectory.vue +++ b/nezha-fronted/src/components/cli/fileDirectory.vue @@ -611,8 +611,8 @@ export default { this[key] = orderType let isDirArr = this.oldFileList.filter(item => item.isDir) let isRegArr = this.oldFileList.filter(item => !item.isDir) - isDirArr = this.$loadsh.orderBy(isDirArr, [user => user.name.toLowerCase()], [orderType]) - isRegArr = this.$loadsh.orderBy(isRegArr, [user => user.name.toLowerCase()], [orderType]) + isDirArr = this.$lodash.orderBy(isDirArr, [user => user.name.toLowerCase()], [orderType]) + isRegArr = this.$lodash.orderBy(isRegArr, [user => user.name.toLowerCase()], [orderType]) this.fileList = [] if (orderType === 'asc') { this.fileList = this.fileList.concat(isDirArr, isRegArr) @@ -623,8 +623,8 @@ export default { this[key] = orderType let isDirArr = this.oldFileList.filter(item => item.isDir) let isRegArr = this.oldFileList.filter(item => !item.isDir) - isDirArr = this.$loadsh.orderBy(isDirArr, order, orderType) - isRegArr = this.$loadsh.orderBy(isRegArr, order, orderType) + isDirArr = this.$lodash.orderBy(isDirArr, order, orderType) + isRegArr = this.$lodash.orderBy(isRegArr, order, orderType) this.fileList = [] if (orderType === 'asc') { this.fileList = this.fileList.concat(isDirArr, isRegArr) diff --git a/nezha-fronted/src/components/cli/webSSHNew.vue b/nezha-fronted/src/components/cli/webSSHNew.vue index bf6982fbc..57b04fd03 100644 --- a/nezha-fronted/src/components/cli/webSSHNew.vue +++ b/nezha-fronted/src/components/cli/webSSHNew.vue @@ -643,18 +643,18 @@ export default { height: terminal.height, cols: terminal.cols, rows: terminal.rows, - host: this.$loadsh.get(terminal, 'custom.host', ''), - port: this.$loadsh.get(terminal, 'custom.port', ''), - assetId: this.$loadsh.get(terminal, 'assetId', ''), - accountId: this.$loadsh.get(terminal, 'accountId', ''), - authProtocol: this.$loadsh.get(terminal, 'custom.authProtocol', ''), - authProtocolPort: this.$loadsh.get(terminal, 'custom.authProtocolPort', ''), - authType: this.$loadsh.get(terminal, 'custom.authType', ''), - authUsername: this.$loadsh.get(terminal, 'custom.authUsername', ''), - authPin: this.$loadsh.get(terminal, 'custom.authPin', ''), - authPriKey: this.$loadsh.get(terminal, 'custom.authPriKey', ''), - authUserTip: this.$loadsh.get(terminal, 'custom.authUserTip', ''), - authPinTip: this.$loadsh.get(terminal, 'custom.authPinTip', ''), + host: this.$lodash.get(terminal, 'custom.host', ''), + port: this.$lodash.get(terminal, 'custom.port', ''), + assetId: this.$lodash.get(terminal, 'assetId', ''), + accountId: this.$lodash.get(terminal, 'accountId', ''), + authProtocol: this.$lodash.get(terminal, 'custom.authProtocol', ''), + authProtocolPort: this.$lodash.get(terminal, 'custom.authProtocolPort', ''), + authType: this.$lodash.get(terminal, 'custom.authType', ''), + authUsername: this.$lodash.get(terminal, 'custom.authUsername', ''), + authPin: this.$lodash.get(terminal, 'custom.authPin', ''), + authPriKey: this.$lodash.get(terminal, 'custom.authPriKey', ''), + authUserTip: this.$lodash.get(terminal, 'custom.authUserTip', ''), + authPinTip: this.$lodash.get(terminal, 'custom.authPinTip', ''), parentWindow: !!father } this.$post('/terminal/login', params).then(res => { @@ -744,18 +744,18 @@ export default { height: terminal.height, cols: terminal.cols, rows: terminal.rows, - host: this.$loadsh.get(terminal, 'custom.host', ''), - port: this.$loadsh.get(terminal, 'custom.port', ''), - assetId: this.$loadsh.get(terminal, 'assetId', ''), - accountId: this.$loadsh.get(terminal, 'accountId', ''), - authProtocol: this.$loadsh.get(terminal, 'custom.authProtocol', ''), - authProtocolPort: this.$loadsh.get(terminal, 'custom.authProtocolPort', ''), - authType: this.$loadsh.get(terminal, 'custom.authType', ''), - authUsername: this.$loadsh.get(terminal, 'custom.authUsername', ''), - authPin: this.$loadsh.get(terminal, 'custom.authPin', ''), - authPriKey: this.$loadsh.get(terminal, 'custom.authPriKey', ''), - authUserTip: this.$loadsh.get(terminal, 'custom.authUserTip', ''), - authPinTip: this.$loadsh.get(terminal, 'custom.authPinTip', '') + host: this.$lodash.get(terminal, 'custom.host', ''), + port: this.$lodash.get(terminal, 'custom.port', ''), + assetId: this.$lodash.get(terminal, 'assetId', ''), + accountId: this.$lodash.get(terminal, 'accountId', ''), + authProtocol: this.$lodash.get(terminal, 'custom.authProtocol', ''), + authProtocolPort: this.$lodash.get(terminal, 'custom.authProtocolPort', ''), + authType: this.$lodash.get(terminal, 'custom.authType', ''), + authUsername: this.$lodash.get(terminal, 'custom.authUsername', ''), + authPin: this.$lodash.get(terminal, 'custom.authPin', ''), + authPriKey: this.$lodash.get(terminal, 'custom.authPriKey', ''), + authUserTip: this.$lodash.get(terminal, 'custom.authUserTip', ''), + authPinTip: this.$lodash.get(terminal, 'custom.authPinTip', '') } this.$post('/terminal/login', params).then(res => { if (res.code == 200) { diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index f20f96b4b..a48b753ad 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -801,7 +801,7 @@ export default { if (!document.getElementById('topology-canvas' + this.topologyIndexF)) { return } - data = this.$loadsh.cloneDeep(data) + data = this.$lodash.cloneDeep(data) const canvasOptions = { rotateCursor: '/static/roteCursor.cur', disableEmptyLine: true, @@ -945,7 +945,7 @@ export default { data.background = '#FFFFFF00' } if (!res.data.topo.newData) { - data.pens = this.$loadsh.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制 + data.pens = this.$lodash.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制 data.pens = data.pens.map(item => { if (item.type === 0) { item = disposeTopoOldData(item, data.pens) @@ -977,7 +977,7 @@ export default { } return item }) - data.pens = this.$loadsh.orderBy(data.pens, 'type', 'asc') + data.pens = this.$lodash.orderBy(data.pens, 'type', 'asc') } resolve(data) }, 100) @@ -1221,7 +1221,7 @@ export default { }, onUpdateProps (node) { - const obj = this.$loadsh.cloneDeep(node) + const obj = this.$lodash.cloneDeep(node) delete obj.x delete obj.y delete obj.center diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue index b7c55e858..0e77071fe 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue @@ -125,7 +125,7 @@ export default { findData (key) { if (key) { const obj = { - ...this.$loadsh.cloneDeep(this.infoData[key]), + ...this.$lodash.cloneDeep(this.infoData[key]), type: key } if (key === 'dc') { @@ -139,7 +139,7 @@ export default { findData2 (key) { if (key) { const obj = { - ...this.$loadsh.cloneDeep(this.infoData[key]), + ...this.$lodash.cloneDeep(this.infoData[key]), type: key, position: { top: 0, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index e1b65e152..38171d957 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -616,8 +616,8 @@ export default { this.panelData = response.data.list if (this.panelData.length > 0) { this.filter.dashboardId = this.panelData[0].id - this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) - this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || []) + this.showPanel = this.$lodash.cloneDeep(this.panelData[0]) + this.variables = this.$lodash.cloneDeep(this.$lodash.get(this, 'showPanel.param.variables', []) || []) this.getData(this.filter) } } @@ -634,8 +634,8 @@ export default { this.panelData = response.data.list if (this.panelData.length > 0) { this.filter.dashboardId = this.panelData[0].id - this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) - this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || []) + this.showPanel = this.$lodash.cloneDeep(this.panelData[0]) + this.variables = this.$lodash.cloneDeep(this.$lodash.get(this, 'showPanel.param.variables', []) || []) this.getData(this.filter) } else { this.chartListLoading = false @@ -838,12 +838,12 @@ export default { // 时间选择器设置默认时间范围 setDefaultTimeRange () { this.$nextTick(() => { - let nowTimeType = this.$loadsh.cloneDeep(this.timeData[3]) - const defaultTimeRange = this.$loadsh.get(this.showPanel, 'param.defaultTimeRange') + let nowTimeType = this.$lodash.cloneDeep(this.timeData[3]) + const defaultTimeRange = this.$lodash.get(this.showPanel, 'param.defaultTimeRange') if (defaultTimeRange) { nowTimeType = this.timeData.find(item => item.id == defaultTimeRange) } - this.nowTimeType = this.$loadsh.cloneDeep(nowTimeType) + this.nowTimeType = this.$lodash.cloneDeep(nowTimeType) // 刷新时间范围 this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType) this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType) @@ -856,8 +856,8 @@ export default { // 设置默认刷新 setDefaultRefresh () { this.$nextTick(() => { - let refresh = this.$loadsh.cloneDeep(this.intervalList[0]) - const defaultRefresh = this.$loadsh.get(this.showPanel, 'param.refresh') + let refresh = this.$lodash.cloneDeep(this.intervalList[0]) + const defaultRefresh = this.$lodash.get(this.showPanel, 'param.refresh') if (defaultRefresh) { refresh = this.intervalList.find(item => item.value == defaultRefresh) } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue index 6f938571d..b95083dee 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue @@ -104,7 +104,7 @@ export default { n.map(item => { if (!item.position) { const obj = { - ...this.$loadsh.cloneDeep(item), + ...this.$lodash.cloneDeep(item), type: 'user', position: { top: 0, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue index 37a1521f2..b8a0b6b01 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue @@ -152,7 +152,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.inputDateQuery = this.handlerTableData(this.tableData) this.pageObj.total = this.tableData.length if (!this.scrollbarWrap) { diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue index 49527c3e3..f29ed4029 100644 --- a/nezha-fronted/src/components/common/deleteButton.vue +++ b/nezha-fronted/src/components/common/deleteButton.vue @@ -146,7 +146,7 @@ export default { this.process = false this.finish = false this.forceDelete = 0 - this.deleteData = this.$loadsh.cloneDeep(this.deleteObjs).map(item => { + this.deleteData = this.$lodash.cloneDeep(this.deleteObjs).map(item => { item.type = this.from return item }) @@ -166,7 +166,7 @@ export default { this.process = false this.finish = false this.forceDelete = 0 - this.deleteData = this.$loadsh.cloneDeep(this.deleteObjs).map(item => { + this.deleteData = this.$lodash.cloneDeep(this.deleteObjs).map(item => { item.type = this.from return item }) diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index e36ffb0b1..ff72d420e 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -149,7 +149,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { @@ -234,7 +234,7 @@ export default { }) }, copy (u, copyParams) { - const copyName = this.$loadsh.get(copyParams, 'copyName', '-copy') + const copyName = this.$lodash.get(copyParams, 'copyName', '-copy') this.object = { ...u, name: u.name + copyName, id: '' } if (this.object.name.length > 64) { const length = this.object.name.length - 64 @@ -316,7 +316,7 @@ export default { { name: type + '_id', value: row.id, regex: 0 } ] } else if (type === 'alertMessage') { - let labels = this.$loadsh.cloneDeep(row.labels) + let labels = this.$lodash.cloneDeep(row.labels) if (typeof labels === 'string') labels = JSON.parse(labels) this.objectSilence.matchers = [] const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type', 'nz_agent_id', 'rule_id', 'rule_name'] diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js index 8dfc7ec27..b9cd741ed 100644 --- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js +++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js @@ -111,7 +111,7 @@ export default { }, 100) }, detailViewRightShow (item) { - this.detailViewRightObj = this.$loadsh.cloneDeep(item) + this.detailViewRightObj = this.$lodash.cloneDeep(item) }, orderDetail (order, orderType) { if (orderType === 'ascending') { diff --git a/nezha-fronted/src/components/common/mixin/mainMixinFun.js b/nezha-fronted/src/components/common/mixin/mainMixinFun.js index 986b7daec..81e127835 100644 --- a/nezha-fronted/src/components/common/mixin/mainMixinFun.js +++ b/nezha-fronted/src/components/common/mixin/mainMixinFun.js @@ -111,6 +111,47 @@ export default { node.addEventListener('animationend', handleAnimationEnd, { once: true }) }) + }, + handleLegendAlias (legend, aliasExpression, params) { + const self = this + const myParams = JSON.parse(JSON.stringify(params)) + myParams.$labels = JSON.parse(JSON.stringify(params)) + myParams.$value = myParams.value + if (/\{\{.+\}\}/.test(aliasExpression)) { + const labelValue = aliasExpression.replace(/(\{\{.+?\}\})/g, function (i) { + const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2) + if (!legend) { + return label + } + let value = null + if (params && self.$lodash.get(myParams, label)) { + value = self.$lodash.get(myParams, label) + } + if (label) { + const reg = new RegExp(label + '=".+?"', 'g') + if (reg.test(legend)) { + const ans = legend.match(reg) + let find = '' + ans.forEach(item => { + const index = legend.indexOf(item) + if (legend[index - 1] !== '_') { + find = item + } + }) + value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1) + } + } + return value || '' + }) + return labelValue + } else { + if (!aliasExpression) { + return legend + // let result =legend.substr(legend.indexOf('"') + 1,legend.lastIndexOf('"') - legend.indexOf('"') - 1); + // return result + } + return aliasExpression + } } } } diff --git a/nezha-fronted/src/components/common/panel/panelVariables.vue b/nezha-fronted/src/components/common/panel/panelVariables.vue index 8bba33922..c62630f60 100644 --- a/nezha-fronted/src/components/common/panel/panelVariables.vue +++ b/nezha-fronted/src/components/common/panel/panelVariables.vue @@ -171,8 +171,8 @@ export default { } } }) - arr = this.$loadsh.uniqBy(arr, 'value') - // arr = this.$loadsh.uniqBy(arr, 'label') + arr = this.$lodash.uniqBy(arr, 'value') + // arr = this.$lodash.uniqBy(arr, 'label') arr.filter(item => item.value) response = arr } @@ -201,7 +201,7 @@ export default { label: item } }) - arr = this.$loadsh.uniqBy(arr, 'value') + arr = this.$lodash.uniqBy(arr, 'value') arr.filter(item => item.value) resolve(arr) }) @@ -230,7 +230,7 @@ export default { label: item } }) - arr = this.$loadsh.uniqBy(arr, 'value') + arr = this.$lodash.uniqBy(arr, 'value') arr = arr.filter(item => item.value) resolve(arr) }) @@ -254,7 +254,7 @@ export default { label: item[label] } }) - arr = this.$loadsh.uniqBy(arr, 'value') + arr = this.$lodash.uniqBy(arr, 'value') arr.filter(item => item.value) resolve(arr) }) diff --git a/nezha-fronted/src/components/common/playlist.vue b/nezha-fronted/src/components/common/playlist.vue index 04c147f57..563cbe022 100644 --- a/nezha-fronted/src/components/common/playlist.vue +++ b/nezha-fronted/src/components/common/playlist.vue @@ -91,7 +91,7 @@ export default { this.$emit('stopPlaylist') }, changePlay () { - let data = this.$loadsh.cloneDeep(this.playlistDashboard[this.currentIndex]) + let data = this.$lodash.cloneDeep(this.playlistDashboard[this.currentIndex]) if (!data) { data = { id: this.playlistObj.dashboardIds[this.currentIndex], diff --git a/nezha-fronted/src/components/common/popBox/selectDashboard.vue b/nezha-fronted/src/components/common/popBox/selectDashboard.vue index 3c0980263..706ad2f0a 100644 --- a/nezha-fronted/src/components/common/popBox/selectDashboard.vue +++ b/nezha-fronted/src/components/common/popBox/selectDashboard.vue @@ -259,7 +259,7 @@ export default { }) }, startPlay (val) { - const data = this.$loadsh.cloneDeep(val) + const data = this.$lodash.cloneDeep(val) data.dashboardIds = JSON.parse(data.dashboardIds) if (data.dashboardIds.length) { this.esc() diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index b0717fb06..7e10c45fb 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -735,7 +735,7 @@ export default { this.$get('visual/dashboard/' + this.params.dashboardId).then(res => { if (res.code === 200) { this.panel = res.data - if (!this.$loadsh.get(this.panel, 'param.report', '')) { + if (!this.$lodash.get(this.panel, 'param.report', '')) { this.panel = { ...this.panel, param: { @@ -760,13 +760,13 @@ export default { } } this.panel.param.report.schedule.type = this.panel.param.report.schedule.type + '' - const startTime = this.$loadsh.get(this.panel, 'param.report.schedule.stime', '') + const startTime = this.$lodash.get(this.panel, 'param.report.schedule.stime', '') if (startTime !== '') { this.panel.param.report.schedule.stime = this.utcTimeToTimezoneStr(this.panel.param.report.schedule.stime, 'YYYY-MM-DD HH:mm:ss') } else { this.panel.param.report.schedule.stime = '' } - const endTime = this.$loadsh.get(this.panel, 'param.report.schedule.etime', '') + const endTime = this.$lodash.get(this.panel, 'param.report.schedule.etime', '') if (endTime !== '') { this.panel.param.report.schedule.etime = this.utcTimeToTimezoneStr(this.panel.param.report.schedule.etime, 'YYYY-MM-DD HH:mm:ss') } else { diff --git a/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue b/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue index c0c2cc37e..4c6ba566c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue +++ b/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue @@ -146,7 +146,7 @@ export default { getTopology(this.meta2dId).paste() }, isNull (val) { - return this.$loadsh.isNull(val) + return this.$lodash.isNull(val) } } } 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 f5e8012c0..ecf6e908c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -127,7 +127,7 @@ export default { const endTime = new Date().getTime() const startTime = endTime - 60 * this.params.timeType * 1000 this.getQueryValues(this.querysArray, startTime, endTime).then((arr) => { - this.clacTopoData(this.$loadsh.cloneDeep(this.topoData), arr).then((data) => { + this.clacTopoData(this.$lodash.cloneDeep(this.topoData), arr).then((data) => { if (!getTopology(this.meta2dId)) { return } @@ -346,10 +346,13 @@ export default { if (!positionShow) { return } + console.log(pen) this.chartParams = { ...pen.data.tooltip, unit: this.params.unit, - statistic: this.params.statistic + statistic: this.params.statistic, + legend: pen.data.legend, + parent: pen.data.parent } this.timer3 = setTimeout(() => { let ePosition = window.ePosition diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js index e84cb5de7..b180d7c72 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js @@ -97,47 +97,6 @@ export default { }) }) }, - handleLegendAlias (legend, aliasExpression, params) { - const self = this - const myParams = JSON.parse(JSON.stringify(params)) - myParams.$labels = JSON.parse(JSON.stringify(params)) - myParams.$value = myParams.value - if (/\{\{.+\}\}/.test(aliasExpression)) { - const labelValue = aliasExpression.replace(/(\{\{.+?\}\})/g, function (i) { - const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2) - if (!legend) { - return label - } - let value = null - if (params && self.$loadsh.get(myParams, label)) { - value = self.$loadsh.get(myParams, label) - } - if (label) { - const reg = new RegExp(label + '=".+?"', 'g') - if (reg.test(legend)) { - const ans = legend.match(reg) - let find = '' - ans.forEach(item => { - const index = legend.indexOf(item) - if (legend[index - 1] !== '_') { - find = item - } - }) - value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1) - } - } - return value || '' - }) - return labelValue - } else { - if (!aliasExpression) { - return legend - // let result =legend.substr(legend.indexOf('"') + 1,legend.lastIndexOf('"') - legend.indexOf('"') - 1); - // return result - } - return aliasExpression - } - }, clacTopoData (data, queryValues) { // 主要处理 属性为原始属性 处理动画属性对原始属性的影响 return new Promise(resolve => { // 处理加载数据 if (!data) { diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue index 50b796e53..0ca77495b 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue @@ -464,7 +464,7 @@ export default { if (!this.elements.length) { this.addExpression() } else { - const expressionsShow = this.$loadsh.cloneDeep(this.expressionsShow) + const expressionsShow = this.$lodash.cloneDeep(this.expressionsShow) this.elements.forEach((item, index) => { this.expressions.push(item.expression) this.expressionName.push(item.name) @@ -477,7 +477,7 @@ export default { // expressionsShow调整顺序 expressionsShow.forEach((subItem) => { if (item.name == subItem.oldName) { - this.$set(this.expressionsShow, index, this.$loadsh.cloneDeep(subItem)) + this.$set(this.expressionsShow, index, this.$lodash.cloneDeep(subItem)) } }) }) @@ -492,7 +492,7 @@ export default { this.expressions = [] this.expressionsShow = [] this.expressionName = [] - this.elements = this.$loadsh.cloneDeep(this.querysArray) + this.elements = this.$lodash.cloneDeep(this.querysArray) this.dataTimeType = this.params.timeType || 1 this.dataStatistic = this.params.statistic || 'last' this.dataUnit = this.params.unit || 1 diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 54e17bb92..23f0f551c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -789,6 +789,31 @@ + +
+ {{$t('dashboard.dashboard.chartForm.datasource')}} +
+
+
+
+
+ {{$t('dashboard.dashboard.chartForm.legend')}} +
+
+
+ + + +
+
+ + + +
+
+
+
+
@@ -806,23 +831,6 @@
-
-
- {{$t('dashboard.dashboard.chartForm.legend')}} -
-
-
- - - -
-
- - - -
-
-
-
{{params.title}}
+
{{ title || params.title}}
- {{params.content}} + {{content || params.content}}
query.name === this.params.legend && query.parent === this.params.parent) + if (source) { + this.dataSource = source + console.log(this.params.title, this.dataSource.elements.expression, this.dataSource.metric) + this.title = this.handleLegendAlias(this.params.title, this.params.title, this.dataSource.metric) || this.params.title + this.content = this.handleLegendAlias(this.params.content, this.params.content, this.dataSource.metric) || this.params.content + } this.params.legends.forEach(item => { const findItem = this.queryValues.find(query => query.name === item.legend && query.parent === item.parent) // if (findItem) { @@ -93,6 +102,8 @@ export default { } } } + }, + methods: { } } diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue index fa011518c..ef494396c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue +++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue @@ -148,7 +148,7 @@ export default { } else { this.redoFlag = false } - if (historyIndex > -1 && !this.$loadsh.isNull(historyIndex)) { + if (historyIndex > -1 && !this.$lodash.isNull(historyIndex)) { this.undoFlag = true } else { this.undoFlag = false diff --git a/nezha-fronted/src/components/common/project/newTopologyL5.vue b/nezha-fronted/src/components/common/project/newTopologyL5.vue index e8826404a..6b0a4e38a 100644 --- a/nezha-fronted/src/components/common/project/newTopologyL5.vue +++ b/nezha-fronted/src/components/common/project/newTopologyL5.vue @@ -784,7 +784,7 @@ export default { if (!document.getElementById('topology-canvas' + this.topologyIndexF)) { return } - data = this.$loadsh.cloneDeep(data) + data = this.$lodash.cloneDeep(data) if (!getTopology(this.topologyIndex)) { let canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions) // canvas.open(data) diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index d157a3156..a6196bc0a 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -801,7 +801,7 @@ export default { if (!document.getElementById('topology-canvas' + this.topologyIndexF)) { return } - data = this.$loadsh.cloneDeep(data) + data = this.$lodash.cloneDeep(data) const canvasOptions = { rotateCursor: '/static/roteCursor.cur', disableEmptyLine: true, @@ -943,7 +943,7 @@ export default { } }) if (!res.data.topo.newData) { - data.pens = this.$loadsh.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制 + data.pens = this.$lodash.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制 data.pens = data.pens.map(item => { if (item.type === 0) { item = disposeTopoOldData(item, data.pens) @@ -975,7 +975,7 @@ export default { } return item }) - data.pens = this.$loadsh.orderBy(data.pens, 'type', 'asc') + data.pens = this.$lodash.orderBy(data.pens, 'type', 'asc') } if (!data.data) { this.projectInfoShow = true @@ -1651,7 +1651,7 @@ export default { }, onUpdateProps (node) { // 更新pen - const obj = this.$loadsh.cloneDeep(node) + const obj = this.$lodash.cloneDeep(node) delete obj.x delete obj.y delete obj.center diff --git a/nezha-fronted/src/components/common/project/topologyMixin.js b/nezha-fronted/src/components/common/project/topologyMixin.js index f4b8194b5..4cb4ce4a3 100644 --- a/nezha-fronted/src/components/common/project/topologyMixin.js +++ b/nezha-fronted/src/components/common/project/topologyMixin.js @@ -104,7 +104,7 @@ export default { if (data.type === 0 || data.type === 1) { data.lineWidth = data.data.lineWidth } - const obj = this.$loadsh.cloneDeep(data) + const obj = this.$lodash.cloneDeep(data) delete obj.x delete obj.y delete obj.center diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index eb37d05b2..8dbe718c5 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -735,8 +735,8 @@ export default { immediate: true, handler (n, o) { this.isEdit = true - const obj = this.$loadsh.cloneDeep(n) - this.editAlertRule = this.$loadsh.cloneDeep(obj) + const obj = this.$lodash.cloneDeep(n) + this.editAlertRule = this.$lodash.cloneDeep(obj) // 获取缓存中的告警等级列表 const severityData = JSON.parse(localStorage.getItem('nz-severityDataWeight')) // 给condition赋值 diff --git a/nezha-fronted/src/components/common/rightBox/batchEditEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchEditEndpoint.vue index f1c4b3b79..35c10152f 100644 --- a/nezha-fronted/src/components/common/rightBox/batchEditEndpoint.vue +++ b/nezha-fronted/src/components/common/rightBox/batchEditEndpoint.vue @@ -219,7 +219,7 @@ export default { } this.$refs.endpointEditForm.validate((valid) => { if (valid && !this.showError) { - const params = this.$loadsh.cloneDeep(this.editData) + const params = this.$lodash.cloneDeep(this.editData) if (params.editType === 1) { delete params.enable } else { diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 07c320a82..68b789548 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -1396,7 +1396,7 @@ export default { if (!this.chartConfig.elements.length) { this.addExpression() } else { - const expressionsShow = this.$loadsh.cloneDeep(this.expressionsShow) + const expressionsShow = this.$lodash.cloneDeep(this.expressionsShow) this.chartConfig.elements.forEach((item, index) => { this.expressions.push(item.expression) this.expressionName.push(item.name) @@ -1409,7 +1409,7 @@ export default { // expressionsShow调整顺序 expressionsShow.forEach((subItem) => { if (item.name == subItem.oldName) { - this.$set(this.expressionsShow, index, this.$loadsh.cloneDeep(subItem)) + this.$set(this.expressionsShow, index, this.$lodash.cloneDeep(subItem)) } }) }) diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index e1a6abb8f..bc49e3d8e 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -614,8 +614,8 @@ export default { delete item.chartId }) } - this.editChart = this.$loadsh.cloneDeep(obj) - this.oldData = this.$loadsh.cloneDeep(obj) + this.editChart = this.$lodash.cloneDeep(obj) + this.oldData = this.$lodash.cloneDeep(obj) if (this.stableTime) { clearTimeout(this.stableTime) this.stableTime = null diff --git a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue index 78752c5a6..602d8e931 100644 --- a/nezha-fronted/src/components/common/rightBox/chartTempBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chartTempBox.vue @@ -280,7 +280,7 @@ export default { this.editChartTemp.varIds = this.$refs.transfer.selectedData.map(item => item.id) } this.$refs.userForm.validate((valid) => { - const params = this.$loadsh.cloneDeep(this.editChartTemp) + const params = this.$lodash.cloneDeep(this.editChartTemp) params.pid = Number(params.pid) if (valid) { if (params.id) { diff --git a/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue b/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue index 676e54948..b3550fc77 100644 --- a/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue @@ -211,7 +211,7 @@ export default { methods: { // 选中的模板变化 tempChange: bus.debounce(function (val) { - const newValue = this.$loadsh.get(val, ['0', 'varType']) + const newValue = this.$lodash.get(val, ['0', 'varType']) const oldValue = this.templateType this.templateType = newValue // 判断varType是否变化 @@ -228,7 +228,7 @@ export default { getDashboardTempData () { if (this.from === 'integration') { this.editDashboard.tmplId = String(this.$parent.tempId) - this.templateList = this.$loadsh.cloneDeep(this.$parent.panelData) + this.templateList = this.$lodash.cloneDeep(this.$parent.panelData) } else { this.$get('visual/dashboard', { type: 'template', pageSize: -1 }).then(response => { if (response.code === 200) { @@ -268,7 +268,7 @@ export default { return } this.prevent_opt.save = true - const params = this.$loadsh.cloneDeep(this.editDashboard) + const params = this.$lodash.cloneDeep(this.editDashboard) this.$refs.form.validate((valid) => { if (valid) { // 模板varType ≠ 0时link有效且必填 diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue index 97f1d011b..f22c81c4d 100644 --- a/nezha-fronted/src/components/common/rightBox/panelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue @@ -775,7 +775,7 @@ export default { 'editPanel.param.report.schedule.stime': { deep: true, handler (n) { - const startTime = this.$loadsh.get(this.editPanel, 'param.report.schedule.stime', '') + const startTime = this.$lodash.get(this.editPanel, 'param.report.schedule.stime', '') if (startTime !== '') { this.editPanel.param.report.schedule.stime = bus .timeFormate(new Date(n), 'YYYY-MM-DD HH:mm:ss') @@ -785,7 +785,7 @@ export default { 'editPanel.param.report.schedule.etime': { deep: true, handler (n) { - const endTime = this.$loadsh.get(this.editPanel, 'param.report.schedule.etime', '') + const endTime = this.$lodash.get(this.editPanel, 'param.report.schedule.etime', '') if (endTime !== '') { this.editPanel.param.report.schedule.etime = bus .timeFormate(new Date(n), 'YYYY-MM-DD HH:mm:ss') diff --git a/nezha-fronted/src/components/common/rightBox/playlistBox.vue b/nezha-fronted/src/components/common/rightBox/playlistBox.vue index b050af103..d5abe351e 100644 --- a/nezha-fronted/src/components/common/rightBox/playlistBox.vue +++ b/nezha-fronted/src/components/common/rightBox/playlistBox.vue @@ -166,7 +166,7 @@ export default { deep: true, handler (n) { this.isEdit = true - this.editPlaylist = this.$loadsh.cloneDeep(n) + this.editPlaylist = this.$lodash.cloneDeep(n) } } } diff --git a/nezha-fronted/src/components/common/searchBox/searchBox.vue b/nezha-fronted/src/components/common/searchBox/searchBox.vue index 24a27cfd3..a780527ad 100644 --- a/nezha-fronted/src/components/common/searchBox/searchBox.vue +++ b/nezha-fronted/src/components/common/searchBox/searchBox.vue @@ -445,7 +445,7 @@ export default { setSearchList (str) { this.selectIndex = -1 if (!str) { - this.searchList = this.$loadsh.cloneDeep(this.oldSearchList) + this.searchList = this.$lodash.cloneDeep(this.oldSearchList) return } this.searchList = this.oldSearchList.filter(item => item.name.indexOf(str) !== -1) @@ -497,7 +497,7 @@ export default { }, editTag (tag, index) { this.editTagIndex = index - this.editTagObj = this.$loadsh.cloneDeep(this.selectArr[index]) + this.editTagObj = this.$lodash.cloneDeep(this.selectArr[index]) this.dialogShow = true this.editDialogObj.value = this.editTagObj.value const keyStr = this.editTagObj.key @@ -556,7 +556,7 @@ export default { return findItem.value.indexOf(item) === index // 因为indexOf 只能查找到第一个 }) } else { - this.selectArr[this.editTagIndex] = this.$loadsh.cloneDeep(this.editTagObj) + this.selectArr[this.editTagIndex] = this.$lodash.cloneDeep(this.editTagObj) } }, querySearch (queryString, cb) { @@ -584,7 +584,7 @@ export default { obj.selectionStart = obj.selectionEnd = len }, 100) } - // this.searchStr = this.$loadsh.cloneDeep(this.searchStr) + // this.searchStr = this.$lodash.cloneDeep(this.searchStr) }, clickOutside () { // 点击页面其他地方触发 this.visible = false @@ -593,7 +593,7 @@ export default { this.valueShow = false // value 的下拉 this.inputWidth = 400 this.searchStr = '' - this.searchList = this.$loadsh.cloneDeep(this.oldSearchList) + this.searchList = this.$lodash.cloneDeep(this.oldSearchList) this.symbolList = [] this.valueList = [] } diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 900b09d25..9ec6f17ca 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -215,7 +215,7 @@ export default { this.getItem() this.getUtcStr() this.getRangeHistoryArr() - const timeTemp = this.$loadsh.cloneDeep(this.searchTime) + const timeTemp = this.$lodash.cloneDeep(this.searchTime) this.oldSearchTime[0] = timeTemp[0] this.oldSearchTime[1] = timeTemp[1] // 监听dateFormat变化 改变日期格式 @@ -230,7 +230,7 @@ export default { const timeEnd = this.momentStrToTimestamp(this.oldSearchTime[1], this.timeFormatMain) this.$set(this.oldSearchTime, 0, this.momentTz(timeStart)) this.$set(this.oldSearchTime, 1, this.momentTz(timeEnd)) - this.searchTime = this.$loadsh.cloneDeep(this.oldSearchTime) + this.searchTime = this.$lodash.cloneDeep(this.oldSearchTime) this.$emit('change', this.searchTime) // 更新vuex日期格式 this.$store.commit('setTimeFormatMain', localStorage.getItem('nz-default-dateFormat') || 'YYYY-MM-DD HH:mm:ss') @@ -297,7 +297,7 @@ export default { if (this.oldSearchTimeError[0] || this.oldSearchTimeError[1]) { return } - this.searchTime = this.$loadsh.cloneDeep(this.oldSearchTime) + this.searchTime = this.$lodash.cloneDeep(this.oldSearchTime) this.showTime = this.nowTimeType = { id: 0, text: this.searchTime[0] + ' ' + this.$t('dashboard.dashboard.to') + ' ' + this.searchTime[1], @@ -319,7 +319,7 @@ export default { this.$emit('change', this.searchTime) }, showDropdown (value) { - const timeTemp = this.$loadsh.cloneDeep(this.searchTime) + const timeTemp = this.$lodash.cloneDeep(this.searchTime) this.oldSearchTime[0] = timeTemp[0] this.oldSearchTime[1] = timeTemp[1] this.oldSearchTimeError[0] = false @@ -468,7 +468,7 @@ export default { this.$set(this.showTime, 'id', nowTimeType.id) this.$set(this.showTime, 'text', nowTimeType.text) this.setSearchTime(nowTimeType.type, nowTimeType.value) - const timeTemp = this.$loadsh.cloneDeep(this.searchTime) + const timeTemp = this.$lodash.cloneDeep(this.searchTime) this.oldSearchTime[0] = timeTemp[0] this.oldSearchTime[1] = timeTemp[1] this.oldSearchTimeError[0] = false diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index 17ad325e4..7288dd0b0 100644 --- a/nezha-fronted/src/components/page/alert/alertRule.vue +++ b/nezha-fronted/src/components/page/alert/alertRule.vue @@ -337,7 +337,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 510b28b59..af083ad79 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -810,7 +810,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue index c37a238c0..5e4fdad1e 100644 --- a/nezha-fronted/src/components/page/config/backups.vue +++ b/nezha-fronted/src/components/page/config/backups.vue @@ -170,7 +170,7 @@ export default { }, edit (row) { this.object = { - ...this.$loadsh.cloneDeep(row), + ...this.$lodash.cloneDeep(row), checkDay: '', checkDays: '', datepicker: '' diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue index 778f7f7a4..5baf9e2f0 100644 --- a/nezha-fronted/src/components/page/config/template/chartTemp.vue +++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue @@ -264,7 +264,7 @@ export default { } }, copy (u, copyParams) { - const copyName = this.$loadsh.get(copyParams, 'copyName', '-copy') + const copyName = this.$lodash.get(copyParams, 'copyName', '-copy') this.object = { ...u, name: u.name + copyName, id: '' } if (this.object.name.length > 64) { const length = this.object.name.length - 64 diff --git a/nezha-fronted/src/components/page/config/template/dashboardTemp.vue b/nezha-fronted/src/components/page/config/template/dashboardTemp.vue index f97d7d7bf..6f9a7309c 100644 --- a/nezha-fronted/src/components/page/config/template/dashboardTemp.vue +++ b/nezha-fronted/src/components/page/config/template/dashboardTemp.vue @@ -168,7 +168,7 @@ export default { this.$get('visual/dashboard/' + u.id).then(res => { if (res.code === 200) { this.object = res.data - if (!this.$loadsh.get(this.object, 'param.report', '')) { + if (!this.$lodash.get(this.object, 'param.report', '')) { this.object = { ...this.object, param: { @@ -193,13 +193,13 @@ export default { } } this.object.param.report.schedule.type = this.object.param.report.schedule.type + '' - const startTime = this.$loadsh.get(this.object, 'param.report.schedule.stime', '') + const startTime = this.$lodash.get(this.object, 'param.report.schedule.stime', '') if (startTime !== '') { this.object.param.report.schedule.stime = this.utcTimeToTimezoneStr(this.object.param.report.schedule.stime, 'YYYY-MM-DD HH:mm:ss') } else { this.object.param.report.schedule.stime = '' } - const endTime = this.$loadsh.get(this.object, 'param.report.schedule.etime', '') + const endTime = this.$lodash.get(this.object, 'param.report.schedule.etime', '') if (endTime !== '') { this.object.param.report.schedule.etime = this.utcTimeToTimezoneStr(this.object.param.report.schedule.etime, 'YYYY-MM-DD HH:mm:ss') } else { diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue index 23ed6f469..6063afb8d 100644 --- a/nezha-fronted/src/components/page/config/terminalLog.vue +++ b/nezha-fronted/src/components/page/config/terminalLog.vue @@ -195,7 +195,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue index d68a25095..9a3985c2d 100644 --- a/nezha-fronted/src/components/page/config/user.vue +++ b/nezha-fronted/src/components/page/config/user.vue @@ -246,7 +246,7 @@ export default { n.map(item => { if (!item.position) { const obj = { - ...this.$loadsh.cloneDeep(item), + ...this.$lodash.cloneDeep(item), type: 'user', position: { top: 0, diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue index 14cb75ad8..7b4e58138 100644 --- a/nezha-fronted/src/components/page/dashboard/dashboard.vue +++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue @@ -468,7 +468,7 @@ export default { this.$get('visual/dashboard/' + u.id).then(res => { if (res.code === 200) { this.panel = res.data - if (!this.$loadsh.get(this.panel, 'param.report', '')) { + if (!this.$lodash.get(this.panel, 'param.report', '')) { this.panel = { ...this.panel, param: { @@ -493,13 +493,13 @@ export default { } } this.panel.param.report.schedule.type = this.panel.param.report.schedule.type + '' - const startTime = this.$loadsh.get(this.panel, 'param.report.schedule.stime', '') + const startTime = this.$lodash.get(this.panel, 'param.report.schedule.stime', '') if (startTime !== '') { this.panel.param.report.schedule.stime = this.utcTimeToTimezoneStr(this.panel.param.report.schedule.stime, 'YYYY-MM-DD HH:mm:ss') } else { this.panel.param.report.schedule.stime = '' } - const endTime = this.$loadsh.get(this.panel, 'param.report.schedule.etime', '') + const endTime = this.$lodash.get(this.panel, 'param.report.schedule.etime', '') if (endTime !== '') { this.panel.param.report.schedule.etime = this.utcTimeToTimezoneStr(this.panel.param.report.schedule.etime, 'YYYY-MM-DD HH:mm:ss') } else { @@ -777,7 +777,7 @@ export default { setTimeout(() => { this.variablesInit = false this.showPanel = val - this.variables = this.$loadsh.cloneDeep(this.$loadsh.get(this, 'showPanel.param.variables', []) || []) + this.variables = this.$lodash.cloneDeep(this.$lodash.get(this, 'showPanel.param.variables', []) || []) this.showPanel.type = 'dashboard' this.filter.dashboardId = this.showPanel.id this.dashboardId = this.showPanel.id @@ -911,7 +911,7 @@ export default { this.$message.error(response) } } - this.variables = this.$loadsh.get(this, 'showPanel.param.variables', []) || [] + this.variables = this.$lodash.get(this, 'showPanel.param.variables', []) || [] function handler (panelData) { panelData.forEach(panel => { @@ -1124,12 +1124,12 @@ export default { setDefaultTimeRange () { this.$nextTick(() => { if (this.$route.query.searchTime) return - let nowTimeType = this.$loadsh.cloneDeep(this.timeData[3]) - const defaultTimeRange = this.$loadsh.get(this.showPanel, 'param.defaultTimeRange') + let nowTimeType = this.$lodash.cloneDeep(this.timeData[3]) + const defaultTimeRange = this.$lodash.get(this.showPanel, 'param.defaultTimeRange') if (defaultTimeRange) { nowTimeType = this.timeData.find(item => item.id == defaultTimeRange) } - this.nowTimeType = this.$loadsh.cloneDeep(nowTimeType) + this.nowTimeType = this.$lodash.cloneDeep(nowTimeType) // 刷新时间范围 this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType) this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType) @@ -1143,8 +1143,8 @@ export default { setDefaultRefresh () { this.$nextTick(() => { if (this.$route.query.refresh) return - let refresh = this.$loadsh.cloneDeep(this.intervalList[0]) - const defaultRefresh = this.$loadsh.get(this.showPanel, 'param.refresh') + let refresh = this.$lodash.cloneDeep(this.intervalList[0]) + const defaultRefresh = this.$lodash.get(this.showPanel, 'param.refresh') if (defaultRefresh) { refresh = this.intervalList.find(item => item.value == defaultRefresh) } diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue b/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue index 45fbd93cd..de1f8c3ac 100644 --- a/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue +++ b/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue @@ -150,8 +150,8 @@ export default { this.panelData = response.data.list if (this.panelData.length > 0) { this.filter.dashboardId = this.panelData[0].id - this.showPanel = this.$loadsh.cloneDeep(this.panelData[0]) - this.variables = this.$loadsh.get(this.panelData, '[0].param.variables') + this.showPanel = this.$lodash.cloneDeep(this.panelData[0]) + this.variables = this.$lodash.get(this.panelData, '[0].param.variables') this.getData(this.filter) } } diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index 480f77f2c..d73838cfc 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -716,7 +716,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue index 745c84ebf..951434c7f 100644 --- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue +++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue @@ -461,7 +461,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) + this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { diff --git a/nezha-fronted/src/entrance/app/main.js b/nezha-fronted/src/entrance/app/main.js index ceb6f82c6..4bfd14a8f 100644 --- a/nezha-fronted/src/entrance/app/main.js +++ b/nezha-fronted/src/entrance/app/main.js @@ -17,7 +17,7 @@ import router from '@/router' import VueResource from 'vue-resource' import axios from 'axios' import { hasPermission, hasButton } from '@/permission' -import loadsh from 'lodash' +import lodash from 'lodash' import plTable from 'pl-table' import VueClipboard from 'vue-clipboard2' import 'pl-table/themes/index.css' @@ -109,7 +109,7 @@ Vue.prototype.$post = post Vue.prototype.$get = get Vue.prototype.$put = put Vue.prototype.$delete = del -Vue.prototype.$loadsh = loadsh // JavaScript 实用工具库 https://www.lodashjs.com/ +Vue.prototype.$lodash = lodash // JavaScript 实用工具库 https://www.lodashjs.com/ Vue.prototype.$CONSTANTS = constants Vue.prototype.$TOOLS = tools Vue.prototype.$bottomBoxWindow = bottomBoxWindow // 底部上滑框控制 diff --git a/nezha-fronted/src/entrance/exportHtml/exportHtml.js b/nezha-fronted/src/entrance/exportHtml/exportHtml.js index 6046749f4..3ce9edcf7 100644 --- a/nezha-fronted/src/entrance/exportHtml/exportHtml.js +++ b/nezha-fronted/src/entrance/exportHtml/exportHtml.js @@ -38,7 +38,7 @@ Vue.prototype.$post = post Vue.prototype.$get = get Vue.prototype.$put = put Vue.prototype.$delete = del -Vue.prototype.$loadsh = loadsh +Vue.prototype.$lodash = loadsh Vue.prototype.$CONSTANTS = constants Vue.prototype.$TOOLS = tools Vue.prototype.$bottomBoxWindow = bottomBoxWindow // 底部上滑框控制 diff --git a/nezha-fronted/src/libs/bus.js b/nezha-fronted/src/libs/bus.js index edcea04e8..642066f9a 100644 --- a/nezha-fronted/src/libs/bus.js +++ b/nezha-fronted/src/libs/bus.js @@ -320,7 +320,7 @@ export default new Vue({ }, // 数组对象扁平化 flatten (arr) { - const tempArr = this.$loadsh.cloneDeep(arr) + const tempArr = this.$lodash.cloneDeep(arr) // 递归调用 function handler (tempArr) { const newArr = []