@riil-frontend/component-topology 10.0.38 → 10.0.41

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

@@ -7,7 +7,7 @@ import Link from "../../../../components/Link";
 
 var alarmLink = function alarmLink(alarmInfo) {
   // console.log('alarmLink', alarmInfo);
-  return "/default/pagecenter/" + PAGE_TYPE.ALERT_DETAIL + "/view/" + alarmInfo.alertId + "?alertId=" + alarmInfo.alertId + "&resId=" + alarmInfo.ciId + "&title=" + alarmInfo.alertObject + "&ruleId=" + alarmInfo.ruleId + "&ciCode=" + alarmInfo.ciTypeCode + "&ciType=" + alarmInfo.ciType;
+  return "/default/pagecenter/" + PAGE_TYPE.ALERT_DETAIL + "/view/" + alarmInfo.alertId + "?alertId=" + alarmInfo.alertId + "&resId=" + alarmInfo.ciId + "&title=&ruleId=" + alarmInfo.ruleId + "&ciCode=" + alarmInfo.ciTypeCode + "&ciType=" + alarmInfo.ciType;
 };
 
 var getNode = function getNode(topo, alarmInfo) {

package/es/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js

@@ -48,7 +48,8 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
   });
 
   var handleChange = function handleChange(v) {
-    // console.log('handleChange: ', v);
+    console.log('handleChange: ', v);
+
     if (typeof onChange === 'function') {
       onChange(v.id);
     }

package/es/core/editor/components/Toolbar/widgets/IconSelect/index.js

@@ -47,7 +47,8 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
   });
 
   var handleChange = function handleChange(v) {
-    // console.log('handleChange: ', v);
+    console.log('handleChange: ', v);
+
     if (typeof onChange === 'function') {
       onChange(v.id);
     }

package/es/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss

@@ -111,6 +111,7 @@
   cursor: pointer;
   &:hover{
     background-color: #f2f7fd;
+    border-radius: 4px;
   }
 
   .iconImgWrapper {

package/es/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js

@@ -47,12 +47,12 @@ function NodeImageButton(props) {
   }, [selection]);
 
   var onChange = function onChange(prop) {
-    // console.log("onChange-prop", prop, selection);
-    //const { name, value } = prop;
+    console.log("onChange-prop", prop, selection); //const { name, value } = prop;
     // const gv = topo.view.topoClient.getGraphView();
     //const element = topo.getSelectionModel().getFirstData();
-    var elements = selection; // console.log("onChange-elements", elements);
 
+    var elements = selection;
+    console.log("onChange-elements", elements);
     elements.forEach(function (element) {
       if (isElementSetImageEnabled(element)) {
         element.setImage(prop);

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -116,9 +116,9 @@ export default function useGraphAlarmDisplay(options) {
       }).filter(function (item) {
         return !!item;
       });
-      rlog.debug('关联拓扑告警：推送ht', {
+      rlog.debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u63A8\u9001ht " + Object.keys(relateTopoAlarms).length, {
         all: relateTopoAlarm,
-        relateTopoAlarms: relateTopoAlarms
+        graphAlarm: relateTopoAlarms
       }); // 更新到ht拓扑
 
       topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));

package/es/core/hooks/useTopoEdit.js

@@ -979,14 +979,16 @@ var useTopoEdit = function useTopoEdit(params) {
         while (1) {
           switch (_context16.prev = _context16.next) {
             case 0:
+              console.log("bindIPtoNode", txtValue, nodeElement);
+
               if (txtValue) {
-                _context16.next = 2;
+                _context16.next = 3;
                 break;
               }
 
               return _context16.abrupt("return");
 
-            case 2:
+            case 3:
               // if (txtValue === nodeElement.a('bindIp')) {
               //   return;
               // }
@@ -996,28 +998,28 @@ var useTopoEdit = function useTopoEdit(params) {
               isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 23;
+                _context16.next = 25;
                 break;
               }
 
               ip = buildIpNode(txtValue);
-              _context16.next = 8;
+              _context16.next = 9;
               return deleteExLink(nodeElement);
 
-            case 8:
+            case 9:
               nodeElement.a(ip);
               nodeElement.setName(txtValue);
               nodeElement.setTag("ip:" + txtValue); // 获取配置
 
               configObj = topo.resourceConfig.getConfig();
-              _context16.next = 14;
+              _context16.next = 15;
               return resourceConfig.updateConfig(configObj);
 
-            case 14:
-              _context16.next = 16;
+            case 15:
+              _context16.next = 17;
               return editDispatchers.fetchDataByConfig();
 
-            case 16:
+            case 17:
               configData = _context16.sent;
               // console.log("configData",configObj, configData);
               _elements = configData.elements;
@@ -1036,7 +1038,8 @@ var useTopoEdit = function useTopoEdit(params) {
                 nodes: [],
                 links: newLink,
                 linkGroups: newLinkGroup
-              }; // console.log("createElementsData", createElementsData);
+              };
+              console.log("createElementsData", createElementsData);
 
               if ([].concat(newLink, newLinkGroup).length > 0) {
                 _htTopo = topo.getHtTopo();
@@ -1044,7 +1047,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 _htTopo.createElements(createElementsData);
               }
 
-            case 23:
+            case 25:
             case "end":
               return _context16.stop();
           }

package/es/core/models/Alarm.js

@@ -165,8 +165,8 @@ var Alarm = /*#__PURE__*/function () {
       return a.obj.createTime - b.obj.createTime;
     }).sort(function (a, b) {
       return a.level > b.level ? 1 : -1;
-    }); // console.log("getAlarms-sb", alarms);
-
+    });
+    console.log("getAlarms-sb", alarms);
     return alarms;
   };
 
