@riil-frontend/component-topology 7.0.9 → 8.0.0-a.10

package/lib/networkTopo/services/topo/basic.js

@@ -420,6 +420,8 @@ var _default = (0, _extends2["default"])({
   */
   getTopoData: function getTopoData(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
+      var _result$links, result;
+
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
@@ -429,22 +431,29 @@ var _default = (0, _extends2["default"])({
               return _componentTopologyUtils.request.get(API_ROOT + "/structure/both/" + id);
 
             case 3:
-              return _context12.abrupt("return", _context12.sent);
+              result = _context12.sent;
+              return _context12.abrupt("return", (0, _extends2["default"])({}, result, {
+                links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
+                  return (0, _extends2["default"])({}, item, {
+                    ciType: 'network_link'
+                  });
+                })
+              }));
 
-            case 6:
-              _context12.prev = 6;
+            case 7:
+              _context12.prev = 7;
               _context12.t0 = _context12["catch"](0);
 
               _rlog["default"].debug('getTopoData-error', _context12.t0);
 
               return _context12.abrupt("return", null);
 
-            case 10:
+            case 11:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 6]]);
+      }, _callee12, null, [[0, 7]]);
     }))();
   },
 
@@ -457,7 +466,9 @@ var _default = (0, _extends2["default"])({
   */
   getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
-      var data, obj;
+      var _result$links2;
+
+      var data, obj, result;
       return _regenerator["default"].wrap(function _callee13$(_context13) {
         while (1) {
           switch (_context13.prev = _context13.next) {
@@ -479,9 +490,16 @@ var _default = (0, _extends2["default"])({
               }));
 
             case 5:
-              return _context13.abrupt("return", _context13.sent);
+              result = _context13.sent;
+              return _context13.abrupt("return", (0, _extends2["default"])({}, result, {
+                links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
+                  return (0, _extends2["default"])({}, item, {
+                    ciType: 'network_link'
+                  });
+                })
+              }));
 
-            case 6:
+            case 7:
             case "end":
               return _context13.stop();
           }
@@ -535,7 +553,7 @@ var _default = (0, _extends2["default"])({
   /**
   * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
   * @param {Number} id Topo ID
-  * @param {String} data
+  * @param {String} data ht拓扑序列化数据
   * @returns
   */
   saveSerializeData: function saveSerializeData(id, data) {
@@ -545,7 +563,9 @@ var _default = (0, _extends2["default"])({
           switch (_context15.prev = _context15.next) {
             case 0:
               _context15.next = 2;
-              return _componentTopologyUtils.request.post(API_ROOT + "/structure/" + id, data);
+              return _componentTopologyUtils.request.post(API_ROOT + "/structure/" + id, {
+                data: data
+              });
 
             case 2:
               return _context15.abrupt("return", _context15.sent);

package/lib/networkTopo/store/linkManager.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 链路新增、编辑 Model
  */

package/lib/networkTopo/store/topoCenter.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 拓扑中心 Model
  *

package/lib/networkTopo/store/topoLinkMod.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 拓扑链路相关 Model
  */

package/lib/networkTopo/utils/resourcePermissionUtil.js

@@ -105,7 +105,7 @@ function addTopoDataResourcePermission(data) {
         permission: getNodePermission(node)
       });
     }),
-    links: addLinksPermission(links),
-    linkGroups: addLinksPermission(linkGroups)
+    links: addLinksPermission(links || []),
+    linkGroups: addLinksPermission(linkGroups || [])
   });
 }

package/lib/utils/topoData.js

@@ -9,7 +9,6 @@ exports.findGroupChildren = findGroupChildren;
 exports.findItemIndex = exports.findItem = void 0;
 exports.formatGroup = formatGroup;
 exports.formatGroups = formatGroups;
-exports.getCiModSet = getCiModSet;
 exports.getCiTypes = getCiTypes;
 exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
@@ -25,8 +24,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _topoPermissionUtil = _interopRequireDefault(require("./topoPermissionUtil"));
-
 var _buildContextmenu = _interopRequireDefault(require("../core/viewer/contextmenu/buildContextmenu"));
 
 var _buildContextmenu2 = _interopRequireDefault(require("../core/editor/contextmenu/buildContextmenu"));
@@ -107,7 +104,7 @@ function updateNodeInfo(topoEngine, topoData) {
     nodes: topoData.nodes.map(function (node) {
       var attributes = node.attributes;
       return (0, _extends2["default"])({}, node, {
-        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipAddress) || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
+        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
         isShowName: topoEngine.attributeMetricDisplay.getNodeNameVisible(node)
       });
     })
@@ -137,88 +134,6 @@ function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-/**
- * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
- * @param {} ciTypeObj
- * @returns
- */
-
-
-var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
-  var tips = globalSetting[type + "Tip"];
-  var tags = globalSetting[type + "Tag"];
-  var tipArr = [];
-  var tagArr = [];
-
-  if (tips !== null && tips !== void 0 && tips.isCustom) {
-    var _tips$data$code;
-
-    (_tips$data$code = tips.data[code]) === null || _tips$data$code === void 0 ? void 0 : _tips$data$code.map(function (item) {
-      tipArr.push(item.code + "-" + item.type);
-    });
-  }
-
-  if (tags !== null && tags !== void 0 && tags.isCustom) {
-    var _tags$data$code;
-
-    (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
-      tagArr.push(item.code + "-" + item.type);
-    });
-  } // rlog.debug(
-  //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
-  //   globalSetting,
-  //   tipArr,
-  //   tagArr
-  // );
-
-
-  var custom = [];
-
-  if (type === "node") {
-    custom.push({
-      id: "name-graph",
-      code: "name",
-      name: "图片名称",
-      type: "custom",
-      tag: tagArr.indexOf("name-graph") >= 0,
-      tip: tipArr.indexOf("name-graph") >= 0
-    });
-    custom.push({
-      id: "display_name-ciType",
-      code: "ciType",
-      name: "资源类型",
-      type: "custom",
-      tag: tagArr.indexOf("display_name-ciType") >= 0,
-      tip: tipArr.indexOf("display_name-ciType") >= 0
-    });
-  }
-
-  var attributes = ciTypeObj.attributes.filter(function (attr) {
-    return !!attr.userVisible;
-  }).map(function (item) {
-    var aid = item.code + "-attribute";
-    return {
-      id: aid,
-      code: item.code,
-      name: item.name,
-      type: "attribute",
-      tag: tagArr.indexOf(aid) >= 0,
-      tip: tipArr.indexOf(aid) >= 0
-    };
-  });
-  var metrics = ciTypeObj.metrics.map(function (item) {
-    var mid = item.code + "-metric";
-    return {
-      id: mid,
-      code: item.code,
-      name: item.name,
-      type: "metric",
-      tag: tagArr.indexOf(mid) >= 0,
-      tip: tipArr.indexOf(mid) >= 0
-    };
-  });
-  return [].concat(custom, attributes, metrics);
-};
 /**
  * 格式化拓扑数据
  *
@@ -253,7 +168,6 @@ function buildGlobal(_ref2) {
   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,
       linkTo = _ref2.linkTo,
       globalConfig = _ref2.globalConfig,
       engine = _ref2.engine;
@@ -281,7 +195,7 @@ function buildGlobal(_ref2) {
     // 背景图
     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),
+      editable: true,
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
@@ -368,10 +282,8 @@ var combTopoData = function combTopoData(_ref3) {
   var _result$groups;
 
   var data = _ref3.data,
-      permission = _ref3.permission,
       linkTo = _ref3.linkTo,
       globalConfig = _ref3.globalConfig,
-      ciTypeMap = _ref3.ciTypeMap,
       engine = _ref3.engine;
   var result = (0, _clusterUtil.processCluster)(updateNodeInfo(engine, data)); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
 
@@ -381,7 +293,6 @@ var combTopoData = function combTopoData(_ref3) {
 
   var global = buildGlobal({
     data: result,
-    permission: permission,
     linkTo: linkTo,
     globalConfig: globalConfig,
     engine: engine
@@ -412,17 +323,11 @@ var combTopoData = function combTopoData(_ref3) {
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);
-  var resAndMetrics = (0, _extends2["default"])({
+  var resAndMetrics = {
     // topo所有ci的id集合
     resIdsList: allCis.map(function (item) {
       return item.id;
     }),
-    ciTypes: getCiTypes(data),
-    // ci类型集合
-    ciTypeMap: ciTypeMap,
-    // ci类型模型map
-    metrics: [],
-    // 所有指标
     nodeIdsList: data.nodes.map(function (item) {
       return {
         ciId: item.id,
@@ -435,86 +340,13 @@ var combTopoData = function combTopoData(_ref3) {
         operation: linkObj.operation
       };
     })
-  }, getCiModSet({
-    engine: engine,
-    data: data,
-    allCis: allCis,
-    ciTypeMap: ciTypeMap,
-    globalConfig: globalConfig
-  })); // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
+  }; // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
 
   return {
     topoData: topoData,
     resAndMetrics: resAndMetrics
   };
 };
-
-exports.combTopoData = combTopoData;
-
-function getCiModSet(params) {
-  var data = params.data,
-      engine = params.engine,
-      allCis = params.allCis,
-      ciTypeMap = params.ciTypeMap,
-      globalConfig = params.globalConfig; // 当前拓扑资源字典
-
-  var ciDoc = {};
-  var ciTypesDoc = {};
-  var allCiModSet = getNodeModSet();
-
-  function getNodeModSet() {
-    var ciTypes = getCiTypesFromCiElements(data.nodes);
-    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)
-      };
-    }); // console.log("modSet--------------------", modSet);
-
-    return modSet;
-  }
-
-  if (allCis.length > 0) {
-    allCis.forEach(function (element, index) {
-      var ciType = element.ciType;
-      ciDoc[element.id] = {
-        code: element.ciType,
-        name: element.name,
-        tag: [],
-        tip: []
-      };
-      ciTypesDoc[ciType] = ciTypesDoc[ciType] || [];
-      ciTypesDoc[element.ciType].push({
-        ciId: element.id
-      });
-    });
-  }
-
-  return {
-    ciDoc: ciDoc,
-    // ci信息集合
-    ciTypesDoc: ciTypesDoc,
-    // 每种ci含有的ci
-    allCiModSet: allCiModSet // 资源类型含有属性和指标集合
-
-  };
-}
 /**
  * 获得两个节点间的连线列表
  * @param {*} links
@@ -524,6 +356,8 @@ function getCiModSet(params) {
  */
 
 
+exports.combTopoData = combTopoData;
+
 function getLinksBetweenTwoNodes(links, id1, id2) {
   return links.filter(function (link) {
     return link.source === id1 && link.target === id2 || link.target === id1 && link.source === id2;

package/package.json

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