@riil-frontend/component-topology 12.0.0-dev.28 → 12.0.0-dev.29

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.0.0-dev.28" === 'string' ? "12.0.0-dev.28" : null;
+var version = typeof "12.0.0-dev.29" === 'string' ? "12.0.0-dev.29" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/utils/metricUtil.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import { metricValueFormat } from '@riil-frontend/utils';
 import DictCache from "../models/cache/DictCache";
 /**
@@ -15,16 +16,19 @@ export function formatMetric(val, metricModel) {
   if (metricModel) {
     var _result$value;
 
-    // 分级字典特殊处理
-    if (metricModel.dict && !DictCache.getDictObject()[metricModel.code]) {
-      val = metricModel.dict[val];
+    var dictObject = _extends({}, DictCache.getDictObject()); // 分级字典特殊处理
+
+
+    if (metricModel.dict) {
+      // val = metricModel.dict[val]
+      dictObject[metricModel.code] = metricModel.dict;
     }
 
     var result = metricValueFormat({
       value: val,
       dataType: metricModel.dataType,
       changeValue: metricModel.changeValue,
-      dict: DictCache.getDictObject(),
+      dict: dictObject,
       unit: metricModel.unit,
       code: metricModel.code
     });

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.28" === 'string' ? "12.0.0-dev.28" : null;
+var version = typeof "12.0.0-dev.29" === 'string' ? "12.0.0-dev.29" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/utils/metricUtil.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.formatMetric = formatMetric;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _utils = require("@riil-frontend/utils");
 
 var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
@@ -23,16 +25,18 @@ function formatMetric(val, metricModel) {
   if (metricModel) {
     var _result$value;
 
-    // 分级字典特殊处理
-    if (metricModel.dict && !_DictCache["default"].getDictObject()[metricModel.code]) {
-      val = metricModel.dict[val];
+    var dictObject = (0, _extends2["default"])({}, _DictCache["default"].getDictObject()); // 分级字典特殊处理
+
+    if (metricModel.dict) {
+      // val = metricModel.dict[val]
+      dictObject[metricModel.code] = metricModel.dict;
     }
 
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
       changeValue: metricModel.changeValue,
-      dict: _DictCache["default"].getDictObject(),
+      dict: dictObject,
       unit: metricModel.unit,
       code: metricModel.code
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.28",
+  "version": "12.0.0-dev.29",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.28/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.29/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }