gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改 lodash 单词拼写错误的问题

Browse Source
This commit is contained in:
zhangyu
2023-06-05 14:52:04 +08:00
parent 717b3fa57a
commit 6f56e8af55
59 changed files with 185 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/chart/chart/chartDoughnut.vue
View File

@@ -112,7 +112,7 @@ export default {
this.setDataLink()
this.legends = []
this.initDoughnutData(this.chartInfo, this.chartData)
this.selectData = this.$loadsh.cloneDeep(this.doughnutData)
this.selectData = this.$lodash.cloneDeep(this.doughnutData)
if (this.isNoData) {
return
}
@@ -361,7 +361,7 @@ export default {
},
clickLegendD3 (isGrey) {
const data = this.doughnutData.filter((item, i) => !isGrey[i])
this.selectData = this.$loadsh.cloneDeep(data)
this.selectData = this.$lodash.cloneDeep(data)
this.drawDoughnutChart(true)
},
resize () {

4
nezha-fronted/src/components/chart/chart/chartRose.vue
View File

@@ -113,7 +113,7 @@ export default {
this.setDataLink()
this.legends = []
this.initRoseData(this.chartInfo, this.chartData)
this.selectData = this.$loadsh.cloneDeep(this.roseData)
this.selectData = this.$lodash.cloneDeep(this.roseData)
if (this.isNoData) {
return
}
@@ -377,7 +377,7 @@ export default {
},
clickLegendD3 (isGrey) {
const data = this.roseData.filter((item, i) => !isGrey[i])
this.selectData = this.$loadsh.cloneDeep(data)
this.selectData = this.$lodash.cloneDeep(data)
this.drawRoseChart(true)
},
resize () {

2
nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
View File

@@ -258,7 +258,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])

4
nezha-fronted/src/components/chart/chartFormat.js
View File

@@ -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 || ''

4
nezha-fronted/src/components/chart/chartHeaderMixin.js
View File

@@ -64,7 +64,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', {
@@ -111,7 +111,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) {

40
nezha-fronted/src/components/chart/chartList.vue
View File

@@ -517,11 +517,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'
// 是否启用显示隐藏功能
@@ -562,15 +562,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)
}
}
})
@@ -581,13 +581,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)
}
})
@@ -620,21 +620,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)
@@ -661,7 +661,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

4
nezha-fronted/src/components/chart/chartMixin.js
View File

@@ -256,8 +256,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')

10
nezha-fronted/src/components/chart/panelChart.vue
View File

@@ -150,7 +150,7 @@ export default {
this.setGlobalVariablesValue(searchTime)
this.myVariables = []
// 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) => { // 处理表达式的变量
// 全局变量替换
@@ -412,9 +412,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]
}
@@ -668,7 +668,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) {
@@ -882,7 +882,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)
})

24
nezha-fronted/src/components/cli/console.vue
View File

@@ -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) {

8
nezha-fronted/src/components/cli/fileDirectory.vue
View File

@@ -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)

48
nezha-fronted/src/components/cli/webSSHNew.vue
View File

@@ -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) {

8
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -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

4
nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
View File

@@ -151,7 +151,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') {
@@ -165,7 +165,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,

18
nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
View File

@@ -608,8 +608,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)
}
}
@@ -626,8 +626,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
@@ -830,12 +830,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)
@@ -848,8 +848,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)
}

2
nezha-fronted/src/components/common/bottomBox/tabs/discoveryTab.vue
View File

