@riil-frontend/component-topology 8.0.0-a.1 → 8.0.0-a.11

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -21,7 +21,7 @@ export default function useMetricPolling(_ref) {
 
 
   var queryLinkMetricsRequest = useRequest(queryLinkLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,
@@ -31,7 +31,7 @@ export default function useMetricPolling(_ref) {
     }
   });
   var queryInterfaceMetricsRequest = useRequest(queryLinkInterfacesLatestMetrics, {
-    pollingInterval: 1000 * 15,
+    pollingInterval: 60 * 1000,
     pollingWhenHidden: false,
     debounceInterval: 200,
     manual: true,

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

@@ -0,0 +1,171 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useRequest } from 'ahooks';
+import { useEffect, useState } from 'react';
+import alarmService from "../../../../../../../services/alarm";
+import service from "../../../../../../../services/overview";
+/**
+ * 概览指标定义
+ * @param {*} props
+ */
+
+var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
+  var id = props.id,
+      isAppTopo = props.isAppTopo,
+      resourceOverviewProps = props.resourceOverviewProps,
+      childrenIds = props.childrenIds,
+      userId = props.userId;
+
+  var _useState = useState([]),
+      alarmRiskList = _useState[0],
+      setAlarmRiskList = _useState[1]; // 获取告警/风险信息
+
+
+  function getAlarmRiskData(_x) {
+    return _getAlarmRiskData.apply(this, arguments);
+  } // 轮询hooks
+
+
+  function _getAlarmRiskData() {
+    _getAlarmRiskData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
+
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!isAppTopo) {
+                _context.next = 9;
+                break;
+              }
+
+              _context.next = 3;
+              return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
+                id: id // metrics: topModelMetrics,
+
+              });
+
+            case 3:
+              _yield$resourceOvervi = _context.sent;
+              alarmList = _yield$resourceOvervi.alarms;
+              alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
+                return {
+                  type: 'alarm',
+                  icon: 'gaojing-3',
+                  className: "alarm-color-icon-lv" + item.alertLevel,
+                  title: "[" + item.alertObject + "] " + item.alertTitle,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  time: item.createTime,
+                  status: item.status,
+                  params: [{
+                    alertId: item.alertId,
+                    status: 'dealing',
+                    userId: userId,
+                    isBaseAlert: false
+                  }]
+                };
+              })) || [];
+              setAlarmRiskList(alarmList);
+              _context.next = 24;
+              break;
+
+            case 9:
+              _context.next = 11;
+              return alarmService.getAlarmByIds([id].concat(childrenIds), {
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
+                // toDeal: 待处理, dealing：处理中
+                pageNum: 1,
+                pageSize: 10000,
+                sortField: 'alertLevel',
+                sortOrder: 'asc'
+              });
+
+            case 11:
+              _yield$alarmService$g = _context.sent;
+              _alarmList2 = _yield$alarmService$g.datas;
+              // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
+              _alarmList2 = _alarmList2.sort(function (a, b) {
+                return b.createTime - a.createTime;
+              });
+              _alarmList2 = _alarmList2.map(function (item) {
+                return {
+                  type: 'alarm',
+                  icon: 'gaojing-3',
+                  className: "alarm-color-icon-lv" + item.alertLevel,
+                  title: "" + item.alertObject + item.alertTitle,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  time: item.createTime,
+                  status: item.status,
+                  params: [{
+                    alertId: item.alertId,
+                    status: 'dealing',
+                    userId: userId,
+                    isBaseAlert: false
+                  }]
+                };
+              }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
+
+              _context.next = 17;
+              return service.queryAllComponentsByCiId(id);
+
+            case 17:
+              AllComponentsByCiId = _context.sent;
+              _context.next = 20;
+              return service.getRiskByIds({
+                ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
+                  return item.id;
+                })),
+                statusList: ['toDeal', 'dealing'],
+                current: 1,
+                pageSize: 10000
+              });
+
+            case 20:
+              _yield$service$getRis = _context.sent;
+              riskList = _yield$service$getRis.content;
+              riskList = riskList.map(function (item) {
+                return {
+                  type: 'risk',
+                  icon: 'Overall_risk_full',
+                  className: 'risk-icon',
+                  title: "" + item.ciName + item.itemName,
+                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.reportName,
+                  time: item.firstFoundTime
+                };
+              }); // console.log('告警和风险', alarmList, riskList);
+
+              setAlarmRiskList([].concat(_alarmList2, riskList));
+
+            case 24:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _getAlarmRiskData.apply(this, arguments);
+  }
+
+  var request = useRequest(getAlarmRiskData, {
+    pollingInterval: 1000 * 15,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
+    manual: true,
+    onSuccess: function onSuccess() {}
+  });
+  useEffect(function () {
+    setAlarmRiskList([]);
+    request.run(id);
+    return function () {
+      request.cancel();
+    };
+  }, [id]);
+  return {
+    alarmRiskList: alarmRiskList,
+    refreshAlarmData: function refreshAlarmData() {
+      request.run();
+    }
+  };
+};
+
+export default useAlarmAndRiskData;

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

@@ -92,9 +92,9 @@ var useMetricModels = function useMetricModels(props) {
   }
 
   var request = useRequest(fetchData, {
-    pollingInterval: 1000 * 5,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 1000 * 60,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(newMetricModels) {
       var a = metricModels.map(function (item) {

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

@@ -50,6 +50,10 @@ function SearchWidget(props) {
 
   var onChange = function onChange(value) {
     setSearchValue(value);
+
+    if (!value) {
+      topo.searchElements(searchType, value);
+    }
   };
 
   return /*#__PURE__*/React.createElement(_Search, {

package/es/networkTopo/services/topo/basic.js

@@ -532,7 +532,7 @@ export default _extends({
   /**
   * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
   * @param {Number} id Topo ID
-  * @param {String} data
+  * @param {String} data ht拓扑序列化数据
   * @returns
   */
   saveSerializeData: function saveSerializeData(id, data) {
@@ -542,7 +542,9 @@ export default _extends({
           switch (_context15.prev = _context15.next) {
             case 0:
               _context15.next = 2;
-              return request.post(API_ROOT + "/structure/" + id, data);
+              return request.post(API_ROOT + "/structure/" + id, {
+                data: data
+              });
 
             case 2:
               return _context15.abrupt("return", _context15.sent);

package/es/networkTopo/store/linkManager.js

@@ -6,7 +6,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 链路新增、编辑 Model
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default function (topoApp) {
   return {
     // 定义 model 的初始 state

package/es/networkTopo/store/topoCenter.js

@@ -8,7 +8,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  *
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/networkTopo/store/topoLinkMod.js

@@ -6,7 +6,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 拓扑链路相关 Model
  */
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 export default function (topoApp) {
   return {
     // 定义 model 的初始 state

package/lib/core/common/icons/basicIcons.js

@@ -23,7 +23,7 @@ var _default = [{
   'name': '人员',
   'url': '/img/topo/basicIcon/人员平面.svg'
 }, {
-  'id': 'system.building',
+  'id': 'system.楼宇',
   'name': '楼宇',
   'url': '/img/topo/basicIcon/楼宇平面.svg'
 }, {

package/lib/core/common/icons/icon.js

@@ -62,11 +62,15 @@ function getResourceIcons(topo) {
 
 
 function getBasicIcons(topo, containsGroupIcon) {
+  var nodeIcons = _manager["default"].iconLibManager.getNodeIcons().filter(function (icon) {
+    return !icon.ciType;
+  });
+
   if (containsGroupIcon === false) {
-    return _basicIcons["default"];
+    return [].concat(nodeIcons, _basicIcons["default"]);
   }
 
-  return [_manager["default"].iconLibManager.getGroupIcon()].concat(_basicIcons["default"]);
+  return [_manager["default"].iconLibManager.getGroupIcon()].concat(nodeIcons, _basicIcons["default"]);
 }
 
 function getGroupDefaultIcons(topo) {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -13,6 +13,8 @@ var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
+
 var _EdgeTypeModule = _interopRequireDefault(require("./EdgeType.module.scss"));
 
 var _LineType = _interopRequireDefault(require("./LineType"));
@@ -77,43 +79,60 @@ var LINE_MOLD_OPTIONS = [{
   icon: 'topo_lineMold_dotted_two'
 }];
 
-function getValuesBySelection(selection) {
+function getValuesByEdges(topo) {
+  function getStartPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  function getEndPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  var selectionEdges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
+  var edgeValues = [];
+  (0, _edgeTypeStyleUtil.loopEdgesAndChildren)(topo, selectionEdges, function (edge) {
+    edgeValues.push({
+      lineButton: edge.s('edge.type'),
+      startPoint: getStartPoint(edge),
+      endPoint: getEndPoint(edge),
+      lineMold: edge.a('lineMode') || 'solidLine'
+    });
+  });
   var values = {
+    lineButton: undefined,
     startPoint: undefined,
     endPoint: undefined,
     lineMold: undefined
-  }; // 仅一条连线选中时回显
-
-  if (selection.length === 1) {
-    var edge = selection[0];
-    values = {
-      startPoint: 'nil',
-      endPoint: 'nil',
-      lineMold: edge.a('lineMode') || 'solidLine'
-    };
-    var icons = edge.s('icons') || {};
-    ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.startPoint = name;
-      }
+  };
+  Object.keys(values).forEach(function (name) {
+    var vals = edgeValues.map(function (item) {
+      return item[name];
     });
-    ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.endPoint = name;
-      }
-    });
-  }
+    var isSame = vals.filter(function (val) {
+      return val === vals[0];
+    }).length === vals.length;
 
+    if (isSame) {
+      values[name] = vals[0];
+    }
+  });
   return values;
 }
 
 function EdgeType(props) {
-  var selection = props.selection,
+  var topo = props.topo,
+      selection = props.selection,
       _onChange = props.onChange;
 
   var field = _field["default"].useField({
     autoUnmount: false,
-    values: getValuesBySelection(selection),
+    values: getValuesByEdges(topo),
     onChange: function onChange(name, value) {
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
@@ -124,7 +143,7 @@ function EdgeType(props) {
   });
 
   (0, _react.useEffect)(function () {
-    field.setValues(getValuesBySelection(selection));
+    field.setValues(getValuesByEdges(topo));
   }, [selection]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _EdgeTypeModule["default"].lineBox

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -11,6 +11,8 @@ var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _LineTypeModule = _interopRequireDefault(require("./LineType.module.scss"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -41,11 +43,14 @@ var LINE_TYPE_OPTIONS = [{
 }];
 
 var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
-  var onChange = props.onChange;
+  var value = props.value,
+      onChange = props.onChange;
 
   function lineButton(item) {
+    var _classNames;
+
     return /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      className: "" + _LineTypeModule["default"].redioBtn,
+      className: (0, _classnames["default"])(_LineTypeModule["default"].redioBtn, (_classNames = {}, _classNames[_LineTypeModule["default"].selected] = value === item.value, _classNames)),
       onClick: function onClick() {
         onChange(item.value);
       }
@@ -67,5 +72,6 @@ var LineType = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   }));
 });
 
+LineType.displayName = 'LineType';
 var _default = LineType;
 exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss

@@ -21,6 +21,10 @@
     &:hover {
       background: #F2F7FD !important;
     }
+
+    &.selected {
+      background: #F2F7FD !important;
+    }
   }
   .redioBtn:last-child{
     margin-right: 0;

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -128,6 +128,7 @@ function EdgeTypeButton(props) {
     disabled: disabled,
     trigger: icon
   }, !disabled && /*#__PURE__*/_react["default"].createElement(_EdgeType["default"], {
+    topo: topo,
     selection: selection,
     onChange: handleChange
   })));

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -24,8 +24,7 @@ function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
-  var getSelectedEdges = function getSelectedEdges(topo) {
-    var gv = topo.getGraphView();
+  var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
     var edges = selection.filter(function (element) {
@@ -51,7 +50,7 @@ function getEdgesBySelection(topo) {
     return edges;
   };
 
-  return getSelectedEdges(topo);
+  return getSelectedEdges(topo.getGraphView());
 }
 /**
  * 遍历连线及子连线

package/lib/core/hooks/usePolling.js

@@ -34,9 +34,9 @@ var usePolling = function usePolling(props) {
   var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
 
   var _useRequest = (0, _ahooks.useRequest)(refresh, {
-    pollingInterval: 1000 * 15,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
       if (result) {

package/lib/core/models/TopoApp.js

@@ -11,14 +11,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _lodash = require("lodash");
 
+var _topo = _interopRequireDefault(require("../services/topo"));
+
 var _CiTypeCache = _interopRequireDefault(require("./cache/CiTypeCache"));
 
 var _Alarm = _interopRequireDefault(require("./Alarm"));
@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "8.0.0-a.1" === 'string' ? "8.0.0-a.1" : null;
+var version = typeof "8.0.0-a.11" === 'string' ? "8.0.0-a.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _utils = require("./utils");
 
-var _topo = require("../../services/topo");
+var _tagtip = require("../../services/topo/tagtip");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
 
@@ -44,7 +44,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
               }
 
               _context.next = 6;
-              return (0, _topo.getMetricsByMonitorTemplateCodes)(this.mtCodes);
+              return (0, _tagtip.getMetricsByMonitorTemplateCodes)(this.mtCodes);
 
             case 6:
               this.mtMetricsMap = _context.sent;

package/lib/core/models/topoData.js

@@ -18,8 +18,16 @@ var _topo = require("@riil-frontend/component-topology-common/es/services/topo")
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 function getLayoutId(layout) {
-  if (!layout || typeof layout === "string") {
+  if (!layout) {
     return layout;
+  } // 拖拽添加分层后点击保存ht传参不正确，临时适配
+
+
+  if (typeof layout === "string") {
+    return {
+      v: 'towardeast',
+      h: 'towardsouth'
+    }[layout] || layout;
   }
 
   var id = layout.id,