@riil-frontend/component-topology 7.0.1 → 7.0.3

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

@@ -157,8 +157,8 @@ function FontColorDropdown(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100),
-    disabled: !background
+    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
+
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '10px',

package/es/core/models/AttributeMetricDisplay.js

@@ -7,6 +7,7 @@ import { keyBy } from 'lodash';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { findItem } from "../../utils/topoData";
 import { queryCisByIds } from "../services";
+import { isMonitoring } from "../utils/manageStatusUtil";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 
@@ -22,12 +23,7 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-} // 无权限不显示标注、悬浮框
-
-
-var filterByPermission = function filterByPermission(resource, items) {
-  return resource.operation ? items : [];
-};
+}
 /**
  * 资源标注、悬浮框数据
  */
@@ -134,13 +130,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         type: 'node',
         id: node.id,
         ciType: ciType,
-        tags: filterByPermission(node, ciTypeConfig.tags),
-        tips: filterByPermission(node, ciTypeConfig.tips)
+        tags: _this.filterCiFiledConfigItems(node, ciTypeConfig.tags),
+        tips: _this.filterCiFiledConfigItems(node, ciTypeConfig.tips)
       };
     });
   } // eslint-disable-next-line class-methods-use-this
   ;
 
+  _proto.filterCiFiledConfigItems = function filterCiFiledConfigItems(data, ciTypeItemConfigs) {
+    // 无权限不显示标注、悬浮框
+    var filterByPermission = function filterByPermission(resource, items) {
+      return resource.operation ? items : [];
+    };
+
+    var list = filterByPermission(data, ciTypeItemConfigs); // 未监控不显示指标
+
+    if (!isMonitoring(data)) {
+      list = list.filter(function (item) {
+        return item.type !== 'metric';
+      });
+    }
+
+    return list;
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
   _proto.getModelType = function getModelType(ci) {
     if (ci.ciType === 'network_link') {
       return ci.attributes.support_templates;
@@ -203,8 +217,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         id: link.id,
         ciType: ciType
       }, tagTipConfig, {
-        tags: filterByPermission(link, tagTipConfig.tags),
-        tips: filterByPermission(link, tagTipConfig.tips)
+        tags: _this2.filterCiFiledConfigItems(link, tagTipConfig.tags),
+        tips: _this2.filterCiFiledConfigItems(link, tagTipConfig.tips)
       });
     });
   }

package/es/core/models/TopoApp.js

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

package/es/core/models/attributeFormatter/index.js

@@ -81,6 +81,10 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.metricTransform = function metricTransform(item, ciData) {
+    if (ciData.id === '000000000381ef35') {
+      console.error(111, item, ciData);
+    }
+
     return this.commonTransform(item, ciData, 'metric');
   };
 

package/es/core/utils/manageStatusUtil.js

@@ -0,0 +1,4 @@
+export function isMonitoring(data) {
+  var manageStatus = data.manageStatus;
+  return manageStatus !== 0;
+}

package/es/style.js

@@ -2,11 +2,11 @@ import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
 import '@alifd/next/es/message/style';
 import '@riil-frontend/component-topology-utils/es/style';
-import '@riil-frontend/utils/es/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@alifd/next/es/drawer/style';
 import '@alifd/next/es/menu-button/style';
 import '@alifd/next/es/search/style';
+import '@riil-frontend/utils/es/style';
 import '@alifd/next/es/tab/style';
 import '@alifd/next/es/table/style';
 import '@riil-frontend/component-table-layout/es/style';

package/es/utils/topoData.js

@@ -2,7 +2,6 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutP
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["extraConfig"];
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { isAvailableArray } from "@riil-frontend/utils";
 import _ from "lodash";
 import topoPermissionUtil from "./topoPermissionUtil";
 import buildViewerContextMenu from "../core/viewer/contextmenu/buildContextmenu";
@@ -21,54 +20,14 @@ import { isGroup } from "./htElementUtils";
  */
 
 export var findItem = function findItem(arr, key, value) {
-  if (isAvailableArray(arr)) {
-    var result;
-
-    for (var i = 0; i < arr.length; i++) {
-      var item = arr[i];
-
-      if (item[key] && item[key] === value) {
-        result = item;
-        break;
-      }
-    }
-
-    return result;
-  } else {
-    return undefined;
-  }
+  return (arr || []).find(function (item) {
+    return item[key] && item[key] === value;
+  });
 };
 export var findItemIndex = function findItemIndex(arr, key, value) {
-  if (isAvailableArray(arr)) {
-    var result = -1;
-
-    for (var i = 0; i < arr.length; i++) {
-      var item = arr[i];
-
-      if (item[key] && item[key] === value) {
-        result = i;
-        break;
-      }
-    }
-
-    return result;
-  } else {
-    return -1;
-  }
-};
-/**
- * 告警列表排序
- * @param {} a
- * @param {*} b
- * @returns
- */
-
-export var sortList = function sortList(a, b) {
-  if (a.level === b.level) {
-    return a.obj.createTime - b.obj.createTime;
-  } else {
-    return a.level - b.level;
-  }
+  return (arr || []).findIndex(function (item) {
+    return item[key] && item[key] === value;
+  });
 }; // 格式化容器
 
 export function formatGroup(group) {
@@ -138,26 +97,6 @@ export function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-/**
- * 获得监控模板code列表
- * @param {*} cis 
- * @returns 
- */
-
-export function getMonitorTemplateCodes(cis) {
-  var codes = [];
-  cis.forEach(function (element) {
-    var _element$attributes;
-
-    // eslint-disable-next-line camelcase
-    var code = (_element$attributes = element.attributes) === null || _element$attributes === void 0 ? void 0 : _element$attributes.support_templates;
-
-    if (code && codes.indexOf(code) < 0) {
-      codes.push(code);
-    }
-  });
-  return codes;
-}
 /**
  * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
  * @param {} ciTypeObj

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

@@ -175,8 +175,8 @@ function FontColorDropdown(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100),
-    disabled: !background
+    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100) // disabled={!background}
+
   })), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       marginTop: '10px',

package/lib/core/models/AttributeMetricDisplay.js

@@ -23,6 +23,8 @@ var _topoData = require("../../utils/topoData");
 
 var _services = require("../services");
 
+var _manageStatusUtil = require("../utils/manageStatusUtil");
+
 var _attributeFormatter = _interopRequireDefault(require("./attributeFormatter"));
 
 var _DictCache = _interopRequireDefault(require("./cache/DictCache"));
@@ -39,12 +41,7 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-} // 无权限不显示标注、悬浮框
-
-
-var filterByPermission = function filterByPermission(resource, items) {
-  return resource.operation ? items : [];
-};
+}
 /**
  * 资源标注、悬浮框数据
  */
@@ -151,13 +148,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         type: 'node',
         id: node.id,
         ciType: ciType,
-        tags: filterByPermission(node, ciTypeConfig.tags),
-        tips: filterByPermission(node, ciTypeConfig.tips)
+        tags: _this.filterCiFiledConfigItems(node, ciTypeConfig.tags),
+        tips: _this.filterCiFiledConfigItems(node, ciTypeConfig.tips)
       };
     });
   } // eslint-disable-next-line class-methods-use-this
   ;
 
+  _proto.filterCiFiledConfigItems = function filterCiFiledConfigItems(data, ciTypeItemConfigs) {
+    // 无权限不显示标注、悬浮框
+    var filterByPermission = function filterByPermission(resource, items) {
+      return resource.operation ? items : [];
+    };
+
+    var list = filterByPermission(data, ciTypeItemConfigs); // 未监控不显示指标
+
+    if (!(0, _manageStatusUtil.isMonitoring)(data)) {
+      list = list.filter(function (item) {
+        return item.type !== 'metric';
+      });
+    }
+
+    return list;
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
   _proto.getModelType = function getModelType(ci) {
     if (ci.ciType === 'network_link') {
       return ci.attributes.support_templates;
@@ -220,8 +235,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         id: link.id,
         ciType: ciType
       }, tagTipConfig, {
-        tags: filterByPermission(link, tagTipConfig.tags),
-        tips: filterByPermission(link, tagTipConfig.tips)
+        tags: _this2.filterCiFiledConfigItems(link, tagTipConfig.tags),
+        tips: _this2.filterCiFiledConfigItems(link, tagTipConfig.tips)
       });
     });
   }

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.1" === 'string' ? "7.0.1" : null;
+var version = typeof "7.0.3" === 'string' ? "7.0.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/attributeFormatter/index.js

@@ -93,6 +93,10 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.metricTransform = function metricTransform(item, ciData) {
+    if (ciData.id === '000000000381ef35') {
+      console.error(111, item, ciData);
+    }
+
     return this.commonTransform(item, ciData, 'metric');
   };
 

package/lib/core/utils/manageStatusUtil.js

@@ -0,0 +1,9 @@
+"use strict";
+
+exports.__esModule = true;
+exports.isMonitoring = isMonitoring;
+
+function isMonitoring(data) {
+  var manageStatus = data.manageStatus;
+  return manageStatus !== 0;
+}

package/lib/style.js

@@ -2,11 +2,11 @@ require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/message/style');
 require('@riil-frontend/component-topology-utils/lib/style');
-require('@riil-frontend/utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/drawer/style');
 require('@alifd/next/lib/menu-button/style');
 require('@alifd/next/lib/search/style');
+require('@riil-frontend/utils/lib/style');
 require('@alifd/next/lib/tab/style');
 require('@alifd/next/lib/table/style');
 require('@riil-frontend/component-table-layout/lib/style');

package/lib/utils/topoData.js

@@ -13,9 +13,7 @@ exports.getCiModSet = getCiModSet;
 exports.getCiTypes = getCiTypes;
 exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
-exports.getMonitorTemplateCodes = getMonitorTemplateCodes;
 exports.parseTopoData = parseTopoData;
-exports.sortList = void 0;
 exports.transtormElementsToMap = transtormElementsToMap;
 exports.updateCiDoc = exports.updateAllCiDoc = void 0;
 
@@ -25,8 +23,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _utils = require("@riil-frontend/utils");
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _topoPermissionUtil = _interopRequireDefault(require("./topoPermissionUtil"));
@@ -55,64 +51,21 @@ var _excluded = ["extraConfig"];
  * @returns {*}
  */
 var findItem = function findItem(arr, key, value) {
-  if ((0, _utils.isAvailableArray)(arr)) {
-    var result;
-
-    for (var i = 0; i < arr.length; i++) {
-      var item = arr[i];
-
-      if (item[key] && item[key] === value) {
-        result = item;
-        break;
-      }
-    }
-
-    return result;
-  } else {
-    return undefined;
-  }
+  return (arr || []).find(function (item) {
+    return item[key] && item[key] === value;
+  });
 };
 
 exports.findItem = findItem;
 
 var findItemIndex = function findItemIndex(arr, key, value) {
-  if ((0, _utils.isAvailableArray)(arr)) {
-    var result = -1;
-
-    for (var i = 0; i < arr.length; i++) {
-      var item = arr[i];
-
-      if (item[key] && item[key] === value) {
-        result = i;
-        break;
-      }
-    }
-
-    return result;
-  } else {
-    return -1;
-  }
-};
-/**
- * 告警列表排序
- * @param {} a
- * @param {*} b
- * @returns
- */
-
-
-exports.findItemIndex = findItemIndex;
-
-var sortList = function sortList(a, b) {
-  if (a.level === b.level) {
-    return a.obj.createTime - b.obj.createTime;
-  } else {
-    return a.level - b.level;
-  }
+  return (arr || []).findIndex(function (item) {
+    return item[key] && item[key] === value;
+  });
 }; // 格式化容器
 
 
-exports.sortList = sortList;
+exports.findItemIndex = findItemIndex;
 
 function formatGroup(group) {
   return (0, _extends2["default"])({}, group, {
@@ -184,27 +137,6 @@ function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-/**
- * 获得监控模板code列表
- * @param {*} cis 
- * @returns 
- */
-
-
-function getMonitorTemplateCodes(cis) {
-  var codes = [];
-  cis.forEach(function (element) {
-    var _element$attributes;
-
-    // eslint-disable-next-line camelcase
-    var code = (_element$attributes = element.attributes) === null || _element$attributes === void 0 ? void 0 : _element$attributes.support_templates;
-
-    if (code && codes.indexOf(code) < 0) {
-      codes.push(code);
-    }
-  });
-  return codes;
-}
 /**
  * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
  * @param {} ciTypeObj

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.3/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }