@riil-frontend/component-topology 9.0.0-a.22 → 9.0.0-a.24

package/es/core/editor/components/Toolbar/widgets/FontSizeWidget.js

@@ -15,7 +15,7 @@ function FontSizeSelect(props) {
         style: {
           width: 18
         }
-      }, val || 12);
+      }, val || 20);
     },
     disabled: disabled,
     onSelect: function onSelect(val) {

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js

@@ -15,7 +15,7 @@ export function getTextStyle(element) {
     color: parseColor(element.s('group.title.color')),
     underline: underline
   }, fontStyleUtil.toMap(element.s('group.title.font')), {
-    fontSize: font.fontSize || 12,
+    fontSize: font.fontSize || 24,
     fontFamily: font.fontFamily || '微软雅黑'
   }, parseBackground(element.s('group.title.background')));
 }

package/es/core/editor/components/settings/propertyViews/node/data/BindIpInput.js

@@ -38,7 +38,7 @@ export default function BindIpInput(props) {
       if (errors) {
         console.error("saveIp-error", errors, vals);
       } else {
-        console.log("saveIp", txtValue);
+        // console.log("saveIp", txtValue);
         setError("");
         onChange(txtValue);
         topoEditApi.relateNodeIp(txtValue, nodeElement);
@@ -65,8 +65,7 @@ export default function BindIpInput(props) {
       return callback();
     }
 
-    var isUnique = isUniqueIp(dm, value, nodeElement);
-    console.log("checkIp", isUnique);
+    var isUnique = isUniqueIp(dm, value, nodeElement); // console.log("checkIp", isUnique);
 
     if (!isUnique) {
       return callback("ip不能重复");

package/es/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -49,8 +49,7 @@ export default function Data(props) {
     values: parseValues(values),
     onChange: function onChange(name, value) {
       field.validate(function (errors, vals) {
-        if (errors) {
-          console.error("field-Data", errors, vals);
+        if (errors) {// console.error("field-Data", errors, vals);
         } else {
           var newValues = field.getValues();
 

package/es/core/hooks/useResourceConfig.js

@@ -45,7 +45,8 @@ export default function (props) {
       resources: config.resources,
       groups: config.groups,
       exportLinkIdList: config.exportLinkIdList,
-      relateTopoIdList: config.relateTopoIdList
+      relateTopoIdList: config.relateTopoIdList //linkIps: config.linkIps,
+
     };
   };
 

package/es/core/hooks/useTopoEdit.js

@@ -974,9 +974,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(txtValue, nodeElement) {
-      var _configObj$linkIps;
-
-      var dm, htTopo, elements, configObj, _yield$editDispatcher5, elementDatas, isUnique, ids, ip, re, config, linksData, createElementsData;
+      var dm, htTopo, elementNodes, isUnique, ids, ip, configObj, configData, _elements, newLinkElements, createElementsData;
 
       return _regeneratorRuntime.wrap(function _callee16$(_context16) {
         while (1) {
@@ -986,28 +984,11 @@ var useTopoEdit = function useTopoEdit(params) {
               // 根据配置查询拓扑数据
               dm = topo.getDataModel();
               htTopo = topo.getHtTopo();
-              elements = getNodes(dm); // 获取配置
-
-              configObj = topo.resourceConfig.getConfig();
-              console.log("configObj", configObj);
-              configObj.linkIps = [].concat((_configObj$linkIps = configObj.linkIps) !== null && _configObj$linkIps !== void 0 ? _configObj$linkIps : [], [txtValue]);
-              console.log("configObj---over", configObj);
-              _context16.next = 9;
-              return resourceConfig.updateConfig(configObj);
-
-            case 9:
-              _context16.next = 11;
-              return editDispatchers.fetchDataByConfig();
-
-            case 11:
-              _yield$editDispatcher5 = _context16.sent;
-              elementDatas = _yield$editDispatcher5.elementDatas;
-              console.log("bindIPtoNode", txtValue, nodeElement, elements);
-              console.log("elementDatas", elementDatas); // 执行唯一性验证
+              elementNodes = getNodes(dm); // 执行唯一性验证
 
               isUnique = isUniqueIp(dm, txtValue, nodeElement);
               ids = [];
-              elements.map(function (element) {
+              elementNodes.map(function (element) {
                 if (element.getTag()) {
                   ids.push(element.getTag());
                 }
@@ -1016,6 +997,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 id: "ip:" + txtValue,
                 name: txtValue,
                 customName: null,
+                bindType: "ip",
                 // 'groupId': null,
                 // 'groupTag': null,
                 ipAddress: txtValue,
@@ -1027,54 +1009,44 @@ var useTopoEdit = function useTopoEdit(params) {
               }; // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 30;
+                _context16.next = 23;
                 break;
               }
 
+              deleteExLink(nodeElement);
               nodeElement.a(ip);
-              nodeElement.setName(txtValue); // nodeElement.a("name", txtValue);
-              // nodeElement.a("customName", null);
-
-              nodeElement.setTag("ip:" + txtValue);
-              _context16.next = 25;
-              return editDispatchers.queryAllLinkByIp({
-                ids: ids,
-                ip: txtValue
-              });
+              nodeElement.setName(txtValue);
+              nodeElement.setTag("ip:" + txtValue); // 获取配置
 
-            case 25:
-              re = _context16.sent;
-              console.log("queryAllLinkByIp", re);
-              config = resourceConfig.getConfig();
-              console.log("resourceConfig.getConfig", config);
-
-              if (re && re.length > 0) {
-                linksData = [];
-                re.map(function (link) {
-                  var sourceId = link.attributes["network_link.source_device_id"];
-                  var source = dm.getDataByTag(sourceId);
-                  var target = nodeElement; // console.log("source, nodeElement, link", source, target, link);
-
-                  if (source && target) {
-                    var linkData = mergeExportLinkData({
-                      source: source,
-                      target: target,
-                      link: link
-                    });
-                    console.log("linkData", linkData);
-                    linksData.push(linkData); // htTopo.createEdge(source, target, link);
-                  }
-                });
-                createElementsData = {
-                  groups: [],
-                  nodes: [],
-                  links: [].concat(linksData),
-                  linkGroups: []
-                };
-                htTopo.createElements(createElementsData); // htTopo.addElements({ lines: [...re] });
-              }
+              configObj = topo.resourceConfig.getConfig(); // console.log("configObj", configObj);
+              // configObj.linkIps = [...(configObj.linkIps ?? []), txtValue];
+              // console.log("configObj---over", configObj);
 
-            case 30:
+              _context16.next = 15;
+              return resourceConfig.updateConfig(configObj);
+
+            case 15:
+              _context16.next = 17;
+              return editDispatchers.fetchDataByConfig();
+
+            case 17:
+              configData = _context16.sent;
+              _elements = configData.elements;
+              newLinkElements = findUNExistedLinkElements(_elements);
+              createElementsData = {
+                groups: [],
+                nodes: [],
+                links: newLinkElements.filter(function (item) {
+                  return item.type === "link";
+                }),
+                linkGroups: newLinkElements.filter(function (item) {
+                  return item.type === "linkGroup";
+                })
+              };
+              console.log("createElementsData", createElementsData);
+              htTopo.createElements(createElementsData);
+
+            case 23:
             case "end":
               return _context16.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 "9.0.0-a.22" === 'string' ? "9.0.0-a.22" : null;
+var version = typeof "9.0.0-a.24" === 'string' ? "9.0.0-a.24" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/topoData.js

@@ -11,8 +11,8 @@ export function getLayoutId(layout) {
 
   if (typeof layout === "string") {
     return {
-      v: 'towardeast',
-      h: 'towardsouth'
+      v: "towardeast",
+      h: "towardsouth"
     }[layout] || layout;
   }
 
@@ -41,7 +41,7 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -73,7 +73,7 @@ function _saveTopo() {
 
           case 8:
             if (!(resources || groups)) {
-              _context.next = 15;
+              _context.next = 16;
               break;
             }
 
@@ -95,24 +95,31 @@ function _saveTopo() {
               });
             }
 
+            linkIps = []; // resources?.static.map((nodeId) => {
+            //   if (nodeId.startsWith("ip_")) {
+            //     linkIps.push(nodeId.replace("ip_", ""));
+            //   }
+            // });
+
             rlog.debug("saveTopo-groupInfo", groupInfo);
-            _context.next = 15;
+            _context.next = 16;
             return topoService.bindResourceToTopo(topoId, {
               groups: groupInfo,
+              linkIps: linkIps,
               exportLinkIdList: exportLinkIdList,
               relateTopoIdList: relateTopoIdList
             });
 
-          case 15:
+          case 16:
             if (!serialize) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
 
-            _context.next = 18;
+            _context.next = 19;
             return topoService.saveSerializeData(topoId, serialize);
 
-          case 18:
+          case 19:
           case "end":
             return _context.stop();
         }

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

@@ -1,8 +1,8 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import keyBy from 'lodash/keyBy';
-import _ from 'lodash';
+import keyBy from "lodash/keyBy";
+import _ from "lodash";
 import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
 
 import { getEdges } from "../../../utils/htElementUtils";
@@ -18,24 +18,24 @@ import CiCache from "../cache/CiCache"; // const interfaceTypeMap = {
 
 /**
  * 是否关键链路
- * @param {*} link 
- * @returns 
+ * @param {*} link
+ * @returns
  */
 
 export function isCrucialLink(link) {
-  return !!link.attributes['network_link.is_crucial'];
+  return !!link.attributes["network_link.is_crucial"];
 }
 /**
  * 是否出口链路
- * @param {*} link 
- * @returns 
+ * @param {*} link
+ * @returns
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
 }
 export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
-  var linkCiMap = keyBy(links, 'id');
+  var linkCiMap = keyBy(links, "id");
   return links.map(function (link) {
     var _interfaceCiMap$attri, _interfaceCiMap$attri2;
 
@@ -44,19 +44,26 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceD
     var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
 
     var sourceNode = nodes.find(function (node) {
-      return node.id === attributes['network_link.source_device_id'];
+      return node.id === attributes["network_link.source_device_id"];
     });
     var targetNode = nodes.find(function (node) {
-      return node.id === attributes['network_link.destination_device_id'];
-    }); // 翻译
+      return node.id === attributes["network_link.destination_device_id"];
+    });
+    var target = link.target; // 目的端为ip节点
+
+    if (attributes["destination_type"] === "ip") {
+      target = "ip:" + attributes["network_link.destination_ipv4"];
+    } // 翻译
+
 
     return _extends({}, link, {
+      target: target,
       attributes: _extends({}, attributes, {
         // 源/目的设备
-        'network_link.source_device_id_object': {
+        "network_link.source_device_id_object": {
           displayName: sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.name
         },
-        'network_link.destination_device_id_object': {
+        "network_link.destination_device_id_object": {
           displayName: targetNode === null || targetNode === void 0 ? void 0 : targetNode.name
         },
         // 源/目的接口类型
@@ -64,10 +71,10 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceD
         destination_type_object: interfaceDoc[attributes.destination_type],
         // 源/目的接口
         source_id_object: {
-          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes['display_name']
+          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes["display_name"]
         },
         destination_id_object: {
-          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes['display_name']
+          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes["display_name"]
         }
       })
     });
@@ -106,7 +113,7 @@ function _getLinksDetail() {
             }), linkCis.map(function (item) {
               return item.attributes.destination_type;
             })))).filter(function (item) {
-              return item !== 'ip';
+              return item !== "ip";
             });
             _context.next = 7;
             return CiCache.load(interfaceIds);
@@ -147,10 +154,10 @@ export var compatibleWith = function compatibleWith(value) {
 
 export var plurals = {
   0: [],
-  1: ['phy'],
-  2: ['phy'],
-  3: ['agg'],
-  4: ['phy', 'agg']
+  1: ["phy"],
+  2: ["phy"],
+  3: ["agg"],
+  4: ["phy", "agg"]
 };
 export var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
@@ -165,25 +172,25 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var dm = gv.getDataModel();
   var edges = getEdges(dm); // console.log("edges", edges);
 
-  var showPhy = types.indexOf('phy') >= 0;
-  var showAgg = types.indexOf('agg') >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
+  var showPhy = types.indexOf("phy") >= 0;
+  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);
-        edge.s('2d.visible', true);
+        edge.s("2d.visible", true);
       } else {
         var _d$attributes, _d$attributes2;
 
         var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === 'network.agg_interface' && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === 'network.agg_interface') {
-          edge.s('2d.visible', showAgg);
+        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
+          edge.s("2d.visible", showAgg);
         } else {
           // console.log("edge", edge, d, showAgg);
-          edge.s('2d.visible', showPhy);
+          edge.s("2d.visible", showPhy);
         }
       }
     });
@@ -198,7 +205,7 @@ export var mergeExportLinkData = function mergeExportLinkData(props) {
   var linkData = _extends({}, link, {
     name: attrObj.name,
     source: attrObj["network_link.source_device_id"],
-    target: attrObj.destination_type === 'ip' ? target.getTag() : attrObj["network_link.destination_device_id"],
+    target: attrObj.destination_type === "ip" ? target.getTag() : attrObj["network_link.destination_device_id"],
     operation: attrObj.operation,
     interfaceSource: attrObj["source_id"],
     interfaceTarget: attrObj["destination_id"],

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

@@ -324,22 +324,23 @@ export default function (topoApp) {
                         layout: getLayoutId(group.layout),
                         resources: resToConditions(group.resources)
                       });
-                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
-
-                    _context4.next = 5;
+                    });
+                    rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
+                    _context4.next = 6;
                     return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
 
-                  case 5:
+                  case 6:
                     data = _context4.sent;
-                    _context4.next = 8;
+                    rlog.debug("getTopoByConditions--------data", data);
+                    _context4.next = 10;
                     return buildTopoData(data);
 
-                  case 8:
+                  case 10:
                     data = _context4.sent;
-                    _context4.next = 11;
+                    _context4.next = 13;
                     return Promise.all([addLinkData(data), topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 11:
+                  case 13:
                     _yield$Promise$all = _context4.sent;
                     dataWithLinkDetail = _yield$Promise$all[0];
                     _combTopoData = combTopoData({
@@ -366,7 +367,7 @@ export default function (topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 19:
+                  case 21:
                   case "end":
                     return _context4.stop();
                 }

package/es/networkTopo/getTopoData.js

@@ -77,6 +77,7 @@ function _addLinkData() {
 
           case 4:
             networkLinks = _context.sent;
+            console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
               return link.ciType !== 'network_link';
             });
@@ -85,7 +86,7 @@ function _addLinkData() {
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

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

@@ -408,17 +408,17 @@ export default _extends({
   */
   getTopoData: function getTopoData(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var _result$nodes, _result$links, result;
+      var _result$nodes, _result$links;
 
+      var result;
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context12.next = 2;
               return request.get(API_ROOT + "/structure/both/" + id);
 
-            case 3:
+            case 2:
               result = _context12.sent;
               return _context12.abrupt("return", processExitLink(_extends({}, result, {
                 nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
@@ -429,18 +429,12 @@ export default _extends({
                 })
               })));
 
-            case 7:
-              _context12.prev = 7;
-              _context12.t0 = _context12["catch"](0);
-              rlog.debug('getTopoData-error', _context12.t0);
-              return _context12.abrupt("return", null);
-
-            case 11:
+            case 4:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 7]]);
+      }, _callee12);
     }))();
   },
 
@@ -483,7 +477,7 @@ export default _extends({
                     ciType: 'network_link'
                   });
                 })
-              })));
+              }), obj.groups));
 
             case 7:
             case "end":
@@ -522,10 +516,7 @@ export default _extends({
 
               obj = prepareGroupParams(newGroups);
               _context14.next = 6;
-              return request.post(API_ROOT + "/resource/" + id, _extends({}, otherConfig, obj, {
-                exportLinkIdList: [] // 传空数组清空
-
-              }));
+              return request.post(API_ROOT + "/resource/" + id, _extends({}, otherConfig, obj));
 
             case 6:
               return _context14.abrupt("return", _context14.sent);