@riil-frontend/component-topology 2.15.9 → 2.15.12

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

@@ -49,6 +49,7 @@ function EditLinkInfo(props) {
   var topo = props.topo,
       lineData = props.lineData,
       onClose = props.onClose,
+      addLinkIsOpen = props.addLinkIsOpen,
       onSave = props.onSave,
       isAdd = props.isAdd,
       loading = props.loading;
@@ -65,47 +66,61 @@ function EditLinkInfo(props) {
 
   var source = lineData.source,
       target = lineData.target,
-      attributes = lineData.attributes;
+      attributes = lineData.attributes; // rlog.debug("lineData-----init", source, target, targetValue.portsDoc);
 
   var _useState = (0, _react.useState)(attributes),
       valus = _useState[0],
       setValus = _useState[1];
 
-  var field = _field["default"].useField({
-    autoUnmount: false,
-    values: parseValues(attributes),
-    onChange: function onChange(name, value) {
-      if (name === "source_id" || name === "destination_id") {
-        var _parseInt, _source$portsDoc$sour, _parseInt2, _target$portsDoc$targ;
+  var _useState2 = (0, _react.useState)(source),
+      sourceValue = _useState2[0],
+      setSource = _useState2[1];
 
-        var nowValues = field.getValues();
-        var sourceId = nowValues["source_id"];
-        var targetId = nowValues["destination_id"]; // rlog.debug("Field-onChange-otherName", nowValues, sourceId, targetId);
+  var _useState3 = (0, _react.useState)(target),
+      targetValue = _useState3[0],
+      setTarget = _useState3[1];
 
-        var sourceRb = (_parseInt = parseInt((_source$portsDoc$sour = source.portsDoc[sourceId]) === null || _source$portsDoc$sour === void 0 ? void 0 : _source$portsDoc$sour.ratedBandwidth, 10)) !== null && _parseInt !== void 0 ? _parseInt : 0;
-        var targetRb = (_parseInt2 = parseInt((_target$portsDoc$targ = target.portsDoc[targetId]) === null || _target$portsDoc$targ === void 0 ? void 0 : _target$portsDoc$targ.ratedBandwidth, 10)) !== null && _parseInt2 !== void 0 ? _parseInt2 : null;
+  var fieldOnChange = function fieldOnChange(name, value) {
+    if (name === "source_id" || name === "destination_id") {
+      var _parseInt, _sourceValue$portsDoc, _parseInt2, _targetValue$portsDoc;
 
-        if (sourceRb && targetRb) {
-          field.setValue("network_link.actual_bandwidth", Math.min(sourceRb, targetRb));
-        } else {
-          field.setValue("network_link.actual_bandwidth", sourceRb || targetRb);
-        }
+      var nowValues = field.getValues();
+      var sourceId = nowValues["source_id"];
+      var targetId = nowValues["destination_id"];
+      var sourceRb = (_parseInt = parseInt((_sourceValue$portsDoc = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc === void 0 ? void 0 : _sourceValue$portsDoc.ratedBandwidth, 10)) !== null && _parseInt !== void 0 ? _parseInt : 0;
+      var targetRb = (_parseInt2 = parseInt((_targetValue$portsDoc = targetValue.portsDoc[targetId]) === null || _targetValue$portsDoc === void 0 ? void 0 : _targetValue$portsDoc.ratedBandwidth, 10)) !== null && _parseInt2 !== void 0 ? _parseInt2 : null;
+
+      if (sourceRb && targetRb) {
+        field.setValue("network_link.actual_bandwidth", Math.min(sourceRb, targetRb));
+      } else {
+        field.setValue("network_link.actual_bandwidth", sourceRb || targetRb);
       }
+    }
 
-      var newValues = field.getValues();
+    var newValues = field.getValues();
 
-      _rlog["default"].debug("Field-onChange", newValues, name, value);
+    _rlog["default"].debug("Field-onChange", newValues, name, value);
 
-      setValus(newValues); //  if (values[name] !== value) {
-      //    onChange(name, value, newValues);
-      //  }
-    }
+    setValus(newValues); //  if (values[name] !== value) {
+    //    onChange(name, value, newValues);
+    //  }
+  };
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: parseValues(attributes),
+    onChange: fieldOnChange
   });
 
   (0, _react.useEffect)(function () {
     setValus(attributes);
+
+    _rlog["default"].debug("useEffect", source, target);
+
+    setSource(source);
+    setTarget(target);
     field.setValues(attributes);
-  }, [attributes]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
+  }, [addLinkIsOpen]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
 
   var labelAlign = "top";
   var formItemLayout = {
@@ -140,23 +155,23 @@ function EditLinkInfo(props) {
       if (errors) {
         _rlog["default"].debug("saveHandleChange-error", errors, values);
       } else {
-        var _source$portsDoc$sour2, _source$portsDoc$sour3, _target$portsDoc$dest, _target$portsDoc$dest2, _source$ipAddress, _target$ipAddress;
+        var _sourceValue$portsDoc2, _sourceValue$portsDoc3, _targetValue$portsDoc2, _targetValue$portsDoc3, _sourceValue$ipAddres, _targetValue$ipAddres;
 
         _rlog["default"].debug("saveHandleChange", valus, source, target);
 
         var sourceId = valus["source_id"];
         var destinationId = valus["destination_id"];
-        var sourceType = (_source$portsDoc$sour2 = (_source$portsDoc$sour3 = source.portsDoc[sourceId]) === null || _source$portsDoc$sour3 === void 0 ? void 0 : _source$portsDoc$sour3.type) !== null && _source$portsDoc$sour2 !== void 0 ? _source$portsDoc$sour2 : "";
-        var destinationType = (_target$portsDoc$dest = (_target$portsDoc$dest2 = target.portsDoc[destinationId]) === null || _target$portsDoc$dest2 === void 0 ? void 0 : _target$portsDoc$dest2.type) !== null && _target$portsDoc$dest !== void 0 ? _target$portsDoc$dest : "";
+        var sourceType = (_sourceValue$portsDoc2 = (_sourceValue$portsDoc3 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc3 === void 0 ? void 0 : _sourceValue$portsDoc3.type) !== null && _sourceValue$portsDoc2 !== void 0 ? _sourceValue$portsDoc2 : "";
+        var destinationType = (_targetValue$portsDoc2 = (_targetValue$portsDoc3 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc3 === void 0 ? void 0 : _targetValue$portsDoc3.type) !== null && _targetValue$portsDoc2 !== void 0 ? _targetValue$portsDoc2 : "";
         var typeJudge = linkTypeJudge(sourceType, destinationType);
         var obj = {
           display_name: valus["display_name"],
           // 链路名称
           name: valus["display_name"],
           // 链路名称
-          "network_link.source_ipv4": (_source$ipAddress = source.ipAddress) !== null && _source$ipAddress !== void 0 ? _source$ipAddress : valus["network_link.source_ipv4"],
+          "network_link.source_ipv4": (_sourceValue$ipAddres = sourceValue.ipAddress) !== null && _sourceValue$ipAddres !== void 0 ? _sourceValue$ipAddres : valus["network_link.source_ipv4"],
           // 源IP
-          "network_link.destination_ipv4": (_target$ipAddress = target.ipAddress) !== null && _target$ipAddress !== void 0 ? _target$ipAddress : valus["network_link.destination_ipv4"],
+          "network_link.destination_ipv4": (_targetValue$ipAddres = targetValue.ipAddress) !== null && _targetValue$ipAddres !== void 0 ? _targetValue$ipAddres : valus["network_link.destination_ipv4"],
           // 目的IP
           // source_id, // 源端口
           // destination_id, // 目的端口
@@ -166,9 +181,9 @@ function EditLinkInfo(props) {
           // 用途
           // source_type, // 必须
           // destination_type, // 必须
-          "network_link.source_device_id": source.id,
+          "network_link.source_device_id": sourceValue.id,
           // 必须
-          "network_link.destination_device_id": target.id,
+          "network_link.destination_device_id": targetValue.id,
           // 必须
           "network_link.connect_type": typeJudge.connect,
           // 必须
@@ -234,23 +249,23 @@ function EditLinkInfo(props) {
     label: "\u6E90\u8282\u70B9\u540D\u79F0"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
-  }, source.name))), /*#__PURE__*/_react["default"].createElement(Col, {
+  }, sourceValue.name))), /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u76EE\u7684\u8282\u70B9\u540D\u79F0"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
-  }, target.name)))), /*#__PURE__*/_react["default"].createElement(Row, {
+  }, targetValue.name)))), /*#__PURE__*/_react["default"].createElement(Row, {
     gutter: "4"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u6E90\u8282\u70B9IP"
-  }), source.ipAddress ? /*#__PURE__*/_react["default"].createElement("div", {
+  }), sourceValue.ipAddress ? /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
-  }, source.ipAddress) : /*#__PURE__*/_react["default"].createElement(_input["default"], {
+  }, sourceValue.ipAddress) : /*#__PURE__*/_react["default"].createElement(_input["default"], {
     placeholder: "\u8BF7\u8F93\u5165",
     name: "network_link.source_ipv4",
     maxLength: 128
@@ -259,9 +274,9 @@ function EditLinkInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u76EE\u7684\u8282\u70B9IP"
-  }), target.ipAddress ? /*#__PURE__*/_react["default"].createElement("div", {
+  }), targetValue.ipAddress ? /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
-  }, target.ipAddress) : /*#__PURE__*/_react["default"].createElement(_input["default"], {
+  }, targetValue.ipAddress) : /*#__PURE__*/_react["default"].createElement(_input["default"], {
     placeholder: "\u8BF7\u8F93\u5165",
     name: "network_link.destination_ipv4",
     maxLength: 128
@@ -274,11 +289,12 @@ function EditLinkInfo(props) {
     label: "\u6E90\u7AEF\u53E3",
     required: true,
     requiredMessage: "\u6E90\u7AEF\u53E3\u4E0D\u80FD\u4E3A\u7A7A"
-  }), source.ipAddress ? /*#__PURE__*/_react["default"].createElement(_select["default"], {
+  }), sourceValue.ipAddress ? /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "source_id",
+    disabled: sourceValue.ports.length === 0,
     className: _indexModule["default"].selectList,
     onChange: portsHandleChange,
-    dataSource: source.ports
+    dataSource: sourceValue.ports
   }) : "-")), /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
@@ -286,11 +302,12 @@ function EditLinkInfo(props) {
     label: "\u76EE\u7684\u7AEF\u53E3",
     required: true,
     requiredMessage: "\u76EE\u7684\u7AEF\u53E3\u4E0D\u80FD\u4E3A\u7A7A"
-  }), target.ipAddress ? /*#__PURE__*/_react["default"].createElement(_select["default"], {
+  }), targetValue.ipAddress ? /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "destination_id",
+    disabled: targetValue.ports.length === 0,
     className: _indexModule["default"].selectList,
     onChange: portsHandleChange,
-    dataSource: target.ports
+    dataSource: targetValue.ports
   }) : "-"))), /*#__PURE__*/_react["default"].createElement(Row, {
     gutter: "4"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
@@ -300,14 +317,14 @@ function EditLinkInfo(props) {
     label: "\u8D44\u6E90\u7C7B\u578B"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
-  }, source.ciName))), /*#__PURE__*/_react["default"].createElement(Col, {
+  }, sourceValue.ciName))), /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u8D44\u6E90\u7C7B\u578B"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
-  }, target.ciName)))), /*#__PURE__*/_react["default"].createElement(Row, {
+  }, targetValue.ciName)))), /*#__PURE__*/_react["default"].createElement(Row, {
     gutter: "4"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "24"
@@ -357,7 +374,7 @@ function EditLinkInfo(props) {
     className: _indexModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: _indexModule["default"].button,
-    disabled: !source.ipAddress,
+    disabled: !sourceValue.ipAddress,
     type: "primary",
     loading: loading,
     onClick: saveHandleChange

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;
     }
 
@@ -150,6 +165,9 @@ var _default = function _default(_ref) {
     } else if (!htTopo.isEdgeGroupAgent(edge)) {
       // 判断当前状态是子连线
       deleteNoBindEdge(edge);
+    } else {
+      // 删除连线组
+      _message["default"].notice('连线组无法删除');
     }
   };
 

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/lib/utils/copyUtil.js

@@ -0,0 +1,13 @@
+"use strict";
+
+exports.__esModule = true;
+exports.clone = clone;
+exports.copy = copy;
+
+function copy(o) {
+  return JSON.parse(JSON.stringify(o));
+}
+
+function clone(o) {
+  return JSON.parse(JSON.stringify(o));
+}

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.9",
+  "version": "2.15.12",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
-    "start:warch": "build-scripts start --watch",
     "build": "build-scripts build --config build.config.js",
     "build:warch": "build-scripts build --watch",
     "test": "build-scripts test",
@@ -111,6 +110,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.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }