@riil-frontend/component-topology 3.1.11 → 3.2.0

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;
 
@@ -305,7 +310,7 @@ function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里
 }
 
 function buildGlobal(_ref2) {
-  var _result$config, _engine$viewProps, _result$global2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
+  var _result$config, _engine$viewProps, _result$global2, _result$customGlobal, _result$customGlobal2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
 
   var result = _ref2.data,
       permission = _ref2.permission,
@@ -332,14 +337,15 @@ function buildGlobal(_ref2) {
     };
   }
 
-  return (0, _extends2["default"])({
+  console.error(111, result);
+  return {
     // 背景图
     backgroundImgUrl: (_engine$viewProps = engine.viewProps) !== null && _engine$viewProps !== void 0 && _engine$viewProps.hideBackground ? null : (0, _backgroundUtil.getBackgroundImageUrl)(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
     control: (0, _extends2["default"])({
       editable: _topoPermissionUtil["default"].isEditable(permission),
       // 是否可编辑----控制[编辑]按钮
       moveable: true
-    }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}),
+    }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal = result.customGlobal) === null || _result$customGlobal === void 0 ? void 0 : _result$customGlobal.control) || {}),
     topoDisplayConfig: (0, _extends2["default"])({
       // alarmSwitch: (result.global || {}).alarmSwitch ?? true,
       showLog: false,
@@ -352,9 +358,8 @@ function buildGlobal(_ref2) {
       // 是否显示链路名称
       nodeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.nodeLabelStyle,
       edgeFlow: edgeFlow
-    }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}),
-    linkTo: linkTo
-  }, result.global || {}, {
+    }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal2 = result.customGlobal) === null || _result$customGlobal2 === void 0 ? void 0 : _result$customGlobal2.topoDisplayConfig) || {}),
+    linkTo: linkTo,
     viewMode: {
       // 右键菜单
       contextMenu: (0, _mergeContextmenu["default"])((0, _buildContextmenu["default"])(engine), (_engine$options$viewe = engine.options.viewer) === null || _engine$options$viewe === void 0 ? void 0 : _engine$options$viewe.contextmenu, engine)
@@ -367,7 +372,7 @@ function buildGlobal(_ref2) {
     icons: (0, _icon.getEditorIcons)(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
     getDefaultNodeIcon: engine.options.getDefaultNodeIcon
-  });
+  };
 }
 /**
  * 将从后端接收的数据转化为topo组件中需要的数据
@@ -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.11",
+  "version": "3.2.0",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.1.11/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.2.0/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/CHANGELOG.md

@@ -1,23 +0,0 @@
-## 3.1.10 2022-4-19 11:20:01
-
-- 支持不显示区域添加资源按钮
-- fix NEWITOM-16174【拓扑】上传自定义图片后，点击图片的属性面板，显示图片中显示的自定义图片显示顺序与上传后顺序不一致
-## 3.1.8
-
-- 支持自定义链路概览基本信息
-- 编辑模式节点属性面板设置支持不显示图标设置
-
-## v2.1.8
-
-- 支持自定义分层添加资源组件
-- 支持添加节点、连线接口 `addElements(data)`
-
-## v2.1.3
-
-- 支持自定义图标
-
-## v2.0.1
-
-新增功能
-- 拓扑图全量更新数据接口，更新时保留元素样式
-- 编辑模式右键菜单