@riil-frontend/component-topology 2.15.9 → 2.15.10

package/es/core/models/TopoApp.js

@@ -19,7 +19,7 @@ import GraphDataModel from "./GraphDataModel";
 import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.9" === 'string' ? "2.15.9" : null;
+var version = typeof "2.15.10" === 'string' ? "2.15.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

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

@@ -1,10 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _Message from "@alifd/next/es/message";
 import _Dialog from "@alifd/next/es/dialog";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import linkService from "../../services/link";
+import { getLinkPermission } from "../../utils/linPermissionUtil";
 /**
  * 删除连线
  */
@@ -26,11 +27,24 @@ export default (function (_ref) {
     });
   };
 
+  function checkLinkDeleteable(link) {
+    var _getLinkPermission = getLinkPermission(link, topo.dataModel.getNodes()),
+        deleteable = _getLinkPermission.deleteable;
+
+    if (deleteable) {
+      return deleteable;
+    }
+
+    _Message.notice('无删除权限');
+
+    return deleteable;
+  }
+
   var deleteLink = function deleteLink(edge) {
     var id = edge.getTag();
     var link = topo.dataModel.getDataById(id);
 
-    if (!link || link.operation !== 'delete') {
+    if (!checkLinkDeleteable(link)) {
       return;
     }
 

package/es/topoCenter/utils/linPermissionUtil.js

@@ -0,0 +1,24 @@
+/**
+ * 获得链路权限
+ * 
+ * @param {*} link 
+ * @param {*} nodes 
+ * @returns 
+ */
+export function getLinkPermission(link, nodes) {
+  var source = nodes.find(function (node) {
+    return node.id === link.source;
+  });
+  var target = nodes.find(function (node) {
+    return node.id === link.target;
+  });
+  return {
+    readable: source.operation || target.operation,
+    writeable: [source, target].filter(function (node) {
+      return ['write', 'delete'].indexOf(node.operation) !== -1;
+    }).length === 2,
+    deleteable: [source, target].filter(function (node) {
+      return ['write', 'delete'].indexOf(node.operation) !== -1;
+    }).length >= 1
+  };
+}

package/lib/core/models/TopoApp.js

@@ -46,7 +46,7 @@ var _edgeUtil = require("../utils/edgeUtil");
 var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.9" === 'string' ? "2.15.9" : null;
+var version = typeof "2.15.10" === 'string' ? "2.15.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

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

@@ -9,16 +9,18 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
 var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _link = _interopRequireDefault(require("../../services/link"));
 
+var _linPermissionUtil = require("../../utils/linPermissionUtil");
+
 /**
  * 删除连线
  */
@@ -39,11 +41,24 @@ var _default = function _default(_ref) {
     });
   };
 
+  function checkLinkDeleteable(link) {
+    var _getLinkPermission = (0, _linPermissionUtil.getLinkPermission)(link, topo.dataModel.getNodes()),
+        deleteable = _getLinkPermission.deleteable;
+
+    if (deleteable) {
+      return deleteable;
+    }
+
+    _message["default"].notice('无删除权限');
+
+    return deleteable;
+  }
+
   var deleteLink = function deleteLink(edge) {
     var id = edge.getTag();
     var link = topo.dataModel.getDataById(id);
 
-    if (!link || link.operation !== 'delete') {
+    if (!checkLinkDeleteable(link)) {
       return;
     }
 

package/lib/topoCenter/utils/linPermissionUtil.js

@@ -0,0 +1,29 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getLinkPermission = getLinkPermission;
+
+/**
+ * 获得链路权限
+ * 
+ * @param {*} link 
+ * @param {*} nodes 
+ * @returns 
+ */
+function getLinkPermission(link, nodes) {
+  var source = nodes.find(function (node) {
+    return node.id === link.source;
+  });
+  var target = nodes.find(function (node) {
+    return node.id === link.target;
+  });
+  return {
+    readable: source.operation || target.operation,
+    writeable: [source, target].filter(function (node) {
+      return ['write', 'delete'].indexOf(node.operation) !== -1;
+    }).length === 2,
+    deleteable: [source, target].filter(function (node) {
+      return ['write', 'delete'].indexOf(node.operation) !== -1;
+    }).length >= 1
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.9",
+  "version": "2.15.10",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -111,6 +111,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.10/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }