@riil-frontend/component-topology 7.0.0-dev.8 → 7.0.1

package/es/core/store/models/topoMod.js

@@ -606,15 +606,16 @@ export default function (topoApp) {
 
                   case 4:
                     topoPermission = _context11.sent;
-                    _context11.next = 10;
+                    rlog.debug('查询拓扑权限', topoPermission);
+                    _context11.next = 11;
                     break;
 
-                  case 7:
-                    _context11.prev = 7;
+                  case 8:
+                    _context11.prev = 8;
                     _context11.t0 = _context11["catch"](1);
                     rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
-                  case 10:
+                  case 11:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -623,12 +624,12 @@ export default function (topoApp) {
 
                     return _context11.abrupt("return", topoPermission);
 
-                  case 12:
+                  case 13:
                   case "end":
                     return _context11.stop();
                 }
               }
-            }, _callee11, null, [[1, 7]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -1,7 +1,6 @@
 import _Message from "@alifd/next/es/message";
 import _Table from "@alifd/next/es/table";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
@@ -56,30 +55,34 @@ function EventsCard(props) {
         title: moment(value).format('YYYY-MM-DD HH:mm:ss')
       }, moment(value).format('YYYY-MM-DD HH:mm:ss'));
     }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/React.createElement(_Button, {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/React.createElement(_Button, {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
+  // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x, _x2) {
     return _alarmRiskOperation.apply(this, arguments);

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -912,6 +912,8 @@ export default function ResourceOverview(props) {
         defaultDisabledCol: ['display_name'],
         max: 6,
         columns: baseInfoCol,
+        getOverviewConfig: resourceOverviewProps.getOverviewConfig,
+        saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
         onChange: baseInfoColChange
       }));
     }
@@ -932,6 +934,8 @@ export default function ResourceOverview(props) {
       defaultCol: defaultCols.keyIndicators,
       max: 6,
       columns: metricCol,
+      getOverviewConfig: resourceOverviewProps.getOverviewConfig,
+      saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
       onChange: metricColChange
     })
   }, /*#__PURE__*/React.createElement(ResourceOverviewMetric, {

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js

@@ -33,7 +33,9 @@ function Configurator(props) {
       type = props.type,
       max = props.max,
       _props$btnStyle = props.btnStyle,
-      btnStyle = _props$btnStyle === void 0 ? {} : _props$btnStyle; // console.log('Configurator props', props);
+      btnStyle = _props$btnStyle === void 0 ? {} : _props$btnStyle,
+      getOverviewConfig = props.getOverviewConfig,
+      saveOverviewConfig = props.saveOverviewConfig; // console.log('Configurator props', props);
 
   var buttonRef = useRef(null);
 
@@ -71,35 +73,33 @@ function Configurator(props) {
 
   function _init() {
     _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _overviewConfig;
+
       var overviewConfig, newPrevCols, newNextCols, oldCols, newCols;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
+              overviewConfig = {};
+
               if (!(topoId && templateCode)) {
-                _context3.next = 6;
+                _context3.next = 5;
                 break;
               }
 
-              _context3.next = 3;
-              return service.getOverviewConfig(topoId, templateCode);
+              _context3.next = 4;
+              return (getOverviewConfig || service.getOverviewConfig)(topoId, templateCode);
 
-            case 3:
-              _context3.t0 = _context3.sent;
-              _context3.next = 7;
-              break;
+            case 4:
+              overviewConfig = _context3.sent;
 
-            case 6:
-              _context3.t0 = {};
-
-            case 7:
-              overviewConfig = _context3.t0;
+            case 5:
               // console.log('overviewConfig', overviewConfig);
               // const overviewConfig = ''
               newPrevCols = [];
               newNextCols = [];
 
-              if (overviewConfig !== null && overviewConfig !== void 0 && overviewConfig[type]) {
+              if ((_overviewConfig = overviewConfig) !== null && _overviewConfig !== void 0 && _overviewConfig[type]) {
                 oldCols = JSON.parse(overviewConfig[type]) || []; // 已设置
 
                 oldCols.forEach(function (old_item) {
@@ -149,7 +149,7 @@ function Configurator(props) {
               setOrgColumns(newCols);
               onChange(newCols);
 
-            case 15:
+            case 12:
             case "end":
               return _context3.stop();
           }
@@ -227,7 +227,7 @@ function Configurator(props) {
 
   var onOk = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _service$saveOverview;
+      var _ref3;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -242,7 +242,7 @@ function Configurator(props) {
               }
 
               _context2.next = 5;
-              return service.saveOverviewConfig(topoId, templateCode, (_service$saveOverview = {}, _service$saveOverview[type] = JSON.stringify(columnsState), _service$saveOverview));
+              return (saveOverviewConfig || service.saveOverviewConfig)(topoId, templateCode, (_ref3 = {}, _ref3[type] = JSON.stringify(columnsState), _ref3));
 
             case 5:
             case "end":

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -101,6 +101,7 @@
 }
 .alarm {
   margin-top: 12px;
+  margin-bottom: 16px;
   .alarm-title {
     overflow: hidden;
     text-overflow: ellipsis;

package/es/core/viewer/components/titlebar/widgets/SettingButton.js

@@ -12,26 +12,17 @@ export default function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
       style = props.style,
-      isEditor = props.isEditor;
+      isEditor = props.isEditor,
+      displaySettingRender = props.displaySettingRender;
 
   var _useState = useState(false),
       visible = _useState[0],
       setVisible = _useState[1];
 
-  var topoModState = topo.store.useModelState('topoMod');
-  var graphLoaded = topoModState.graphLoaded;
-
   var changeClick = function changeClick() {
     setVisible(true);
   };
 
-  useEffect(function () {
-    if (graphLoaded) {
-      var _topo$viewProps$urlPa;
-
-      setVisible(!!((_topo$viewProps$urlPa = topo.viewProps.urlParams) !== null && _topo$viewProps$urlPa !== void 0 && _topo$viewProps$urlPa.showSetting));
-    }
-  }, [graphLoaded]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     style: style,
     onClick: changeClick,
@@ -42,6 +33,7 @@ export default function SettingButton(props) {
     visible: visible,
     topo: topo,
     isEditor: isEditor,
+    displaySettingRender: displaySettingRender,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

package/es/core/viewer/components/titlebar/widgets/SettingButtonWidget.js

@@ -10,12 +10,14 @@ export default function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
       style = props.style,
-      isEditor = props.isEditor;
+      isEditor = props.isEditor,
+      displaySettingRender = props.displaySettingRender;
   return /*#__PURE__*/React.createElement(SettingButton, {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style,
-    isEditor: isEditor
+    displaySettingRender: displaySettingRender,
+    isEditor: isEditor,
+    style: style
   });
 }
 ;

package/es/networkTopo/getTopoData.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) {
@@ -16,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) {
@@ -32,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();
         }
@@ -72,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) {
@@ -89,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();
         }

package/es/networkTopo/index.js

@@ -1,4 +1,4 @@
 import TopoCenter from "./models/TopoCenter";
+import Topology from "./components/TopoView";
 import createTopo from "./createTopo";
-import Topology from "./components/Topology";
-export { TopoCenter, createTopo, Topology };
+export { Topology, TopoCenter, createTopo };

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);
+    }))();
+  }
+};