@riil-frontend/component-topology 11.0.22 → 11.0.24

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "11.0.22" === 'string' ? "11.0.22" : null;
+var version = typeof "11.0.24" === 'string' ? "11.0.24" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -762,17 +762,10 @@ var Topo = /*#__PURE__*/function () {
     this.alarm.updateState({
       alarmList: alarmList
     });
-  }
-  /**
-   * TODO 待定
-   * @param {*} data 
-   */
-  ;
+  };
 
-  _proto.loadAttrsAndMetrics =
-  /*#__PURE__*/
-  function () {
-    var _loadAttrsAndMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee17(data) {
+  _proto.switchToViewMode = /*#__PURE__*/function () {
+    var _switchToViewMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee17() {
       return _regenerator["default"].wrap(function _callee17$(_context17) {
         while (1) {
           switch (_context17.prev = _context17.next) {
@@ -784,26 +777,6 @@ var Topo = /*#__PURE__*/function () {
       }, _callee17);
     }));
 
-    function loadAttrsAndMetrics(_x11) {
-      return _loadAttrsAndMetrics.apply(this, arguments);
-    }
-
-    return loadAttrsAndMetrics;
-  }();
-
-  _proto.switchToViewMode = /*#__PURE__*/function () {
-    var _switchToViewMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee18() {
-      return _regenerator["default"].wrap(function _callee18$(_context18) {
-        while (1) {
-          switch (_context18.prev = _context18.next) {
-            case 0:
-            case "end":
-              return _context18.stop();
-          }
-        }
-      }, _callee18);
-    }));
-
     function switchToViewMode() {
       return _switchToViewMode.apply(this, arguments);
     }
@@ -812,16 +785,16 @@ var Topo = /*#__PURE__*/function () {
   }();
 
   _proto.switchToEditMode = /*#__PURE__*/function () {
-    var _switchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee19() {
-      return _regenerator["default"].wrap(function _callee19$(_context19) {
+    var _switchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee18() {
+      return _regenerator["default"].wrap(function _callee18$(_context18) {
         while (1) {
-          switch (_context19.prev = _context19.next) {
+          switch (_context18.prev = _context18.next) {
             case 0:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
         }
-      }, _callee19);
+      }, _callee18);
     }));
 
     function switchToEditMode() {

package/lib/core/models/attributeFormatter/formatter/commonTransform.js

@@ -19,6 +19,11 @@ function commonTransform(options) {
     if (ciData[attrType + "Map"][fieldCode + "_object"]) {
       fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
     }
+  } // 分级字典特殊处理
+
+
+  if (fieldMeta.dict) {
+    fieldValue = fieldMeta.dict[fieldValue];
   }
 
   return {

package/lib/core/models/cache/CiTypeCache.js

@@ -24,7 +24,7 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
  */
 var CiTypeCache = /*#__PURE__*/function () {
   function CiTypeCache() {
-    this.cache = {};
+    this.ciTypeMap = {};
   }
 
   var _proto = CiTypeCache.prototype;
@@ -50,7 +50,7 @@ var CiTypeCache = /*#__PURE__*/function () {
               _rlog["default"].error('查询Ci模型异常', _context.t0);
 
             case 8:
-              return _context.abrupt("return", this.cache);
+              return _context.abrupt("return", this.ciTypeMap);
 
             case 9:
             case "end":
@@ -77,7 +77,7 @@ var CiTypeCache = /*#__PURE__*/function () {
           switch (_context2.prev = _context2.next) {
             case 0:
               unLoadCiTypeIds = ciTypeIds.filter(function (id) {
-                return !_this.cache[id];
+                return !_this.ciTypeMap[id];
               });
               _context2.next = 3;
               return _topo["default"].ciInfo.batchQueryCiTypeInfo(unLoadCiTypeIds);
@@ -85,7 +85,7 @@ var CiTypeCache = /*#__PURE__*/function () {
             case 3:
               ciTypeMetas = _context2.sent;
               this.addCiTypes(ciTypeMetas);
-              return _context2.abrupt("return", this.cache);
+              return _context2.abrupt("return", this.ciTypeMap);
 
             case 6:
             case "end":
@@ -111,7 +111,7 @@ var CiTypeCache = /*#__PURE__*/function () {
   };
 
   _proto.addCiType = function addCiType(ciTypeMeta) {
-    var cache = (0, _extends2["default"])({}, this.cache);
+    var cache = (0, _extends2["default"])({}, this.ciTypeMap);
     var attributes = adapterNetworkLinkAttributes(ciTypeMeta, ciTypeMeta.attributes || []);
     var metrics = ciTypeMeta.metrics || [];
     cache[ciTypeMeta.code] = (0, _extends2["default"])({}, ciTypeMeta, {
@@ -120,11 +120,11 @@ var CiTypeCache = /*#__PURE__*/function () {
       metrics: metrics,
       metricMap: (0, _keyBy["default"])(metrics, 'code')
     });
-    this.cache = cache;
+    this.ciTypeMap = cache;
   };
 
   _proto.getCiType = function getCiType(typeCode) {
-    return this.cache[typeCode];
+    return this.ciTypeMap[typeCode];
   };
 
   _proto.getCiTypeByCi = function getCiTypeByCi(ci) {
@@ -144,7 +144,7 @@ var CiTypeCache = /*#__PURE__*/function () {
   (0, _createClass2["default"])(CiTypeCache, [{
     key: "ciTypes",
     get: function get() {
-      return this.cache;
+      return this.ciTypeMap;
     }
   }]);
   return CiTypeCache;

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

@@ -138,7 +138,7 @@ function _getLinksDetail() {
           case 7:
             interfaceCiMap = _context.sent;
             _context.next = 10;
-            return _CiTypeCache["default"].getCiTypeMap(interfaceTypes);
+            return _CiTypeCache["default"].load(interfaceTypes);
 
           case 10:
             interfaceDoc = _context.sent;

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

@@ -367,7 +367,7 @@ function _default(topoApp) {
                   case 11:
                     data = _context4.sent;
                     _context4.next = 14;
-                    return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
+                    return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 14:
                     _yield$Promise$all = _context4.sent;

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

@@ -325,7 +325,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, _yield$Promise$all2, newData, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, extraConfig, _combTopoData, topoData, resAndMetrics, _yield$Promise$all, newData, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -454,23 +454,17 @@ function _default(topoApp) {
                     _rlog["default"].debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
 
                     _context6.next = 41;
-                    return Promise.all([// topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)),
-                    dispatch.customIcon.loadCustomIcons() // topoApp.elementTagTipConfig.init(result), // 暂停新配置开发
-                    ]);
+                    return dispatch.customIcon.loadCustomIcons();
 
                   case 41:
-                    _yield$Promise$all = _context6.sent;
-                    ciTypeMap = _yield$Promise$all[0];
-                    customIcons = _yield$Promise$all[1];
-                    xxx = _yield$Promise$all[2];
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 48;
+                    _context6.next = 44;
                     return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 48:
+                  case 44:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -478,7 +472,7 @@ function _default(topoApp) {
                       globalConfig: extraConfig
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics; // rlog.debug("topoMod.initTopoData combTopoData", { topoData, resAndMetrics, });
 
-                    _context6.next = 51;
+                    _context6.next = 47;
                     return _this5.update({
                       currentTopo: topoData.config,
                       data: result,
@@ -488,25 +482,25 @@ function _default(topoApp) {
                       resAndMetrics: resAndMetrics
                     });
 
-                  case 51:
+                  case 47:
                     dispatch.topoBizMod.combBatchCiInfo(resAndMetrics);
                     dispatch.background.init(extraConfig); // TODO 优化打开拓扑图显示告警速度：打开拓扑图立即请求告警
 
                     topoApp.alarm.open(); // 加载标注悬浮框数据
 
-                    _context6.next = 56;
-                    return Promise.all([(0, _getTopoData.addLinkData)(result), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
+                    _context6.next = 52;
+                    return Promise.all([(0, _getTopoData.addLinkData)(result), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
-                  case 56:
-                    _yield$Promise$all2 = _context6.sent;
-                    newData = _yield$Promise$all2[0];
-                    _context6.next = 60;
+                  case 52:
+                    _yield$Promise$all = _context6.sent;
+                    newData = _yield$Promise$all[0];
+                    _context6.next = 56;
                     return _this5.update({
                       data: newData
                     });
 
-                  case 60:
+                  case 56:
                     dispatch.topoBizMod.update({
                       pollingSwitch: true
                     });
@@ -521,7 +515,7 @@ function _default(topoApp) {
                       loading: false
                     });
 
-                  case 66:
+                  case 62:
                   case "end":
                     return _context6.stop();
                 }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js

@@ -150,7 +150,7 @@ function ClusterMemberTableContainer(props) {
               ciDataResult = _yield$Promise$all[0];
               memberRoleMetrics = _yield$Promise$all[1];
               _context.next = 10;
-              return topo.ciTyeCache.getCiTypeMap(ciDataResult.data.map(function (item) {
+              return topo.ciTyeCache.load(ciDataResult.data.map(function (item) {
                 return item.typeCode;
               }));
 

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -178,8 +178,11 @@ function processExitLink(topoData) {
   }
 
   function findElementSerializeById(serialize, id) {
+    // 背景图没有a
     return serialize.d.find(function (item) {
-      return item.a.id === id;
+      var _item$a;
+
+      return ((_item$a = item.a) === null || _item$a === void 0 ? void 0 : _item$a.id) === id;
     });
   }
   /**

package/package.json

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