@riil-frontend/component-topology 4.0.1 → 4.0.2

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "4.0.1" === 'string' ? "4.0.1" : null;
+var version = typeof "4.0.2" === 'string' ? "4.0.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -152,7 +152,7 @@ function AddLinkDrawer(props) {
 
   var handleEvent = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(e) {
-      var sourcePorts, targetPorts, source, target, connect_type;
+      var sourcePorts, targetPorts, source, target, targetDisableCreatePhyAggLink, connect_type;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -177,11 +177,12 @@ function AddLinkDrawer(props) {
               setTargetIFDoc(targetPorts.portsDoc);
               source = translationNode(e.source, sourcePorts);
               target = translationNode(e.target, targetPorts);
+              targetDisableCreatePhyAggLink = !target.ciData || !(target.ciData.permission.writeable || target.ciData.permission.deleteable);
               editDispatchers.update({
                 addLinkIsOpen: true,
                 currentLink: null
               });
-              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 ? "phy" : "exit";
+              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 && !targetDisableCreatePhyAggLink ? "phy" : "exit";
               setLink({
                 source: source,
                 target: target,
@@ -200,20 +201,20 @@ function AddLinkDrawer(props) {
                   connect_type: connect_type
                 }
               });
-              _context2.next = 22;
+              _context2.next = 23;
               break;
 
-            case 19:
-              _context2.prev = 19;
+            case 20:
+              _context2.prev = 20;
               _context2.t0 = _context2["catch"](3);
               rlog.error("出现异常", _context2.t0);
 
-            case 22:
+            case 23:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[3, 19]]);
+      }, _callee2, null, [[3, 20]]);
     }));
 
     return function handleEvent(_x3) {
@@ -254,6 +255,7 @@ function AddLinkDrawer(props) {
               connect_type = currentLink.attributes["network_link.connect_type"] === "exit" ? "exit" : "phy";
               setLink({
                 source: {
+                  ciData: topo.dataModel.getDataById(currentLink.source),
                   id: currentLink.source,
                   name: currentLink.attributes["network_link.source_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.source_device_id"],
@@ -265,6 +267,7 @@ function AddLinkDrawer(props) {
                   portsDoc: sourcePorts.portsDoc
                 },
                 target: {
+                  ciData: topo.dataModel.getDataById(currentLink.target),
                   id: currentLink.target,
                   name: currentLink.attributes["network_link.destination_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.destination_device_id"],
@@ -384,6 +387,7 @@ function AddLinkDrawer(props) {
 
     var attrObject = node._attrObject;
     return {
+      ciData: topo.dataModel.getDataById(attrObject.id),
       id: attrObject.id,
       name: attrObject.name,
       ciId: attrObject.id,

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

@@ -23,6 +23,13 @@ import styles from "./index.module.scss";
 function parseValues(values) {
   return _extends({}, values);
 }
+/**
+ * 两端都有编辑/删除权限才能创建物理和聚合链路。
+ * 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+ * @param {*} props 
+ * @returns 
+ */
+
 
 export default function EditLinkInfo(props) {
   var _sourceValue$ipAddres2, _sourceValue$portsDoc5, _sourceValue$portsDoc6, _targetValue$portsDoc5, _targetValue$portsDoc6;
@@ -257,8 +264,10 @@ export default function EditLinkInfo(props) {
       name: "network_link.destination_ipv4",
       maxLength: 128
     });
-  };
+  }; // 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+
 
+  var disableCreatePhyAggLink = target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0 || !lineData.target || isAdd && !(lineData.target.ciData.permission.writeable || lineData.target.ciData.permission.deleteable);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.editForm
   }, /*#__PURE__*/React.createElement(_Form, {
@@ -378,7 +387,7 @@ export default function EditLinkInfo(props) {
   }, /*#__PURE__*/React.createElement(_Radio, {
     id: "phy",
     value: "phy",
-    disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
+    disabled: disableCreatePhyAggLink
   }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/React.createElement(_Radio, {
     id: "exit",
     value: "exit"

package/es/utils/clusterUtil.js

@@ -82,7 +82,7 @@ export function handleClusterNoPermission(topo) {
   var dm = topo.getHtTopo().getGraphView().dm();
   var groups = getGroups(dm);
   groups.forEach(function (group) {
-    if (isClusterHtElement(group) && !group.a('operation')) {
+    if (isClusterHtElement(group) && !group.a('operation') && group.isExpanded()) {
       group.setExpanded(false);
     }
   });

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.1" === 'string' ? "4.0.1" : null;
+var version = typeof "4.0.2" === 'string' ? "4.0.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -182,7 +182,7 @@ function AddLinkDrawer(props) {
 
   var handleEvent = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(e) {
-      var sourcePorts, targetPorts, source, target, connect_type;
+      var sourcePorts, targetPorts, source, target, targetDisableCreatePhyAggLink, connect_type;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -208,11 +208,12 @@ function AddLinkDrawer(props) {
               setTargetIFDoc(targetPorts.portsDoc);
               source = translationNode(e.source, sourcePorts);
               target = translationNode(e.target, targetPorts);
+              targetDisableCreatePhyAggLink = !target.ciData || !(target.ciData.permission.writeable || target.ciData.permission.deleteable);
               editDispatchers.update({
                 addLinkIsOpen: true,
                 currentLink: null
               });
-              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 ? "phy" : "exit";
+              connect_type = target.ciType !== "customNode" && target.ipAddress && targetPorts.ports.length > 0 && !targetDisableCreatePhyAggLink ? "phy" : "exit";
               setLink({
                 source: source,
                 target: target,
@@ -231,21 +232,21 @@ function AddLinkDrawer(props) {
                   connect_type: connect_type
                 }
               });
-              _context2.next = 22;
+              _context2.next = 23;
               break;
 
-            case 19:
-              _context2.prev = 19;
+            case 20:
+              _context2.prev = 20;
               _context2.t0 = _context2["catch"](3);
 
               _rlog["default"].error("出现异常", _context2.t0);
 
-            case 22:
+            case 23:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[3, 19]]);
+      }, _callee2, null, [[3, 20]]);
     }));
 
     return function handleEvent(_x3) {
@@ -286,6 +287,7 @@ function AddLinkDrawer(props) {
               connect_type = currentLink.attributes["network_link.connect_type"] === "exit" ? "exit" : "phy";
               setLink({
                 source: {
+                  ciData: topo.dataModel.getDataById(currentLink.source),
                   id: currentLink.source,
                   name: currentLink.attributes["network_link.source_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.source_device_id"],
@@ -297,6 +299,7 @@ function AddLinkDrawer(props) {
                   portsDoc: sourcePorts.portsDoc
                 },
                 target: {
+                  ciData: topo.dataModel.getDataById(currentLink.target),
                   id: currentLink.target,
                   name: currentLink.attributes["network_link.destination_device_id_object"].displayName,
                   ciId: currentLink.attributes["network_link.destination_device_id"],
@@ -416,6 +419,7 @@ function AddLinkDrawer(props) {
 
     var attrObject = node._attrObject;
     return {
+      ciData: topo.dataModel.getDataById(attrObject.id),
       id: attrObject.id,
       name: attrObject.name,
       ciId: attrObject.id,

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

@@ -49,6 +49,13 @@ var Row = _grid["default"].Row,
 function parseValues(values) {
   return (0, _extends2["default"])({}, values);
 }
+/**
+ * 两端都有编辑/删除权限才能创建物理和聚合链路。
+ * 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+ * @param {*} props 
+ * @returns 
+ */
+
 
 function EditLinkInfo(props) {
   var _sourceValue$ipAddres2, _sourceValue$portsDoc5, _sourceValue$portsDoc6, _targetValue$portsDoc5, _targetValue$portsDoc6;
@@ -285,8 +292,10 @@ function EditLinkInfo(props) {
       name: "network_link.destination_ipv4",
       maxLength: 128
     });
-  };
+  }; // 目的没编辑/删除权限时，在添加链路抽屉中链接方式默认出口，物理/聚合置灰不可选
+
 
+  var disableCreatePhyAggLink = target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0 || !lineData.target || isAdd && !(lineData.target.ciData.permission.writeable || lineData.target.ciData.permission.deleteable);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].editForm
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
@@ -406,7 +415,7 @@ function EditLinkInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     id: "phy",
     value: "phy",
-    disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
+    disabled: disableCreatePhyAggLink
   }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     id: "exit",
     value: "exit"

package/lib/utils/clusterUtil.js

@@ -106,7 +106,7 @@ function handleClusterNoPermission(topo) {
   var dm = topo.getHtTopo().getGraphView().dm();
   var groups = (0, _htElementUtils.getGroups)(dm);
   groups.forEach(function (group) {
-    if (isClusterHtElement(group) && !group.a('operation')) {
+    if (isClusterHtElement(group) && !group.a('operation') && group.isExpanded()) {
       group.setExpanded(false);
     }
   });

package/package.json

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