From db7f526b1e386d508a4e6fbc44db27eb87d51940 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 14 Jul 2022 13:59:52 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2024=20fix=EF=BC=9A{{A.$labels}}=20?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/chartTable.vue | 6 ++++++ .../src/components/common/@topology/core/src/core.js | 1 - .../components/common/@topology/core/src/models/point.js | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue index 6ef5c3a24..d51ccb0f1 100644 --- a/nezha-fronted/src/components/chart/chart/chartTable.vue +++ b/nezha-fronted/src/components/chart/chart/chartTable.vue @@ -211,6 +211,9 @@ export default { if (label.indexOf('$value') !== -1) { value = chartDataFormat.getUnit(column.unit ? column.unit : 2).compute(value, null, -1, 2) } + if (!((typeof value) == 'string' && value.constructor == String)) { + value = JSON.stringify(lodash.get(params, label)) + } } return value || '' }) @@ -238,6 +241,9 @@ export default { let value = null if (lodash.get(params, label)) { value = lodash.get(params, label) + if (!((typeof value) == 'string' && value.constructor == String)) { + value = JSON.stringify(lodash.get(params, label)) + } } return value || label }) diff --git a/nezha-fronted/src/components/common/@topology/core/src/core.js b/nezha-fronted/src/components/common/@topology/core/src/core.js index 317fc41c1..ee4997280 100644 --- a/nezha-fronted/src/components/common/@topology/core/src/core.js +++ b/nezha-fronted/src/components/common/@topology/core/src/core.js @@ -2986,7 +2986,6 @@ const Topology = /** @class */ (function () { } this.cache = null this.data = null - console.log(this.options) this.options.on = null window.topology = null this.activeLayer = null diff --git a/nezha-fronted/src/components/common/@topology/core/src/models/point.js b/nezha-fronted/src/components/common/@topology/core/src/models/point.js index a7bcfe7fb..e76deaf25 100644 --- a/nezha-fronted/src/components/common/@topology/core/src/models/point.js +++ b/nezha-fronted/src/components/common/@topology/core/src/models/point.js @@ -47,7 +47,6 @@ const Point = /** @class */ (function () { return Point }()) export { Point } -console.log(132123132123) window.topologyPoint = Point window.Le5leTopologyPoint = Point // # sourceMappingURL=point.js.map