@riil-frontend/component-topology 3.4.0 → 3.5.0-a.2

package/lib/topoCenter/getTopoData.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.addLinkData = addLinkData;
+exports.buildData = buildData;
 exports["default"] = getTopoData;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -16,6 +17,8 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 
 var _linkUtils = require("../core/models/utils/linkUtils");
 
+var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
+
 function addLinkData(_x) {
   return _addLinkData.apply(this, arguments);
 }
@@ -62,30 +65,73 @@ function _addLinkData() {
   return _addLinkData.apply(this, arguments);
 }
 
-function getTopoData(_x2) {
-  return _getTopoData.apply(this, arguments);
+function buildData(_x2) {
+  return _buildData.apply(this, arguments);
 }
 
-function _getTopoData() {
-  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
-    var data;
+function _buildData() {
+  _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
+    var newData;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return _topo["default"].getTopoData(id);
+            return addLinkData(data);
 
           case 2:
-            data = _context2.sent;
-            return _context2.abrupt("return", data ? addLinkData(data) : data);
+            newData = _context2.sent;
+            newData = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(newData);
+            return _context2.abrupt("return", newData);
 
-          case 4:
+          case 5:
           case "end":
             return _context2.stop();
         }
       }
     }, _callee2);
   }));
+  return _buildData.apply(this, arguments);
+}
+
+function getTopoData(_x3) {
+  return _getTopoData.apply(this, arguments);
+}
+
+function _getTopoData() {
+  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+    var data;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return _topo["default"].getTopoData(id);
+
+          case 2:
+            data = _context3.sent;
+
+            if (data) {
+              _context3.next = 5;
+              break;
+            }
+
+            return _context3.abrupt("return", data);
+
+          case 5:
+            _context3.next = 7;
+            return buildData(data);
+
+          case 7:
+            data = _context3.sent;
+            return _context3.abrupt("return", data);
+
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
   return _getTopoData.apply(this, arguments);
 }

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

@@ -182,6 +182,8 @@ var _default = function _default(_ref) {
     } else {
       htTopo.deleteEdge(edge);
     }
+
+    topo.linkDynamicStyleExecutor.execute();
   };
 
   var deleteEdges = function deleteEdges(edges) {

package/lib/topoCenter/store/topoTreeMod.js

@@ -7,6 +7,8 @@ exports["default"] = _default;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -15,8 +17,6 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _topoMocks = require("../../utils/topoMocks");
-
 var _tree = require("../../utils/tree");
 
 var clone = function clone(data) {
@@ -33,7 +33,6 @@ function _default(topoApp) {
       treeData: [],
       // 是否加载数据
       loaded: false,
-      topoInteData: _topoMocks.topoInteData,
       selectedNode: [],
       defId: '',
       drawVisible: false,
@@ -280,25 +279,13 @@ function _default(topoApp) {
 
                   case 4:
                     resTreeData = _context5.sent;
+                    _context5.next = 7;
+                    return _this4.refreshTree();
 
-                    _this4.refreshTree(); // let treeData = clone(state.topoTreeMod.treeData);
-                    // loopTree(
-                    //   treeData,
-                    //   conditions,
-                    //   (parent, index, arr) => {
-                    //     arr[index].showDefault = true;
-                    //   }
-                    // );
-                    //
-                    // treeData = formatTree(treeData, state.functionAuth.permissions);
-                    //
-                    // this.update({
-                    //   treeData,
-                    //   defId: conditions,
-                    // });
-
+                  case 7:
+                    _message["default"].success('设置成功');
 
-                  case 6:
+                  case 8:
                   case "end":
                     return _context5.stop();
                 }

package/lib/topoCenter/utils/linPermissionUtil.js

@@ -3,24 +3,16 @@
 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;
-  }
-};
+var _resourcePermissionUtil = require("./resourcePermissionUtil");
+
 /**
  * 获得链路权限
  *
  * @param {*} link
  * @param {*} nodes
+ * @deprecated 
  * @returns
  */
-
-
 function getLinkPermission(edge, nodes, link) {
   var source = nodes.find(function (node) {
     return node.id === edge.getSource().getTag();
@@ -30,11 +22,5 @@ function getLinkPermission(edge, nodes, link) {
   }); // console.log("getLinkPermission", edge, source, target, link);
 
   var linkType = link ? link.attributes["network_link.connect_type"] : edge.a("network_link.connect_type");
-  return {
-    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 === null || node === void 0 ? void 0 : node.operation) !== -1;
-    }).length >= 1
-  };
+  return (0, _resourcePermissionUtil.getLinkPermissionByConnectType)(linkType, source, target);
 }

package/lib/topoCenter/utils/resourcePermissionUtil.js

@@ -0,0 +1,98 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.addTopoDataResourcePermission = addTopoDataResourcePermission;
+exports.getLinkPermission = getLinkPermission;
+exports.getLinkPermissionByConnectType = getLinkPermissionByConnectType;
+exports.getNodePermission = getNodePermission;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+function getNodePermission(node) {
+  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)
+  };
+}
+/**
+ * 获得链路权限
+ *
+ * @param {*} link
+ * @param {*} source
+ * @param {*} target
+ * @returns
+ */
+
+
+function getLinkPermission(link, source, target) {
+  var linkType = link.attributes['network_link.connect_type'];
+
+  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 {
+    readable: !!(source !== null && source !== void 0 && source.operation) || !!(target !== null && target !== void 0 && target.operation),
+    writeable: isWriteable(),
+    deleteable: [source, target].filter(function (node) {
+      return ['write', 'delete'].includes(node === null || node === void 0 ? void 0 : node.operation);
+    }).length >= 1
+  };
+}
+/**
+ * 适配接口
+ * 
+ * @param {*} connectType 
+ * @param {*} source 
+ * @param {*} target 
+ * @returns 
+ */
+
+
+function getLinkPermissionByConnectType(connectType, source, target) {
+  var link = {
+    attributes: {
+      'network_link.connect_type': connectType
+    }
+  };
+  return getLinkPermission(link, source, target);
+}
+
+function addTopoDataResourcePermission(data) {
+  var nodes = data.nodes,
+      links = data.links,
+      linkGroups = data.linkGroups;
+
+  var addLinksPermission = function addLinksPermission(linkList) {
+    return linkList.map(function (link) {
+      var source = nodes.find(function (n) {
+        return n.id === link.source;
+      });
+      var target = nodes.find(function (n) {
+        return n.id === link.target;
+      });
+      return (0, _extends2["default"])({}, link, {
+        permission: getLinkPermission(link, source, target)
+      });
+    });
+  };
+
+  return (0, _extends2["default"])({}, data, {
+    nodes: nodes.map(function (node) {
+      return (0, _extends2["default"])({}, node, {
+        permission: getNodePermission(node)
+      });
+    }),
+    links: addLinksPermission(links),
+    linkGroups: addLinksPermission(linkGroups)
+  });
+}

package/lib/utils/ResourceConfigUtil.js

@@ -65,7 +65,7 @@ function getResourceConfigFromHt(topo) {
 
     if (id) {
       var linkData = topo.dataModel.getDataById(id);
-      var connectType = linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"];
+      var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
 
       if (connectType === "exit" && !exportLinkIdList.includes(id)) {
         exportLinkIdList.push(id);

package/lib/utils/htElementUtils.js

@@ -30,8 +30,9 @@ exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
 exports.isValidEdge = isValidEdge;
+exports.setElementRuntimeStyle = setElementRuntimeStyle;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
@@ -52,10 +53,10 @@ function getElementData(element) {
   };
 
   if (className === 'ht.Edge') {
-    return (0, _extends2["default"])({}, commonData);
+    return (0, _extends3["default"])({}, commonData);
   }
 
-  return (0, _extends2["default"])({}, commonData, {
+  return (0, _extends3["default"])({}, commonData, {
     position: element.getPosition()
   });
 }
@@ -130,7 +131,7 @@ function getGroupData(element) {
     groupTag: parent.a('tag') // 父容器
 
   } : {};
-  return (0, _extends2["default"])({
+  return (0, _extends3["default"])({
     name: element.getStyleMap().label
   }, element.getAttrObject(), {
     id: element.getTag(),
@@ -154,7 +155,7 @@ function getNodeData(element) {
     groupTag: parent.a('tag') // 父容器
 
   } : {};
-  return (0, _extends2["default"])({}, element.getAttrObject(), {
+  return (0, _extends3["default"])({}, element.getAttrObject(), {
     tag: element.getId(),
     image: element.getImage()
   }, groupInfo);
@@ -254,7 +255,7 @@ function getEdgeDatas(dataModel) {
   return getEdges(dataModel).map(function (element) {
     var _element$getSource, _element$getTarget;
 
-    return (0, _extends2["default"])({}, element.getAttrObject(), {
+    return (0, _extends3["default"])({}, element.getAttrObject(), {
       source: (_element$getSource = element.getSource()) === null || _element$getSource === void 0 ? void 0 : _element$getSource.getTag(),
       target: (_element$getTarget = element.getTarget()) === null || _element$getTarget === void 0 ? void 0 : _element$getTarget.getTag(),
       tag: element.getId()
@@ -326,4 +327,16 @@ function getGroupChildrenNodes(group) {
 
 function getGroupChildrenData(group) {
   return getGroupChildren(group).map(getNodeData);
+}
+
+function setElementRuntimeStyle(element, name, value) {
+  var _extends2;
+
+  var runtimeStyle = (0, _extends3["default"])({}, element.a('runtimeStyles') || {}, (_extends2 = {}, _extends2[name] = value, _extends2));
+
+  if (value === undefined) {
+    delete runtimeStyle[name];
+  }
+
+  element.a('runtimeStyles', runtimeStyle);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "3.4.0",
+  "version": "3.5.0-a.2",
   "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.6.0",
+    "@riil-frontend/component-topology-graph": "^2.7.0-a.1",
     "@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.4.0/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.0-a.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }