@riil-frontend/component-topology 2.14.2-alpha.13 → 2.14.2-alpha.18

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.module.scss

@@ -67,7 +67,18 @@
       }
     }
   }
-  .alarm{
+  .alarm {
     margin-top: 12px;
+    .alarm-color-icon {
+      width: 12px;
+      height: 12px;
+      font-size: 12px;
+      margin-right: 4px;
+    }
+    :global {
+      .#{$css-prefix}btn-helper{
+        vertical-align: baseline;
+      }
+    }
   }
 }

package/lib/core/viewer/components/plugins/BaseInfo/index.js

@@ -31,12 +31,24 @@ function Title(_ref) {
   var id = _ref.id,
       name = _ref.name,
       type = _ref.type,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      topo = _ref.topo;
 
   if (type === 'node') {
     // 查询资源列表
+    console.log('topo 查询资源列表 title params', {
+      id: id,
+      name: name,
+      type: type,
+      onChange: onChange,
+      topo: topo
+    });
     var nodes = topo.store.getModelState('topoMod').data.nodes;
     console.log('查询资源列表', nodes);
+    nodes = nodes.filter(function (item) {
+      return item.id !== id;
+    });
+    if (!nodes.length) return name;
     return /*#__PURE__*/_react["default"].createElement(_menuButton["default"], {
       text: true,
       label: name,
@@ -74,12 +86,15 @@ function BaseInfo(props) {
     name: '',
     type: '',
     // 类型： node、link
-    ciType: ''
+    ciType: '',
+    ciName: ''
   }),
       activeData = _useState2[0],
       setActiveData = _useState2[1];
 
+  console.log('topo 概览', props);
   (0, _react.useEffect)(function () {
+    console.log('topo 概览', props);
     var notifier = topo.view.topoClient.notifier;
     notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
     return function () {
@@ -88,17 +103,23 @@ function BaseInfo(props) {
   }, []);
 
   function openOverview(data) {
+    var _topo$options$resourc;
+
     console.log('openOverview data', data);
     var id = data.id,
         name = data.name,
         type = data.type,
-        ciType = data.ciType;
+        ciType = data.ciType,
+        ciName = data.ciName;
     setActiveData({
       id: id,
       name: name,
       type: type,
-      ciType: ciType
-    });
+      ciType: ciType,
+      ciName: ciName
+    }); // 应用拓扑中没有链路详情
+
+    if ((_topo$options$resourc = topo.options.resourceOverviewDrawer) !== null && _topo$options$resourc !== void 0 && _topo$options$resourc.getData && type === 'link') return;
 
     var _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType),
         metrics = _topo$ciTyeCache$getC.metrics;
@@ -126,6 +147,7 @@ function BaseInfo(props) {
     closeMode: ['close', 'esc'],
     visible: visible,
     title: /*#__PURE__*/_react["default"].createElement(Title, (0, _extends2["default"])({}, activeData, {
+      topo: topo,
       onChange: onChangeActive
     })),
     width: 580,
@@ -141,6 +163,5 @@ function BaseInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData))))));
 }
 
-;
 var _default = BaseInfo;
 exports["default"] = _default;

package/lib/core/viewer/components/plugins/BaseInfo/index.module.scss

@@ -1,7 +1,7 @@
 @import '~@alifd/next/variables.scss';
 
 .baseInfo {
-  z-index: 1009;
+  // z-index: 1009 !important;
   :global {
     .#{$css-prefix}drawer-body {
       height: calc(100% - 46px);

package/lib/models/topoAlarm.js

@@ -59,7 +59,7 @@ var _default = {
                     alarmRecord: []
                   });
 
-                  return _context.abrupt("return", 'resetAlarmDoc Over');
+                  return _context.abrupt("return", "resetAlarmDoc Over");
 
                 case 2:
                 case "end":
@@ -74,7 +74,7 @@ var _default = {
         var _this2 = this;
 
         return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-          var alarmdata, _state$topoAlarm, alarmDoc, alarmRecord, alarmList, _state$topoMod, resAndMetrics, topoData, resIdsList, alarmCiDoc, doc, record, i, item, rid, obj, sliceTag, alarmlist, eqFlag;
+          var alarmdata, _state$topoAlarm, alarmDoc, alarmRecord, alarmList, _state$topoMod, resAndMetrics, topoData, resIdsList, alarmCiDoc, doc, record, _loop, i, alarmlist, eqFlag;
 
           return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) {
@@ -91,23 +91,31 @@ var _default = {
 
                   record = _lodash["default"].uniq(alarmRecord);
 
-                  _rlog["default"].debug('告警归档-doc, record, alarmRecord', doc, record, alarmRecord);
+                  _rlog["default"].debug("告警归档-doc, record, alarmRecord", doc, record, alarmRecord);
 
-                  for (i = 0; i < alarmdata.length; i++) {
-                    item = (0, _extends2["default"])({}, alarmdata[i]);
-                    rid = alarmCiDoc[item.id];
+                  _loop = function _loop(i) {
+                    var item = (0, _extends2["default"])({}, alarmdata[i]); // demo mock
+                    // if (item.alertId === 9144) {
+                    //   item.level = Math.floor(Math.random() * 4) + 1;
+                    //   if (item.level === 4) {
+                    //     item.status = "reset";
+                    //   }
+                    // }
+                    // over
 
-                    _rlog["default"].debug('处理一条告警', item, rid, item.id, item.alertId, item.status);
+                    var rid = alarmCiDoc[item.id];
 
-                    if ((resIdsList || []).indexOf(rid) >= 0) {
-                      obj = item.obj;
+                    _rlog["default"].debug("处理一条告警", item, rid, item.id, item.level, item.alertId, item.status);
 
+                    if ((resIdsList || []).indexOf(rid) >= 0) {
                       if (record.indexOf(item.alertId) < 0 && item.status === "toDeal") {
                         // rlog.debug('这是一条新告警');
                         record.push(item.alertId);
 
                         if (doc.hasOwnProperty(rid)) {
-                          if ((0, _topoData.findItem)(doc[rid], "alertId", item.alertId) === undefined) {
+                          if (doc[rid].findIndex(function (x) {
+                            return x.alertId === item.alertId;
+                          }) >= 0) {
                             doc[rid].push(item);
                           }
 
@@ -115,30 +123,48 @@ var _default = {
                         } else {
                           doc[rid] = [item];
                         }
-                      } else if (item.status !== "toDeal") {
-                        // rlog.debug('该告警移除', item.status, doc[item.id]);
-                        if (doc.hasOwnProperty(rid)) {
-                          sliceTag = (0, _topoData.findItemIndex)(doc[rid], "alertId", item.alertId);
-
+                      } else if (doc.hasOwnProperty(rid)) {
+                        var sliceTag = doc[rid].findIndex(function (x) {
+                          return x.alertId === item.alertId;
+                        }); //
+
+                        if (item.status === "toDeal") {
+                          if (doc[rid][sliceTag].level !== item.level) {
+                            var newArr = [].concat(doc[rid]);
+                            newArr.splice(sliceTag, 1, item);
+                            doc[rid] = newArr.sort(_topoData.sortList);
+
+                            _rlog["default"].debug("告警变更", doc[rid], item);
+                          } else {
+                            _rlog["default"].debug("重复告警", item);
+                          }
+                        } else {
                           if (sliceTag >= 0) {
-                            doc[rid].splice(sliceTag, 1);
+                            var _newArr = [].concat(doc[rid]);
+
+                            _newArr.splice(sliceTag, 1);
+
+                            doc[rid] = _newArr;
                           }
 
-                          _rlog["default"].debug('该告警移除状态', sliceTag, doc[rid], doc);
+                          _rlog["default"].debug("该告警移除状态-status", item.status, doc[rid], doc);
 
                           if (doc[rid].length === 0) {
                             delete doc[rid];
                           }
-                        }
 
-                        record.splice(record.indexOf(obj.alertId), 1);
+                          record.splice(record.indexOf(item.alertId), 1);
+                        }
                       } else {
-                        _rlog["default"].debug('重复告警', item);
+                        _rlog["default"].warn("收到一条异常告警", item);
                       }
                     }
-                  }
+                  };
+
+                  for (i = 0; i < alarmdata.length; i++) {
+                    _loop(i);
+                  } // rlog.debug("准备发送的告警", doc, record);
 
-                  _rlog["default"].debug('准备发送的告警', doc, record);
 
                   alarmlist = _lodash["default"].compact(Object.keys(doc).map(function (id) {
                     if (doc[id].length > 0) {
@@ -153,7 +179,7 @@ var _default = {
                     }
                   }));
 
-                  _rlog["default"].debug('告警归档结束', alarmList, doc, record);
+                  _rlog["default"].debug("告警归档结束", alarmList, alarmlist, doc, record);
 
                   eqFlag = _lodash["default"].isEqual(_lodash["default"].sortBy(alarmlist), _lodash["default"].sortBy(alarmList));
 

package/lib/style.js

@@ -5,6 +5,7 @@ require('@alifd/next/lib/dialog/style');
 require('@riil-frontend/utils/lib/style');
 require('@alifd/next/lib/upload/style');
 require('@alifd/next/lib/icon/style');
+require('@alifd/next/lib/config-provider/style');
 require('@alifd/next/lib/input/style');
 require('@alifd/next/lib/field/style');
 require('@alifd/next/lib/form/style');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.14.2-alpha.13",
+  "version": "2.14.2-alpha.18",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -111,6 +111,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.14.2-alpha.13/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.14.2-alpha.18/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }