@riil-frontend/component-topology 11.0.15 → 11.0.18

package/lib/core/models/attributeFormatter/formatter/commonTransform.js

@@ -1,36 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = commonTransform;
-exports.formatMetric = formatMetric;
-
-var _utils = require("@riil-frontend/utils");
 
-var _DictCache = _interopRequireDefault(require("../../cache/DictCache"));
-
-/**
- * 格式化指标
- * @param {*} val
- * @param {*} metricInfo
- * @returns
- */
-function formatMetric(val, metricInfo) {
-  // rlog.debug('formatMetric', item, metricInfo);
-  if (metricInfo) {
-    var result = (0, _utils.metricValueFormat)({
-      value: val,
-      dataType: metricInfo.dataType,
-      dict: _DictCache["default"].getDictObject(),
-      unit: metricInfo.unit,
-      code: metricInfo.code
-    });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
-  } else {
-    return "" + val;
-  }
-}
+var _metricUtil = require("../../../utils/metricUtil");
 
 function commonTransform(options) {
   var item = options.item,
@@ -54,7 +27,7 @@ function commonTransform(options) {
     // 属性code
     name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || '',
     // 属性名称
-    value: formatMetric(fieldValue, fieldMeta),
+    value: (0, _metricUtil.formatMetric)(fieldValue, fieldMeta),
     // 属性值
     originValue: fieldValue
   };

package/lib/core/utils/metricUtil.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.formatMetric = formatMetric;
+
+var _utils = require("@riil-frontend/utils");
+
+var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
+
+/**
+ * 格式化指标
+ * @param {*} val
+ * @param {*} metricModel
+ * @returns
+ */
+function formatMetric(val, metricModel) {
+  if (metricModel) {
+    var result = (0, _utils.metricValueFormat)({
+      value: val,
+      dataType: metricModel.dataType,
+      dict: _DictCache["default"].getDictObject(),
+      unit: metricModel.unit,
+      code: metricModel.code
+    });
+    return result.value + " " + (result.value === '-' ? '' : result.unit);
+  } else {
+    return "" + val;
+  }
+}

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

@@ -45,14 +45,14 @@ var _useCiAttrAndMetricData = _interopRequireDefault(require("./useCiAttrAndMetr
 
 var _Configurator = _interopRequireDefault(require("./components/Configurator"));
 
-var _attributeFormatter = require("../../../../../../models/attributeFormatter");
-
 var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTopoCard"));
 
 var _EventsCard = _interopRequireDefault(require("./EventsCard"));
 
 var _NetworkBaseInfo = _interopRequireDefault(require("./NetworkBaseInfo"));
 
+var _metricUtil = require("../../../../../../utils/metricUtil");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -513,7 +513,7 @@ function ResourceOverview(props) {
               }
 
               item = _step.value;
-              value = (0, _attributeFormatter.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
+              value = (0, _metricUtil.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
               contentTitle = value;
               return _context6.delegateYield( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
                 var link, address, owned_computer_room, owned_cabinet, roomLink, node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "11.0.15",
+  "version": "11.0.18",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -75,7 +75,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.1.2",
-    "@riil-frontend/component-topology-graph": "^2.8.2",
+    "@riil-frontend/component-topology-graph": "^4.0.6",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -118,6 +118,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.15/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.18/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }