@riil-frontend/component-topology 3.5.0-a.9 → 3.5.2

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

@@ -91,46 +91,55 @@ var _default = {
   },
 
   /**
-   * 新建/编辑链路
+   * 查询当前节点关联的链路
    *
-   * @param {array} ciIds
+   * @param {array} ciId
    */
-  editLink: function editLink(parm) {
+  queryLinksByNodeId: function queryLinksByNodeId(ciId) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-      var result;
+      var condition, parm, jsonParm, result;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
-              _context3.next = 3;
-              return _componentTopologyUtils.request.put("/topo/v1/api/networkLink", parm);
+              condition = "type('network_link') && (network_link.source_device_id='" + ciId + "' || network_link.destination_device_id='" + ciId + "')";
+              parm = {
+                condition: condition,
+                sort: "name asc",
+                currentPage: 1,
+                pageSize: 9999
+              };
+              jsonParm = JSON.stringify(parm);
+              console.log("查询当前节点关联的链路", parm, jsonParm);
+              _context3.prev = 4;
+              _context3.next = 7;
+              return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 3:
+            case 7:
               result = _context3.sent;
               return _context3.abrupt("return", result);
 
-            case 7:
-              _context3.prev = 7;
-              _context3.t0 = _context3["catch"](0);
+            case 11:
+              _context3.prev = 11;
+              _context3.t0 = _context3["catch"](4);
 
-              _rlog["default"].error("编辑链路", _context3.t0);
+              _rlog["default"].error("查询可关联链路", _context3.t0);
 
-            case 10:
+            case 14:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[0, 7]]);
+      }, _callee3, null, [[4, 11]]);
     }))();
   },
 
   /**
-   * 删除链路
+   * 新建/编辑链路
    *
    * @param {array} ciIds
    */
-  deleteLink: function deleteLink(id) {
+  editLink: function editLink(parm) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       var result;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
@@ -139,7 +148,7 @@ var _default = {
             case 0:
               _context4.prev = 0;
               _context4.next = 3;
-              return _componentTopologyUtils.request["delete"]("/topo/v1/api/networkLink/{" + id + "}");
+              return _componentTopologyUtils.request.put("/topo/v1/api/networkLink", parm);
 
             case 3:
               result = _context4.sent;
@@ -149,7 +158,7 @@ var _default = {
               _context4.prev = 7;
               _context4.t0 = _context4["catch"](0);
 
-              _rlog["default"].error("删除链路", _context4.t0);
+              _rlog["default"].error("编辑链路", _context4.t0);
 
             case 10:
             case "end":
@@ -158,6 +167,41 @@ var _default = {
         }
       }, _callee4, null, [[0, 7]]);
     }))();
+  },
+
+  /**
+   * 删除链路
+   *
+   * @param {array} ciIds
+   */
+  deleteLink: function deleteLink(id) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      var result;
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
+              _context5.next = 3;
+              return _componentTopologyUtils.request["delete"]("/topo/v1/api/networkLink/{" + id + "}");
+
+            case 3:
+              result = _context5.sent;
+              return _context5.abrupt("return", result);
+
+            case 7:
+              _context5.prev = 7;
+              _context5.t0 = _context5["catch"](0);
+
+              _rlog["default"].error("删除链路", _context5.t0);
+
+            case 10:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5, null, [[0, 7]]);
+    }))();
   }
 };
 exports["default"] = _default;

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

@@ -0,0 +1,183 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = BindExitLinkSelect;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _link = _interopRequireDefault(require("../../../../../../topoCenter/services/link"));
+
+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; }
+
+function BindExitLinkSelect(props) {
+  var topo = props.topo,
+      edge = props.edge,
+      values = props.values,
+      onChange = props.onChange,
+      editorProps = props.editorProps;
+  var store = topo.store;
+
+  var _store$useModel = store.useModel("topoConfig"),
+      editState = _store$useModel[0],
+      editDispatchers = _store$useModel[1]; // 可关联出口链路
+
+
+  var _useState = (0, _react.useState)([]),
+      associatedlinks = _useState[0],
+      setAssociatedlinks = _useState[1]; // const [isLine, setIsLine] = useState(false);
+
+
+  var getLinkByNodes = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
+      var result, hasLinkIds, axlink;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return _link["default"].queryAssociatedlinks(id);
+
+            case 2:
+              result = _context.sent;
+              hasLinkIds = topo.getLines().map(function (line) {
+                return line.id;
+              });
+              axlink = [];
+              result.data.map(function (exLink) {
+                if (hasLinkIds.indexOf(exLink.id) < 0) {
+                  axlink.push(exLink);
+                }
+              });
+
+              _rlog["default"].debug("出口链路列表", result.data, axlink);
+
+              setAssociatedlinks(axlink);
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function getLinkByNodes(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  (0, _react.useEffect)(function () {
+    console.log("CommonEdgePropertyView-edge", edge, edge.getSource().getTag(), edge.getTarget());
+    var ids = [edge.getSource().getTag(), edge.getTarget().getTag()];
+    getLinkByNodes(ids);
+  }, [edge]);
+
+  var bindExitLink = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
+      var data, exitLink, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements, target, aobj;
+
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              data = associatedlinks.find(function (link) {
+                return link.id === value;
+              });
+
+              _rlog["default"].debug("bindExitLink--- v, edge", data, edge);
+
+              exitLink = {
+                attributes: [],
+                ciType: "network_link",
+                dtype: "link",
+                id: data.id,
+                interfaceSource: data["network_link.source_device_id"],
+                interfaceTarget: data.attributes["network_link.destination_device_id"],
+                metrics: [],
+                name: data.attributes.name,
+                "network_link.connect_type": "exit",
+                "network_link.destination_ipv4": data.attributes["network_link.destination_ipv4"],
+                operation: "delete",
+                connect_type: "exit",
+                source: data.attributes.source_id,
+                target: data.attributes.destination_id,
+                type: "link"
+              };
+              config = topo.resourceConfig.getConfigFromHt();
+
+              _rlog["default"].debug("getConfigFromHt", config, topo.resourceConfig);
+
+              exconfig = (0, _extends2["default"])({}, config);
+              exportLinkIdList = config.exportLinkIdList;
+              exportLinkIdList.push(data.id);
+              topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
+                exportLinkIdList: exportLinkIdList
+              }));
+              _context2.next = 11;
+              return editDispatchers.fetchDataByConfig();
+
+            case 11:
+              _yield$editDispatcher = _context2.sent;
+              elements = _yield$editDispatcher.elements;
+              target = edge.getTarget();
+
+              if (target.getTag() === undefined) {
+                target.a("name", exitLink["network_link.destination_ipv4"]);
+              }
+
+              aobj = edge.getAttrObject();
+              edge.setAttrObject((0, _extends2["default"])({}, aobj, exitLink));
+              edge.setTag(data.id);
+              console.log("bindExitLink------------", target, target.getTag(), data["network_link.destination_ipv4"], exitLink);
+
+              _rlog["default"].debug("fetchDataByConfig", elements);
+
+            case 20:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function bindExitLink(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u5173\u8054\u51FA\u53E3\u94FE\u8DEF",
+    style: {
+      marginBottom: 0
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
+    style: {
+      width: 232
+    },
+    disabled: associatedlinks.length < 1,
+    onChange: function onChange(v) {
+      bindExitLink(v);
+    }
+  }, associatedlinks.map(function (item, index) {
+    return /*#__PURE__*/_react["default"].createElement(_select["default"].Option, {
+      value: item.id,
+      key: index
+    }, item.attributes.display_name);
+  })));
+}

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

@@ -62,8 +62,7 @@ function LindInfoPreview(props) {
   }];
 
   var getValue = function getValue(name) {
-    var value;
-    console.log('LindInfoPreview-getValue', data, name);
+    var value; // console.log('LindInfoPreview-getValue',data,name)
 
     if (data) {
       if (data.attributes[name + "_object"]) {

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

@@ -21,7 +21,7 @@ var _linkUtils = require("../../../core/models/utils/linkUtils");
 
 var _link = _interopRequireDefault(require("../../services/link"));
 
-var _linPermissionUtil = require("../../utils/linPermissionUtil");
+var _resourcePermissionUtil = require("../../utils/resourcePermissionUtil");
 
 /**
  * 删除连线
@@ -44,8 +44,7 @@ var _default = function _default(_ref) {
   };
 
   function checkLinkDeleteable(link) {
-    var _getLinkPermission = (0, _linPermissionUtil.getLinkPermission)(link, topo.dataModel.getNodes()),
-        deleteable = _getLinkPermission.deleteable;
+    var deleteable = link.permission.deleteable;
 
     if (deleteable) {
       return deleteable;

package/lib/topoCenter/utils/resourcePermissionUtil.js

@@ -7,14 +7,19 @@ exports.addTopoDataResourcePermission = addTopoDataResourcePermission;
 exports.getLinkPermission = getLinkPermission;
 exports.getLinkPermissionByConnectType = getLinkPermissionByConnectType;
 exports.getNodePermission = getNodePermission;
+exports.parseBasicPermission = parseBasicPermission;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 function getNodePermission(node) {
+  return parseBasicPermission(node === null || node === void 0 ? void 0 : node.operation);
+}
+
+function parseBasicPermission(operation) {
   return {
-    readable: !!(node !== null && node !== void 0 && node.operation),
-    writeable: ['write', 'delete'].includes(node === null || node === void 0 ? void 0 : node.operation),
-    deleteable: ['delete'].includes(node === null || node === void 0 ? void 0 : node.operation)
+    readable: !!operation,
+    writeable: ['write', 'delete'].includes(operation),
+    deleteable: ['delete'].includes(operation)
   };
 }
 /**
@@ -28,16 +33,16 @@ function getNodePermission(node) {
 
 
 function getLinkPermission(link, source, target) {
-  var linkType = link.attributes['network_link.connect_type'];
+  var linkType = link.attributes['network_link.connect_type']; // 出口链路使用权限中心配置
+
+  if (linkType === 'exit') {
+    return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
+  }
 
   var isWriteable = function isWriteable() {
-    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;
-    }
+    return [source, target].filter(function (node) {
+      return ['write', 'delete'].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
+    }).length === 2;
   };
 
   return {
@@ -80,8 +85,11 @@ function addTopoDataResourcePermission(data) {
       var target = nodes.find(function (n) {
         return n.id === link.target;
       });
+      var permission = getLinkPermission(link, source, target);
       return (0, _extends2["default"])({}, link, {
-        permission: getLinkPermission(link, source, target)
+        // 临时适配，待优化
+        operation: link.operation || (permission.readable ? 'read' : null),
+        permission: permission
       });
     });
   };

package/lib/utils/topoData.js

@@ -321,9 +321,9 @@ function buildGlobal(_ref2) {
 
   if ((_result$config = result.config) !== null && _result$config !== void 0 && _result$config.enableLineFlow) {
     edgeFlow = {
-      type: 'point',
+      type: "point",
       // 必填，支持传送带drip、光点point、箭头arrow
-      direction: 'from' // 流动方向，可为空，默认源到目的
+      direction: "from" // 流动方向，可为空，默认源到目的
 
     };
   }
@@ -332,7 +332,7 @@ function buildGlobal(_ref2) {
     edgeFlow = {
       type: globalConfig.edgeFlow,
       // 必填，支持传送带drip、光点point、箭头arrow
-      direction: globalConfig.edgeFlowDirection || 'from' // 流动方向，可为空，默认源到目的
+      direction: globalConfig.edgeFlowDirection || "from" // 流动方向，可为空，默认源到目的
 
     };
   }
@@ -391,7 +391,7 @@ var combTopoData = function combTopoData(_ref3) {
       engine = _ref3.engine;
   // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
   var config = (0, _extends2["default"])({
-    type: 'auto'
+    type: "auto"
   }, result.config); // global
 
   var global = buildGlobal({
@@ -490,9 +490,9 @@ function getCiModSet(params) {
     return getModSet(ciTypes);
   }
   /**
-   * 
-   * @param {array} ciTypeCodes 
-   * @returns 
+   *
+   * @param {array} ciTypeCodes
+   * @returns
    */
 
 
@@ -502,12 +502,6 @@ function getCiModSet(params) {
       return ciTypeCodes.includes(item);
     }).forEach(function (key) {
       var ciTypeObj = ciTypeMap[key];
-      modSet[key] = {
-        name: ciTypeObj.displayName,
-        code: ciTypeObj.code,
-        icon: ciTypeObj.icon,
-        list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
-      };
 
       if (key === "network_link") {
         var linkKeyArr = [{
@@ -537,8 +531,16 @@ function getCiModSet(params) {
 
           return link.code;
         });
+      } else {
+        modSet[key] = {
+          name: ciTypeObj.displayName,
+          code: ciTypeObj.code,
+          icon: ciTypeObj.icon,
+          list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
+        };
       }
     });
+    console.log("modSet--------------------", modSet);
     return modSet;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "3.5.0-a.9",
+  "version": "3.5.2",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,7 +41,7 @@
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
-    "@riil-frontend/component-topo-icon-select": "^1.0.15",
+    "@riil-frontend/component-topo-icon-select": "^1.0.16",
     "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
@@ -67,8 +67,8 @@
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
     "@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.7.0-a.3",
+    "@riil-frontend/component-topology-common": "^1.1.1",
+    "@riil-frontend/component-topology-graph": "^2.7.0-a.5",
     "@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.5.0-a.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }