@riil-frontend/component-topology 2.15.8 → 2.15.11

package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -10,7 +10,10 @@ export default function LayerResourceList(props) {
   var topo = props.topo,
       layer = props.layer;
   var nodes = getLayerChildrenNodes(layer);
-  var data = nodes.map(function (node) {
+  var relateDataNodes = nodes.filter(function (node) {
+    return !!node.getTag();
+  });
+  var data = relateDataNodes.map(function (node) {
     return {
       title: node.a('name'),
       img: getIconById(node.getImage(), topo)

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.8" === 'string' ? "2.15.8" : null;
+var version = typeof "2.15.11" === 'string' ? "2.15.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -2,12 +2,18 @@ import _Button from "@alifd/next/es/button";
 import React from "react";
 import LindInfoPreview from "../../link/LindInfoPreview";
 import styles from "../../link/LindInfoPreview.module.scss";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { getLinkPermission } from "../../../../../../utils/linPermissionUtil";
 export default function LinkDataTab(props) {
   var topo = props.topo,
       edge = props.edge,
-      editorProps = props.editorProps;
-  var operation = props.edge.a("operation");
-  var disabled = ["delete", "write"].indexOf(operation) < 0; // 节点间只有连线组时，显示连线组的数据
+      editorProps = props.editorProps; // const operation = props.edge.a("operation");
+
+  var nodes = topo.dataModel.getNodes(); //rlog.debug("LinkDataTab--edge", edge, nodes);
+  // const disabled = ["delete", "write"].indexOf(operation) < 0;
+
+  var permission = getLinkPermission(edge.getAttrObject(), nodes); //rlog.debug("LinkDataTab--", permission);
+  // 节点间只有连线组时，显示连线组的数据
 
   var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
       links = _topo$store$useModelS.links,
@@ -38,7 +44,7 @@ export default function LinkDataTab(props) {
   }, /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,
     type: "primary",
-    disabled: disabled,
+    disabled: !permission.writeable,
     onClick: openEditLinkDrawer
   }, "\u7F16\u8F91")));
 }

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

@@ -245,7 +245,7 @@ function AddLinkDrawer(props) {
               rlog.debug("加载哪些ci类型可创建链路", ciTypesConnectable, topo, nodes);
               ciIds = [];
               nodes.map(function (node) {
-                if (ciTypesConnectable[node.ciType]) {
+                if (ciTypesConnectable[node.ciType] && ["delete", "write"].indexOf(node.operation) >= 0) {
                   ciIds.push(node.id);
                 }
               });
@@ -336,7 +336,7 @@ function AddLinkDrawer(props) {
         } // 切换到连线组状态
 
 
-        htTopo.toggleEdgeGroup(source, target, true);
+        htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
         if (edgesInNodes.length === 1 && !htTopo.getEdgeData(edgesInNodes[0])) {
@@ -345,7 +345,7 @@ function AddLinkDrawer(props) {
           htTopo.createEdge(source, target, linkData);
         }
 
-        htTopo.toggleEdgeGroup(source, target, false);
+        htTopo.toggleEdgeGroup(source, target, true);
       } // TODO 选中
 
 
@@ -466,6 +466,7 @@ function AddLinkDrawer(props) {
     lineData: link,
     topo: topo,
     onClose: closeDrawer,
+    addLinkIsOpen: addLinkIsOpen,
     onSave: onSave,
     loading: loading,
     isAdd: isAddMode

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

@@ -25,6 +25,7 @@ export default 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;
@@ -41,45 +42,57 @@ export default 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 = useState(attributes),
       valus = _useState[0],
       setValus = _useState[1];
 
-  var field = _Field.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 = 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 = 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;
 
-      var newValues = field.getValues();
-      rlog.debug("Field-onChange", newValues, name, value);
-      setValus(newValues); //  if (values[name] !== value) {
-      //    onChange(name, value, newValues);
-      //  }
+      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();
+    rlog.debug("Field-onChange", newValues, name, value);
+    setValus(newValues); //  if (values[name] !== value) {
+    //    onChange(name, value, newValues);
+    //  }
+  };
+
+  var field = _Field.useField({
+    autoUnmount: false,
+    values: parseValues(attributes),
+    onChange: fieldOnChange
   });
 
   useEffect(function () {
     setValus(attributes);
+    rlog.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 = {
@@ -114,22 +127,22 @@ export default function EditLinkInfo(props) {
       if (errors) {
         rlog.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.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, // 目的端口
@@ -139,9 +152,9 @@ export default 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,
           // 必须
@@ -207,23 +220,23 @@ export default function EditLinkInfo(props) {
     label: "\u6E90\u8282\u70B9\u540D\u79F0"
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.label
-  }, source.name))), /*#__PURE__*/React.createElement(Col, {
+  }, sourceValue.name))), /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u76EE\u7684\u8282\u70B9\u540D\u79F0"
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.label
-  }, target.name)))), /*#__PURE__*/React.createElement(Row, {
+  }, targetValue.name)))), /*#__PURE__*/React.createElement(Row, {
     gutter: "4"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u6E90\u8282\u70B9IP"
-  }), source.ipAddress ? /*#__PURE__*/React.createElement("div", {
+  }), sourceValue.ipAddress ? /*#__PURE__*/React.createElement("div", {
     className: styles.label
-  }, source.ipAddress) : /*#__PURE__*/React.createElement(_Input, {
+  }, sourceValue.ipAddress) : /*#__PURE__*/React.createElement(_Input, {
     placeholder: "\u8BF7\u8F93\u5165",
     name: "network_link.source_ipv4",
     maxLength: 128
@@ -232,9 +245,9 @@ export default function EditLinkInfo(props) {
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u76EE\u7684\u8282\u70B9IP"
-  }), target.ipAddress ? /*#__PURE__*/React.createElement("div", {
+  }), targetValue.ipAddress ? /*#__PURE__*/React.createElement("div", {
     className: styles.label
-  }, target.ipAddress) : /*#__PURE__*/React.createElement(_Input, {
+  }, targetValue.ipAddress) : /*#__PURE__*/React.createElement(_Input, {
     placeholder: "\u8BF7\u8F93\u5165",
     name: "network_link.destination_ipv4",
     maxLength: 128
@@ -247,11 +260,12 @@ export default function EditLinkInfo(props) {
     label: "\u6E90\u7AEF\u53E3",
     required: true,
     requiredMessage: "\u6E90\u7AEF\u53E3\u4E0D\u80FD\u4E3A\u7A7A"
-  }), source.ipAddress ? /*#__PURE__*/React.createElement(_Select, {
+  }), sourceValue.ipAddress ? /*#__PURE__*/React.createElement(_Select, {
     name: "source_id",
+    disabled: sourceValue.ports.length === 0,
     className: styles.selectList,
     onChange: portsHandleChange,
-    dataSource: source.ports
+    dataSource: sourceValue.ports
   }) : "-")), /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
@@ -259,11 +273,12 @@ export default function EditLinkInfo(props) {
     label: "\u76EE\u7684\u7AEF\u53E3",
     required: true,
     requiredMessage: "\u76EE\u7684\u7AEF\u53E3\u4E0D\u80FD\u4E3A\u7A7A"
-  }), target.ipAddress ? /*#__PURE__*/React.createElement(_Select, {
+  }), targetValue.ipAddress ? /*#__PURE__*/React.createElement(_Select, {
     name: "destination_id",
+    disabled: targetValue.ports.length === 0,
     className: styles.selectList,
     onChange: portsHandleChange,
-    dataSource: target.ports
+    dataSource: targetValue.ports
   }) : "-"))), /*#__PURE__*/React.createElement(Row, {
     gutter: "4"
   }, /*#__PURE__*/React.createElement(Col, {
@@ -273,14 +288,14 @@ export default function EditLinkInfo(props) {
     label: "\u8D44\u6E90\u7C7B\u578B"
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.label
-  }, source.ciName))), /*#__PURE__*/React.createElement(Col, {
+  }, sourceValue.ciName))), /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
     labelAlign: labelAlign,
     label: "\u8D44\u6E90\u7C7B\u578B"
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.label
-  }, target.ciName)))), /*#__PURE__*/React.createElement(Row, {
+  }, targetValue.ciName)))), /*#__PURE__*/React.createElement(Row, {
     gutter: "4"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "24"
@@ -330,7 +345,7 @@ export default function EditLinkInfo(props) {
     className: styles.footer
   }, /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,
-    disabled: !source.ipAddress,
+    disabled: !sourceValue.ipAddress,
     type: "primary",
     loading: loading,
     onClick: saveHandleChange

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/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -24,7 +24,10 @@ function LayerResourceList(props) {
   var topo = props.topo,
       layer = props.layer;
   var nodes = (0, _htElementUtils.getLayerChildrenNodes)(layer);
-  var data = nodes.map(function (node) {
+  var relateDataNodes = nodes.filter(function (node) {
+    return !!node.getTag();
+  });
+  var data = relateDataNodes.map(function (node) {
     return {
       title: node.a('name'),
       img: (0, _icon.getIconById)(node.getImage(), topo)

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.8" === 'string' ? "2.15.8" : null;
+var version = typeof "2.15.11" === 'string' ? "2.15.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 var topoDebug = {};
 window.topoDebug = topoDebug;

package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -13,12 +13,20 @@ var _LindInfoPreview = _interopRequireDefault(require("../../link/LindInfoPrevie
 
 var _LindInfoPreviewModule = _interopRequireDefault(require("../../link/LindInfoPreview.module.scss"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+var _linPermissionUtil = require("../../../../../../utils/linPermissionUtil");
+
 function LinkDataTab(props) {
   var topo = props.topo,
       edge = props.edge,
-      editorProps = props.editorProps;
-  var operation = props.edge.a("operation");
-  var disabled = ["delete", "write"].indexOf(operation) < 0; // 节点间只有连线组时，显示连线组的数据
+      editorProps = props.editorProps; // const operation = props.edge.a("operation");
+
+  var nodes = topo.dataModel.getNodes(); //rlog.debug("LinkDataTab--edge", edge, nodes);
+  // const disabled = ["delete", "write"].indexOf(operation) < 0;
+
+  var permission = (0, _linPermissionUtil.getLinkPermission)(edge.getAttrObject(), nodes); //rlog.debug("LinkDataTab--", permission);
+  // 节点间只有连线组时，显示连线组的数据
 
   var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
       links = _topo$store$useModelS.links,
@@ -49,7 +57,7 @@ function LinkDataTab(props) {
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: _LindInfoPreviewModule["default"].button,
     type: "primary",
-    disabled: disabled,
+    disabled: !permission.writeable,
     onClick: openEditLinkDrawer
   }, "\u7F16\u8F91")));
 }

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

@@ -278,7 +278,7 @@ function AddLinkDrawer(props) {
 
               ciIds = [];
               nodes.map(function (node) {
-                if (ciTypesConnectable[node.ciType]) {
+                if (ciTypesConnectable[node.ciType] && ["delete", "write"].indexOf(node.operation) >= 0) {
                   ciIds.push(node.id);
                 }
               });
@@ -375,7 +375,7 @@ function AddLinkDrawer(props) {
         } // 切换到连线组状态
 
 
-        htTopo.toggleEdgeGroup(source, target, true);
+        htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
         if (edgesInNodes.length === 1 && !htTopo.getEdgeData(edgesInNodes[0])) {
@@ -384,7 +384,7 @@ function AddLinkDrawer(props) {
           htTopo.createEdge(source, target, linkData);
         }
 
-        htTopo.toggleEdgeGroup(source, target, false);
+        htTopo.toggleEdgeGroup(source, target, true);
       } // TODO 选中
 
 
@@ -507,6 +507,7 @@ function AddLinkDrawer(props) {
     lineData: link,
     topo: topo,
     onClose: closeDrawer,
+    addLinkIsOpen: addLinkIsOpen,
     onSave: onSave,
     loading: loading,
     isAdd: isAddMode