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

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

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

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

@@ -5,6 +5,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _Message from "@alifd/next/es/message";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _ConfigProvider from "@alifd/next/es/config-provider";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import topoServer from '@riil-frontend/component-topology-common/es/services/topo/index';
@@ -12,6 +13,7 @@ import _ from 'lodash';
 import _svgToShape from "./utils/svgToShape";
 import styles from "./UploadIconDialog.module.scss";
 import "./UploadIconDialog.scss";
+var config = _ConfigProvider.config;
 
 function getFileName(file) {
   return file.name.substring(0, file.name.indexOf('.'));
@@ -254,6 +256,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
   };
 
   _proto.renderUpload = function renderUpload() {
+    var prefix = this.props.prefix;
     var files = this.state.files;
     return /*#__PURE__*/React.createElement(_Upload.Dragger, {
       ref: this.saveUploaderRef,
@@ -277,15 +280,15 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       onSuccess: this.handleUploadFinish,
       onError: this.handleUploadError
     }, /*#__PURE__*/React.createElement("div", {
-      className: "next-upload-drag"
+      className: prefix + "upload-drag"
     }, /*#__PURE__*/React.createElement("p", {
-      className: "next-upload-drag-icon"
+      className: prefix + "upload-drag-icon"
     }, /*#__PURE__*/React.createElement(_Icon, {
       type: "upload"
     })), /*#__PURE__*/React.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.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")));
   };
 
@@ -326,4 +329,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
   return UploadIconDialog;
 }(React.Component);
 
-export { UploadIconDialog as default };
+UploadIconDialog.defaultProps = {
+  prefix: 'next-'
+};
+export default config(UploadIconDialog);

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

@@ -1,10 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { EE } from "@riil-frontend/component-riil-event-emitter";
-import { isAvailableArray } from "@riil-frontend/utils";
-import moment from "moment"; // import { alarmListDemo } from "./mocks";
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { EE } from '@riil-frontend/component-riil-event-emitter';
+import { isAvailableArray } from '@riil-frontend/utils';
+import moment from 'moment'; // import { alarmListDemo } from "./mocks";
 
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
@@ -57,7 +57,7 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 5:
-              rlog.info("Alarm.open 打开告警通道", id); // 订阅告警推送
+              rlog.info('Alarm.open 打开告警通道', id); // 订阅告警推送
 
               this.hmGetTopoAlarm(id); // 打开告警推送通道
 
@@ -91,7 +91,7 @@ var Alarm = /*#__PURE__*/function () {
 
 
     var id = this.topoApp.id;
-    rlog.info("关闭告警通道", id); // 取消订阅告警推送
+    rlog.info('关闭告警通道', id); // 取消订阅告警推送
     // 关闭告警推送通道
 
     this.closeTopoAlarm(id);
@@ -127,10 +127,10 @@ 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.debug("获取告警列表--resAndMetrics,topoData,data", this.topoApp, resAndMetrics, topoData, data);
+              rlog.debug('获取告警列表--resAndMetrics,topoData,data', this.topoApp, resAndMetrics, topoData, data);
               cids = Object.keys(alarmCiDoc);
               _context2.next = 8;
               return topoService.getCisComponentIds(cids);
@@ -140,22 +140,22 @@ var Alarm = /*#__PURE__*/function () {
               ids = [].concat(cids);
               idsx = Object.keys(componentIds).map(function (k) {
                 ids = [].concat(ids, componentIds[k]);
-                return "";
+                return '';
               });
-              rlog.debug("获取告警列表", componentIds, alarmCiDoc, ids);
-              endTime = null; //new Date().valueOf();
+              rlog.debug('获取告警列表', componentIds, alarmCiDoc, ids);
+              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
@@ -179,7 +179,7 @@ var Alarm = /*#__PURE__*/function () {
 
             case 20:
               result = _context2.sent;
-              rlog.debug("getAlarmById-result", result); // if (alarmIsOpened) {
+              rlog.debug('getAlarmById-result', result); // if (alarmIsOpened) {
               //   //this.topoApp.loadAlarm(result.datas);
               //   this.getAlarmByEE({ type: "alarm", data: result.datas });
               // }
@@ -237,7 +237,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();
 
@@ -247,8 +247,8 @@ var Alarm = /*#__PURE__*/function () {
 
             case 10:
               // rlog.debug("openTopoAlarm 获取初始化告警-------------------开始");
-              EE.on("topo", "topo", function (data, other) {
-                rlog.debug("openTopoAlarm 获取初始化告警------收到信息", data);
+              EE.on('topo', 'topo', function (data, other) {
+                rlog.debug('openTopoAlarm 获取初始化告警------收到信息', data);
 
                 _this.getAlarmByEE(data);
               });
@@ -300,8 +300,8 @@ var Alarm = /*#__PURE__*/function () {
 
             case 3:
               this.currentTopoId = null;
-              rlog.debug("useAlarm.useEffect 告警WebSocket 结束");
-              EE.removeListener("topo", "topo");
+              rlog.debug('useAlarm.useEffect 告警WebSocket 结束');
+              EE.removeListener('topo', 'topo');
               this.updateState({
                 topoAlarmIsOpen: false,
                 alarmOpening: false,
@@ -338,7 +338,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
               });
@@ -408,12 +408,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 (!isAvailableArray(alertData)) {
+              if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
                 _context7.next = 17;
                 break;
               }
@@ -444,7 +444,7 @@ var Alarm = /*#__PURE__*/function () {
                 break;
               }
 
-              rlog.debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
+              rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
               _context7.next = 13;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
@@ -483,16 +483,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/es/core/services/overview.js

@@ -0,0 +1,29 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { getRequest } from '@riil-frontend/component-topology-common/es/utils/request';
+export default {
+  /**
+   * 根据资源id获取风险
+   * @param {*} params ciIdList
+   */
+  getRiskByIds: function getRiskByIds(params) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return getRequest().post('/health/v1/api/management/getRiskList', params);
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};

package/es/core/utils/exportData.js

@@ -24,7 +24,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,