@@ -543,7 +543,7 @@ var Alarm = /*#__PURE__*/function () {
               // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
-                _context9.next = 24;
+                _context9.next = 27;
                 break;
               }
 
@@ -575,27 +575,28 @@ var Alarm = /*#__PURE__*/function () {
                 }
 
                 return obj;
-              }); // console.log("before-combAlarmData", sendAl, idsList);
+              });
+              console.log("before-combAlarmData", sendAl, idsList);
 
               if (!(sendAl.length > 0)) {
-                _context9.next = 24;
+                _context9.next = 27;
                 break;
               }
 
               rlog.debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
-              _context9.prev = 12;
-              _context9.next = 15;
+              _context9.prev = 13;
+              _context9.next = 16;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
               });
 
-            case 15:
+            case 16:
               _yield$alarmDispatche = _context9.sent;
               eqFlag = _yield$alarmDispatche.eqFlag;
               alarmlist = _yield$alarmDispatche.alarmlist;
+              console.log("handleAlarmEvent", alarmIsOpened, eqFlag);
+              console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
 
-              // console.log("handleAlarmEvent", alarmIsOpened,eqFlag);
-              // console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
               if (alarmIsOpened) {
                 this.hmGetTopoAlarmByDoc(); // 通知所有告警
 
@@ -610,20 +611,20 @@ var Alarm = /*#__PURE__*/function () {
                 }
               }
 
-              _context9.next = 24;
+              _context9.next = 27;
               break;
 
-            case 21:
-              _context9.prev = 21;
-              _context9.t0 = _context9["catch"](12);
+            case 24:
+              _context9.prev = 24;
+              _context9.t0 = _context9["catch"](13);
               rlog.error("告警发送异常", _context9.t0);
 
-            case 24:
+            case 27:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee9, this, [[13, 24]]);
     }));
 
     function handleAlarmEvent(_x7) {

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "10.0.38" === 'string' ? "10.0.38" : null;
+var version = typeof "10.0.41" === 'string' ? "10.0.41" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/store/models/topoConfig.js

@@ -252,8 +252,8 @@ export default function (topoApp) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes; // console.log("editState", editState);
-
+                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                    console.log("editState", editState);
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
@@ -261,10 +261,10 @@ export default function (topoApp) {
                       exportLinkIdList: exportLinkIdList,
                       ipNodes: ipNodes
                     };
-                    _context2.next = 5;
+                    _context2.next = 6;
                     return _this2.getTopoByConditions(query);
 
-                  case 5:
+                  case 6:
                     data = _context2.sent;
                     rlog.debug("按配置查询拓扑数据", {
                       config: {
@@ -275,7 +275,7 @@ export default function (topoApp) {
                     });
                     return _context2.abrupt("return", data);
 
-                  case 8:
+                  case 9:
                   case "end":
                     return _context2.stop();
                 }
@@ -475,16 +475,17 @@ export default function (topoApp) {
               while (1) {
                 switch (_context8.prev = _context8.next) {
                   case 0:
-                    ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
-                    _context8.next = 3;
+                    ids = data.ids, ip = data.ip;
+                    console.log("queryAllLinkByIp", ids, ip);
+                    _context8.next = 4;
                     return networkLinkServer.queryLinksByIp(ids, ip);
 
-                  case 3:
+                  case 4:
                     result = _context8.sent;
+                    console.log("queryAllLinkByIp-result", result);
                     return _context8.abrupt("return", (_result$data = result === null || result === void 0 ? void 0 : result.data) !== null && _result$data !== void 0 ? _result$data : []);
 
-                  case 5:
+                  case 7:
                   case "end":
                     return _context8.stop();
                 }

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -172,15 +172,15 @@ export default function ResourceOverview(props) {
 
             case 3:
               power = _context.sent;
+              console.log(power);
 
-              // console.log(power)
               if (power.data.length) {
                 window.open("" + window.location.origin + roomLink);
               } else {
                 _Message.error('无访问权限，请联系管理员');
               }
 
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }

package/es/networkTopo/getTopoData.js

@@ -77,7 +77,7 @@ function _addLinkData() {
 
           case 4:
             networkLinks = _context.sent;
-            // console.log("如果是网络链路，补充详情信息", networkLinks);
+            console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
               return link.ciType !== 'network_link';
             });
@@ -86,7 +86,7 @@ function _addLinkData() {
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/es/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -28,8 +28,8 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     });
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var config = topo.attributeMetricDisplay.getConfig(); // console.log("getIpNodeTagsAndTips", config, ipNodes);
-
+    var config = topo.attributeMetricDisplay.getConfig();
+    console.log("getIpNodeTagsAndTips", config, ipNodes);
     var tagDatas = config.nodeTag && !config.nodeTag.isCustom ? config.nodeTag.data : [];
     var tipDatas = config.nodeTip && !config.nodeTip.isCustom ? config.nodeTip.data : [];
     var tagHasIpv4 = tagDatas.filter(function (item) {

package/es/utils/topoData.js

@@ -116,31 +116,13 @@ export function parseTopoData(result) {
 
   return _extends({}, result, {
     groups: result.groups || [],
-    nodes: (result.nodes || []).map(parsePermission),
-    links: (result.links || []).map(parsePermission),
+    nodes: result.nodes || [],
+    links: result.links || [],
     linkGroups: result.linkGroups || [],
     global: _extends({}, otherGlobal, {
       extraConfig: JSON.parse(((_result$global = result.global) === null || _result$global === void 0 ? void 0 : _result$global.extraConfig) || "{}")
     })
-  }); // 如果没有权限字段，则增加
-
-  function parsePermission(data) {
-    if (data.permission) {
-      return data;
-    }
-
-    return _extends({}, data, {
-      permission: parseBasicPermission(data === null || data === void 0 ? void 0 : data.operation)
-    });
-  }
-
-  function parseBasicPermission(operation) {
-    return {
-      readable: !!operation,
-      writeable: ['write', 'delete'].includes(operation),
-      deleteable: ['delete'].includes(operation)
-    };
-  }
+  });
 }
 export function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里
 }

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -23,7 +23,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var alarmLink = function alarmLink(alarmInfo) {
   // console.log('alarmLink', alarmInfo);
-  return "/default/pagecenter/" + _uicbb.PAGE_TYPE.ALERT_DETAIL + "/view/" + alarmInfo.alertId + "?alertId=" + alarmInfo.alertId + "&resId=" + alarmInfo.ciId + "&title=" + alarmInfo.alertObject + "&ruleId=" + alarmInfo.ruleId + "&ciCode=" + alarmInfo.ciTypeCode + "&ciType=" + alarmInfo.ciType;
+  return "/default/pagecenter/" + _uicbb.PAGE_TYPE.ALERT_DETAIL + "/view/" + alarmInfo.alertId + "?alertId=" + alarmInfo.alertId + "&resId=" + alarmInfo.ciId + "&title=&ruleId=" + alarmInfo.ruleId + "&ciCode=" + alarmInfo.ciTypeCode + "&ciType=" + alarmInfo.ciType;
 };
 
 var getNode = function getNode(topo, alarmInfo) {

package/lib/core/editor/components/Toolbar/widgets/IconSelect/IconSelect.js

@@ -62,7 +62,8 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
   });
 
   var handleChange = function handleChange(v) {
-    // console.log('handleChange: ', v);
+    console.log('handleChange: ', v);
+
     if (typeof onChange === 'function') {
       onChange(v.id);
     }

package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.js

@@ -60,7 +60,8 @@ var TopoIconSelect = function TopoIconSelect(props, ref) {
   });
 
   var handleChange = function handleChange(v) {
-    // console.log('handleChange: ', v);
+    console.log('handleChange: ', v);
+
     if (typeof onChange === 'function') {
       onChange(v.id);
     }

package/lib/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss

@@ -111,6 +111,7 @@
   cursor: pointer;
   &:hover{
     background-color: #f2f7fd;
+    border-radius: 4px;
   }
 
   .iconImgWrapper {

package/lib/core/editor/components/Toolbar/widgets/NodeImageButton/NodeImageButton.js

@@ -64,12 +64,12 @@ function NodeImageButton(props) {
   }, [selection]);
 
   var onChange = function onChange(prop) {
-    // console.log("onChange-prop", prop, selection);
-    //const { name, value } = prop;
+    console.log("onChange-prop", prop, selection); //const { name, value } = prop;
     // const gv = topo.view.topoClient.getGraphView();
     //const element = topo.getSelectionModel().getFirstData();
-    var elements = selection; // console.log("onChange-elements", elements);
 
+    var elements = selection;
+    console.log("onChange-elements", elements);
     elements.forEach(function (element) {
       if (isElementSetImageEnabled(element)) {
         element.setImage(prop);

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -127,9 +127,9 @@ function useGraphAlarmDisplay(options) {
         return !!item;
       });
 
-      _rlog["default"].debug('关联拓扑告警：推送ht', {
+      _rlog["default"].debug("\u5173\u8054\u62D3\u6251\u544A\u8B66\uFF1A\u63A8\u9001ht " + Object.keys(relateTopoAlarms).length, {
         all: relateTopoAlarm,
-        relateTopoAlarms: relateTopoAlarms
+        graphAlarm: relateTopoAlarms
       }); // 更新到ht拓扑
 
 

package/lib/core/hooks/useTopoEdit.js

@@ -1020,14 +1020,16 @@ var useTopoEdit = function useTopoEdit(params) {
         while (1) {
           switch (_context16.prev = _context16.next) {
             case 0:
+              console.log("bindIPtoNode", txtValue, nodeElement);
+
               if (txtValue) {
-                _context16.next = 2;
+                _context16.next = 3;
                 break;
               }
 
               return _context16.abrupt("return");
 
-            case 2:
+            case 3:
               // if (txtValue === nodeElement.a('bindIp')) {
               //   return;
               // }
@@ -1037,28 +1039,28 @@ var useTopoEdit = function useTopoEdit(params) {
               isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 23;
+                _context16.next = 25;
                 break;
               }
 
               ip = (0, _exitLinkUtil.buildIpNode)(txtValue);
-              _context16.next = 8;
+              _context16.next = 9;
               return deleteExLink(nodeElement);
 
-            case 8:
+            case 9:
               nodeElement.a(ip);
               nodeElement.setName(txtValue);
               nodeElement.setTag("ip:" + txtValue); // 获取配置
 
               configObj = topo.resourceConfig.getConfig();
-              _context16.next = 14;
+              _context16.next = 15;
               return resourceConfig.updateConfig(configObj);
 
-            case 14:
-              _context16.next = 16;
+            case 15:
+              _context16.next = 17;
               return editDispatchers.fetchDataByConfig();
 
-            case 16:
+            case 17:
               configData = _context16.sent;
               // console.log("configData",configObj, configData);
               _elements = configData.elements;
@@ -1077,7 +1079,8 @@ var useTopoEdit = function useTopoEdit(params) {
                 nodes: [],
                 links: newLink,
                 linkGroups: newLinkGroup
-              }; // console.log("createElementsData", createElementsData);
+              };
+              console.log("createElementsData", createElementsData);
 
               if ([].concat(newLink, newLinkGroup).length > 0) {
                 _htTopo = topo.getHtTopo();
@@ -1085,7 +1088,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 _htTopo.createElements(createElementsData);
               }
 
-            case 23:
+            case 25:
             case "end":
               return _context16.stop();
           }

package/lib/core/models/Alarm.js

@@ -181,8 +181,8 @@ var Alarm = /*#__PURE__*/function () {
       return a.obj.createTime - b.obj.createTime;
     }).sort(function (a, b) {
       return a.level > b.level ? 1 : -1;
-    }); // console.log("getAlarms-sb", alarms);
-
+    });
+    console.log("getAlarms-sb", alarms);
     return alarms;
   };
 
@@ -565,7 +565,7 @@ var Alarm = /*#__PURE__*/function () {
               // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-                _context9.next = 24;
+                _context9.next = 27;
                 break;
               }
 
@@ -597,28 +597,29 @@ var Alarm = /*#__PURE__*/function () {
                 }
 
                 return obj;
-              }); // console.log("before-combAlarmData", sendAl, idsList);
+              });
+              console.log("before-combAlarmData", sendAl, idsList);
 
               if (!(sendAl.length > 0)) {
-                _context9.next = 24;
+                _context9.next = 27;
                 break;
               }
 
               _rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
 
-              _context9.prev = 12;
-              _context9.next = 15;
+              _context9.prev = 13;
+              _context9.next = 16;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
               });
 
-            case 15:
+            case 16:
               _yield$alarmDispatche = _context9.sent;
               eqFlag = _yield$alarmDispatche.eqFlag;
               alarmlist = _yield$alarmDispatche.alarmlist;
+              console.log("handleAlarmEvent", alarmIsOpened, eqFlag);
+              console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
 
-              // console.log("handleAlarmEvent", alarmIsOpened,eqFlag);
-              // console.log("handleAlarmEvent-topo.viewProps", this.topo.viewProps);
               if (alarmIsOpened) {
                 this.hmGetTopoAlarmByDoc(); // 通知所有告警
 
@@ -633,21 +634,21 @@ var Alarm = /*#__PURE__*/function () {
                 }
               }
 
-              _context9.next = 24;
+              _context9.next = 27;
               break;
 
-            case 21:
-              _context9.prev = 21;
-              _context9.t0 = _context9["catch"](12);
+            case 24:
+              _context9.prev = 24;
+              _context9.t0 = _context9["catch"](13);
 
               _rlog["default"].error("告警发送异常", _context9.t0);
 
-            case 24:
+            case 27:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, this, [[12, 21]]);
+      }, _callee9, this, [[13, 24]]);
     }));
 
     function handleAlarmEvent(_x7) {

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "10.0.38" === 'string' ? "10.0.38" : null;
+var version = typeof "10.0.41" === 'string' ? "10.0.41" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