@riil-frontend/component-topology 2.15.22 → 2.15.25

package/es/core/components/AlarmListPanel/index.js

@@ -1,4 +1,3 @@
-import _Dialog from "@alifd/next/es/dialog";
 import _List from "@alifd/next/es/list";
 import React, { useState, useEffect } from "react";
 import AlarmListItem from "./components/AlarmListItem";
@@ -6,23 +5,22 @@ import { Link } from "react-router-dom";
 import NoDataPage from "@riil-frontend/component-no-data-page";
 import styles from "./index.module.scss";
 import { alarmListDemo } from "./mocks";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 
 function AlarmListPanel(props, ref) {
   // 传入参数
   var topo = props.topo,
       target = props.toolBarRef,
+      titleBarRef = props.titleBarRef,
       visible = props.visible;
-  var alarm = topo.alarm;
 
   var _useState = useState([]),
       alarmList = _useState[0],
       setAlarmList = _useState[1];
 
-  var _topo$store$useModel = topo.store.useModel('topoAlarm'),
+  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
       alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1]; // const [topoState, topoDispatchers] = store.useModel('topoMod');
-  // const{  alarmPanelIsOpen }  = store.getState().topoMod;
-
+      alarmDispatchers = _topo$store$useModel[1];
 
   var alarmData = alarmState.alarmData,
       alarmPanelIsOpen = alarmState.alarmPanelIsOpen,
@@ -34,42 +32,19 @@ function AlarmListPanel(props, ref) {
   };
 
   useEffect(function () {
-    // console.log(
-    //   "AlarmListPanel-useEffect",
-    //   topo,
-    //   alarmPanelIsOpen,
-    //   alarmIsOpened,
-    //   alarmData,
-    //   alarmList
-    // );
     if (alarmData) {
       var _alarmData$slice;
 
-      topo.alarm.switchAlarmPopPanel(alarmIsOpened && (alarmData === null || alarmData === void 0 ? void 0 : alarmData.length) > 0);
-      setAlarmList((_alarmData$slice = alarmData === null || alarmData === void 0 ? void 0 : alarmData.slice(0, 10)) !== null && _alarmData$slice !== void 0 ? _alarmData$slice : []); // setAlarmList(alarmListDemo);
+      rlog.debug("AlarmListPanel-useEffect", alarmIsOpened); // topo.alarm.switchAlarmPopPanel(alarmIsOpened && alarmData?.length > 0);
+
+      setAlarmList((_alarmData$slice = alarmData === null || alarmData === void 0 ? void 0 : alarmData.slice(0, 10)) !== null && _alarmData$slice !== void 0 ? _alarmData$slice : []);
     } else {
       setAlarmList([]);
     }
   }, [alarmData]);
-  return /*#__PURE__*/React.createElement(_Dialog, {
+  return /*#__PURE__*/React.createElement("div", {
     className: styles.AlarmListPanel,
-    id: "AlarmListPanel",
-    align: false,
-    top: 100,
-    overlayProps: {
-      style: {
-        right: 15,
-        top: 100
-      },
-      target: {
-        target: target
-      }
-    },
-    onClose: onClose,
-    hasMask: false,
-    closeMode: "close",
-    visible: alarmPanelIsOpen,
-    footer: false
+    id: "AlarmListPanel"
   }, /*#__PURE__*/React.createElement(_List, {
     header: /*#__PURE__*/React.createElement("div", {
       style: {
@@ -80,7 +55,14 @@ function AlarmListPanel(props, ref) {
     }, "\u5173\u8054\u544A\u8B66\u4FE1\u606F"), /*#__PURE__*/React.createElement(Link, {
       className: styles.listTitleLink,
       to: "/default/alarmCenter/alarmList"
-    }, "\u67E5\u770B\u6240\u6709\u544A\u8B66")),
+    }, "\u67E5\u770B\u6240\u6709\u544A\u8B66"), /*#__PURE__*/React.createElement("a", {
+      role: "button",
+      "aria-label": "\u5173\u95ED",
+      className: "next-dialog-close",
+      onClick: onClose
+    }, /*#__PURE__*/React.createElement("i", {
+      className: "next-icon next-icon-close next-medium next-dialog-close-icon"
+    }))),
     dataSource: alarmList,
     emptyContent: /*#__PURE__*/React.createElement(NoDataPage, {
       className: styles.emptyContent,

package/es/core/components/TopoView/topoView.js

@@ -64,6 +64,7 @@ var TopoView = function TopoView(props) {
       tData = _useState[0],
       setTData = _useState[1];
 
+  var titleBarRef = useRef();
   var topoEdit = useTopoEdit({
     topo: topo,
     topoId: topoId,
@@ -264,6 +265,7 @@ var TopoView = function TopoView(props) {
   }), isEditMode && /*#__PURE__*/React.createElement(EditorPlugin, {
     topo: topo,
     topoEdit: topoEdit,
+    titleBarRef: titleBarRef,
     topoContext: {
       urlParams: urlParams
     },

package/es/core/components/titlebar/TitleBar.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "render", "viewerProps"];
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from "react";
 import PropTypes from "prop-types";
 import TopoViewerTitleBar from "../../viewer/components/titlebar/TopoViewerTitleBar";
 import TopoEditorTitleBar from "../../editor/components/titlebar/TopoEditorTitleBar";
@@ -14,11 +14,11 @@ function TitleBar(props) {
 
   var store = topo.store;
 
-  var _store$useModel = store.useModel('topoMod'),
+  var _store$useModel = store.useModel("topoMod"),
       topoState = _store$useModel[0];
 
   var viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
+  var isEditMode = viewState === "edit";
 
   if (render) {
     return render({

package/es/core/models/Alarm.js

@@ -216,12 +216,13 @@ var Alarm = /*#__PURE__*/function () {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoAlarm');
+              console.log("switchAlarmPopPanel", flag);
+              topoDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
               topoDispatchers.update({
                 alarmPanelIsOpen: flag
               });
 
-            case 2:
+            case 3:
             case "end":
               return _context3.stop();
           }
@@ -360,35 +361,13 @@ var Alarm = /*#__PURE__*/function () {
    * 打开\关闭告警列表弹窗
    *
    */
-  ;
-
-  _proto.switchAlarmPopPanel =
-  /*#__PURE__*/
-  function () {
-    var _switchAlarmPopPanel2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(flag) {
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-        while (1) {
-          switch (_context6.prev = _context6.next) {
-            case 0:
-              console.log("switchAlarmPopPanel", flag);
-              this.updateState({
-                alarmPanelIsOpen: flag
-              });
-
-            case 2:
-            case "end":
-              return _context6.stop();
-          }
-        }
-      }, _callee6, this);
-    }));
+  // async switchAlarmPopPanel(flag) {
+  //   console.log("switchAlarmPopPanel", flag);
+  //   this.updateState({
+  //     alarmPanelIsOpen: flag,
+  //   });
+  // }
 
-    function switchAlarmPopPanel(_x5) {
-      return _switchAlarmPopPanel2.apply(this, arguments);
-    }
-
-    return switchAlarmPopPanel;
-  }()
   /**
    * 当资源变化时，需要刷新。
    */
@@ -397,22 +376,22 @@ var Alarm = /*#__PURE__*/function () {
   _proto.restart =
   /*#__PURE__*/
   function () {
-    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+    var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
       var id;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               id = this.currentTopoId;
-              _context7.next = 3;
+              _context6.next = 3;
               return this.openTopoAlarm(id);
 
             case 3:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
         }
-      }, _callee7, this);
+      }, _callee6, this);
     }));
 
     function restart() {
@@ -430,12 +409,12 @@ var Alarm = /*#__PURE__*/function () {
   _proto.getAlarmByEE =
   /*#__PURE__*/
   function () {
-    var _getAlarmByEE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(alertData) {
+    var _getAlarmByEE = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(alertData) {
       var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist;
 
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
@@ -445,7 +424,7 @@ var Alarm = /*#__PURE__*/function () {
               console.log("getAlarmByEE-接收到推送的原始告警信息", alertData);
 
               if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-                _context8.next = 25;
+                _context7.next = 25;
                 break;
               }
 
@@ -478,19 +457,19 @@ var Alarm = /*#__PURE__*/function () {
               }); // rlog.debug("before-combAlarmData", al, bizState);
 
               if (!(sendAl.length > 0)) {
-                _context8.next = 25;
+                _context7.next = 25;
                 break;
               }
 
               rlog.debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
-              _context8.prev = 13;
-              _context8.next = 16;
+              _context7.prev = 13;
+              _context7.next = 16;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
               });
 
             case 16:
-              _yield$alarmDispatche = _context8.sent;
+              _yield$alarmDispatche = _context7.sent;
               eqFlag = _yield$alarmDispatche.eqFlag;
               alarmlist = _yield$alarmDispatche.alarmlist;
 
@@ -499,23 +478,23 @@ var Alarm = /*#__PURE__*/function () {
                 this.hmGetTopoAlarm();
               }
 
-              _context8.next = 25;
+              _context7.next = 25;
               break;
 
             case 22:
-              _context8.prev = 22;
-              _context8.t0 = _context8["catch"](13);
-              rlog.error("告警发送异常", _context8.t0);
+              _context7.prev = 22;
+              _context7.t0 = _context7["catch"](13);
+              rlog.error("告警发送异常", _context7.t0);
 
             case 25:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
         }
-      }, _callee8, this, [[13, 22]]);
+      }, _callee7, this, [[13, 22]]);
     }));
 
-    function getAlarmByEE(_x6) {
+    function getAlarmByEE(_x5) {
       return _getAlarmByEE.apply(this, arguments);
     }
 

package/es/core/models/AttributeMetricDisplay.js

@@ -24,7 +24,12 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-}
+} // 无权限不显示标注、悬浮框
+
+
+var filterByPermission = function filterByPermission(resource, items) {
+  return resource.operation ? items : [];
+};
 /**
  * 资源标注、悬浮框数据
  */
@@ -152,6 +157,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       tips: []
     };
   }
+  /**
+   * 查询需要查询数据的连线
+   * @param {*} data 
+   * @returns 
+   */
+  ;
+
+  _proto.getEdges = function getEdges(data) {
+    // 获得图上业务节点、业务连线
+    var _ref2 = data || this.topo.dataModel.getData(),
+        links = _ref2.links,
+        linkGroups = _ref2.linkGroups;
+
+    return [].concat(links.map(function (link) {
+      return _extends({}, link, {
+        type: 'edge'
+      });
+    }), linkGroups.map(function (link) {
+      return _extends({}, link, {
+        type: 'edgeGroup'
+      });
+    })).filter(function (link) {
+      return link.ciType === 'network_link';
+    });
+  }
   /**
    * 获取资源的标注、悬浮框配置，只包含属性和指标字段。无权限的资源无配置
    * 
@@ -165,15 +195,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this = this;
 
     // 获得图上业务节点、业务连线
-    var _ref2 = data || this.topo.store.getModelState('topoMod').data,
-        nodes = _ref2.nodes,
-        links = _ref2.links,
-        linkGroups = _ref2.linkGroups; // 无权限不显示标注、悬浮框
-
-
-    var filterByPermission = function filterByPermission(resource, items) {
-      return resource.operation ? items : [];
-    };
+    var _ref3 = data || this.topo.dataModel.getData(),
+        nodes = _ref3.nodes;
 
     return [].concat(nodes.filter(function (node) {
       return !!node.ciType;
@@ -189,29 +212,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: filterByPermission(node, ciTypeConfig.tags),
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
-    }), links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
+    }), this.getEdges().map(function (link) {
       var ciType = link.ciType;
 
       var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
 
       return {
-        type: 'edge',
-        id: link.id,
-        ciType: ciType,
-        tags: filterByPermission(link, ciTypeConfig.tags),
-        tips: filterByPermission(link, ciTypeConfig.tips)
-      };
-    }), linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      var ciType = link.ciType;
-
-      var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
-
-      return {
-        type: 'edgeGroup',
+        type: link.type,
         id: link.id,
         ciType: ciType,
         tags: filterByPermission(link, ciTypeConfig.tags),
@@ -226,6 +233,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return this.getResourceTagTipConfig().map(function (ciConfig) {
       var fields = {
+        ciType: ciConfig.ciType,
+        type: ciConfig.type,
         id: ciConfig.id,
         attributes: [],
         metrics: []
@@ -314,9 +323,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
   _proto.updateNodesNameVisible = function updateNodesNameVisible() {
     var dm = this.topo.getDataModel();
-    this.getNodesNameVisible().forEach(function (_ref3) {
-      var id = _ref3.id,
-          visible = _ref3.visible;
+    this.getNodesNameVisible().forEach(function (_ref4) {
+      var id = _ref4.id,
+          visible = _ref4.visible;
       dm.getDataByTag(id).a('isShowName', visible);
     });
   }
@@ -333,14 +342,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this4 = this;
 
-      var _this$topo$store$getS, resIdsList, nodeIdsList, linkIdsList, _this$topo$store$getM, links, linkGroups, codes, param, linkAdapter, result;
+      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               linkAdapter = function _linkAdapter(data) {
-                var link = findItem([].concat(links, linkGroups), 'id', data.id);
+                var link = topo.dataModel.getDataById(data.id);
 
                 if (!link) {
                   return data;
@@ -353,9 +362,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               };
 
-              _this$topo$store$getS = this.topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _this$topo$store$getS.resIdsList, nodeIdsList = _this$topo$store$getS.nodeIdsList, linkIdsList = _this$topo$store$getS.linkIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
-
-              _this$topo$store$getM = this.topo.store.getModelState('topoMod').data, links = _this$topo$store$getM.links, linkGroups = _this$topo$store$getM.linkGroups; // 无资源，不查询
+              topo = this.topo;
+              _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              // 无资源，不查询
 
               if (resIdsList.length) {
                 _context.next = 5;
@@ -370,14 +379,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
             case 7:
               // 需要查询的指标列表
-              codes = this.getResourceMetricCodes(); // if (!codes.length) {
-              //   return [];
-              // }
-
+              codes = this.getResourceMetricCodes();
               param = {
                 ciId: nodeIdsList,
                 codes: codes,
-                relationId: linkIdsList
+                // 过滤掉不需要查询的
+                relationId: this.getEdges().map(function (edge) {
+                  return {
+                    ciId: edge.id,
+                    operation: edge.operation
+                  };
+                })
               };
               /**
                * 链路属性适配
@@ -511,20 +523,29 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                     attributeMap = ciData.attributeMap;
                 ciRefAttributeMap[id] = [];
 
-                _this5.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attributeMeta) {
-                  return !!attributeMeta.refCi;
-                }).forEach(function (attributeMeta) {
-                  var refId = attributeMap[attributeMeta.code];
+                var ciTypeMeta = _this5.topo.ciTyeCache.getCiType(ciType);
 
-                  if (refId && !refIdMap[refId]) {
-                    refIdMap[refId] = true;
-                  }
+                if (ciTypeMeta) {
+                  ciTypeMeta.attributes.filter(function (attributeMeta) {
+                    return !!attributeMeta.refCi;
+                  }).forEach(function (attributeMeta) {
+                    var refId = attributeMap[attributeMeta.code];
+
+                    if (refId && !refIdMap[refId]) {
+                      refIdMap[refId] = true;
+                    }
 
-                  ciRefAttributeMap[id].push({
-                    attrCode: attributeMeta.code,
-                    id: refId
+                    ciRefAttributeMap[id].push({
+                      attrCode: attributeMeta.code,
+                      id: refId
+                    });
                   });
-                });
+                } else {
+                  rlog.warn('推送属性指标数据：未查询到ciType', {
+                    ciData: ciData,
+                    ciType: ciType
+                  });
+                }
               });
               refIds = Object.keys(refIdMap);
 
@@ -659,9 +680,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$store$getM2 = this.topo.store.getModelState('topoMod').data,
-        links = _this$topo$store$getM2.links,
-        linkGroups = _this$topo$store$getM2.linkGroups;
+    var _this$topo$store$getM = this.topo.store.getModelState('topoMod').data,
+        links = _this$topo$store$getM.links,
+        linkGroups = _this$topo$store$getM.linkGroups;
 
     var getLinkUId = function getLinkUId(link) {
       return [link.source, link.target].sort().join('-');

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.22" === 'string' ? "2.15.22" : null;
+var version = typeof "2.15.25" === 'string' ? "2.15.25" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -608,7 +608,7 @@ export default function ResourceOverview(props) {
   }
 
   var columns = [{
-    title: '事件',
+    title: '描述',
     dataIndex: 'title',
     key: 'title',
     cell: function cell(value, index, record) {