@riil-frontend/component-topology 3.1.12 → 3.3.0

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -27,6 +27,8 @@ var _grid = _interopRequireDefault(require("@alifd/next/lib/grid"));
 
 var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
+var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
@@ -37,6 +39,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var RadioGroup = _radio["default"].Group;
 var FormItem = _form["default"].Item;
 var Row = _grid["default"].Row,
     Col = _grid["default"].Col; // import LindInfoPreview from "../../link/LindInfoPreview";
@@ -60,9 +63,9 @@ function EditLinkInfo(props) {
 
   var _topo$store$useModel2 = topo.store.useModel("topoBizMod"),
       bizState = _topo$store$useModel2[0],
-      bizDispatchers = _topo$store$useModel2[1];
+      bizDispatchers = _topo$store$useModel2[1]; // const { resAndMetrics } = topoState;
+  // const { resAndMetrics } = bizState;
 
-  var resAndMetrics = topoState.resAndMetrics; // const { resAndMetrics } = bizState;
 
   var source = lineData.source,
       target = lineData.target,
@@ -80,6 +83,10 @@ function EditLinkInfo(props) {
       targetValue = _useState3[0],
       setTarget = _useState3[1];
 
+  var _useState4 = (0, _react.useState)(true),
+      connectEnable = _useState4[0],
+      setConnectEnable = _useState4[1];
+
   var fieldOnChange = function fieldOnChange(name, value) {
     var newValues = field.getValues();
 
@@ -111,7 +118,8 @@ function EditLinkInfo(props) {
     }
   };
 
-  var linkTypeJudge = function linkTypeJudge(sourceType, destinationType) {
+  var linkTypeJudge = function linkTypeJudge(sourceType, destinationType, type) {
+    console.log("linkTypeJudge", sourceType, destinationType, type);
     var connect = "phy";
     var support = "m.physical_link";
 
@@ -120,8 +128,9 @@ function EditLinkInfo(props) {
       support = "m.agg_link";
     }
 
-    if (sourceType === "" || destinationType === "") {
+    if (type === "exit") {
       connect = "exit";
+      support = "m.exit_link";
     }
 
     return {
@@ -130,6 +139,11 @@ function EditLinkInfo(props) {
     };
   };
 
+  var connectHandleChange = function connectHandleChange(v) {
+    console.log("connectHandleChange", v);
+    field.setValue("connect_type", v);
+  };
+
   var portsHandleChange = function portsHandleChange(type, value) {
     var _sourceValue$portsDoc, _sourceValue$portsDoc2, _targetValue$portsDoc, _targetValue$portsDoc2;
 
@@ -156,15 +170,15 @@ function EditLinkInfo(props) {
       if (errors) {
         _rlog["default"].debug("saveHandleChange-error", errors, values);
       } else {
-        var _sourceValue$portsDoc3, _sourceValue$portsDoc4, _targetValue$portsDoc3, _targetValue$portsDoc4, _sourceValue$ipAddres, _targetValue$ipAddres;
+        var _valus$destination_id, _sourceValue$portsDoc3, _sourceValue$portsDoc4, _targetValue$portsDoc3, _targetValue$portsDoc4, _sourceValue$ipAddres, _targetValue$ipAddres, _targetValue$id;
 
         _rlog["default"].debug("saveHandleChange", valus, source, target);
 
         var sourceId = valus["source_id"];
-        var destinationId = valus["destination_id"];
+        var destinationId = (_valus$destination_id = valus["destination_id"]) !== null && _valus$destination_id !== void 0 ? _valus$destination_id : "";
         var sourceType = (_sourceValue$portsDoc3 = (_sourceValue$portsDoc4 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc4 === void 0 ? void 0 : _sourceValue$portsDoc4.type) !== null && _sourceValue$portsDoc3 !== void 0 ? _sourceValue$portsDoc3 : "";
         var destinationType = (_targetValue$portsDoc3 = (_targetValue$portsDoc4 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc4 === void 0 ? void 0 : _targetValue$portsDoc4.type) !== null && _targetValue$portsDoc3 !== void 0 ? _targetValue$portsDoc3 : "";
-        var typeJudge = linkTypeJudge(sourceType, destinationType);
+        var typeJudge = linkTypeJudge(sourceType, destinationType, valus["connect_type"]);
         var obj = {
           display_name: valus["display_name"],
           // 链路名称
@@ -184,7 +198,7 @@ function EditLinkInfo(props) {
           // destination_type, // 必须
           "network_link.source_device_id": sourceValue.id,
           // 必须
-          "network_link.destination_device_id": targetValue.id,
+          "network_link.destination_device_id": (_targetValue$id = targetValue.id) !== null && _targetValue$id !== void 0 ? _targetValue$id : "",
           // 必须
           "network_link.connect_type": typeJudge.connect,
           // 必须
@@ -201,6 +215,10 @@ function EditLinkInfo(props) {
           obj["destination_id"] = destinationId; // 目的端口
 
           obj["destination_type"] = destinationType;
+        } else {
+          obj["destination_id"] = ""; // 目的端口
+
+          obj["destination_type"] = "";
         }
 
         if (isAdd) {
@@ -303,7 +321,7 @@ function EditLinkInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u76EE\u7684\u7AEF\u53E3",
-    required: true,
+    required: valus["connect_type"] !== "exit",
     requiredMessage: "\u76EE\u7684\u7AEF\u53E3\u4E0D\u80FD\u4E3A\u7A7A"
   }), targetValue.ipAddress ? /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "destination_id",
@@ -350,6 +368,25 @@ function EditLinkInfo(props) {
     gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "24"
+  }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
+    labelAlign: labelAlign,
+    label: "\u94FE\u63A5\u65B9\u5F0F"
+  }), /*#__PURE__*/_react["default"].createElement(RadioGroup, {
+    name: "connect_type",
+    onChange: function onChange(v) {
+      connectHandleChange(v);
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    id: "phy",
+    value: "phy",
+    disabled: target.ciType === "customNode"
+  }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    id: "exit",
+    value: "exit"
+  }, "\u51FA\u53E3"))))), /*#__PURE__*/_react["default"].createElement(Row, {
+    gutter: "16"
+  }, /*#__PURE__*/_react["default"].createElement(Col, {
+    span: "24"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u5B9E\u9645\u5E26\u5BBD\uFF08Mbps\uFF09"

package/lib/topoCenter/components/editor/propertyViews/edge/link/LinkInfoPreview.js

@@ -15,6 +15,8 @@ var _LinkInfoPreviewModule = _interopRequireDefault(require("./LinkInfoPreview.m
 
 var _attributeFormatter = require("../../../../../../core/models/attributeFormatter");
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -45,8 +47,13 @@ function LindInfoPreview(props) {
   }, {
     label: "目的端口",
     name: "destination_id"
-  }, // { label: "取值端口", name: "network_link.work_mode" },
-  {
+  }, {
+    label: "取值端口",
+    name: "network_link.value_port"
+  }, {
+    label: "链接方式",
+    name: "network_link.connect_type"
+  }, {
     label: "实际带宽",
     name: "network_link.actual_bandwidth"
   }, {
@@ -57,14 +64,27 @@ function LindInfoPreview(props) {
   var getValue = function getValue(name) {
     var value;
 
-    if (data.attributes[name + "_object"]) {
-      value = data.attributes[name + "_object"].displayName;
+    if (data) {
+      if (data.attributes[name + "_object"]) {
+        value = data.attributes[name + "_object"].displayName;
+      } else {
+        value = data.attributes[name];
+      }
+
+      var attrMeta = topo.ciTyeCache.getCiType("network_link").attributeMap[name];
+      value = (0, _attributeFormatter.formatMetric)(value, attrMeta);
+
+      if (name === "network_link.value_port") {
+        value = "源端口";
+      }
+
+      if (name === "network_link.connect_type") {
+        value = data.attributes[name] === "exit" ? "出口" : "物理/聚合";
+      }
     } else {
-      value = data.attributes[name];
+      value = "-";
     }
 
-    var attrMeta = topo.ciTyeCache.getCiType("network_link").attributeMap[name];
-    value = (0, _attributeFormatter.formatMetric)(value, attrMeta);
     return value;
   };
 

package/lib/topoCenter/event/index.js

@@ -7,4 +7,5 @@ var TopoCenterEvent = function TopoCenterEvent() {};
 
 exports["default"] = TopoCenterEvent;
 TopoCenterEvent.TOPO_LINK_ENTER_CREATE_MODE = "topo_link_enter_create_mode";
-TopoCenterEvent.TOPO_LINK_CREATED = "topo_link_created";
+TopoCenterEvent.TOPO_LINK_CREATED = "topo_link_created";
+TopoCenterEvent.TOPO_LINK_SELECT_SOURCE_NODE = "topo_link_select_source_node";

package/lib/topoCenter/hooks/editor/useDeleteEdges.js

@@ -56,31 +56,24 @@ var _default = function _default(_ref) {
     return deleteable;
   }
 
-  var deleteLink = function deleteLink(edge) {
-    var id = edge.getTag();
-    var link = topo.dataModel.getDataById(id);
-    var isAgg = (0, _linkUtils.isAggLink)(link);
-
-    if (!checkLinkDeleteable(link)) {
-      return;
-    }
-
-    var htTopo = topo.getHtTopo();
-    confirmDeleteLink( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var success, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
+  var doDeleteLink = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(link, edge) {
+      var id, isAgg, success, htTopo, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              id = link.id;
+              isAgg = (0, _linkUtils.isAggLink)(link);
+              _context.next = 4;
               return _link["default"].deleteLink(id);
 
-            case 2:
+            case 4:
               success = _context.sent;
 
               if (success) {
-                _context.next = 6;
+                _context.next = 8;
                 break;
               }
 
@@ -88,9 +81,10 @@ var _default = function _default(_ref) {
 
               return _context.abrupt("return");
 
-            case 6:
-              _message["default"].success('删除成功'); // 获取两个节点间的连线数据列表 
+            case 8:
+              _message["default"].success('删除成功');
 
+              htTopo = topo.getHtTopo(); // 获取两个节点间的连线数据列表 
 
               edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
 
@@ -114,28 +108,56 @@ var _default = function _default(_ref) {
 
               _topo$store$getModel = topo.store.getModel('topoMod'), topoState = _topo$store$getModel[0], topoDispatchers = _topo$store$getModel[1];
               _topoState$data = topoState.data, links = _topoState$data.links, linkGroups = _topoState$data.linkGroups;
-              _context.next = 13;
+              _context.next = 16;
               return topoDispatchers.update({
                 data: (0, _extends2["default"])({}, topoState.data, {
-                  links: links.filter(function (link) {
-                    return link.id !== id;
+                  links: links.filter(function (item) {
+                    return item.id !== id;
                   }),
-                  linkGroups: linkGroups.filter(function (link) {
-                    return link.id !== id;
+                  linkGroups: linkGroups.filter(function (item) {
+                    return item.id !== id;
                   })
                 })
               });
 
-            case 13:
+            case 16:
               // 刷新链路动态线宽
               topo.linkDynamicStyleExecutor.execute();
 
-            case 14:
+            case 17:
             case "end":
               return _context.stop();
           }
         }
       }, _callee);
+    }));
+
+    return function doDeleteLink(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  var deleteLink = function deleteLink(edge) {
+    var id = edge.getTag();
+    var link = topo.dataModel.getDataById(id);
+
+    if (!checkLinkDeleteable(link)) {
+      return;
+    }
+
+    confirmDeleteLink( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              doDeleteLink(link, edge);
+
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
     })));
   };
   /**

package/lib/topoCenter/services/link.js

@@ -156,6 +156,50 @@ var _default = {
         }
       }, _callee4, null, [[0, 7]]);
     }))();
+  },
+
+  /**
+   * 查询可关联链路
+   *
+   * @param {array} ciIds
+   */
+  queryAssociatedlinks: function queryAssociatedlinks(ids) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      var idtxt, parm, jsonParm, result;
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              idtxt = "'" + ids[0] + "','" + ids[1] + "'";
+              parm = {
+                condition: "type('network_link') && network_link.connect_type = 'exit' && network_link.source_device_id in [" + idtxt + "]",
+                sort: "name asc",
+                currentPage: 1,
+                pageSize: 20
+              };
+              jsonParm = JSON.stringify(parm);
+              console.log("queryAssociatedlinks", ids, idtxt, parm, jsonParm);
+              _context5.prev = 4;
+              _context5.next = 7;
+              return (0, _componentTopologyCommon.getRequest)().post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
+
+            case 7:
+              result = _context5.sent;
+              return _context5.abrupt("return", result);
+
+            case 11:
+              _context5.prev = 11;
+              _context5.t0 = _context5["catch"](4);
+
+              _rlog["default"].error("查询可关联链路", _context5.t0);
+
+            case 14:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5, null, [[4, 11]]);
+    }))();
   }
 };
 exports["default"] = _default;

package/lib/topoCenter/utils/linPermissionUtil.js

@@ -3,27 +3,39 @@
 exports.__esModule = true;
 exports.getLinkPermission = getLinkPermission;
 
+var isWriteable = function isWriteable(link, source, target, linkType) {
+  if (linkType === "exit") {
+    return ["write", "delete"].indexOf(source === null || source === void 0 ? void 0 : source.operation) !== -1;
+  } else {
+    return [source, target].filter(function (node) {
+      return ["write", "delete"].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
+    }).length === 2;
+  }
+};
 /**
  * 获得链路权限
- * 
- * @param {*} link 
- * @param {*} nodes 
- * @returns 
+ *
+ * @param {*} link
+ * @param {*} nodes
+ * @returns
  */
-function getLinkPermission(link, nodes) {
+
+
+function getLinkPermission(edge, nodes, link) {
   var source = nodes.find(function (node) {
-    return node.id === link.source;
+    return node.id === edge.source;
   });
   var target = nodes.find(function (node) {
-    return node.id === link.target;
-  });
+    return node.id === edge.target;
+  }); // console.log("getLinkPermission", edge, source, target, link);
+
+  var linkType = link.attributes["network_link.connect_type"]; //TODO 这里的逻辑因为 出口链路 可能需要调整
+
   return {
-    readable: source.operation || target.operation,
-    writeable: [source, target].filter(function (node) {
-      return ['write', 'delete'].indexOf(node.operation) !== -1;
-    }).length === 2,
+    readable: (source === null || source === void 0 ? void 0 : source.operation) || (target === null || target === void 0 ? void 0 : target.operation),
+    writeable: isWriteable(edge, source, target, linkType),
     deleteable: [source, target].filter(function (node) {
-      return ['write', 'delete'].indexOf(node.operation) !== -1;
+      return ["write", "delete"].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
     }).length >= 1
   };
 }

package/lib/utils/ResourceConfigUtil.js

@@ -11,19 +11,21 @@ var _htElementUtils = require("./htElementUtils");
 
 /**
  * 从拓扑图解析出拓扑资源配置
- * 
- * @param {ht.DataModel} dataModel 
+ *
+ * @param {ht.DataModel} dataModel
  * @returns {{layers, groups, resources}}
  */
-function getResourceConfigFromHt(dataModel) {
-  // 获得分层
+function getResourceConfigFromHt(topo) {
+  var htTopo = topo.getHtTopo();
+  var dataModel = topo.getDataModel(); // 获得分层
+
   var layerElements = (0, _htElementUtils.getLayers)(dataModel);
   var layers = layerElements.map(function (layerElement) {
     return {
       id: layerElement.getTag(),
-      tag: layerElement.a('tag'),
-      name: layerElement.s('label'),
-      order: layerElement.a('order'),
+      tag: layerElement.a("tag"),
+      name: layerElement.s("label"),
+      order: layerElement.a("order"),
       resources: {
         "static": (0, _htElementUtils.getLayerChildrenNodes)(layerElement).filter(function (node) {
           return !!node.getTag();
@@ -40,7 +42,7 @@ function getResourceConfigFromHt(dataModel) {
   var viewNodes = (0, _htElementUtils.getNodes)(dataModel).filter(function (node) {
     return !node.getParent();
   }).filter(function (node) {
-    return node.a('type') === 'node';
+    return node.a("type") === "node";
   }).filter(function (node) {
     return !!node.getTag();
   });
@@ -51,20 +53,40 @@ function getResourceConfigFromHt(dataModel) {
   }; // console.error('getResourceConfigFromHt', {
   //   viewNodes,
   // });
+  // 查询出口链路列表
+
+  var exportLinkIdList = [];
+  var edges = (0, _htElementUtils.getEdges)(dataModel);
+  console.log(" 查询出口链路列表-edges", edges, dataModel);
+  edges.forEach(function (edge) {
+    var edgeData = htTopo.getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
+
+    var id = edgeData._attrObject.id;
+
+    if (id) {
+      var linkData = topo.dataModel.getDataById(id);
+      var connectType = linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"];
 
+      if (connectType === "exit" && !exportLinkIdList.includes(id)) {
+        exportLinkIdList.push(id);
+      }
+    }
+  });
   return {
-    layers: (0, _sortBy["default"])(layers, 'order'),
-    groups: (0, _sortBy["default"])([].concat(layers, groups), 'order'),
-    resources: resources
+    layers: (0, _sortBy["default"])(layers, "order"),
+    groups: (0, _sortBy["default"])([].concat(layers, groups), "order"),
+    resources: resources,
+    exportLinkIdList: exportLinkIdList // 出口链路id列表
+
   };
 }
 
 function getGroupConfigByElement(groupElement) {
   return {
     id: groupElement.getTag(),
-    tag: groupElement.a('tag'),
-    name: groupElement.a('name'),
-    order: groupElement.a('order'),
+    tag: groupElement.a("tag"),
+    name: groupElement.a("name"),
+    order: groupElement.a("order"),
     resources: {
       "static": (0, _htElementUtils.getGroupChildrenNodes)(groupElement).filter(function (node) {
         return !!node.getTag();

package/lib/utils/topoData.js

@@ -310,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,
@@ -337,14 +337,14 @@ function buildGlobal(_ref2) {
     };
   }
 
-  return (0, _extends2["default"])({
+  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,
@@ -357,9 +357,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)
@@ -372,7 +371,7 @@ function buildGlobal(_ref2) {
     icons: (0, _icon.getEditorIcons)(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
     getDefaultNodeIcon: engine.options.getDefaultNodeIcon
-  });
+  };
 }
 /**
  * 将从后端接收的数据转化为topo组件中需要的数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "3.1.12",
+  "version": "3.3.0",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -68,7 +68,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.0.9",
-    "@riil-frontend/component-topology-graph": "^2.5.8",
+    "@riil-frontend/component-topology-graph": "^2.6.0",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.1.12/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.3.0/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/CHANGELOG.md

@@ -1,27 +0,0 @@
-## 3.1.11 2022-4-20 10:55:08
-
-- 支持移除概览功能参数
-
-## 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
-
-新增功能
-- 拓扑图全量更新数据接口，更新时保留元素样式
-- 编辑模式右键菜单

package/es/core/common/icons/defaultIcons.js

@@ -1,44 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import { iconFactory } from '@riil-frontend/component-topology-graph';
-/**
- * 资源面板图片-默认节点图标
- *
- * @type {(*|{url: *})[]}
- */
-
-export var DEFAULT_NODE_ICONS = [{
-  id: 'ciType.switch',
-  name: '交换机'
-}, {
-  id: 'system.coreswitch',
-  name: '核心交换机'
-}, {
-  id: 'ciType.router',
-  name: '路由器',
-  ciType: 'network.router'
-}, {
-  id: 'system.db',
-  name: '数据库'
-}, {
-  id: 'system.dc',
-  name: '数据中心'
-}, {
-  id: 'system.firewall',
-  name: '防火墙'
-}, {
-  id: 'system.server',
-  name: '服务器'
-}, {
-  id: 'system.cloud',
-  name: '云'
-}, {
-  id: 'system.building',
-  name: '楼宇'
-}, {
-  id: 'system.internet',
-  name: '互联网'
-}].map(function (item) {
-  return _extends({}, item, {
-    url: iconFactory.getIconImageUrl(item.id)
-  });
-});