@riil-frontend/component-topology 3.5.3 → 3.5.4

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.5.3" === 'string' ? "3.5.3" : null;
+var version = typeof "3.5.4" === 'string' ? "3.5.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -66,7 +66,7 @@ function AddLinkDrawer(props) {
   var linkNodesRef = useRef();
 
   var getPortsById = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id, currentLink) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
       var result, links, ifTypes, ifDoc, usedPorts, portsDoc, ports;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -84,24 +84,21 @@ function AddLinkDrawer(props) {
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
-              }); // console.log("端口类型列表", ifTypes);
-
-              _context.next = 9;
+              });
+              console.log("端口类型列表", ifTypes);
+              _context.next = 10;
               return getInterfaceObject(ifTypes);
 
-            case 9:
+            case 10:
               ifDoc = _context.sent;
-              // console.log("端口类型字典", ifDoc);
+              console.log("端口类型字典", ifDoc);
               usedPorts = [];
               links.data.map(function (link) {
-                // console.log("getPortsById-去重", links, id);
-                if (link.id !== (currentLink === null || currentLink === void 0 ? void 0 : currentLink.id)) {
-                  usedPorts.push(link.attributes.destination_id);
-                  usedPorts.push(link.attributes.source_id);
-                }
+                usedPorts.push(link.attributes.destination_id);
+                usedPorts.push(link.attributes.source_id);
               });
-              usedPorts = _.uniq(usedPorts); // rlog.debug("端口列表", result, links);
-              //const list = result[id];
+              usedPorts = _.uniq(usedPorts);
+              rlog.debug("端口列表", result, links); //const list = result[id];
 
               portsDoc = {};
               ports = result.map(function (item) {
@@ -123,7 +120,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 16:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -131,7 +128,7 @@ function AddLinkDrawer(props) {
       }, _callee);
     }));
 
-    return function getPortsById(_x, _x2) {
+    return function getPortsById(_x) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -202,7 +199,7 @@ function AddLinkDrawer(props) {
       }, _callee2, null, [[3, 19]]);
     }));
 
-    return function handleEvent(_x3) {
+    return function handleEvent(_x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -223,15 +220,16 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.next = 2;
-              return getPortsById(currentLink.source, currentLink);
+              console.log("编辑链路--当前链路", currentLink);
+              _context3.next = 3;
+              return getPortsById(currentLink.source);
 
-            case 2:
+            case 3:
               sourcePorts = _context3.sent;
-              _context3.next = 5;
-              return getPortsById(currentLink.target, currentLink);
+              _context3.next = 6;
+              return getPortsById(currentLink.target);
 
-            case 5:
+            case 6:
               targetPorts = _context3.sent;
               setSourceIFDoc(sourcePorts.portsDoc);
               setTargetIFDoc(targetPorts.portsDoc);
@@ -265,7 +263,7 @@ function AddLinkDrawer(props) {
                 })
               });
 
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -416,9 +414,7 @@ function AddLinkDrawer(props) {
   };
 
   var mergeExportLinkData = function mergeExportLinkData(data, attributes) {
-    var _sourceIFDoc$data$sou, _targetIFDoc$data$des;
-
-    // console.log("mergeExportLinkData", data, attributes);
+    console.log("mergeExportLinkData", data, attributes);
     return _extends({}, attributes, {
       id: data.id,
       name: data.name,
@@ -439,10 +435,10 @@ function AddLinkDrawer(props) {
         support_templates: data.support_templates,
         use: data.use,
         source_id_object: {
-          displayName: (_sourceIFDoc$data$sou = sourceIFDoc[data.source_id]) === null || _sourceIFDoc$data$sou === void 0 ? void 0 : _sourceIFDoc$data$sou.label
+          displayName: sourceIFDoc[data.source_id].label
         },
         destination_id_object: {
-          displayName: (_targetIFDoc$data$des = targetIFDoc[data.destination_id]) === null || _targetIFDoc$data$des === void 0 ? void 0 : _targetIFDoc$data$des.label
+          displayName: targetIFDoc[data.destination_id].label
         }
       })
     });
@@ -450,14 +446,14 @@ function AddLinkDrawer(props) {
 
   var onSave = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
-      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData, _config, _yield$editDispatcher2, _elements;
+      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData;
 
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               //editDispatchers.update({ addLinkIsOpen: false });
-              // console.log("保存链路信息", isAddMode, data);
+              // rlog.debug("保存链路信息", isAddMode, data);
               setLoading(true);
               parm = {
                 attributes: data
@@ -491,14 +487,14 @@ function AddLinkDrawer(props) {
               _context5.prev = 15;
 
               if (!result) {
-                _context5.next = 55;
+                _context5.next = 36;
                 break;
               }
 
               config = topo.resourceConfig.getConfigFromHt(); // 新建后显示到图上
 
               if (!isAddMode) {
-                _context5.next = 31;
+                _context5.next = 32;
                 break;
               }
 
@@ -520,8 +516,8 @@ function AddLinkDrawer(props) {
               elements = _yield$editDispatcher.elements;
               linkData = elements.find(function (element) {
                 return element.id === result;
-              }); // console.log("创建成功-parm,linkData", parm, linkData);
-
+              });
+              console.log("创建成功-parm,linkData", parm, linkData);
               addLinkToGraph({
                 linkData: clone(linkData),
                 linkType: linkType,
@@ -530,78 +526,62 @@ function AddLinkDrawer(props) {
 
               _Message.success("创建成功");
 
-              _context5.next = 53;
+              _context5.next = 34;
               break;
 
-            case 31:
-              if (!(linkType === "exit")) {
-                _context5.next = 46;
-                break;
-              }
+            case 32:
+              // console.log("保存编辑信息", data, linkType);
+              if (linkType === "exit") {
+                edge = topo.getGraphView().dm().sm().ld();
+                aobj = edge.getAttrObject();
+                edge.setAttrObject(_extends({}, aobj, data));
+                target = edge.getTarget();
 
-              edge = topo.getGraphView().dm().sm().ld();
-              aobj = edge.getAttrObject();
-              edge.setAttrObject(_extends({}, aobj, data));
-              target = edge.getTarget();
+                if (target.getTag() === undefined) {
+                  target.a("name", data["network_link.destination_ipv4"]);
+                }
 
-              if (target.getTag() === undefined) {
-                target.a("name", data["network_link.destination_ipv4"]);
+                links = topoState.data.links;
+                linkAttrKey = links.findIndex(function (item) {
+                  return item.id === aobj.id;
+                });
+                newLinkData = mergeExportLinkData(edge.getAttrObject(), links[linkAttrKey]);
+                newLinks = clone(links);
+                newLinks.splice(linkAttrKey, 1, newLinkData);
+                newData = _extends({}, topoState.data, {
+                  links: newLinks
+                });
+                topoDispatchers.update({
+                  data: newData
+                });
               }
 
-              links = topoState.data.links;
-              linkAttrKey = links.findIndex(function (item) {
-                return item.id === aobj.id;
-              });
-              newLinkData = mergeExportLinkData(edge.getAttrObject(), links[linkAttrKey]);
-              newLinks = clone(links);
-              newLinks.splice(linkAttrKey, 1, newLinkData);
-              newData = _extends({}, topoState.data, {
-                links: newLinks
-              });
-              topoDispatchers.update({
-                data: newData
-              });
-              _context5.next = 52;
-              break;
-
-            case 46:
-              _config = topo.resourceConfig.getConfigFromHt();
-              topo.resourceConfig.updateConfig(_config);
-              _context5.next = 50;
-              return editDispatchers.fetchDataByConfig();
-
-            case 50:
-              _yield$editDispatcher2 = _context5.sent;
-              _elements = _yield$editDispatcher2.elements;
-
-            case 52:
               _Message.success("保存成功");
 
-            case 53:
+            case 34:
               editDispatchers.update({
                 addLinkIsOpen: false,
                 currentLink: null
               });
               topo.linkDynamicStyleExecutor.execute();
 
-            case 55:
-              _context5.next = 60;
+            case 36:
+              _context5.next = 40;
               break;
 
-            case 57:
-              _context5.prev = 57;
+            case 38:
+              _context5.prev = 38;
               _context5.t0 = _context5["catch"](15);
-              rlog.debug("保存链路信息异常", _context5.t0);
 
-            case 60:
+            case 40:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[15, 57]]);
+      }, _callee5, null, [[15, 38]]);
     }));
 
-    return function onSave(_x4) {
+    return function onSave(_x3) {
       return _ref6.apply(this, arguments);
     };
   }();

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

@@ -80,7 +80,7 @@ export default function EditLinkInfo(props) {
   };
 
   var linkTypeJudge = function linkTypeJudge(sourceType, destinationType, type) {
-    // console.log("linkTypeJudge", sourceType, destinationType, type);
+    console.log("linkTypeJudge", sourceType, destinationType, type);
     var connect = "phy";
     var support = "m.physical_link";
 
@@ -134,15 +134,16 @@ export default function EditLinkInfo(props) {
     var links = topo.getEdges();
     var usedNames = [];
     links.map(function (link) {
-      // console.log('checkName',link.id,lineData)
+      console.log('checkName', link.id, lineData);
+
       if (link.dtype === "link" && link.name && link.id !== lineData.attributes.linkId) {
         usedNames.push(link.name);
       }
     });
 
     if (usedNames.indexOf(displayName) >= 0) {
-      // console.log("setError", checkName, usedNames, displayName);
-      // field.setError("display_name", "链路名称重复");
+      console.log("setError", checkName, usedNames, displayName); // field.setError("display_name", "链路名称重复");
+
       return callback("链路名称重复");
     } else {
       return callback();

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss

@@ -1,12 +1,3 @@
-@import '~@alifd/next/variables.scss';
-
 .drawer {
   width: 504px;
-
-  :global {
-    .#{$css-prefix}drawer-body {
-      padding: 20px 24px 50px 20px;
-    }
-  }
-
 }

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.5.3" === 'string' ? "3.5.3" : null;
+var version = typeof "3.5.4" === 'string' ? "3.5.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -95,7 +95,7 @@ function AddLinkDrawer(props) {
   var linkNodesRef = (0, _react.useRef)();
 
   var getPortsById = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id, currentLink) {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
       var result, links, ifTypes, ifDoc, usedPorts, portsDoc, ports;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -113,24 +113,23 @@ function AddLinkDrawer(props) {
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
-              }); // console.log("端口类型列表", ifTypes);
-
-              _context.next = 9;
+              });
+              console.log("端口类型列表", ifTypes);
+              _context.next = 10;
               return (0, _linkUtils.getInterfaceObject)(ifTypes);
 
-            case 9:
+            case 10:
               ifDoc = _context.sent;
-              // console.log("端口类型字典", ifDoc);
+              console.log("端口类型字典", ifDoc);
               usedPorts = [];
               links.data.map(function (link) {
-                // console.log("getPortsById-去重", links, id);
-                if (link.id !== (currentLink === null || currentLink === void 0 ? void 0 : currentLink.id)) {
-                  usedPorts.push(link.attributes.destination_id);
-                  usedPorts.push(link.attributes.source_id);
-                }
+                usedPorts.push(link.attributes.destination_id);
+                usedPorts.push(link.attributes.source_id);
               });
-              usedPorts = _lodash["default"].uniq(usedPorts); // rlog.debug("端口列表", result, links);
-              //const list = result[id];
+              usedPorts = _lodash["default"].uniq(usedPorts);
+
+              _rlog["default"].debug("端口列表", result, links); //const list = result[id];
+
 
               portsDoc = {};
               ports = result.map(function (item) {
@@ -152,7 +151,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 16:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -160,7 +159,7 @@ function AddLinkDrawer(props) {
       }, _callee);
     }));
 
-    return function getPortsById(_x, _x2) {
+    return function getPortsById(_x) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -233,7 +232,7 @@ function AddLinkDrawer(props) {
       }, _callee2, null, [[3, 19]]);
     }));
 
-    return function handleEvent(_x3) {
+    return function handleEvent(_x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -254,15 +253,16 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.next = 2;
-              return getPortsById(currentLink.source, currentLink);
+              console.log("编辑链路--当前链路", currentLink);
+              _context3.next = 3;
+              return getPortsById(currentLink.source);
 
-            case 2:
+            case 3:
               sourcePorts = _context3.sent;
-              _context3.next = 5;
-              return getPortsById(currentLink.target, currentLink);
+              _context3.next = 6;
+              return getPortsById(currentLink.target);
 
-            case 5:
+            case 6:
               targetPorts = _context3.sent;
               setSourceIFDoc(sourcePorts.portsDoc);
               setTargetIFDoc(targetPorts.portsDoc);
@@ -296,7 +296,7 @@ function AddLinkDrawer(props) {
                 })
               });
 
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -447,9 +447,7 @@ function AddLinkDrawer(props) {
   };
 
   var mergeExportLinkData = function mergeExportLinkData(data, attributes) {
-    var _sourceIFDoc$data$sou, _targetIFDoc$data$des;
-
-    // console.log("mergeExportLinkData", data, attributes);
+    console.log("mergeExportLinkData", data, attributes);
     return (0, _extends2["default"])({}, attributes, {
       id: data.id,
       name: data.name,
@@ -470,10 +468,10 @@ function AddLinkDrawer(props) {
         support_templates: data.support_templates,
         use: data.use,
         source_id_object: {
-          displayName: (_sourceIFDoc$data$sou = sourceIFDoc[data.source_id]) === null || _sourceIFDoc$data$sou === void 0 ? void 0 : _sourceIFDoc$data$sou.label
+          displayName: sourceIFDoc[data.source_id].label
         },
         destination_id_object: {
-          displayName: (_targetIFDoc$data$des = targetIFDoc[data.destination_id]) === null || _targetIFDoc$data$des === void 0 ? void 0 : _targetIFDoc$data$des.label
+          displayName: targetIFDoc[data.destination_id].label
         }
       })
     });
@@ -481,14 +479,14 @@ function AddLinkDrawer(props) {
 
   var onSave = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data) {
-      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData, _config, _yield$editDispatcher2, _elements;
+      var parm, result, linkType, config, exportLinkIdList, _yield$editDispatcher, elements, linkData, edge, aobj, target, links, linkAttrKey, newLinkData, newLinks, newData;
 
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               //editDispatchers.update({ addLinkIsOpen: false });
-              // console.log("保存链路信息", isAddMode, data);
+              // rlog.debug("保存链路信息", isAddMode, data);
               setLoading(true);
               parm = {
                 attributes: data
@@ -522,14 +520,14 @@ function AddLinkDrawer(props) {
               _context5.prev = 15;
 
               if (!result) {
-                _context5.next = 55;
+                _context5.next = 36;
                 break;
               }
 
               config = topo.resourceConfig.getConfigFromHt(); // 新建后显示到图上
 
               if (!isAddMode) {
-                _context5.next = 31;
+                _context5.next = 32;
                 break;
               }
 
@@ -551,8 +549,8 @@ function AddLinkDrawer(props) {
               elements = _yield$editDispatcher.elements;
               linkData = elements.find(function (element) {
                 return element.id === result;
-              }); // console.log("创建成功-parm,linkData", parm, linkData);
-
+              });
+              console.log("创建成功-parm,linkData", parm, linkData);
               addLinkToGraph({
                 linkData: (0, _copyUtil.clone)(linkData),
                 linkType: linkType,
@@ -561,79 +559,62 @@ function AddLinkDrawer(props) {
 
               _message["default"].success("创建成功");
 
-              _context5.next = 53;
+              _context5.next = 34;
               break;
 
-            case 31:
-              if (!(linkType === "exit")) {
-                _context5.next = 46;
-                break;
-              }
+            case 32:
+              // console.log("保存编辑信息", data, linkType);
+              if (linkType === "exit") {
+                edge = topo.getGraphView().dm().sm().ld();
+                aobj = edge.getAttrObject();
+                edge.setAttrObject((0, _extends2["default"])({}, aobj, data));
+                target = edge.getTarget();
 
-              edge = topo.getGraphView().dm().sm().ld();
-              aobj = edge.getAttrObject();
-              edge.setAttrObject((0, _extends2["default"])({}, aobj, data));
-              target = edge.getTarget();
+                if (target.getTag() === undefined) {
+                  target.a("name", data["network_link.destination_ipv4"]);
+                }
 
-              if (target.getTag() === undefined) {
-                target.a("name", data["network_link.destination_ipv4"]);
+                links = topoState.data.links;
+                linkAttrKey = links.findIndex(function (item) {
+                  return item.id === aobj.id;
+                });
+                newLinkData = mergeExportLinkData(edge.getAttrObject(), links[linkAttrKey]);
+                newLinks = (0, _copyUtil.clone)(links);
+                newLinks.splice(linkAttrKey, 1, newLinkData);
+                newData = (0, _extends2["default"])({}, topoState.data, {
+                  links: newLinks
+                });
+                topoDispatchers.update({
+                  data: newData
+                });
               }
 
-              links = topoState.data.links;
-              linkAttrKey = links.findIndex(function (item) {
-                return item.id === aobj.id;
-              });
-              newLinkData = mergeExportLinkData(edge.getAttrObject(), links[linkAttrKey]);
-              newLinks = (0, _copyUtil.clone)(links);
-              newLinks.splice(linkAttrKey, 1, newLinkData);
-              newData = (0, _extends2["default"])({}, topoState.data, {
-                links: newLinks
-              });
-              topoDispatchers.update({
-                data: newData
-              });
-              _context5.next = 52;
-              break;
-
-            case 46:
-              _config = topo.resourceConfig.getConfigFromHt();
-              topo.resourceConfig.updateConfig(_config);
-              _context5.next = 50;
-              return editDispatchers.fetchDataByConfig();
-
-            case 50:
-              _yield$editDispatcher2 = _context5.sent;
-              _elements = _yield$editDispatcher2.elements;
-
-            case 52:
               _message["default"].success("保存成功");
 
-            case 53:
+            case 34:
               editDispatchers.update({
                 addLinkIsOpen: false,
                 currentLink: null
               });
               topo.linkDynamicStyleExecutor.execute();
 
-            case 55:
-              _context5.next = 60;
+            case 36:
+              _context5.next = 40;
               break;
 
-            case 57:
-              _context5.prev = 57;
+            case 38:
+              _context5.prev = 38;
               _context5.t0 = _context5["catch"](15);
 
-              _rlog["default"].debug("保存链路信息异常", _context5.t0);
-
-            case 60:
+            case 40:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[15, 57]]);
+      }, _callee5, null, [[15, 38]]);
     }));
 
-    return function onSave(_x4) {
+    return function onSave(_x3) {
       return _ref6.apply(this, arguments);
     };
   }();

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

@@ -108,7 +108,7 @@ function EditLinkInfo(props) {
   };
 
   var linkTypeJudge = function linkTypeJudge(sourceType, destinationType, type) {
-    // console.log("linkTypeJudge", sourceType, destinationType, type);
+    console.log("linkTypeJudge", sourceType, destinationType, type);
     var connect = "phy";
     var support = "m.physical_link";
 
@@ -162,15 +162,16 @@ function EditLinkInfo(props) {
     var links = topo.getEdges();
     var usedNames = [];
     links.map(function (link) {
-      // console.log('checkName',link.id,lineData)
+      console.log('checkName', link.id, lineData);
+
       if (link.dtype === "link" && link.name && link.id !== lineData.attributes.linkId) {
         usedNames.push(link.name);
       }
     });
 
     if (usedNames.indexOf(displayName) >= 0) {
-      // console.log("setError", checkName, usedNames, displayName);
-      // field.setError("display_name", "链路名称重复");
+      console.log("setError", checkName, usedNames, displayName); // field.setError("display_name", "链路名称重复");
+
       return callback("链路名称重复");
     } else {
       return callback();

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss

@@ -1,12 +1,3 @@
-@import '~@alifd/next/variables.scss';
-
 .drawer {
   width: 504px;
-
-  :global {
-    .#{$css-prefix}drawer-body {
-      padding: 20px 24px 50px 20px;
-    }
-  }
-
 }