@riil-frontend/component-topology 12.0.0-dev.9 → 12.1.0-dev.2

package/es/core/models/utils/linkUtils.js

@@ -2,8 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from "lodash/keyBy";
-import _ from "lodash";
-import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
+import _ from "lodash"; // 查询所有连线
 
 import { getEdges } from "../../../utils/htElementUtils";
 import CiTypeCache from "../cache/CiTypeCache";
@@ -32,7 +31,20 @@ export function isCrucialLink(link) {
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
+  var _link$attributes;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
+}
+/**
+ * 是否聚合链路
+ * @param {*} link 
+ * @returns 
+ */
+
+export function isAggLink(link) {
+  var _link$attributes2, _link$attributes3;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
 export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
   var linkCiMap = keyBy(links, "id");
@@ -83,7 +95,7 @@ function _getLinksDetail() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!links || !links.length)) {
+          if (links !== null && links !== void 0 && links.length) {
             _context.next = 2;
             break;
           }
@@ -91,9 +103,6 @@ function _getLinksDetail() {
           return _context.abrupt("return", []);
 
         case 2:
-          // const linkCis = await topoService.relation.batchQueryRelation(
-          //   links.map((link) => link.id)
-          // );
           linkCis = links;
           interfaceIds = [].concat(linkCis.map(function (item) {
             return item.attributes.source_id;
@@ -171,17 +180,15 @@ export var showLinkByConfig = function showLinkByConfig(props) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
+        edge.s("x.visible", true);
       } else {
-        var _d$attributes, _d$attributes2;
-
         var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
+        if (isAggLink(d)) {
+          edge.s("x.visible", showAgg);
         } else {
           // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
+          edge.s("x.visible", showPhy);
         }
       }
     });

package/es/core/services/topo/basic.js

@@ -104,7 +104,7 @@ export default {
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var data, obj;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -123,7 +123,7 @@ export default {
             obj = prepareGroupParams(data);
             _context.next = 5;
             return request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, obj, {
-              exportLinkIdList: exportLinkIdList
+              exportLinkIdList: []
             }));
 
           case 5:

package/es/core/store/models/topoConfig.js

@@ -35,7 +35,6 @@ var initialState = {
     "static": []
   },
   groups: [],
-  exportLinkIdList: [],
   // config: {
   //   view: null,
   //   groups: [],
@@ -243,18 +242,17 @@ export default function (topoApp) {
           var _this2 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, query, data;
+            var editState, resources, _editState$groups, groups, query, data;
 
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   editState = rootState.topoConfig;
-                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                   query = {
                     id: rootState.topoMod.topoId,
                     resources: resources,
-                    groups: groups,
-                    ipNodes: ipNodes
+                    groups: groups
                   };
                   _context2.next = 5;
                   return _this2.getTopoByConditions(query);
@@ -303,13 +301,13 @@ export default function (topoApp) {
           var _this4 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   rlog.debug("getTopoByConditions--------", params);
-                  topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                  topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = resToConditions(resources);
                   groupInfo = isAvailableArray(groups) && groups.map(function (group) {
                     return _extends({}, group, {
@@ -319,7 +317,7 @@ export default function (topoApp) {
                   });
                   rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
                   _context4.next = 7;
-                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
 
                 case 7:
                   data = _context4.sent;
@@ -458,8 +456,7 @@ export default function (topoApp) {
             return _regeneratorRuntime.wrap(function _callee8$(_context8) {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
-                  ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
+                  ids = data.ids, ip = data.ip;
                   _context8.next = 3;
                   return networkLinkServer.queryLinksByIp(ids, ip);
 

package/es/core/store/models/topoMod.js

@@ -208,76 +208,23 @@ export default function (topoApp) {
         enterEditMode: function enterEditMode(playload, rootState) {
           topoApp.enterEditMode();
         },
-        openDefaultTopoPage: function openDefaultTopoPage(conditions, rootState) {
-          var _this3 = this;
-
+        refreshPermission: function refreshPermission() {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-            var topoId, treeData;
             return _regeneratorRuntime.wrap(function _callee3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
-                  if (conditions === void 0) {
-                    conditions = {};
-                  }
-
-                  topoId = rootState.topoTreeMod.defId;
-
-                  if (!topoId) {
-                    // 查找第一个
-                    treeData = rootState.topoTreeMod.treeData;
-                    loopTreeByKey(treeData, 'type', 1, function (item, index, arr) {
-                      if (!topoId) {
-                        topoId = item.id;
-                      }
-                    });
-                  } // 右侧切换拓扑图
-
-
-                  _this3.openTopoPage({
-                    id: topoId
-                  });
-
-                case 4:
-                case "end":
-                  return _context3.stop();
-              }
-            }, _callee3);
-          }))();
-        },
-        refreshPermission: function refreshPermission() {
-          var _this4 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
-                case 0:
-                  _context4.next = 2;
+                  _context3.next = 2;
                   return dispatch.functionAuth.refresh();
 
                 case 2:
-                  _context4.next = 4;
-                  return _this4.refreshTopoTree();
-
-                case 4:
-                case "end":
-                  return _context4.stop();
-              }
-            }, _callee4);
-          }))();
-        },
-        refreshTopoTree: function refreshTopoTree() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
-                case 0:
-                  _context5.next = 2;
+                  _context3.next = 4;
                   return dispatch.topoTreeMod.refreshTree();
 
-                case 2:
+                case 4:
                 case "end":
-                  return _context5.stop();
+                  return _context3.stop();
               }
-            }, _callee5);
+            }, _callee3);
           }))();
         },
 
@@ -292,19 +239,19 @@ export default function (topoApp) {
          * @return {Promise<void>}
          */
         initTopoData: function initTopoData(props, state) {
-          var _this5 = this;
+          var _this3 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
             var _result$config;
 
             var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, extraConfig, _combTopoData, topoData, resAndMetrics, _yield$Promise$all, newData, endTime;
 
-            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   startTime = moment();
                   topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh, clear = props.clear;
-                  _context6.next = 4;
+                  _context4.next = 4;
                   return topoApp.open(topoId);
 
                 case 4:
@@ -327,7 +274,7 @@ export default function (topoApp) {
                     });
                   }
 
-                  _this5.update(startState);
+                  _this3.update(startState);
 
                   dispatch.topoBizMod.update({
                     pollingSwitch: false
@@ -337,24 +284,24 @@ export default function (topoApp) {
                   permission = 'write';
 
                   if (!topoApp.options.usePermission) {
-                    _context6.next = 19;
+                    _context4.next = 19;
                     break;
                   }
 
-                  _context6.next = 14;
-                  return _this5.getTopoPermission({
+                  _context4.next = 14;
+                  return _this3.getTopoPermission({
                     id: topoId
                   });
 
                 case 14:
-                  permission = _context6.sent;
+                  permission = _context4.sent;
 
                   if (topoPermissonUtil.isReadable(permission)) {
-                    _context6.next = 19;
+                    _context4.next = 19;
                     break;
                   }
 
-                  _this5.update({
+                  _this3.update({
                     loading: false,
                     topoData: null,
                     data: null,
@@ -363,26 +310,26 @@ export default function (topoApp) {
                   });
 
                   topoApp.options.onLoad();
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
 
                 case 19:
                   if (!data) {
-                    _context6.next = 30;
+                    _context4.next = 30;
                     break;
                   }
 
                   graphConfig = {};
 
                   if (!topoId) {
-                    _context6.next = 27;
+                    _context4.next = 27;
                     break;
                   }
 
-                  _context6.next = 24;
+                  _context4.next = 24;
                   return topoService.getTopoData(topoId);
 
                 case 24:
-                  topoConfig = _context6.sent;
+                  topoConfig = _context4.sent;
                   if (!topoConfig) rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
                   graphConfig = {
                     global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
@@ -392,23 +339,23 @@ export default function (topoApp) {
 
                 case 27:
                   result = _extends({}, data, graphConfig);
-                  _context6.next = 33;
+                  _context4.next = 33;
                   break;
 
                 case 30:
-                  _context6.next = 32;
+                  _context4.next = 32;
                   return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                 case 32:
-                  result = _context6.sent;
+                  result = _context4.sent;
 
                 case 33:
                   if (result) {
-                    _context6.next = 37;
+                    _context4.next = 37;
                     break;
                   }
 
-                  _this5.update({
+                  _this3.update({
                     loading: false,
                     data: null,
                     globalConfig: null,
@@ -417,17 +364,17 @@ export default function (topoApp) {
                   });
 
                   topoApp.options.onLoad();
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
 
                 case 37:
                   result = parseTopoData(result);
                   rlog.debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
-                  _context6.next = 41;
+                  _context4.next = 41;
                   return dispatch.customIcon.loadCustomIcons();
 
                 case 41:
                   extraConfig = result.global.extraConfig;
-                  _context6.next = 44;
+                  _context4.next = 44;
                   return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
                     alarmSwitch: result.global.alarmSwitch,
                     alarmListDefaultOpen: result.global.alarmListDefaultOpen
@@ -441,8 +388,8 @@ export default function (topoApp) {
                     globalConfig: extraConfig
                   }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics; // rlog.debug("topoMod.initTopoData combTopoData", { topoData, resAndMetrics, });
 
-                  _context6.next = 47;
-                  return _this5.update({
+                  _context4.next = 47;
+                  return _this3.update({
                     currentTopo: topoData.config,
                     data: result,
                     globalConfig: extraConfig,
@@ -457,15 +404,15 @@ export default function (topoApp) {
 
                   topoApp.alarm.open(); // 加载标注悬浮框数据
 
-                  _context6.next = 52;
+                  _context4.next = 52;
                   return Promise.all([addLinkData(result), topoApp.ciTyeCache.load(getCiTypes(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                   ]);
 
                 case 52:
-                  _yield$Promise$all = _context6.sent;
+                  _yield$Promise$all = _context4.sent;
                   newData = _yield$Promise$all[0];
-                  _context6.next = 56;
-                  return _this5.update({
+                  _context4.next = 56;
+                  return _this3.update({
                     data: newData
                   });
 
@@ -478,15 +425,15 @@ export default function (topoApp) {
                   rlog.info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
                   topoApp.options.onLoad();
 
-                  _this5.update({
+                  _this3.update({
                     loading: false
                   });
 
                 case 62:
                 case "end":
-                  return _context6.stop();
+                  return _context4.stop();
               }
-            }, _callee6);
+            }, _callee4);
           }))();
         },
 
@@ -494,21 +441,21 @@ export default function (topoApp) {
          * 刷新拓扑图
          */
         refreshTopo: function refreshTopo(payload, rootState) {
-          var _this6 = this;
+          var _this4 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
             var _payload, clear;
 
-            return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-              while (1) switch (_context7.prev = _context7.next) {
+            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   if (payload === void 0) {
                     payload = {};
                   }
 
                   _payload = payload, clear = _payload.clear;
-                  _context7.next = 4;
-                  return _this6.initTopoData({
+                  _context5.next = 4;
+                  return _this4.initTopoData({
                     topoId: rootState.topoMod.topoId,
                     refresh: true,
                     clear: clear
@@ -516,18 +463,18 @@ export default function (topoApp) {
 
                 case 4:
                 case "end":
-                  return _context7.stop();
+                  return _context5.stop();
               }
-            }, _callee7);
+            }, _callee5);
           }))();
         },
         operationTopoPage: function operationTopoPage(conditions, state) {
-          var _this7 = this;
+          var _this5 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
             var td;
-            return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   if (conditions === void 0) {
                     conditions = {};
@@ -535,7 +482,7 @@ export default function (topoApp) {
 
                   if (conditions.id === state.topoMod.topoId) {
                     if (conditions.type === 'delete') {
-                      _this7.update({
+                      _this5.update({
                         topoId: conditions.defId
                       });
                     }
@@ -547,7 +494,7 @@ export default function (topoApp) {
                         })
                       });
 
-                      _this7.update({
+                      _this5.update({
                         topoData: td
                       });
                     }
@@ -555,29 +502,29 @@ export default function (topoApp) {
 
                 case 2:
                 case "end":
-                  return _context8.stop();
+                  return _context6.stop();
               }
-            }, _callee8);
+            }, _callee6);
           }))();
         },
         openPermissionSetting: function openPermissionSetting(payload, rootState) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
-            return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-              while (1) switch (_context9.prev = _context9.next) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+            return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+              while (1) switch (_context7.prev = _context7.next) {
                 case 0:
                   dispatch.permissionSetting.open();
 
                 case 1:
                 case "end":
-                  return _context9.stop();
+                  return _context7.stop();
               }
-            }, _callee9);
+            }, _callee7);
           }))();
         },
         updateDelId: function updateDelId(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-            return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-              while (1) switch (_context10.prev = _context10.next) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+            return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+              while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   if (conditions === void 0) {
                     conditions = '';
@@ -587,49 +534,49 @@ export default function (topoApp) {
 
                 case 2:
                 case "end":
-                  return _context10.stop();
+                  return _context8.stop();
               }
-            }, _callee10);
+            }, _callee8);
           }))();
         },
         getTopoPermission: function getTopoPermission(playload, rootState) {
-          var _this8 = this;
+          var _this6 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
             var id, update, topoPermission;
-            return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-              while (1) switch (_context11.prev = _context11.next) {
+            return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   id = playload.id, update = playload.update;
-                  _context11.prev = 1;
-                  _context11.next = 4;
+                  _context9.prev = 1;
+                  _context9.next = 4;
                   return topoApp.serverApi.auth.getTopoPermission(id);
 
                 case 4:
-                  topoPermission = _context11.sent;
+                  topoPermission = _context9.sent;
                   rlog.debug('查询拓扑权限', topoPermission);
-                  _context11.next = 11;
+                  _context9.next = 11;
                   break;
 
                 case 8:
-                  _context11.prev = 8;
-                  _context11.t0 = _context11["catch"](1);
-                  rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                  _context9.prev = 8;
+                  _context9.t0 = _context9["catch"](1);
+                  rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context9.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
                 case 11:
                   if (update !== false) {
-                    _this8.update({
+                    _this6.update({
                       topoPermission: topoPermission
                     });
                   }
 
-                  return _context11.abrupt("return", topoPermission);
+                  return _context9.abrupt("return", topoPermission);
 
                 case 13:
                 case "end":
-                  return _context11.stop();
+                  return _context9.stop();
               }
-            }, _callee11, null, [[1, 8]]);
+            }, _callee9, null, [[1, 8]]);
           }))();
         }
       };

package/es/core/utils/edgeUtil.js

@@ -1,5 +1,13 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { showLinkByConfig } from "../models/utils/linkUtils";
+/**
+ * 是否手工连线
+ * @param {*} edge 
+ */
+
+export function isCustomEdge(edge) {
+  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+}
 /**
  * 根据配置更新连线展开折叠状态
  *

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