@riil-frontend/component-topology 3.5.8 → 3.5.11

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.5.8" === 'string' ? "3.5.8" : null;
+var version = typeof "3.5.11" === 'string' ? "3.5.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -461,7 +461,7 @@ export default function ResourceOverview(props) {
             case 0:
               _context5.next = 2;
               return alarmService.getAlarmByIds([id], {
-                alertStatusList: ['toDeal', 'dealing'],
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
                 pageSize: 999,

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

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
-import queryCiMonitorMetricModels from "../../../getCiDisplayMetricModels";
+import { queryCiMonitorMetricCodes } from "../../../getCiDisplayMetricModels";
 /**
  * 概览指标定义
  * @param {*} props
@@ -33,21 +33,25 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var mmm, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return queryCiMonitorMetricModels(id, ciTypeMeta.metrics);
+              return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || queryCiMonitorMetricCodes)(id);
 
             case 2:
-              mmm = _context.sent;
+              monitorMetrics = _context.sent;
+              ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
+                return !!monitorMetrics.find(function (item) {
+                  return item === m.code;
+                });
+              }); // 未监控不显示指标，临时在这里处理
 
-              // 未监控不显示指标，临时在这里处理
               if (!isMonite) {
-                mmm = [];
+                ciMonitorMetricModels = [];
               }
 
               displayMetricModels = null; // 支持自定义显示指标范围
@@ -61,7 +65,7 @@ var useMetricModels = function useMetricModels(props) {
 
                 if (_metricCodes) {
                   displayMetricModels = _metricCodes.map(function (code) {
-                    return mmm.find(function (item) {
+                    return ciMonitorMetricModels.find(function (item) {
                       return item.code === code;
                     });
                   }).filter(function (item) {
@@ -71,13 +75,13 @@ var useMetricModels = function useMetricModels(props) {
               }
 
               if (!displayMetricModels) {
-                displayMetricModels = mmm;
+                displayMetricModels = ciMonitorMetricModels;
               }
 
               displayMetricModels = displayMetricModels.slice(0, 6);
               return _context.abrupt("return", displayMetricModels);
 
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }

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

@@ -1,12 +1,12 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
-export default function queryCiMonitorMetricModels(_x, _x2) {
-  return _queryCiMonitorMetricModels.apply(this, arguments);
+export function queryCiMonitorMetricStrategys(_x) {
+  return _queryCiMonitorMetricStrategys.apply(this, arguments);
 }
 
-function _queryCiMonitorMetricModels() {
-  _queryCiMonitorMetricModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id, metricModels) {
+function _queryCiMonitorMetricStrategys() {
+  _queryCiMonitorMetricStrategys = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
     var map, monitorMetrics;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -20,11 +20,7 @@ function _queryCiMonitorMetricModels() {
             monitorMetrics = (map[id] || []).filter(function (item) {
               return item.metricType !== 'info';
             });
-            return _context.abrupt("return", metricModels.filter(function (m) {
-              return !!monitorMetrics.find(function (item) {
-                return item.code === m.code;
-              });
-            }));
+            return _context.abrupt("return", monitorMetrics);
 
           case 5:
           case "end":
@@ -33,5 +29,31 @@ function _queryCiMonitorMetricModels() {
       }
     }, _callee);
   }));
-  return _queryCiMonitorMetricModels.apply(this, arguments);
+  return _queryCiMonitorMetricStrategys.apply(this, arguments);
+}
+
+export function queryCiMonitorMetricCodes(_x2) {
+  return _queryCiMonitorMetricCodes.apply(this, arguments);
+}
+
+function _queryCiMonitorMetricCodes() {
+  _queryCiMonitorMetricCodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+    var arr;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            arr = queryCiMonitorMetricStrategys(id);
+            return _context2.abrupt("return", arr.map(function (item) {
+              return item.code;
+            }));
+
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _queryCiMonitorMetricCodes.apply(this, arguments);
 }

package/es/models/topoAlarm.js

@@ -8,7 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
 import { sortList } from "../utils/topoData";
-var showAlarmStatus = ["toDeal", "dealing", "change"];
+var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 export default function (topo) {
   return {
     // 定义 model 的初始 state

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -376,10 +376,8 @@ export default function EditLinkInfo(props) {
     }
   }, /*#__PURE__*/React.createElement(_Radio, {
     id: "phy",
-    value: "phy" // disabled={
-    //   target.ciType === "customNode" || !targetValue.ipAddress||targetValue.ports.length === 0
-    // }
-
+    value: "phy",
+    disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
   }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/React.createElement(_Radio, {
     id: "exit",
     value: "exit"

package/es/topoCenter/models/LinkTagsTipsBuilder.js

@@ -133,15 +133,26 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         config = _ref.config,
         linkChildren = _ref.linkChildren,
         data = _ref.data;
+    var connectTypes = ['physical_link.', 'export_link.'];
+
+    var replaceMetricConfigCode = function replaceMetricConfigCode(item) {
+      var code = item.code;
+      connectTypes.forEach(function (prefix) {
+        code = code.replace(prefix, 'physical_link.');
+      });
+      return _extends({}, item, {
+        code: code
+      });
+    }; // 查询配置，过滤不在范围内的属性
+
 
-    // 查询配置，过滤不在范围内的属性
     var finalConfig = _extends({}, config, {
       tags: config.tags.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      }),
+      }).map(replaceMetricConfigCode),
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      })
+      }).map(replaceMetricConfigCode)
     }); // 构造数据，计算指标值
 
 
@@ -194,15 +205,14 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       ciType: 'network_link',
       metricMap: {}
     };
-    var connectType = linkChildren[0].attributes['network_link.connect_type'];
     metrics.forEach(function (m) {
-      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
       try {
         var values = linkChildrenData.map(function (linkData) {
+          var connectType = linkData.attributeMap['network_link.connect_type'];
+          var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
           return linkData.metricMap[metricCode];
         });
-        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+        mergeData.metricMap["physical_link." + m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
         rlog.warn('连线组指标计算异常', error);
       }

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.5.8" === 'string' ? "3.5.8" : null;
+var version = typeof "3.5.11" === 'string' ? "3.5.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -493,7 +493,7 @@ function ResourceOverview(props) {
             case 0:
               _context5.next = 2;
               return _alarm["default"].getAlarmByIds([id], {
-                alertStatusList: ['toDeal', 'dealing'],
+                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
                 pageSize: 999,

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js

@@ -13,7 +13,7 @@ var _ahooks = require("ahooks");
 
 var _react = require("react");
 
-var _getCiDisplayMetricModels = _interopRequireDefault(require("../../../getCiDisplayMetricModels"));
+var _getCiDisplayMetricModels = require("../../../getCiDisplayMetricModels");
 
 /**
  * 概览指标定义
@@ -44,21 +44,25 @@ var useMetricModels = function useMetricModels(props) {
 
   function _fetchData() {
     _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var mmm, displayMetricModels, _metricCodes;
+      var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return (0, _getCiDisplayMetricModels["default"])(id, ciTypeMeta.metrics);
+              return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
 
             case 2:
-              mmm = _context.sent;
+              monitorMetrics = _context.sent;
+              ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
+                return !!monitorMetrics.find(function (item) {
+                  return item === m.code;
+                });
+              }); // 未监控不显示指标，临时在这里处理
 
-              // 未监控不显示指标，临时在这里处理
               if (!isMonite) {
-                mmm = [];
+                ciMonitorMetricModels = [];
               }
 
               displayMetricModels = null; // 支持自定义显示指标范围
@@ -72,7 +76,7 @@ var useMetricModels = function useMetricModels(props) {
 
                 if (_metricCodes) {
                   displayMetricModels = _metricCodes.map(function (code) {
-                    return mmm.find(function (item) {
+                    return ciMonitorMetricModels.find(function (item) {
                       return item.code === code;
                     });
                   }).filter(function (item) {
@@ -82,13 +86,13 @@ var useMetricModels = function useMetricModels(props) {
               }
 
               if (!displayMetricModels) {
-                displayMetricModels = mmm;
+                displayMetricModels = ciMonitorMetricModels;
               }
 
               displayMetricModels = displayMetricModels.slice(0, 6);
               return _context.abrupt("return", displayMetricModels);
 
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }

package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js

@@ -3,7 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = queryCiMonitorMetricModels;
+exports.queryCiMonitorMetricCodes = queryCiMonitorMetricCodes;
+exports.queryCiMonitorMetricStrategys = queryCiMonitorMetricStrategys;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -11,12 +12,12 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-function queryCiMonitorMetricModels(_x, _x2) {
-  return _queryCiMonitorMetricModels.apply(this, arguments);
+function queryCiMonitorMetricStrategys(_x) {
+  return _queryCiMonitorMetricStrategys.apply(this, arguments);
 }
 
-function _queryCiMonitorMetricModels() {
-  _queryCiMonitorMetricModels = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id, metricModels) {
+function _queryCiMonitorMetricStrategys() {
+  _queryCiMonitorMetricStrategys = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
     var map, monitorMetrics;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
@@ -30,11 +31,7 @@ function _queryCiMonitorMetricModels() {
             monitorMetrics = (map[id] || []).filter(function (item) {
               return item.metricType !== 'info';
             });
-            return _context.abrupt("return", metricModels.filter(function (m) {
-              return !!monitorMetrics.find(function (item) {
-                return item.code === m.code;
-              });
-            }));
+            return _context.abrupt("return", monitorMetrics);
 
           case 5:
           case "end":
@@ -43,5 +40,31 @@ function _queryCiMonitorMetricModels() {
       }
     }, _callee);
   }));
-  return _queryCiMonitorMetricModels.apply(this, arguments);
+  return _queryCiMonitorMetricStrategys.apply(this, arguments);
+}
+
+function queryCiMonitorMetricCodes(_x2) {
+  return _queryCiMonitorMetricCodes.apply(this, arguments);
+}
+
+function _queryCiMonitorMetricCodes() {
+  _queryCiMonitorMetricCodes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
+    var arr;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            arr = queryCiMonitorMetricStrategys(id);
+            return _context2.abrupt("return", arr.map(function (item) {
+              return item.code;
+            }));
+
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _queryCiMonitorMetricCodes.apply(this, arguments);
 }

package/lib/models/topoAlarm.js

@@ -20,7 +20,7 @@ var _topoData = require("../utils/topoData");
 /**
  * 告警
  */
-var showAlarmStatus = ["toDeal", "dealing", "change"];
+var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
 function _default(topo) {
   return {

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -404,10 +404,8 @@ function EditLinkInfo(props) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     id: "phy",
-    value: "phy" // disabled={
-    //   target.ciType === "customNode" || !targetValue.ipAddress||targetValue.ports.length === 0
-    // }
-
+    value: "phy",
+    disabled: target.ciType === "customNode" || !targetValue.ipAddress || targetValue.ports.length === 0
   }, "\u7269\u7406/\u805A\u5408"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     id: "exit",
     value: "exit"

package/lib/topoCenter/models/LinkTagsTipsBuilder.js

@@ -144,14 +144,26 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         config = _ref.config,
         linkChildren = _ref.linkChildren,
         data = _ref.data;
-    // 查询配置，过滤不在范围内的属性
+    var connectTypes = ['physical_link.', 'export_link.'];
+
+    var replaceMetricConfigCode = function replaceMetricConfigCode(item) {
+      var code = item.code;
+      connectTypes.forEach(function (prefix) {
+        code = code.replace(prefix, 'physical_link.');
+      });
+      return (0, _extends2["default"])({}, item, {
+        code: code
+      });
+    }; // 查询配置，过滤不在范围内的属性
+
+
     var finalConfig = (0, _extends2["default"])({}, config, {
       tags: config.tags.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      }),
+      }).map(replaceMetricConfigCode),
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      })
+      }).map(replaceMetricConfigCode)
     }); // 构造数据，计算指标值
 
     var mergeData = this.buildData(data, linkChildren); // 构造标注、悬浮框数据
@@ -203,15 +215,14 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       ciType: 'network_link',
       metricMap: {}
     };
-    var connectType = linkChildren[0].attributes['network_link.connect_type'];
     metrics.forEach(function (m) {
-      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
       try {
         var values = linkChildrenData.map(function (linkData) {
+          var connectType = linkData.attributeMap['network_link.connect_type'];
+          var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
           return linkData.metricMap[metricCode];
         });
-        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+        mergeData.metricMap["physical_link." + m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
         _rlog["default"].warn('连线组指标计算异常', error);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "3.5.8",
+  "version": "3.5.11",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -42,7 +42,7 @@
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.16",
-    "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
+    "@riil-frontend/component-topology-utils": "^2.1.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
     "react-color": "^2.19.3",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.8/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.5.11/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }