Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts: # .gitignore # nezha-fronted/src/assets/css/font/iconfont.js # nezha-fronted/src/components/chart/chart/chartAutotopology.vue # nezha-fronted/src/components/common/ChartDiagram/diagram.vue # nezha-fronted/src/components/common/detailView/view/detailViewRight.vue # nezha-fronted/src/components/common/js/common.js # nezha-fronted/src/components/common/js/tools.js # nezha-fronted/src/components/common/project/topologyL5.vue # nezha-fronted/static/config.json
This commit is contained in:
@@ -31,7 +31,7 @@ export function getHexagon (key) {
|
||||
return hexagonCache[`hexagon${key}`]
|
||||
}
|
||||
|
||||
const topologyCache = {}
|
||||
export let topologyCache = {}
|
||||
|
||||
export function getTopology (key) {
|
||||
// console.log(topologyCache, 'topologyCache')
|
||||
@@ -42,13 +42,16 @@ export function setTopology (key, value) {
|
||||
topologyCache[`topology${key}`] = value
|
||||
}
|
||||
|
||||
export function clearTopologyCache () {
|
||||
topologyCache = {}
|
||||
}
|
||||
// const topologyImgList = localStorage.getItem('nz-imgList') ? JSON.parse(localStorage.getItem('nz-imgList')) : {}
|
||||
|
||||
export function getTopologyImg (key) {
|
||||
return false
|
||||
}
|
||||
|
||||
const topologyImg = {}
|
||||
export const topologyImg = {}
|
||||
|
||||
export function dealImg (url, id) {
|
||||
if (url) {
|
||||
|
||||
Reference in New Issue
Block a user