@riil-frontend/component-topology 3.1.9 → 3.1.12

package/lib/models/customIcon.js

@@ -167,7 +167,7 @@ function _default(engine) {
           var _this3 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var data;
+            var data, allIcons, newIcons;
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
@@ -175,26 +175,31 @@ function _default(engine) {
                     data = payload.data;
 
                     _this3.update({
-                      visible: false,
-                      icons: {
-                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
-                        container: []
-                      }
-                    });
+                      visible: false
+                    }); // 注册
+
 
                     data.forEach(function (icon) {
                       var iconUrl = _topo["default"].icon.getIconImageUrl(icon.id);
 
                       window.ht.Default.setImage((0, _icon.getCustomIconHtId)(icon.id), iconUrl);
+                    });
+                    _context4.next = 5;
+                    return _this3.loadCustomIcons();
+
+                  case 5:
+                    allIcons = _context4.sent;
+                    newIcons = allIcons.node.filter(function (icon) {
+                      return !!data.find(function (item) {
+                        return item.id === icon.id;
+                      });
                     }); // 通知ht
 
                     engine.view.topoClient.emitEvent('topo_shape_upload_finish', (0, _extends2["default"])({}, payload, {
-                      data: (0, _icon.transformCustomIcons2HtIcons)(data)
+                      data: (0, _icon.transformCustomIcons2HtIcons)(newIcons)
                     }));
-                    _context4.next = 6;
-                    return _this3.loadCustomIcons();
 
-                  case 6:
+                  case 8:
                   case "end":
                     return _context4.stop();
                 }

package/lib/utils/topoData.js

@@ -10,6 +10,7 @@ exports.formatGroups = formatGroups;
 exports.getAlarmSwitch = getAlarmSwitch;
 exports.getCiModSet = getCiModSet;
 exports.getCiTypes = getCiTypes;
+exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
 exports.parseTopoData = parseTopoData;
 exports.updateCiDoc = exports.updateAllCiDoc = exports.sortList = void 0;
@@ -166,8 +167,7 @@ var tfLink = function tfLink(engine, link, nodes) {
   });
 };
 
-function getCiTypes(topoData) {
-  var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
+function getCiTypesFromCiElements(allCi) {
   var ciTypes = [];
   allCi.forEach(function (element) {
     if (element.ciType && ciTypes.indexOf(element.ciType) < 0) {
@@ -177,6 +177,11 @@ function getCiTypes(topoData) {
   return ciTypes;
 }
 
+function getCiTypes(topoData) {
+  var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
+  return getCiTypesFromCiElements(allCi);
+}
+
 function getAlarmSwitch(topoData) {
   var _topoData$global;
 
@@ -448,6 +453,7 @@ var combTopoData = function combTopoData(_ref3) {
     })
   }, getCiModSet({
     engine: engine,
+    data: result,
     allCis: allCis,
     ciTypeMap: ciTypeMap,
     globalConfig: globalConfig
@@ -462,7 +468,8 @@ var combTopoData = function combTopoData(_ref3) {
 exports.combTopoData = combTopoData;
 
 function getCiModSet(params) {
-  var engine = params.engine,
+  var data = params.data,
+      engine = params.engine,
       allCis = params.allCis,
       ciTypeMap = params.ciTypeMap,
       globalConfig = params.globalConfig; // 当前拓扑资源字典
@@ -471,49 +478,70 @@ function getCiModSet(params) {
   var ciTypesDoc = {}; //
 
   var bindingCiSet = {};
-  var allCiModSet = {};
-  var allLinkModSet = {};
-  Object.keys(ciTypeMap).forEach(function (key) {
-    var ciTypeObj = {};
-    var linkKeyArr = [{
-      code: "phy",
-      key: "phy",
-      name: "物理链路"
-    }, {
-      code: "agg",
-      key: "agg",
-      name: "聚合链路"
-    }, {
-      code: "export_link",
-      key: "exp",
-      name: "出口链路"
-    }];
-
-    if (key === "network_link") {
-      linkKeyArr.map(function (link, index) {
-        ciTypeObj = engine.ciTyeCache.getNetworkLinkCiType(link.key);
-
-        if (ciTypeObj) {
-          allLinkModSet[link.code] = {
-            name: link.name,
-            code: link.code,
-            icon: ciTypeObj.icon,
-            list: ciModfilter(ciTypeObj, globalConfig, "link", link.code)
-          };
-        }
+  var allCiModSet = getNodeModSet();
+  var allLinkModSet = getLinkModSet();
 
-        return link.code;
-      });
-    } else {
-      ciTypeObj = ciTypeMap[key];
-      allCiModSet[key] = {
+  function getNodeModSet() {
+    var ciTypes = getCiTypesFromCiElements(data.nodes);
+    return getModSet(ciTypes);
+  }
+
+  function getLinkModSet() {
+    var ciTypes = getCiTypesFromCiElements([].concat(data.links, data.linkGroups));
+    return getModSet(ciTypes);
+  }
+  /**
+   * 
+   * @param {array} ciTypeCodes 
+   * @returns 
+   */
+
+
+  function getModSet(ciTypeCodes) {
+    var modSet = {};
+    Object.keys(ciTypeMap).filter(function (item) {
+      return ciTypeCodes.includes(item);
+    }).forEach(function (key) {
+      var ciTypeObj = ciTypeMap[key];
+      modSet[key] = {
         name: ciTypeObj.displayName,
         code: ciTypeObj.code,
         icon: ciTypeObj.icon,
         list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
       };
-    }
-  });
+
+      if (key === "network_link") {
+        var linkKeyArr = [{
+          code: "phy",
+          key: "phy",
+          name: "物理链路"
+        }, {
+          code: "agg",
+          key: "agg",
+          name: "聚合链路"
+        }, {
+          code: "exit",
+          key: "exit",
+          name: "出口链路"
+        }];
+        linkKeyArr.map(function (link, index) {
+          ciTypeObj = engine.ciTyeCache.getNetworkLinkCiType(link.key);
+
+          if (ciTypeObj) {
+            modSet[link.code] = {
+              name: link.name,
+              code: link.code,
+              icon: ciTypeObj.icon,
+              list: ciModfilter(ciTypeObj, globalConfig, "link", link.code)
+            };
+          }
+
+          return link.code;
+        });
+      }
+    });
+    return modSet;
+  }
 
   if (allCis.length > 0) {
     allCis.forEach(function (element, index) {

package/package.json

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