@riil-frontend/component-topology 12.0.0-dev.8 → 12.0.1

package/es/core/utils/edgeUtil.js

@@ -1,5 +1,13 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { showLinkByConfig } from "../models/utils/linkUtils";
+/**
+ * 是否手工连线
+ * @param {*} edge 
+ */
+
+export function isCustomEdge(edge) {
+  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+}
 /**
  * 根据配置更新连线展开折叠状态
  *

package/es/core/utils/metricUtil.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import { metricValueFormat } from '@riil-frontend/utils';
 import DictCache from "../models/cache/DictCache";
 /**
@@ -15,16 +16,19 @@ export function formatMetric(val, metricModel) {
   if (metricModel) {
     var _result$value;
 
-    // 分级字典特殊处理
-    if (metricModel.dict && !DictCache.getDictObject()[metricModel.code]) {
-      val = metricModel.dict[val];
+    var dictObject = _extends({}, DictCache.getDictObject()); // 分级字典特殊处理
+
+
+    if (metricModel.dict) {
+      // val = metricModel.dict[val]
+      dictObject[metricModel.code] = metricModel.dict;
     }
 
     var result = metricValueFormat({
       value: val,
       dataType: metricModel.dataType,
       changeValue: metricModel.changeValue,
-      dict: DictCache.getDictObject(),
+      dict: dictObject,
       unit: metricModel.unit,
       code: metricModel.code
     });

package/es/core/utils/showGraphManageStatusUtil.js

@@ -4,6 +4,7 @@ export function showManageStatus(options) {
   var topo = options.topo,
       resources = options.resources,
       graphLoaded = options.graphLoaded,
+      alarmSwitch = options.alarmSwitch,
       cisEventLevel = options.cisEventLevel;
 
   var hasAlarm = function hasAlarm(id) {
@@ -20,9 +21,9 @@ export function showManageStatus(options) {
           manageStatus = resource.manageStatus,
           permission = resource.permission;
       var isNotMonite = manageStatus === 0;
-      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 没有告警且有查看权限，才显示未监控状态
+      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 未监控 && 有查看权限 && (告警静默 || 没有告警)，才显示未监控状态
 
-      var showUnMoniteStatus = !hasAlarm(id) && isNotMonite && readable;
+      var showUnMoniteStatus = isNotMonite && readable && (alarmSwitch === false || !hasAlarm(id));
       var element = topo.getDataModel().getDataByTag(id);
       if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
 

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

@@ -9,43 +9,80 @@ import BlockBox from "./BlockBox";
 import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
 import styles from "./index.module.scss";
+import { getHistory } from '@riil-frontend/component-topology-utils';
 
 function formatUrl(url) {
-  return url;
+  var _window, _window$location;
+
+  console.log(url);
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
 }
 
 function EventsCard(props) {
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
-      onHandleAlarm = props.onHandleAlarm; // 告警table列配置
+      onHandleAlarm = props.onHandleAlarm;
+
+  var jumpTo = function jumpTo(url) {
+    closeDetailDrawer();
+
+    if (topo.viewProps.jumpto) {
+      topo.viewProps.jumpto(url);
+    } else {
+      getHistory().push(formatUrl(url));
+    }
+  }; // 告警table列配置
+
 
   var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
+    title: "描述",
+    dataIndex: "title",
+    key: "title",
     cell: function cell(value, index, record) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: styles['alarm-title'],
-        title: value,
-        onClick: closeDetailDrawer
-      }, /*#__PURE__*/React.createElement(_Icon, {
-        type: record.icon,
-        size: "xs",
-        className: styles['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/React.createElement("a", {
-        className: styles.link,
-        href: formatUrl(record.link)
-      }, value));
+      return (
+        /*#__PURE__*/
+        // <div
+        //   className={styles["alarm-title"]}
+        //   title={value}
+        //   onClick={closeDetailDrawer}
+        // >
+        //   <Icon
+        //     type={record.icon}
+        //     size="xs"
+        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
+        //   />
+        //   <Link to={formatUrl(record.link)}>{value}</Link>
+        // </div>
+        React.createElement("div", {
+          className: styles['alarm-title'],
+          title: value,
+          onClick: function onClick() {
+            jumpTo(record.link);
+          }
+        }, /*#__PURE__*/React.createElement(_Icon, {
+          type: record.icon,
+          size: "xs",
+          className: styles['alarm-color-icon'] + " " + record.className
+        }), /*#__PURE__*/React.createElement("span", {
+          className: styles.link
+        }, value))
+      );
     }
   }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
+    title: "时间",
+    dataIndex: "time",
+    key: "time",
     width: 144,
     cell: function cell(value, index, record) {
       return /*#__PURE__*/React.createElement("div", {
-        title: moment(value).format('YYYY-MM-DD HH:mm:ss')
-      }, moment(value).format('YYYY-MM-DD HH:mm:ss'));
+        title: moment(value).format("YYYY-MM-DD HH:mm:ss")
+      }, moment(value).format("YYYY-MM-DD HH:mm:ss"));
     }
   } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
   // {

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

@@ -23,8 +23,8 @@ export default function LinkTopoCard(props) {
       openFlow = _useState[0],
       setOpenFlow = _useState[1];
 
-  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + data.attributes.name + "&num=0";
-  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + data.attributes.name + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
+  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + encodeURIComponent(data.attributes.display_name) + "&num=0";
+  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + encodeURIComponent(data.attributes.display_name) + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
 
   var isOpenFlows = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {

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

@@ -34,7 +34,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isAppTopo) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
 
@@ -49,27 +49,29 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             alarmList = _yield$resourceOvervi2.alarms;
             alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                alarmInfo: item,
+                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,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             })) || [];
+            console.log("setAlarmRiskList", alarmList);
             setAlarmRiskList(alarmList);
-            _context.next = 24;
+            _context.next = 25;
             break;
 
-          case 9:
-            _context.next = 11;
+          case 10:
+            _context.next = 12;
             return alarmService.getAlarmByIds([id].concat(childrenIds), {
               alertStatusList: ['toDeal', 'woDealing', 'dealing'],
               // toDeal: 待处理, dealing：处理中
@@ -79,7 +81,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               sortOrder: 'asc'
             });
 
-          case 11:
+          case 12:
             _yield$alarmService$g2 = _context.sent;
             _alarmList2 = _yield$alarmService$g2.datas;
             // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
@@ -88,28 +90,28 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             });
             _alarmList2 = _alarmList2.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                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,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
 
-            _context.next = 17;
+            _context.next = 18;
             return service.queryAllComponentsByCiId(id);
 
-          case 17:
+          case 18:
             AllComponentsByCiId = _context.sent;
-            _context.next = 20;
+            _context.next = 21;
             return service.getRiskByIds({
               ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
                 return item.id;
@@ -119,7 +121,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               pageSize: 10000
             });
 
-          case 20:
+          case 21:
             _yield$service$getRis2 = _context.sent;
             riskList = _yield$service$getRis2.content;
             riskList = riskList.map(function (item) {
@@ -135,7 +137,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
 
             setAlarmRiskList([].concat(_alarmList2, riskList));
 
-          case 24:
+          case 25:
           case "end":
             return _context.stop();
         }

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

@@ -154,3 +154,11 @@
   background-color: transparent;
   border-color: transparent;
 }
+.link{
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--color-link-1);
+  cursor: pointer;
+}

package/es/core/viewer/components/plugins/ViewerPlugin.js

@@ -8,8 +8,10 @@ export default function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
+  var alarmInfoDoc = viewerProps.alarmInfoDoc;
   useAlarm({
-    topo: topo
+    topo: topo,
+    alarmInfoDoc: alarmInfoDoc
   });
   useManageStatus({
     topo: topo

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

@@ -5,11 +5,7 @@ import useEventData from "../../../../hooks/useEventData";
 
 function AlarmButton(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
+  var alarmState = topo.store.useModelState("topoAlarm");
   var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
   var alarmData = useEventData({
     topo: topo

package/es/networkTopo/components/TopoView.js

@@ -2,7 +2,7 @@ import _Loading from "@alifd/next/es/loading";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
-import React, { useState, useEffect, useRef, useCallback } from "react";
+import React from "react";
 import NodataPage from "@riil-frontend/component-topology-common/es/components/NoDataPage/index";
 import BasicTopoView from "../../core/components/TopoView";
 import topoPermissonUtil from "../../utils/topoPermissionUtil";
@@ -11,8 +11,8 @@ import TopoNoPermission from "./TopoNoPermission";
 import styles from "../../components/index.module.scss";
 import useLinkDynamicStyle from "../hooks/useLinkDynamicStyle";
 import useRelateTopo from "../hooks/viewer/useRelateTopo";
-import useEdgeFlow from "../hooks/viewer/useEdgeFlow";
-import useEdgeExpand from "../hooks/useEdgeExpand";
+import useEdgeFlow from "../hooks/viewer/useEdgeFlow"; // import useEdgeExpand from "../hooks/useEdgeExpand";
+
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
@@ -36,10 +36,8 @@ function NetworkTopologyCore(props) {
   });
   useEdgeFlow({
     topo: topo
-  });
-  useEdgeExpand({
-    topo: topo
-  });
+  }); // useEdgeExpand({ topo })
+
   var relateTopo = useRelateTopo({
     topo: topo
   });
@@ -68,10 +66,7 @@ function NetworkTopologyCore(props) {
       });
     } else if (!topoId) {
       return null;
-    } // if (loading) {
-    //   return null;
-    // }
-
+    }
 
     if (!loading) {
       // 加载完成后

package/es/networkTopo/hooks/useEdgeExpand.js

@@ -15,9 +15,8 @@ export default function useEdgeExpand(props) {
           data = e.data;
 
       if (data instanceof ht.Group && property === 'expanded') {
-        updateEdgeExpanded(topo);
-        setTimeout(function () {
-          updateEdgeExpanded(topo);
+        // updateEdgeExpanded(topo)
+        setTimeout(function () {// updateEdgeExpanded(topo)
         }, 100);
       }
     }

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

@@ -1,7 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources", "exportLinkIdList"];
+var _excluded = ["groups", "resources"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { rlog } from '@riil-frontend/component-topology-utils';
@@ -463,11 +463,11 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
+      var groups, resources, otherConfig, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+            groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {