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

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

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _Box from "@alifd/next/es/box";
 import _Collapse from "@alifd/next/es/collapse";
 import React, { useEffect } from "react";
@@ -5,9 +6,40 @@ import styles from "./LinkInfoPreview.module.scss";
 import { formatMetric } from "../../../../../../core/models/attributeFormatter";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 var CollapsePanel = _Collapse.Panel;
+
+function Item(props) {
+  return /*#__PURE__*/React.createElement(_Box, {
+    key: props.name,
+    direction: "row",
+    spacing: 8,
+    className: styles.row
+  }, /*#__PURE__*/React.createElement(_Box, {
+    className: styles.label
+  }, props.label), /*#__PURE__*/React.createElement(_Box, {
+    className: props.name === "use" ? styles.uselabelValue : styles.labelValue,
+    flex: 1
+  }, props.content));
+}
+
 export default 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"
@@ -23,7 +55,7 @@ export default function LindInfoPreview(props) {
   }, {
     label: "源端IP",
     name: "network_link.source_ipv4"
-  }, {
+  }].concat(cmpFieldsSource, [{
     label: "目的节点名称",
     name: "network_link.destination_device_id"
   }, {
@@ -35,7 +67,7 @@ export default function LindInfoPreview(props) {
   }, {
     label: "目的端IP",
     name: "network_link.destination_ipv4"
-  }, {
+  }], cmpFields, [{
     label: "取值端口",
     name: "network_link.value_port"
   }, {
@@ -44,7 +76,7 @@ export default function LindInfoPreview(props) {
   }, {
     label: "用途",
     name: "use"
-  }];
+  }]);
 
   var getValue = function getValue(name) {
     var value; // console.log('LindInfoPreview-getValue',data,name)
@@ -69,18 +101,12 @@ export default function LindInfoPreview(props) {
     return value;
   };
 
-  return fields.map(function (field) {
-    return /*#__PURE__*/React.createElement(_Box, {
-      key: field.name,
-      direction: "row",
-      spacing: 8,
-      className: styles.row
-    }, /*#__PURE__*/React.createElement(_Box, {
-      className: styles.label
-    }, field.label), /*#__PURE__*/React.createElement(_Box, {
-      className: field.name === "use" ? styles.uselabelValue : styles.labelValue,
-      flex: 1
-    }, getValue(field.name)));
+  return fields.map(function (field, index) {
+    return /*#__PURE__*/React.createElement(Item, _extends({
+      key: index
+    }, field, {
+      content: field.content || getValue(field.name)
+    }));
   }); // <Collapse
   //   defaultExpandedKeys={["相关资源"]}
   //   style={{ border: "none" }}

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

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _useGroupSortResources from "../../hooks/editor/useGroupSortResources";
 import LayerConfigPlugin from "./plugins/LayerConfigPlugin";
-import AddLinkDrawer from "./propertyViews/edge/addLinkDrawer/AddLinkDrawer";
 import EdgePropertyView from "./propertyViews/edge/EdgePropertyView";
 import LinkPropertyView from "./propertyViews/edge/LinkPropertyView";
 import LayerRelatedResourceList from "./propertyViews/LayerRelatedResourceList";
@@ -25,8 +24,8 @@ export default function useEditorProps(props) {
       var edge = _ref.edge;
       return edge.getTag() ? 'link' : null;
     },
-    showLinkConfig: true,
-    // 是否显示链路相关配置
-    plugins: [LayerConfigPlugin, AddLinkDrawer]
-  }, customEditorProps);
+    showLinkConfig: true
+  }, customEditorProps, {
+    plugins: [LayerConfigPlugin].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
+  });
 }

package/es/networkTopo/getTopoData.js

@@ -1,9 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import { getLinksDetail } from "../core/models/utils/linkUtils";
-import { queryCisByIds } from "../core/services";
 import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil"; // import "./utils/__tests__/resourcePermissionUtil.test";
 
 export function addLinkData(_x, _x2) {
@@ -17,7 +15,7 @@ export function addLinkData(_x, _x2) {
 
 function _addLinkData() {
   _addLinkData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(oldLinks, nodes) {
-    var links;
+    var links, networkLinks, otherLinks;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -33,18 +31,24 @@ function _addLinkData() {
               }
 
               return true;
-            });
+            }); // 如果是网络链路，补充详情信息
+
             _context.next = 3;
-            return getLinksDetail(links, nodes);
+            return 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();
         }
@@ -73,7 +77,7 @@ export function buildData(_x3) {
 
 function _buildData() {
   _buildData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, nodeCis, linkData;
+    var newData, nodes, _yield$Promise$all, linkData;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -90,34 +94,18 @@ function _buildData() {
               });
             });
             _context2.next = 4;
-            return Promise.all([// 查询节点属性
-            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 _extends({}, 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 = _extends({}, newData, {
               nodes: nodes
             }, linkData);
             newData = addTopoDataResourcePermission(newData);
             return _context2.abrupt("return", newData);
 
-          case 11:
+          case 9:
           case "end":
             return _context2.stop();
         }
@@ -127,12 +115,12 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-export default function getTopoData(_x4) {
+export default function getTopoData(_x4, _x5) {
   return _getTopoData.apply(this, arguments);
 }
 
 function _getTopoData() {
-  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+  _getTopoData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, topoService) {
     var data;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {

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

@@ -4,7 +4,6 @@ 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 { isAggLink } from "../../../core/models/utils/linkUtils";
 import linkService from "../../services/link";
 import { getLinkPermission } from "../../utils/resourcePermissionUtil";
 /**
@@ -33,6 +32,11 @@ export default (function (_ref) {
 
     if (deleteable) {
       return deleteable;
+    } // 分级管理 下级链路禁用删除
+
+
+    if (link.isSubResource) {
+      return false;
     }
 
     _Message.notice('无删除权限');
@@ -49,8 +53,7 @@ export default (function (_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isGroup = false; // isAggLink(link);
-
+              isGroup = false;
               _context.next = 4;
               return linkService.deleteLink(id);
 

package/es/networkTopo/services/alert.js

@@ -0,0 +1,55 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { request } from '@riil-frontend/component-topology-utils';
+export default {
+  /**
+  * 根据资源id获取告警
+  * @param {*} params Topo ID
+  */
+  getAlarmByIds: function getAlarmByIds(params) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return request.post('/topo/v1/api/structure/componentIds', params);
+
+            case 2:
+              return _context2.abrupt("return", _context2.sent);
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }))();
+  }
+};

package/es/networkTopo/services/authorization.js

@@ -0,0 +1,135 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+/**
+ * @Author: zhaoshenghua
+ * @Date:   2021-04-16 11:11:05
+ * @Last Modified by:   zhaoshenghua
+ * @Last Modified time: 2021-09-27 17:02:55
+ */
+import { request } from '@riil-frontend/component-topology-utils';
+export default {
+  /**
+   * 根据用户对菜单进行预鉴权
+   * @param {*} menus url对象数组
+   * [{url:'/admin/connectInfo'}]
+   * @return [{url:'/admin/connectInfo',passed:'PASS'}]
+   */
+  checkMenuAuthentication: function checkMenuAuthentication(menus) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return 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);
+    }))();
+  }
+};