@@ -101,7 +101,7 @@ export default {
n.map(item => {
if (!item.position) {
const obj = {
...this.$loadsh.cloneDeep(item),
...this.$lodash.cloneDeep(item),
type: 'user',
position: {
top: 0,

2
nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue
View File

@@ -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,

2
nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
View File

@@ -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) {

4
nezha-fronted/src/components/common/deleteButton.vue
View File

@@ -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
})

14
nezha-fronted/src/components/common/js/tools.js
View File

@@ -3,7 +3,7 @@ import MessageBox from 'element-ui/packages/message-box/src/main'
import i18n from '../i18n'
import bus from '@/libs/bus'
import moment from 'moment-timezone'
import loadsh from 'lodash'
import lodash from 'lodash'
/* 弹窗点击外部后关闭 */
const exceptClassName = ['prevent-clickoutside', 'config-dropdown', 'nz-pop', 'el-picker', 'chart-box-dropdown', 'metric-dropdown', 'el-cascader__dropdown', 'no-style-class', 'el-message-box', 'nz-dashboard-dropdown', 'el-autocomplete-suggestion', 'nz-temp-box', 'el-time-panel', 'el-dropdown-menu', 'el-select-dropdown', 'no-close'] // clickoutside排除的class(白名单) no-style-class：没有任何样式的class
export const clickoutside = {
@@ -13,9 +13,9 @@ export const clickoutside = {
if (!binding.expression) return
const unsavedChange = localStorage.getItem('nz-unsaved-change')
try {
el.__oldValue__ = loadsh.cloneDeep(binding.value.obj)
el.__oldValue__ = lodash.cloneDeep(binding.value.obj)
el.__newValue__ = el.__oldValue__
el.__oldData__ = loadsh.cloneDeep(binding.value.oldData)
el.__oldData__ = lodash.cloneDeep(binding.value.oldData)
} catch (e) {
}
@@ -39,7 +39,7 @@ export const clickoutside = {
return false
}
if (el.__oldValue__) {
// const newValue = loadsh.cloneDeep(binding.value.obj)
// const newValue = lodash.cloneDeep(binding.value.obj)
const oldData = el.__oldData__ || el.__oldValue__
if (unsavedChange == 'on' && !isEqual(oldData, el.__newValue__) && !el.isShow) {
el.isShow = true
@@ -78,7 +78,7 @@ export const clickoutside = {
update (el, binding, vnode) {
if (binding.arg && binding.arg != 'stable') {
if (binding.value.obj.datasource !== '0') {
el.__oldValue__ = loadsh.cloneDeep(binding.value.obj)
el.__oldValue__ = lodash.cloneDeep(binding.value.obj)
}
}
el.__newValue__ = binding.value.obj
@@ -220,7 +220,7 @@ export const cancelWithChange = {
setTimeout(() => {
if (!binding.value || !binding.value.obj) return
const unsavedChange = localStorage.getItem('nz-unsaved-change')
el.__oldValue__ = loadsh.cloneDeep(binding.value.obj)
el.__oldValue__ = lodash.cloneDeep(binding.value.obj)
el.__newValue__ = el.__oldValue__
function domClick (e) {
if (unsavedChange == 'on' && !isEqual(el.__oldValue__, el.__newValue__)) {
@@ -243,7 +243,7 @@ export const cancelWithChange = {
},
update (el, binding, vnode) {
if (binding.arg && binding.arg != 'stable') {
el.__oldValue__ = loadsh.cloneDeep(binding.value.obj)
el.__oldValue__ = lodash.cloneDeep(binding.value.obj)
}
el.__newValue__ = binding.value.obj
},

6
nezha-fronted/src/components/common/mixin/dataList.js
View File

@@ -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']

2
nezha-fronted/src/components/common/mixin/detailViewMixin.js
View File

@@ -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') {

10
nezha-fronted/src/components/common/panel/panelVariables.vue
View File

@@ -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)
})

2
nezha-fronted/src/components/common/playlist.vue
View File

@@ -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],

2
nezha-fronted/src/components/common/popBox/selectDashboard.vue
View File

@@ -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()

6
nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
View File

@@ -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 {

2
nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue
View File

@@ -146,7 +146,7 @@ export default {
getTopology(this.meta2dId).paste()
},
isNull (val) {
return this.$loadsh.isNull(val)
return this.$lodash.isNull(val)
}
}
}

4
nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
View File

@@ -109,8 +109,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')

6
nezha-fronted/src/components/common/project/meta2d/meta2dData.vue
View File

@@ -463,7 +463,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)
@@ -476,7 +476,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))
}
})
})
@@ -489,7 +489,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

2
nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
View File

@@ -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

2
nezha-fronted/src/components/common/project/newTopologyL5.vue
View File

@@ -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)

8
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -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

2
nezha-fronted/src/components/common/project/topologyMixin.js
View File

@@ -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

4
nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
View File

@@ -797,11 +797,11 @@ export default {
immediate: true,
handler (n, o) {
this.isEdit = true
const obj = this.$loadsh.cloneDeep(n)
const obj = this.$lodash.cloneDeep(n)
if (!obj.dashboardId) {
obj.dashboardId = ''
}
this.editAlertRule = this.$loadsh.cloneDeep(obj)
this.editAlertRule = this.$lodash.cloneDeep(obj)
this.showPanel.id = this.editAlertRule.dashboardId
// 获取缓存中的告警等级列表
const severityData = JSON.parse(localStorage.getItem('nz-severityDataWeight'))

6
nezha-fronted/src/components/common/rightBox/asset/assetDiscoveryBox.vue
View File

@@ -220,7 +220,7 @@ export default {
if (valid) {
this.prevent_opt.save = true
console.log(this.editAssetDiscovery)
const params = this.$loadsh.cloneDeep(this.editAssetDiscovery)
const params = this.$lodash.cloneDeep(this.editAssetDiscovery)
params.schedule.stime = this.momentStrToTimestamp(params.schedule.stime)
if (this.editAssetDiscovery.id) {
this.$put('/tool/discovery', params).then(response => {
@@ -253,11 +253,11 @@ export default {
assetDiscovery: {
immediate: true,
handler (n) {
const editAssetDiscovery = this.$loadsh.cloneDeep(n)
const editAssetDiscovery = this.$lodash.cloneDeep(n)
if (editAssetDiscovery.schedule && editAssetDiscovery.schedule.stime) {
editAssetDiscovery.schedule.stime = this.momentTz(editAssetDiscovery.schedule.stime)
}
this.editAssetDiscovery = this.$loadsh.cloneDeep(editAssetDiscovery)
this.editAssetDiscovery = this.$lodash.cloneDeep(editAssetDiscovery)
}
}
}

2
nezha-fronted/src/components/common/rightBox/batchEditEndpoint.vue
View File

@@ -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 {

4
nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
View File

@@ -1491,7 +1491,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)
@@ -1504,7 +1504,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))
}
})
})

4
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -621,8 +621,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

2
nezha-fronted/src/components/common/rightBox/chartTempBox.vue
View File

@@ -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) {

6
nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue
View File

@@ -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有效且必填

4
nezha-fronted/src/components/common/rightBox/panelBox.vue
View File

@@ -784,7 +784,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')
@@ -794,7 +794,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')

2
nezha-fronted/src/components/common/rightBox/playlistBox.vue
View File

@@ -165,7 +165,7 @@ export default {
deep: true,
handler (n) {
this.isEdit = true
this.editPlaylist = this.$loadsh.cloneDeep(n)
this.editPlaylist = this.$lodash.cloneDeep(n)
}
}
}

10
nezha-fronted/src/components/common/timePicker.vue
View File

@@ -216,7 +216,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变化 改变日期格式
@@ -231,7 +231,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')
@@ -298,7 +298,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],
@@ -320,7 +320,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
@@ -469,7 +469,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

2
nezha-fronted/src/components/page/alert/alertRule.vue
View File

@@ -338,7 +338,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) {

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -813,7 +813,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) {

2
nezha-fronted/src/components/page/asset/assetDiscovery.vue
View File

@@ -176,7 +176,7 @@ export default {
},
methods: {
add () {
this.object = this.$loadsh.cloneDeep(this.blankObject)
this.object = this.$lodash.cloneDeep(this.blankObject)
this.rightBox.show = true
},
edit (row) {

2
nezha-fronted/src/components/page/config/backups.vue
View File

@@ -170,7 +170,7 @@ export default {
},
edit (row) {
this.object = {
...this.$loadsh.cloneDeep(row),
...this.$lodash.cloneDeep(row),
checkDay: '',
checkDays: '',
datepicker: ''

2
nezha-fronted/src/components/page/config/template/chartTemp.vue
View File

@@ -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

6
nezha-fronted/src/components/page/config/template/dashboardTemp.vue
View File

@@ -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 {

2
nezha-fronted/src/components/page/config/terminalLog.vue
View File

@@ -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) {

2
nezha-fronted/src/components/page/config/user.vue
View File

@@ -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,

20
nezha-fronted/src/components/page/dashboard/dashboard.vue
View File

@@ -463,7 +463,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: {
@@ -488,13 +488,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 {
@@ -773,7 +773,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
@@ -907,7 +907,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 => {
@@ -1120,12 +1120,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)
@@ -1139,8 +1139,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)
}

2
nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
View File

@@ -4057,7 +4057,7 @@ export default {
}
},
handlerRowData (data) {
const metric = this.$loadsh.cloneDeep(data)
const metric = this.$lodash.cloneDeep(data)
const metricName = metric.__name__ || ''
let temp = metricName
const labelColor = '#588874'// #66d9ef

4
nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue
View File

@@ -169,8 +169,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)
}
}

2
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -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) {

2
nezha-fronted/src/components/page/monitor/module/moduleList.vue
View File

@@ -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) {

6
nezha-fronted/src/entrance/app/lodashInfo.md
View File

@@ -31,11 +31,11 @@
例子
var object = { 'a': [{ 'b': { 'c': 3 } }] };
this.loadsh.get(object, 'a[0].b.c') => 3
this.lodash.get(object, 'a[0].b.c') => 3
this.loadsh.get(object, ['a', '0', 'b', 'c']); => 3
this.lodash.get(object, ['a', '0', 'b', 'c']); => 3
this.loadsh.get(object, 'a.b.c', 'default'); => 'default'
this.lodash.get(object, 'a.b.c', 'default'); => 'default'
* 3 数组去重

4
nezha-fronted/src/entrance/app/main.js
View File

@@ -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 // 底部上滑框控制

4
nezha-fronted/src/entrance/exportHtml/exportHtml.js
View File

@@ -14,7 +14,7 @@ import router from '@/router/exportHtmlRouter'
import VueResource from 'vue-resource'
import axios from 'axios'
// import { hasPermission } from '@/permission'
import loadsh from 'lodash'
import lodash from 'lodash'
import { post, get, put, del } from '@/http.js'
import { clickoutside, bottomBoxWindow, stringTimeParseToUnix, unixTimeParseToString, chartResizeTool, tableSet, cancelWithChange, myLoading } from '@/components/common/js/tools.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 = lodash
Vue.prototype.$CONSTANTS = constants
Vue.prototype.$TOOLS = tools
Vue.prototype.$bottomBoxWindow = bottomBoxWindow // 底部上滑框控制

2
nezha-fronted/src/libs/bus.js
View File

@@ -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 = []