@riil-frontend/component-topology 7.0.0-dev.2 → 7.0.0-dev.20

package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -15,14 +15,10 @@ var _Data = _interopRequireDefault(require("./Data"));
 
 function LinkPropertyView(props) {
   var edge = props.edge,
-      topo = props.topo; // 无权限不显示数据页签
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
-      links = _topo$store$useModelS.links,
-      linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
-    return item.id === edge.getTag();
-  });
+      topo = props.topo;
+  var link = topo.dataModel.useDataById(edge.getTag());
+  var source = topo.dataModel.useDataById(link.source);
+  var target = topo.dataModel.useDataById(link.target); // 无权限不显示数据页签
 
   if (link) {
     var readable = link.permission.readable;
@@ -37,6 +33,8 @@ function LinkPropertyView(props) {
   }
 
   return /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
-    link: link
+    link: link,
+    source: source,
+    target: target
   }));
 }

package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LindInfoPreview;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 
 var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
@@ -23,9 +25,39 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var CollapsePanel = _collapse["default"].Panel;
 
+function Item(props) {
+  return /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    key: props.name,
+    direction: "row",
+    spacing: 8,
+    className: _LinkInfoPreviewModule["default"].row
+  }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    className: _LinkInfoPreviewModule["default"].label
+  }, props.label), /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    className: props.name === "use" ? _LinkInfoPreviewModule["default"].uselabelValue : _LinkInfoPreviewModule["default"].labelValue,
+    flex: 1
+  }, props.content));
+}
+
 function LindInfoPreview(props) {
   var topo = props.topo,
-      data = props.data;
+      data = props.data,
+      isCmpTopo = props.isCmpTopo,
+      target = props.target;
+  var cmpFields = [];
+  var cmpFieldsSource = []; // 分级拓扑逻辑
+
+  if (isCmpTopo && target.id.indexOf("sub") >= 0) {
+    cmpFields.push({
+      label: "所属平台",
+      content: target.attributes.platform
+    });
+    cmpFieldsSource.push({
+      label: "所属平台",
+      content: '本级平台'
+    });
+  }
+
   var fields = [{
     label: "链路名称",
     name: "display_name"
@@ -41,7 +73,7 @@ function LindInfoPreview(props) {
   }, {
     label: "源端IP",
     name: "network_link.source_ipv4"
-  }, {
+  }].concat(cmpFieldsSource, [{
     label: "目的节点名称",
     name: "network_link.destination_device_id"
   }, {
@@ -53,7 +85,7 @@ function LindInfoPreview(props) {
   }, {
     label: "目的端IP",
     name: "network_link.destination_ipv4"
-  }, {
+  }], cmpFields, [{
     label: "取值端口",
     name: "network_link.value_port"
   }, {
@@ -62,7 +94,7 @@ function LindInfoPreview(props) {
   }, {
     label: "用途",
     name: "use"
-  }];
+  }]);
 
   var getValue = function getValue(name) {
     var value; // console.log('LindInfoPreview-getValue',data,name)
@@ -87,18 +119,12 @@ function LindInfoPreview(props) {
     return value;
   };
 
-  return fields.map(function (field) {
-    return /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      key: field.name,
-      direction: "row",
-      spacing: 8,
-      className: _LinkInfoPreviewModule["default"].row
-    }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: _LinkInfoPreviewModule["default"].label
-    }, field.label), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: field.name === "use" ? _LinkInfoPreviewModule["default"].uselabelValue : _LinkInfoPreviewModule["default"].labelValue,
-      flex: 1
-    }, getValue(field.name)));
+  return fields.map(function (field, index) {
+    return /*#__PURE__*/_react["default"].createElement(Item, (0, _extends2["default"])({
+      key: index
+    }, field, {
+      content: field.content || getValue(field.name)
+    }));
   }); // <Collapse
   //   defaultExpandedKeys={["相关资源"]}
   //   style={{ border: "none" }}

package/lib/networkTopo/components/editor/useEditorProps.js

@@ -11,8 +11,6 @@ var _useGroupSortResources2 = _interopRequireDefault(require("../../hooks/editor
 
 var _LayerConfigPlugin = _interopRequireDefault(require("./plugins/LayerConfigPlugin"));
 
-var _AddLinkDrawer = _interopRequireDefault(require("./propertyViews/edge/addLinkDrawer/AddLinkDrawer"));
-
 var _EdgePropertyView = _interopRequireDefault(require("./propertyViews/edge/EdgePropertyView"));
 
 var _LinkPropertyView = _interopRequireDefault(require("./propertyViews/edge/LinkPropertyView"));
@@ -39,8 +37,8 @@ function useEditorProps(props) {
       var edge = _ref.edge;
       return edge.getTag() ? 'link' : null;
     },
-    showLinkConfig: true,
-    // 是否显示链路相关配置
-    plugins: [_LayerConfigPlugin["default"], _AddLinkDrawer["default"]]
-  }, customEditorProps);
+    showLinkConfig: true
+  }, customEditorProps, {
+    plugins: [_LayerConfigPlugin["default"]].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
+  });
 }

package/lib/networkTopo/getTopoData.js

@@ -13,12 +13,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _linkUtils = require("../core/models/utils/linkUtils");
 
-var _services = require("../core/services");
-
 var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
 // import "./utils/__tests__/resourcePermissionUtil.test";
@@ -34,7 +30,7 @@ function addLinkData(_x, _x2) {
 
 function _addLinkData() {
   _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLinks, nodes) {
-    var links;
+    var links, networkLinks, otherLinks;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -50,18 +46,24 @@ function _addLinkData() {
               }
 
               return true;
-            });
+            }); // 如果是网络链路，补充详情信息
+
             _context.next = 3;
-            return (0, _linkUtils.getLinksDetail)(links, nodes);
+            return (0, _linkUtils.getLinksDetail)(links.filter(function (link) {
+              return !link.ciType;
+            }), nodes);
 
           case 3:
-            links = _context.sent;
+            networkLinks = _context.sent;
+            otherLinks = links.filter(function (link) {
+              return !!link.ciType;
+            });
             return _context.abrupt("return", {
-              links: links,
+              links: [].concat(networkLinks, otherLinks),
               linkGroups: []
             });
 
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -90,7 +92,7 @@ function buildData(_x3) {
 
 function _buildData() {
   _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, nodeCis, linkData;
+    var newData, nodes, _yield$Promise$all, linkData;
 
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
@@ -107,34 +109,18 @@ function _buildData() {
               });
             });
             _context2.next = 4;
-            return Promise.all([// 查询节点属性
-            (0, _services.queryCisByIds)(nodes.map(function (node) {
-              return node.id;
-            })), addLinkData(data.links || [], nodes)]);
+            return Promise.all([addLinkData(data.links || [], nodes)]);
 
           case 4:
             _yield$Promise$all = _context2.sent;
-            nodeCis = _yield$Promise$all[0];
-            linkData = _yield$Promise$all[1];
-            nodes = nodes.map(function (node) {
-              var _node$attributes$find;
-
-              return (0, _extends2["default"])({}, node, {
-                ipAddress: Array.isArray(node.attributes) ? (_node$attributes$find = node.attributes.find(function (item) {
-                  return item.code === 'ipAddress';
-                })) === null || _node$attributes$find === void 0 ? void 0 : _node$attributes$find.value : null,
-                attributes: nodeCis.find(function (ci) {
-                  return ci.id === node.id;
-                }).attributes
-              });
-            });
+            linkData = _yield$Promise$all[0];
             newData = (0, _extends2["default"])({}, newData, {
               nodes: nodes
             }, linkData);
             newData = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(newData);
             return _context2.abrupt("return", newData);
 
-          case 11:
+          case 9:
           case "end":
             return _context2.stop();
         }
@@ -144,19 +130,19 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-function getTopoData(_x4) {
+function getTopoData(_x4, _x5) {
   return _getTopoData.apply(this, arguments);
 }
 
 function _getTopoData() {
-  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
     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);
+            return topoService.getTopoData(id);
 
           case 2:
             data = _context3.sent;

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

@@ -17,8 +17,6 @@ var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _linkUtils = require("../../../core/models/utils/linkUtils");
-
 var _link = _interopRequireDefault(require("../../services/link"));
 
 var _resourcePermissionUtil = require("../../utils/resourcePermissionUtil");
@@ -48,6 +46,11 @@ var _default = function _default(_ref) {
 
     if (deleteable) {
       return deleteable;
+    } // 分级管理 下级链路禁用删除
+
+
+    if (link.isSubResource) {
+      return false;
     }
 
     _message["default"].notice('无删除权限');
@@ -64,8 +67,7 @@ var _default = function _default(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isGroup = false; // isAggLink(link);
-
+              isGroup = false;
               _context.next = 4;
               return _link["default"].deleteLink(id);
 

package/lib/networkTopo/services/alert.js

@@ -0,0 +1,66 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
+var _default = {
+  /**
+  * 根据资源id获取告警
+  * @param {*} params Topo ID
+  */
+  getAlarmByIds: function getAlarmByIds(params) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return _componentTopologyUtils.request.post('/alert/v1/api/alert/getAlertListInResource', params);
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  },
+
+  /**
+  * 通过ciId获取组件id
+  * ['xxxxxxx']
+  *
+  */
+  getCisComponentIds: function getCisComponentIds(params) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return _componentTopologyUtils.request.post('/topo/v1/api/structure/componentIds', params);
+
+            case 2:
+              return _context2.abrupt("return", _context2.sent);
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }))();
+  }
+};
+exports["default"] = _default;

package/lib/networkTopo/services/authorization.js

@@ -0,0 +1,145 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+
+/**
+ * @Author: zhaoshenghua
+ * @Date:   2021-04-16 11:11:05
+ * @Last Modified by:   zhaoshenghua
+ * @Last Modified time: 2021-09-27 17:02:55
+ */
+var _default = {
+  /**
+   * 根据用户对菜单进行预鉴权
+   * @param {*} menus url对象数组
+   * [{url:'/admin/connectInfo'}]
+   * @return [{url:'/admin/connectInfo',passed:'PASS'}]
+   */
+  checkMenuAuthentication: function checkMenuAuthentication(menus) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkMenuAuthentication', menus);
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  },
+
+  /**
+   * 资源预鉴权
+   * @param {Array} res id对象集合
+   * [{id:'000000000035f663'}]
+   * @return [{id:'000000000035f663',passed:'read'/'write'/'delete'/'impermissibility'}]
+   */
+  checkSourceAuthentication: function checkSourceAuthentication(res) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkSourceAuthentication', res);
+
+            case 2:
+              return _context2.abrupt("return", _context2.sent);
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }))();
+  },
+
+  /**
+   * 功能鉴权
+   */
+  checkFuncAuthentication: function checkFuncAuthentication(param) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return _componentTopologyUtils.request.post('/authorization/v1/api/authority/check/checkFuncAuthentication', param);
+
+            case 2:
+              return _context3.abrupt("return", _context3.sent);
+
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3);
+    }))();
+  },
+
+  /**
+   *获得角色列表
+   *@param {Array} orders 排序
+   *@param {Array} simpleFilter 过滤字段
+   * */
+  queryRolesList: function queryRolesList(param) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return _componentTopologyUtils.request.post('/authorization/v1/api/roles/list', param);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }))();
+  },
+  orgRolePostPage: function orgRolePostPage(param) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return _componentTopologyUtils.request.post('/identity/v1/api/user/orgRolePost/page', param);
+
+            case 2:
+              return _context5.abrupt("return", _context5.sent);
+
+            case 3:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5);
+    }))();
+  }
+};
+exports["default"] = _default;