@riil-frontend/component-topology 11.0.22 → 11.0.24

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -53,7 +53,7 @@ export default function DisplaySettingDrawer(props) {
               setLoading(false);
               rlog.error('DisplaySettingDrawer.handleOk', _context.t0);
 
-              _Message.warn('保存失败');
+              _Message.warning('保存失败');
 
             case 14:
             case "end":

package/es/core/hooks/useCiAttributeChange.js

@@ -1,12 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { useEffect } from 'react';
 import CiCache from "../models/cache/CiCache";
 import useTopoEventListener from "./useTopoEventListener";
 
 function mergeData(cis, ciChangeData) {
   if (!cis.find(function (item) {
-    return item.id === ciChangeData.id;
+    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
   })) {
     return cis;
   }

package/es/core/hooks/usePolling.js

@@ -43,16 +43,30 @@ var usePolling = function usePolling(props) {
 
   function _fetchData() {
     _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricResult, transformLinkData;
+      var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricResult, mergeData, transformLinkData, adapterIpv6;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              adapterIpv6 = function _adapterIpv(data) {
+                var ipv6 = data.attributeMap.ipv6_address;
+
+                if (!ipv6 && data.attributeMap.ipv6_address_list) {
+                  ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
+                }
+
+                return _extends({}, data, {
+                  attributeMap: _extends({}, data.attributeMap, {
+                    ipv6_address: ipv6
+                  })
+                });
+              };
+
               transformLinkData = function _transformLinkData(data) {
-                var _topo$dataModel$getDa = topo.dataModel.getData(),
-                    links = _topo$dataModel$getDa.links,
-                    linkGroups = _topo$dataModel$getDa.linkGroups;
+                var _topo$dataModel$getDa2 = topo.dataModel.getData(),
+                    links = _topo$dataModel$getDa2.links,
+                    linkGroups = _topo$dataModel$getDa2.linkGroups;
 
                 var link = [].concat(links, linkGroups).find(function (item) {
                   return item.id === data.id;
@@ -67,17 +81,44 @@ var usePolling = function usePolling(props) {
                 });
               };
 
+              mergeData = function _mergeData(metricResult) {
+                // 合并属性、指标
+                var _topo$dataModel$getDa = topo.dataModel.getData(),
+                    nodes = _topo$dataModel$getDa.nodes,
+                    links = _topo$dataModel$getDa.links;
+
+                return [].concat(nodes, links).filter(function (item) {
+                  return !!item.ciType;
+                }).map(function (ciData) {
+                  var resultData = _extends({}, ciData, {
+                    attributeMap: _extends({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
+                  });
+
+                  resultData = transformLinkData(resultData);
+                  resultData = adapterIpv6(resultData);
+                  return resultData;
+                }).map(function (ciData) {
+                  var _metricResult$find;
+
+                  return _extends({}, ciData, {
+                    metrics: ((_metricResult$find = metricResult.find(function (item) {
+                      return item.id === ciData.ciId || ciData.id;
+                    })) === null || _metricResult$find === void 0 ? void 0 : _metricResult$find.metrics) || {}
+                  });
+                });
+              };
+
               _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
               // 无资源，不查询
 
               if (resIdsList.length) {
-                _context.next = 4;
+                _context.next = 6;
                 break;
               }
 
               return _context.abrupt("return", []);
 
-            case 4:
+            case 6:
               // 需要查询的指标列表
               codes = topo.attributeMetricDisplay.getResourceMetricCodes();
               param = {
@@ -94,36 +135,21 @@ var usePolling = function usePolling(props) {
               _context.t0 = Promise;
               _context.t1 = // 查询指标值
               topo.serverApi.ciInfo.batchQueryCiInfo(param);
-              _context.next = 10;
+              _context.next = 12;
               return DictCache.init();
 
-            case 10:
+            case 12:
               _context.t2 = _context.sent;
               _context.t3 = [_context.t1, _context.t2];
-              _context.next = 14;
+              _context.next = 16;
               return _context.t0.all.call(_context.t0, _context.t3);
 
-            case 14:
+            case 16:
               _yield$Promise$all = _context.sent;
               ciMetricResult = _yield$Promise$all[0];
-              return _context.abrupt("return", ciMetricResult.map(function (data) {
-                var ci = topo.dataModel.getDataById(data.id);
-
-                var resultData = _extends({}, data, ci, {
-                  attributeMap: _extends({}, (ci === null || ci === void 0 ? void 0 : ci.attributes) || {})
-                });
-
-                resultData = transformLinkData(resultData); // 特殊处理：ipv6 从ipv6_address_list取第一个
-
-                // 特殊处理：ipv6 从ipv6_address_list取第一个
-                if (resultData.attributeMap.ipv6_address_list && !resultData.attributeMap.ipv6_address) {
-                  resultData.attributeMap.ipv6_address = (resultData.attributeMap.ipv6_address_list || '').split(',')[0];
-                }
-
-                return resultData;
-              }));
+              return _context.abrupt("return", mergeData(ciMetricResult));
 
-            case 17:
+            case 19:
             case "end":
               return _context.stop();
           }

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 "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);
 /**
  * 拓扑显示和编辑
@@ -730,17 +730,10 @@ var Topo = /*#__PURE__*/function () {
     this.alarm.updateState({
       alarmList: alarmList
     });
-  }
-  /**
-   * TODO 待定
-   * @param {*} data 
-   */
-  ;
+  };
 
-  _proto.loadAttrsAndMetrics =
-  /*#__PURE__*/
-  function () {
-    var _loadAttrsAndMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(data) {
+  _proto.switchToViewMode = /*#__PURE__*/function () {
+    var _switchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17() {
       return _regeneratorRuntime.wrap(function _callee17$(_context17) {
         while (1) {
           switch (_context17.prev = _context17.next) {
@@ -752,26 +745,6 @@ var Topo = /*#__PURE__*/function () {
       }, _callee17);
     }));
 
-    function loadAttrsAndMetrics(_x11) {
-      return _loadAttrsAndMetrics.apply(this, arguments);
-    }
-
-    return loadAttrsAndMetrics;
-  }();
-
-  _proto.switchToViewMode = /*#__PURE__*/function () {
-    var _switchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
-      return _regeneratorRuntime.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);
     }
@@ -780,16 +753,16 @@ var Topo = /*#__PURE__*/function () {
   }();
 
   _proto.switchToEditMode = /*#__PURE__*/function () {
-    var _switchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
-      return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+    var _switchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
+      return _regeneratorRuntime.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/es/core/models/attributeFormatter/formatter/commonTransform.js

@@ -13,6 +13,11 @@ export default 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/es/core/models/cache/CiTypeCache.js

@@ -11,7 +11,7 @@ import keyBy from 'lodash/keyBy';
 
 var CiTypeCache = /*#__PURE__*/function () {
   function CiTypeCache() {
-    this.cache = {};
+    this.ciTypeMap = {};
   }
 
   var _proto = CiTypeCache.prototype;
@@ -36,7 +36,7 @@ var CiTypeCache = /*#__PURE__*/function () {
               rlog.error('查询Ci模型异常', _context.t0);
 
             case 8:
-              return _context.abrupt("return", this.cache);
+              return _context.abrupt("return", this.ciTypeMap);
 
             case 9:
             case "end":
@@ -63,7 +63,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 topoService.ciInfo.batchQueryCiTypeInfo(unLoadCiTypeIds);
@@ -71,7 +71,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":
@@ -97,7 +97,7 @@ var CiTypeCache = /*#__PURE__*/function () {
   };
 
   _proto.addCiType = function addCiType(ciTypeMeta) {
-    var cache = _extends({}, this.cache);
+    var cache = _extends({}, this.ciTypeMap);
 
     var attributes = adapterNetworkLinkAttributes(ciTypeMeta, ciTypeMeta.attributes || []);
     var metrics = ciTypeMeta.metrics || [];
@@ -107,11 +107,11 @@ var CiTypeCache = /*#__PURE__*/function () {
       metrics: metrics,
       metricMap: keyBy(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) {
@@ -131,7 +131,7 @@ var CiTypeCache = /*#__PURE__*/function () {
   _createClass(CiTypeCache, [{
     key: "ciTypes",
     get: function get() {
-      return this.cache;
+      return this.ciTypeMap;
     }
   }]);
 

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

@@ -114,7 +114,7 @@ function _getLinksDetail() {
           case 7:
             interfaceCiMap = _context.sent;
             _context.next = 10;
-            return CiTypeCache.getCiTypeMap(interfaceTypes);
+            return CiTypeCache.load(interfaceTypes);
 
           case 10:
             interfaceDoc = _context.sent;

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

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

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

@@ -307,7 +307,7 @@ export default function (topoApp) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee6$(_context6) {
               while (1) {
@@ -434,23 +434,17 @@ export default function (topoApp) {
                     result = parseTopoData(result);
                     rlog.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(_extends({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 48:
+                  case 44:
                     _combTopoData = combTopoData({
                       engine: topoApp,
                       data: result,
@@ -458,7 +452,7 @@ export default function (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,
@@ -468,25 +462,25 @@ export default function (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([addLinkData(result), topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
+                    _context6.next = 52;
+                    return Promise.all([addLinkData(result), topoApp.ciTyeCache.load(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
                     });
@@ -499,7 +493,7 @@ export default function (topoApp) {
                       loading: false
                     });
 
-                  case 66:
+                  case 62:
                   case "end":
                     return _context6.stop();
                 }

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

@@ -131,7 +131,7 @@ export default 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/es/networkTopo/utils/exitLinkUtil.js

@@ -167,8 +167,11 @@ export 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/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -74,7 +74,7 @@ function DisplaySettingDrawer(props) {
 
               _rlog["default"].error('DisplaySettingDrawer.handleOk', _context.t0);
 
-              _message["default"].warn('保存失败');
+              _message["default"].warning('保存失败');
 
             case 14:
             case "end":

package/lib/core/hooks/useCiAttributeChange.js

@@ -9,15 +9,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _react = require("react");
-
 var _CiCache = _interopRequireDefault(require("../models/cache/CiCache"));
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
 function mergeData(cis, ciChangeData) {
   if (!cis.find(function (item) {
-    return item.id === ciChangeData.id;
+    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
   })) {
     return cis;
   }

package/lib/core/hooks/usePolling.js

@@ -60,16 +60,30 @@ var usePolling = function usePolling(props) {
 
   function _fetchData() {
     _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricResult, transformLinkData;
+      var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricResult, mergeData, transformLinkData, adapterIpv6;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              adapterIpv6 = function _adapterIpv(data) {
+                var ipv6 = data.attributeMap.ipv6_address;
+
+                if (!ipv6 && data.attributeMap.ipv6_address_list) {
+                  ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
+                }
+
+                return (0, _extends2["default"])({}, data, {
+                  attributeMap: (0, _extends2["default"])({}, data.attributeMap, {
+                    ipv6_address: ipv6
+                  })
+                });
+              };
+
               transformLinkData = function _transformLinkData(data) {
-                var _topo$dataModel$getDa = topo.dataModel.getData(),
-                    links = _topo$dataModel$getDa.links,
-                    linkGroups = _topo$dataModel$getDa.linkGroups;
+                var _topo$dataModel$getDa2 = topo.dataModel.getData(),
+                    links = _topo$dataModel$getDa2.links,
+                    linkGroups = _topo$dataModel$getDa2.linkGroups;
 
                 var link = [].concat(links, linkGroups).find(function (item) {
                   return item.id === data.id;
@@ -84,17 +98,43 @@ var usePolling = function usePolling(props) {
                 });
               };
 
+              mergeData = function _mergeData(metricResult) {
+                // 合并属性、指标
+                var _topo$dataModel$getDa = topo.dataModel.getData(),
+                    nodes = _topo$dataModel$getDa.nodes,
+                    links = _topo$dataModel$getDa.links;
+
+                return [].concat(nodes, links).filter(function (item) {
+                  return !!item.ciType;
+                }).map(function (ciData) {
+                  var resultData = (0, _extends2["default"])({}, ciData, {
+                    attributeMap: (0, _extends2["default"])({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
+                  });
+                  resultData = transformLinkData(resultData);
+                  resultData = adapterIpv6(resultData);
+                  return resultData;
+                }).map(function (ciData) {
+                  var _metricResult$find;
+
+                  return (0, _extends2["default"])({}, ciData, {
+                    metrics: ((_metricResult$find = metricResult.find(function (item) {
+                      return item.id === ciData.ciId || ciData.id;
+                    })) === null || _metricResult$find === void 0 ? void 0 : _metricResult$find.metrics) || {}
+                  });
+                });
+              };
+
               _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
               // 无资源，不查询
 
               if (resIdsList.length) {
-                _context.next = 4;
+                _context.next = 6;
                 break;
               }
 
               return _context.abrupt("return", []);
 
-            case 4:
+            case 6:
               // 需要查询的指标列表
               codes = topo.attributeMetricDisplay.getResourceMetricCodes();
               param = {
@@ -111,34 +151,21 @@ var usePolling = function usePolling(props) {
               _context.t0 = Promise;
               _context.t1 = // 查询指标值
               topo.serverApi.ciInfo.batchQueryCiInfo(param);
-              _context.next = 10;
+              _context.next = 12;
               return _DictCache["default"].init();
 
-            case 10:
+            case 12:
               _context.t2 = _context.sent;
               _context.t3 = [_context.t1, _context.t2];
-              _context.next = 14;
+              _context.next = 16;
               return _context.t0.all.call(_context.t0, _context.t3);
 
-            case 14:
+            case 16:
               _yield$Promise$all = _context.sent;
               ciMetricResult = _yield$Promise$all[0];
-              return _context.abrupt("return", ciMetricResult.map(function (data) {
-                var ci = topo.dataModel.getDataById(data.id);
-                var resultData = (0, _extends2["default"])({}, data, ci, {
-                  attributeMap: (0, _extends2["default"])({}, (ci === null || ci === void 0 ? void 0 : ci.attributes) || {})
-                });
-                resultData = transformLinkData(resultData); // 特殊处理：ipv6 从ipv6_address_list取第一个
-
-                // 特殊处理：ipv6 从ipv6_address_list取第一个
-                if (resultData.attributeMap.ipv6_address_list && !resultData.attributeMap.ipv6_address) {
-                  resultData.attributeMap.ipv6_address = (resultData.attributeMap.ipv6_address_list || '').split(',')[0];
-                }
-
-                return resultData;
-              }));
+              return _context.abrupt("return", mergeData(ciMetricResult));
 
-            case 17:
+            case 19:
             case "end":
               return _context.stop();
           }