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

package/es/networkTopo/utils/exitLinkUtil.js

@@ -64,58 +64,72 @@ export function isUniqueIp(dataModel, ip, nodeElement) {
 
 export function processExitLink(topoData) {
   var nodes = topoData.nodes,
-      links = topoData.links;
+      links = topoData.links; // 出口链路目的端设置为IP节点或者ping资源节点id
 
-  var serialize = _extends({}, getHtSerialize(topoData.serialize));
+  var newLinks = updateLinkTarget(links, nodes);
 
-  if (!serialize) {
-    return topoData;
-  } // 历史数据升级
+  if (!topoData.serialize) {
+    return _extends({}, topoData, {
+      links: newLinks
+    });
+  }
+
+  var serialize = _extends({}, getHtSerialize(topoData.serialize)); // 历史数据升级
 
 
   links.filter(isExitLink) // 升级V1.4前配置的出口链路目的端节点为IP节点
   .forEach(function (link) {
-    return upgradeExitLinkTarget(link);
-  }); // 出口链路目的端设置为IP节点或者ping资源节点id
+    return upgradeExitLinkTarget(link, serialize);
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-  var newLinks = links.map(function (link) {
-    if (!isExitLink(link) || link.target && nodes.find(function (node) {
-      return node.id === link.target;
-    })) {
-      return link;
-    }
+  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
 
-    var destinationIp = link.attributes['network_link.destination_ipv4'];
-    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes(serialize, nodes);
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  function upgradeLinkTargetNotExisted(links) {
+    newLinks = links.map(function (link) {
+      if (!isExitLink(link) || link.target && nodes.find(function (node) {
+        return node.id === link.target;
+      })) {
+        return link;
+      }
 
-    var target = pingNode ? pingNode.id : "ip:" + destinationIp; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+      var destinationIp = link.attributes['network_link.destination_ipv4'];
+      var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
 
-    var targetSerialize = findElementSerializeById(serialize, target);
+      var target = link.target; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-    if (!targetSerialize) {
-      var linkSerialize = findElementSerializeById(serialize, link.id);
+      var targetSerialize = findElementSerializeById(serialize, target);
 
-      if (linkSerialize) {
-        // 根据链路序列化数据找目的端节点
-        // eslint-disable-next-line no-underscore-dangle
-        var targetNodeSerialize = serialize.d.find(function (item) {
-          return item.i === linkSerialize.p.target.__i;
-        });
+      if (!targetSerialize) {
+        var linkSerialize = findElementSerializeById(serialize, link.id);
+
+        if (linkSerialize) {
+          // 根据链路序列化数据找目的端节点
+          // eslint-disable-next-line no-underscore-dangle
+          var targetNodeSerialize = serialize.d.find(function (item) {
+            return item.i === linkSerialize.p.target.__i;
+          });
 
-        if (targetNodeSerialize) {
-          target = targetNodeSerialize.p.tag;
+          if (targetNodeSerialize) {
+            target = targetNodeSerialize.p.tag;
+          }
         }
       }
-    }
 
-    return _extends({}, link, {
-      target: target
+      return _extends({}, link, {
+        target: target
+      });
     });
-  }); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
-
-  var ipNodes = getIpNodes();
+    return newLinks;
+  }
 
-  function getIpNodes() {
+  function getIpNodes(serialize, nodes) {
     // 从序列化获取关联的IP
     var ips = serialize.d.filter(function (item) {
       return item.a.bindType === 'ip';
@@ -123,10 +137,10 @@ export function processExitLink(topoData) {
       return item.a.bindIp;
     }).filter(function (item) {
       return !!item;
-    }).filter(function (ip) {
+    }) // 过滤ping资源对应的ip
+    .filter(function (ip) {
       return !findPingNode(nodes, ip);
-    }); // TODO 过滤ping资源对应的ip
-
+    });
     return ips.map(buildIpNode);
   }
 
@@ -147,7 +161,7 @@ export function processExitLink(topoData) {
    */
 
 
-  function upgradeExitLinkTarget(link) {
+  function upgradeExitLinkTarget(link, serialize) {
     var destinationIp = link.attributes['network_link.destination_ipv4'];
     var linkSerialize = findElementSerializeById(serialize, link.id);
 
@@ -166,42 +180,16 @@ export function processExitLink(topoData) {
       }
     }
   }
-
-  return _extends({}, topoData, {
-    nodes: [].concat(nodes, ipNodes),
-    links: newLinks,
-    serialize: serialize
-  });
 } // 从拓扑数据查找
 
 function findPingNode(nodes, ip) {
   return nodes.find(function (node) {
     return node.ciType === "ping" && (node.ipAddress || node.attributes.ipv4_address) === ip;
   });
-}
-/**
- * 编辑模式按资源查询拓扑数据处理出口链路target
- * FIXME 移到frontend 网络拓扑编辑
- * @param {*} topoData 
- * @returns 
- */
-
-
-export function processByConditionResult(topoData) {
-  var nodes = topoData.nodes,
-      links = topoData.links;
-  var ipNodes = getIpNodes();
-
-  function getIpNodes() {
-    // 从序列化获取关联的IP
-    var ips = [].filter(function (ip) {
-      return !findPingNode(nodes, ip);
-    }); // TODO 过滤ping资源对应的ip
-
-    return ips.map(buildIpNode);
-  } // 出口链路目的端设置为IP节点或者ping资源节点id
+} // 出口链路目的端设置为IP节点或者ping资源节点id
 
 
+function updateLinkTarget(links, nodes) {
   var newLinks = links.map(function (link) {
     if (!isExitLink(link) || link.target && nodes.find(function (node) {
       return node.id === link.target;
@@ -217,8 +205,38 @@ export function processByConditionResult(topoData) {
       target: target
     });
   });
+  return newLinks;
+}
+/**
+ * 编辑模式按资源查询拓扑数据处理出口链路target
+ * 1. 出口链路目的端设置为IP节点或者ping资源节点id
+ * 2. IP构造为node节点
+ * FIXME 移到frontend 网络拓扑编辑
+ * @param {*} topoData 
+ * @returns 
+ */
+
+
+export function processByConditionResult(topoData, groupConfigs) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+  var newLinks = updateLinkTarget(links, nodes);
   return _extends({}, topoData, {
     nodes: [].concat(nodes, ipNodes),
     links: newLinks
   });
+
+  function getIpNodes(groupConfigs, nodes) {
+    var ips = groupConfigs.map(function (g) {
+      return g.condition.linkIps;
+    }).reduce(function (result, groupIps) {
+      return [].concat(result, groupIps);
+    }, []) // 过滤ping资源对应的ip节点
+    .filter(function (ip) {
+      return !findPingNode(nodes, ip);
+    });
+    return ips.map(buildIpNode);
+  }
 }

package/es/utils/ResourceConfigUtil.js

@@ -2,8 +2,7 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import sortBy from 'lodash/sortBy';
 import { isExitLink } from "../core/models/utils/linkUtils";
 import { isClusterHtElement } from "./clusterUtil";
-import { getGroupChildrenResourceElements, getLayerChildrenResourceElements } from "./htElementDataUtil";
-import { getEdges, getGroups, getLayers, getNodes } from "./htElementUtils";
+import { getEdges, getGroupChildren, getGroups, getLayerChildren, getLayers, getNodes } from "./htElementUtils";
 /**
  * 从拓扑图解析出拓扑资源配置
  *
@@ -104,7 +103,9 @@ function getLayerDatas(dataModel) {
       name: layerElement.s('label'),
       order: layerElement.a('order'),
       resources: {
-        "static": getLayerChildrenResourceElements(layerElement).map(function (node) {
+        "static": getLayerChildren(layerElement).filter(function (item) {
+          return !!item.getTag();
+        }).map(function (node) {
           return node.getTag();
         })
       }
@@ -133,7 +134,7 @@ function getGroupConfigByElement(groupElement) {
     name: groupElement.a('name'),
     order: groupElement.a('order'),
     resources: {
-      "static": getGroupChildrenResourceElements(groupElement).filter(function (node) {
+      "static": getGroupChildren(groupElement).filter(function (node) {
         return !!node.getTag();
       }).map(function (node) {
         return node.getTag();

package/es/utils/htElementDataUtil.js

@@ -1,4 +1,4 @@
-import { getEdges, getGroupChildren, getLayerChildren } from "./htElementUtils";
+import { getEdges } from "./htElementUtils";
 import * as htElementUtils from "./htElementUtils";
 export function isLayer(element) {
   return element.className === 'ht.Grid';
@@ -21,12 +21,6 @@ export function isResourceElement(element) {
 export function isResourceNodeElement(element) {
   return (htElementUtils.isGroup(element) || htElementUtils.isNode(element)) && isResourceElement(element);
 }
-export function getGroupChildrenResourceElements(element) {
-  return getGroupChildren(element).filter(isResourceElement);
-}
-export function getLayerChildrenResourceElements(layerElement) {
-  return getLayerChildren(layerElement).filter(isResourceElement);
-}
 export var getAllEdgeResourceIds = function getAllEdgeResourceIds(dm) {
   return getEdges(dm).filter(function (node) {
     return !!node.getTag();

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

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

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

@@ -33,7 +33,7 @@ function getTextStyle(element) {
     color: (0, _colorUtil.parseColor)(element.s('group.title.color')),
     underline: underline
   }, _fontStyleUtil["default"].toMap(element.s('group.title.font')), {
-    fontSize: font.fontSize || 12,
+    fontSize: font.fontSize || 24,
     fontFamily: font.fontFamily || '微软雅黑'
   }, (0, _colorUtil.parseBackground)(element.s('group.title.background')));
 }

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

@@ -54,7 +54,7 @@ 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);
@@ -81,8 +81,7 @@ function BindIpInput(props) {
       return callback();
     }
 
-    var isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, value, nodeElement);
-    console.log("checkIp", isUnique);
+    var isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, value, nodeElement); // console.log("checkIp", isUnique);
 
     if (!isUnique) {
       return callback("ip不能重复");

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

@@ -73,8 +73,7 @@ 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/lib/core/hooks/useResourceConfig.js

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

package/lib/core/hooks/useTopoEdit.js

@@ -1016,9 +1016,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].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 _regenerator["default"].wrap(function _callee16$(_context16) {
         while (1) {
@@ -1028,28 +1026,11 @@ var useTopoEdit = function useTopoEdit(params) {
               // 根据配置查询拓扑数据
               dm = topo.getDataModel();
               htTopo = topo.getHtTopo();
-              elements = (0, _htElementUtils.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 = (0, _htElementUtils.getNodes)(dm); // 执行唯一性验证
 
               isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement);
               ids = [];
-              elements.map(function (element) {
+              elementNodes.map(function (element) {
                 if (element.getTag()) {
                   ids.push(element.getTag());
                 }
@@ -1058,6 +1039,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 id: "ip:" + txtValue,
                 name: txtValue,
                 customName: null,
+                bindType: "ip",
                 // 'groupId': null,
                 // 'groupTag': null,
                 ipAddress: txtValue,
@@ -1069,54 +1051,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 = (0, _linkUtils.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/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./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/lib/core/models/topoData.js

@@ -25,8 +25,8 @@ function getLayoutId(layout) {
 
   if (typeof layout === "string") {
     return {
-      v: 'towardeast',
-      h: 'towardsouth'
+      v: "towardeast",
+      h: "towardsouth"
     }[layout] || layout;
   }
 
@@ -57,7 +57,7 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].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 _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -91,7 +91,7 @@ function _saveTopo() {
 
           case 8:
             if (!(resources || groups)) {
-              _context.next = 15;
+              _context.next = 16;
               break;
             }
 
@@ -113,25 +113,32 @@ function _saveTopo() {
               });
             }
 
+            linkIps = []; // resources?.static.map((nodeId) => {
+            //   if (nodeId.startsWith("ip_")) {
+            //     linkIps.push(nodeId.replace("ip_", ""));
+            //   }
+            // });
+
             _rlog["default"].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();
         }