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

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

@@ -13,12 +13,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.createElement(_MenuButton, {
       text: true,
       label: name,
@@ -56,12 +68,15 @@ function BaseInfo(props) {
     name: '',
     type: '',
     // 类型： node、link
-    ciType: ''
+    ciType: '',
+    ciName: ''
   }),
       activeData = _useState2[0],
       setActiveData = _useState2[1];
 
+  console.log('topo 概览', props);
   useEffect(function () {
+    console.log('topo 概览', props);
     var notifier = topo.view.topoClient.notifier;
     notifier.on(TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
     return function () {
@@ -70,17 +85,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;
@@ -108,6 +129,7 @@ function BaseInfo(props) {
     closeMode: ['close', 'esc'],
     visible: visible,
     title: /*#__PURE__*/React.createElement(Title, _extends({}, activeData, {
+      topo: topo,
       onChange: onChangeActive
     })),
     width: 580,
@@ -123,5 +145,4 @@ function BaseInfo(props) {
   }, /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, props, activeData))))));
 }
 
-;
 export default BaseInfo;

package/es/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/es/models/topoAlarm.js

@@ -44,7 +44,7 @@ export default {
                     alarmRecord: []
                   });
 
-                  return _context.abrupt("return", 'resetAlarmDoc Over');
+                  return _context.abrupt("return", "resetAlarmDoc Over");
 
                 case 2:
                 case "end":
@@ -59,7 +59,7 @@ export default {
         var _this2 = this;
 
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) {
@@ -73,22 +73,31 @@ export default {
                   rlog.debug("topoAlarmMod.combAlarmData--alarmdata-resIdsList", alarmdata, resIdsList); // rlog.debug("topoAlarmMod.combAlarmData-alarmDoc, alarmRecord ", alarmDoc, alarmRecord );
 
                   record = _.uniq(alarmRecord);
-                  rlog.debug('告警归档-doc, record, alarmRecord', doc, record, alarmRecord);
+                  rlog.debug("告警归档-doc, record, alarmRecord", doc, record, alarmRecord);
 
-                  for (i = 0; i < alarmdata.length; i++) {
-                    item = _extends({}, alarmdata[i]);
-                    rid = alarmCiDoc[item.id];
-                    rlog.debug('处理一条告警', item, rid, item.id, item.alertId, item.status);
+                  _loop = function _loop(i) {
+                    var item = _extends({}, alarmdata[i]); // demo mock
+                    // if (item.alertId === 9144) {
+                    //   item.level = Math.floor(Math.random() * 4) + 1;
+                    //   if (item.level === 4) {
+                    //     item.status = "reset";
+                    //   }
+                    // }
+                    // over
 
-                    if ((resIdsList || []).indexOf(rid) >= 0) {
-                      obj = item.obj;
 
+                    var rid = alarmCiDoc[item.id];
+                    rlog.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 (findItem(doc[rid], "alertId", item.alertId) === undefined) {
+                          if (doc[rid].findIndex(function (x) {
+                            return x.alertId === item.alertId;
+                          }) >= 0) {
                             doc[rid].push(item);
                           }
 
@@ -96,30 +105,48 @@ export default {
                         } else {
                           doc[rid] = [item];
                         }
-                      } else if (item.status !== "toDeal") {
-                        // rlog.debug('该告警移除', item.status, doc[item.id]);
-                        if (doc.hasOwnProperty(rid)) {
-                          sliceTag = 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(sortList);
+                            rlog.debug("告警变更", doc[rid], item);
+                          } else {
+                            rlog.debug("重复告警", item);
+                          }
+                        } else {
                           if (sliceTag >= 0) {
-                            doc[rid].splice(sliceTag, 1);
+                            var _newArr = [].concat(doc[rid]);
+
+                            _newArr.splice(sliceTag, 1);
+
+                            doc[rid] = _newArr;
                           }
 
-                          rlog.debug('该告警移除状态', sliceTag, doc[rid], doc);
+                          rlog.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.debug('重复告警', item);
+                        rlog.warn("收到一条异常告警", item);
                       }
                     }
-                  }
+                  };
+
+                  for (i = 0; i < alarmdata.length; i++) {
+                    _loop(i);
+                  } // rlog.debug("准备发送的告警", doc, record);
+
 
-                  rlog.debug('准备发送的告警', doc, record);
                   alarmlist = _.compact(Object.keys(doc).map(function (id) {
                     if (doc[id].length > 0) {
                       var alarmObj = _extends({}, doc[id][0], {
@@ -133,7 +160,7 @@ export default {
                       return null;
                     }
                   }));
-                  rlog.debug('告警归档结束', alarmList, doc, record);
+                  rlog.debug("告警归档结束", alarmList, alarmlist, doc, record);
                   eqFlag = _.isEqual(_.sortBy(alarmlist), _.sortBy(alarmList));
 
                   _this2.update({

package/es/style.js

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

package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -78,7 +78,7 @@ function DisplaySettingDrawer(props) {
               setLoading(false);
               console.error('DisplaySettingDrawer.handleOk', _context.t0);
 
-              _message["default"].success('保存失败');
+              _message["default"].warn('保存失败');
 
             case 21:
             case "end":

package/lib/core/editor/components/iconManage/UploadIconDialog.js

@@ -21,6 +21,8 @@ var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
+var _configProvider = _interopRequireDefault(require("@alifd/next/lib/config-provider"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo/index"));
@@ -33,6 +35,8 @@ var _UploadIconDialogModule = _interopRequireDefault(require("./UploadIconDialog
 
 require("./UploadIconDialog.scss");
 
+var config = _configProvider["default"].config;
+
 function getFileName(file) {
   return file.name.substring(0, file.name.indexOf('.'));
 }
@@ -274,6 +278,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
   };
 
   _proto.renderUpload = function renderUpload() {
+    var prefix = this.props.prefix;
     var files = this.state.files;
     return /*#__PURE__*/_react["default"].createElement(_upload["default"].Dragger, {
       ref: this.saveUploaderRef,
@@ -297,15 +302,15 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       onSuccess: this.handleUploadFinish,
       onError: this.handleUploadError
     }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "next-upload-drag"
+      className: prefix + "upload-drag"
     }, /*#__PURE__*/_react["default"].createElement("p", {
-      className: "next-upload-drag-icon"
+      className: prefix + "upload-drag-icon"
     }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
       type: "upload"
     })), /*#__PURE__*/_react["default"].createElement("p", {
-      className: "next-upload-drag-text"
+      className: prefix + "upload-drag-text"
     }, "\u70B9\u51FB\u6B64\u5904\u9009\u53D6\u6587\u4EF6\u6216\u5C06\u6587\u4EF6\u62D6\u62FD\u81F3\u6B64\u5904"), /*#__PURE__*/_react["default"].createElement("p", {
-      className: "next-upload-drag-hint"
+      className: prefix + "upload-drag-hint"
     }, "\u652F\u6301 SVG \u683C\u5F0F\uFF0C\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7100k")));
   };
 
@@ -346,4 +351,10 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
   return UploadIconDialog;
 }(_react["default"].Component);
 
-exports["default"] = UploadIconDialog;
+UploadIconDialog.defaultProps = {
+  prefix: 'next-'
+};
+
+var _default = config(UploadIconDialog);
+
+exports["default"] = _default;

package/lib/core/models/common/Alarm.js

@@ -71,7 +71,7 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 5:
-              _rlog["default"].info("Alarm.open 打开告警通道", id); // 订阅告警推送
+              _rlog["default"].info('Alarm.open 打开告警通道', id); // 订阅告警推送
 
 
               this.hmGetTopoAlarm(id); // 打开告警推送通道
@@ -107,7 +107,7 @@ var Alarm = /*#__PURE__*/function () {
 
     var id = this.topoApp.id;
 
-    _rlog["default"].info("关闭告警通道", id); // 取消订阅告警推送
+    _rlog["default"].info('关闭告警通道', id); // 取消订阅告警推送
     // 关闭告警推送通道
 
 
@@ -144,11 +144,11 @@ var Alarm = /*#__PURE__*/function () {
             case 0:
               _this$topoApp$store$g = this.topoApp.store.getState().topoMod, data = _this$topoApp$store$g.data, resAndMetrics = _this$topoApp$store$g.resAndMetrics, topoData = _this$topoApp$store$g.topoData;
               _this$getState = this.getState(), alarmIsOpened = _this$getState.alarmIsOpened, alarmOpening = _this$getState.alarmOpening;
-              linkDynamicStyleDispatcher = this.topoApp.store.getModel("linkDynamicStyle")[1]; // const { nodes, links } = data;
+              linkDynamicStyleDispatcher = this.topoApp.store.getModel('linkDynamicStyle')[1]; // const { nodes, links } = data;
 
               alarmCiDoc = resAndMetrics.alarmCiDoc;
 
-              _rlog["default"].debug("获取告警列表--resAndMetrics,topoData,data", this.topoApp, resAndMetrics, topoData, data);
+              _rlog["default"].debug('获取告警列表--resAndMetrics,topoData,data', this.topoApp, resAndMetrics, topoData, data);
 
               cids = Object.keys(alarmCiDoc);
               _context2.next = 8;
@@ -159,24 +159,24 @@ var Alarm = /*#__PURE__*/function () {
               ids = [].concat(cids);
               idsx = Object.keys(componentIds).map(function (k) {
                 ids = [].concat(ids, componentIds[k]);
-                return "";
+                return '';
               });
 
-              _rlog["default"].debug("获取告警列表", componentIds, alarmCiDoc, ids);
+              _rlog["default"].debug('获取告警列表', componentIds, alarmCiDoc, ids);
 
-              endTime = null; //new Date().valueOf();
+              endTime = null; // new Date().valueOf();
 
-              startTime = null; //moment().subtract(1, "months").valueOf();
+              startTime = null; // moment().subtract(1, "months").valueOf();
 
               parms = {
                 ciIdList: ids,
-                alertStatusList: ["toDeal"],
-                status: "toDeal",
+                alertStatusList: ['toDeal'],
+                status: 'toDeal',
                 pageNum: 1,
                 pageSize: 10,
-                sortField: "alertLevel",
+                sortField: 'alertLevel',
                 alertLevelList: [],
-                sortOrder: "asc",
+                sortOrder: 'asc',
                 createTime: {
                   startTime: startTime,
                   endTime: endTime
@@ -201,7 +201,7 @@ var Alarm = /*#__PURE__*/function () {
             case 20:
               result = _context2.sent;
 
-              _rlog["default"].debug("getAlarmById-result", result); // if (alarmIsOpened) {
+              _rlog["default"].debug('getAlarmById-result', result); // if (alarmIsOpened) {
               //   //this.topoApp.loadAlarm(result.datas);
               //   this.getAlarmByEE({ type: "alarm", data: result.datas });
               // }
@@ -260,7 +260,7 @@ var Alarm = /*#__PURE__*/function () {
               this.updateState({
                 alarmOpening: true
               });
-              alarmDispatchers = this.topoApp.store.getModelDispatchers("topoAlarm");
+              alarmDispatchers = this.topoApp.store.getModelDispatchers('topoAlarm');
               _context3.next = 8;
               return alarmDispatchers.resetAlarmDoc();
 
@@ -270,8 +270,8 @@ var Alarm = /*#__PURE__*/function () {
 
             case 10:
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
-              _componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
-                _rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
+              _componentRiilEventEmitter.EE.on('topo', 'topo', function (data, other) {
+                _rlog["default"].debug('openTopoAlarm 获取初始化告警------收到信息', data);
 
                 _this.getAlarmByEE(data);
               });
@@ -325,9 +325,9 @@ var Alarm = /*#__PURE__*/function () {
             case 3:
               this.currentTopoId = null;
 
-              _rlog["default"].debug("useAlarm.useEffect 告警WebSocket 结束");
+              _rlog["default"].debug('useAlarm.useEffect 告警WebSocket 结束');
 
-              _componentRiilEventEmitter.EE.removeListener("topo", "topo");
+              _componentRiilEventEmitter.EE.removeListener('topo', 'topo');
 
               this.updateState({
                 topoAlarmIsOpen: false,
@@ -365,7 +365,7 @@ var Alarm = /*#__PURE__*/function () {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
-              console.log("switchAlarmPopPanel", flag);
+              console.log('switchAlarmPopPanel', flag);
               this.updateState({
                 alarmPanelIsOpen: flag
               });
@@ -435,12 +435,12 @@ var Alarm = /*#__PURE__*/function () {
               _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topoApp.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, alarmCiDoc = resAndMetrics.alarmCiDoc;
-              alarmDispatchers = this.topoApp.store.getModelDispatchers("topoAlarm");
-              linkDynamicStyleDispatcher = this.topoApp.store.getModelDispatchers("linkDynamicStyle"); // 添加事件
+              alarmDispatchers = this.topoApp.store.getModelDispatchers('topoAlarm');
+              linkDynamicStyleDispatcher = this.topoApp.store.getModelDispatchers('linkDynamicStyle'); // 添加事件
 
-              console.log("getAlarmByEE-接收到推送的原始告警信息", alertData);
+              console.log('getAlarmByEE-接收到推送的原始告警信息', alertData);
 
-              if (!(0, _utils.isAvailableArray)(alertData)) {
+              if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
                 _context7.next = 17;
                 break;
               }
@@ -471,7 +471,7 @@ var Alarm = /*#__PURE__*/function () {
                 break;
               }
 
-              _rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
+              _rlog["default"].debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
 
               _context7.next = 13;
               return alarmDispatchers.combAlarmData({
@@ -511,16 +511,16 @@ var Alarm = /*#__PURE__*/function () {
   };
 
   _proto.getState = function getState() {
-    return this.topoApp.store.getModelState("topoAlarm");
+    return this.topoApp.store.getModelState('topoAlarm');
   };
 
   _proto.useState = function useState() {
-    var state = this.topoApp.store.useModelState("topoAlarm");
+    var state = this.topoApp.store.useModelState('topoAlarm');
     return state;
   };
 
   _proto.updateState = function updateState(state) {
-    return this.topoApp.store.getModelDispatchers("topoAlarm").update(state);
+    return this.topoApp.store.getModelDispatchers('topoAlarm').update(state);
   };
 
   return Alarm;

package/lib/core/services/overview.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _request = require("@riil-frontend/component-topology-common/es/utils/request");
+
+var _default = {
+  /**
+   * 根据资源id获取风险
+   * @param {*} params ciIdList
+   */
+  getRiskByIds: function getRiskByIds(params) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return (0, _request.getRequest)().post('/health/v1/api/management/getRiskList', params);
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};
+exports["default"] = _default;

package/lib/core/utils/exportData.js

@@ -35,7 +35,7 @@ function _ref() {
                   'imageName': element.a('customName') || element.a('name') || element.getName()
                 };
               }),
-              'linkes': links.map(function (link) {
+              'links': links.map(function (link) {
                 var id = link.id,
                     source = link.source,
                     target = link.target,