@riil-frontend/component-topology 2.14.2-alpha.21 → 2.14.2-alpha.25

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

@@ -5,18 +5,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _drawer = _interopRequireDefault(require("@alifd/next/lib/drawer"));
 
 var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _menuButton = _interopRequireDefault(require("@alifd/next/lib/menu-button"));
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
+var _overview = _interopRequireDefault(require("../../../../services/overview"));
+
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _ResourceOverview = _interopRequireDefault(require("./components/ResourceOverview"));
@@ -51,11 +57,14 @@ function Title(_ref) {
     return /*#__PURE__*/_react["default"].createElement(_menuButton["default"], {
       text: true,
       autoWidth: false,
+      size: "large",
       popupStyle: {
         maxHeight: 360,
         overflow: 'auto'
       },
-      label: name,
+      label: /*#__PURE__*/_react["default"].createElement("div", {
+        className: _indexModule["default"]['drawer-title']
+      }, name),
       onItemClick: function onItemClick(key) {
         return onChange(nodes.find(function (item) {
           return item.id === key;
@@ -69,7 +78,9 @@ function Title(_ref) {
       }, item.name);
     }));
   } else {
-    return name;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: _indexModule["default"]['drawer-title']
+    }, "\u94FE\u8DEF\u8BE6\u60C5");
   }
 } // 基本信息
 
@@ -96,8 +107,13 @@ function BaseInfo(props) {
       activeData = _useState2[0],
       setActiveData = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(''),
+      userId = _useState3[0],
+      setUserId = _useState3[1];
+
   (0, _react.useEffect)(function () {
     console.log('topo 概览', props);
+    getUser();
     var notifier = topo.view.topoClient.notifier;
     notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
     return function () {
@@ -105,6 +121,34 @@ function BaseInfo(props) {
     };
   }, []);
 
+  function getUser() {
+    return _getUser.apply(this, arguments);
+  }
+
+  function _getUser() {
+    _getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var res;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return _overview["default"].getUserId();
+
+            case 2:
+              res = _context.sent;
+              setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
+
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _getUser.apply(this, arguments);
+  }
+
   function openOverview(data) {
     var _topo$options$resourc;
 
@@ -165,7 +209,9 @@ function BaseInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
     title: "\u8D44\u6E90\u6982\u89C8",
     key: "1"
-  }, /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData))))));
+  }, /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
+    userId: userId
+  }))))));
 }
 
 var _default = BaseInfo;

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

@@ -2,9 +2,15 @@
 
 .baseInfo {
   // z-index: 1009 !important;
+  box-shadow: 0px 0px 6px 1px #F2F7FD;
+  .drawer-title{
+    font-size: 16px;
+    font-weight: 500;
+    color: #4D6277;
+  }
   :global {
     .#{$css-prefix}drawer-body {
-      height: calc(100% - 46px);
+      height: calc(100% - 49px);
       padding: 16px 24px;
       .#{$css-prefix}tabs-content{
         height: calc(100% - 31px);

package/lib/models/topoAlarm.js

@@ -84,10 +84,14 @@ var _default = {
                   _state$topoAlarm = state.topoAlarm, alarmDoc = _state$topoAlarm.alarmDoc, alarmRecord = _state$topoAlarm.alarmRecord, alarmList = _state$topoAlarm.alarmList;
                   _state$topoMod = state.topoMod, resAndMetrics = _state$topoMod.resAndMetrics, topoData = _state$topoMod.topoData;
                   resIdsList = resAndMetrics.resIdsList, alarmCiDoc = resAndMetrics.alarmCiDoc;
-                  doc = (0, _extends2["default"])({}, alarmDoc);
-
-                  _rlog["default"].debug("topoAlarmMod.combAlarmData--alarmdata-resIdsList", alarmdata, resIdsList); // rlog.debug("topoAlarmMod.combAlarmData-alarmDoc, alarmRecord ", alarmDoc, alarmRecord );
-
+                  doc = (0, _extends2["default"])({}, alarmDoc); // rlog.debug(
+                  //   " 归档处理告警信息.doc, alarmdata,resIdsList,alarmRecord",
+                  //   doc,
+                  //   alarmdata,
+                  //   resIdsList,
+                  //   alarmRecord
+                  // );
+                  // rlog.debug("topoAlarmMod.combAlarmData-alarmDoc, alarmRecord ", alarmDoc, alarmRecord );
 
                   record = _lodash["default"].uniq(alarmRecord);
 
@@ -105,34 +109,48 @@ var _default = {
 
                     var rid = alarmCiDoc[item.id];
 
-                    _rlog["default"].debug("处理一条告警", item, rid, item.id, item.level, item.alertId, item.status);
+                    _rlog["default"].debug("处理一条告警", item, rid, item.status, record);
 
                     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 (doc[rid].findIndex(function (x) {
-                            return x.alertId === item.alertId;
-                          }) >= 0) {
-                            doc[rid].push(item);
-                          }
+                      if (record.indexOf(item.alertId) < 0) {
+                        _rlog["default"].debug("这是一条新告警");
 
-                          doc[rid] = doc[rid].sort(_topoData.sortList);
+                        if (item.status === "toDeal") {
+                          record.push(item.alertId);
+
+                          if (doc.hasOwnProperty(rid)) {
+                            if (doc[rid].findIndex(function (x) {
+                              return x.alertId === item.alertId;
+                            }) < 0) {
+                              var newArr = [].concat(doc[rid]);
+                              newArr.push(item);
+                              doc[rid] = newArr.sort(_topoData.sortList);
+                            }
+                          } else {
+                            doc[rid] = [item];
+                          }
                         } else {
-                          doc[rid] = [item];
+                          _rlog["default"].warn("接收到异常告警");
                         }
-                      } else if (doc.hasOwnProperty(rid)) {
+                      } else {
                         var sliceTag = doc[rid].findIndex(function (x) {
                           return x.alertId === item.alertId;
-                        }); //
+                        }); // rlog.debug(
+                        //   "已有资源告警-doc-rid-record-sliceTag-item",
+                        //   doc,
+                        //   rid,
+                        //   record,
+                        //   sliceTag,
+                        //   item
+                        // );
 
                         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);
+                            var _newArr = [].concat(doc[rid]);
+
+                            _newArr.splice(sliceTag, 1, item);
+
+                            doc[rid] = _newArr.sort(_topoData.sortList);
 
                             _rlog["default"].debug("告警变更", doc[rid], item);
                           } else {
@@ -140,11 +158,11 @@ var _default = {
                           }
                         } else {
                           if (sliceTag >= 0) {
-                            var _newArr = [].concat(doc[rid]);
+                            var _newArr2 = [].concat(doc[rid]);
 
-                            _newArr.splice(sliceTag, 1);
+                            _newArr2.splice(sliceTag, 1);
 
-                            doc[rid] = _newArr;
+                            doc[rid] = _newArr2;
                           }
 
                           _rlog["default"].debug("该告警移除状态-status", item.status, doc[rid], doc);
@@ -155,8 +173,6 @@ var _default = {
 
                           record.splice(record.indexOf(item.alertId), 1);
                         }
-                      } else {
-                        _rlog["default"].warn("收到一条异常告警", item);
                       }
                     }
                   };
@@ -178,11 +194,10 @@ var _default = {
                       return null;
                     }
                   }));
-
-                  _rlog["default"].debug("告警归档结束", alarmList, alarmlist, doc, record);
-
                   eqFlag = _lodash["default"].isEqual(_lodash["default"].sortBy(alarmlist), _lodash["default"].sortBy(alarmList));
 
+                  _rlog["default"].debug("告警归档结束", eqFlag, alarmList, alarmlist, doc, record);
+
                   _this2.update({
                     alarmDoc: doc,
                     alarmRecord: record,
@@ -194,7 +209,7 @@ var _default = {
                     alarmlist: alarmlist
                   });
 
-                case 15:
+                case 14:
                 case "end":
                   return _context2.stop();
               }

package/lib/utils/topoData.js

@@ -237,7 +237,9 @@ var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
     });
   }
 
-  var attributes = ciTypeObj.attributes.map(function (item) {
+  var attributes = ciTypeObj.attributes.filter(function (attr) {
+    return !!attr.userVisible;
+  }).map(function (item) {
     var aid = item.code + "-attribute";
     return {
       id: aid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.14.2-alpha.21",
+  "version": "2.14.2-alpha.25",
   "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.21/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.14.2-alpha.25/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }