@riil-frontend/component-topology 3.1.10 → 3.1.13

package/demo/1/345/237/272/346/234/254//345/210/207/346/215/242/345/233/276/346/240/207.md

@@ -0,0 +1,11 @@
+---
+title: 切换图标
+order: 10
+---
+
+<br/>
+
+```jsx
+<DemoCode src="../../demo-src/basic/SwitchNodeIconDemo.jsx" />
+```
+

package/demo/CHANGELOG/CHANGELOG.md

@@ -1,5 +1,19 @@
-## v2.3.17 / 2021-11-11
+## v3.1.12 `2022-4-21 14:56:34`
 
+- 概览支持自定义指标范围和顺序
+
+## v3.1.11 `2022-4-20 10:55:08`
+
+- 支持移除概览功能
+
+## v3.1.10 `2022-4-19 11:20:01`
+
+- 支持不显示区域添加资源按钮
+
+## v3.1.8
+
+- 支持自定义链路概览基本信息
+- 编辑模式节点属性面板设置支持不显示图标设置
 
 
 ## v2.1.8

package/demo-mock/basic/topo/v1/api/attributes/once

@@ -10194,6 +10194,101 @@
         "dataRange": "0-100",
         "changeValue": "",
         "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx3",
+        "name": "xxx3指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx4",
+        "name": "xxx4指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx5",
+        "name": "xxx5指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx6",
+        "name": "xxx6指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx7",
+        "name": "xxx7指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
       }
     ]
   }

package/demo-mock/basic/topo/v1/api/attributes/once.json

@@ -10054,7 +10054,7 @@
     "parent": null,
     "enable": true,
     "source": "system",
-    "displayName": "网络链路",
+    "displayName": "xx链路",
     "vendor": null,
     "version": "v1.0",
     "category": "resources",
@@ -10194,6 +10194,101 @@
         "dataRange": "0-100",
         "changeValue": "",
         "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx3",
+        "name": "xxx3指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx4",
+        "name": "xxx4指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx5",
+        "name": "xxx5指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx6",
+        "name": "xxx6指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx7",
+        "name": "xxx7指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
       }
     ]
   }

package/es/components/BatchAttrMetric/index.js

@@ -76,6 +76,7 @@ var BatchAttrMetricDrawer = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
   })));
 });
+BatchAttrMetricDrawer.displayName = 'BatchAttrMetricDrawer';
 BatchAttrMetricDrawer.propTypes = {
   // 数据项
   allCiSet: PropTypes.any.isRequired,

package/es/core/common/icons/icon.js

@@ -6,6 +6,25 @@ var groupDefaultIcons = [{
   name: '区域',
   url: '/img/topo/citype-icons/区域_平面.svg'
 }];
+export function getSystemIcons() {
+  var networkTopoCiTypeIcons = getNetworkTopoCiTypeIcons().filter(function (icon) {
+    return !DEFAULT_NODE_ICONS.filter(function (defaultIcon) {
+      return defaultIcon.id === icon.id;
+    }).length;
+  });
+  return [].concat(DEFAULT_NODE_ICONS, networkTopoCiTypeIcons);
+}
+export function getIconLibs() {
+  return [{
+    id: '1',
+    name: '默认图标库1',
+    icons: getSystemIcons()
+  }, {
+    id: '2',
+    name: '默认图标库2',
+    icons: getSystemIcons()
+  }];
+}
 /**
  * 获取默认图标
  * @param {*} topo 
@@ -13,12 +32,7 @@ var groupDefaultIcons = [{
  */
 
 export function getNodeDefaultIcons(topo) {
-  var networkTopoCiTypeIcons = getNetworkTopoCiTypeIcons().filter(function (icon) {
-    return !DEFAULT_NODE_ICONS.filter(function (defaultIcon) {
-      return defaultIcon.id === icon.id;
-    }).length;
-  });
-  return [].concat(DEFAULT_NODE_ICONS, networkTopoCiTypeIcons, topo.options.icons || []);
+  return [].concat(getSystemIcons(), topo.options.icons || []);
 }
 export function getGroupDefaultIcons(topo) {
   return [].concat(groupDefaultIcons, getNodeDefaultIcons(topo));

package/es/core/components/DisplaySettingDrawer/ResourceDisplay/CommonCheckboxGroup.module.scss

@@ -1,4 +1,4 @@
-
+@import "@alifd/next/variables";
 
 .contaienr {
   padding: 16px 12px;
@@ -9,11 +9,11 @@
     margin: -8px;
 
     :global {
-      .next-checkbox-group.next-checkbox-group-hoz {
+      .#{$css-prefix}checkbox-group.next-checkbox-group-hoz {
         display: flex;
         flex-flow: row wrap;
   
-        .next-checkbox-wrapper {
+        .#{$css-prefix}checkbox-wrapper {
           margin-left: 8px;
           margin-right: 8px;
         }

package/es/core/components/ResourceViewAttributeSetting/Setting.js

@@ -119,4 +119,5 @@ var ResourceDiplayInfoSetting = /*#__PURE__*/forwardRef(function (props, ref) {
     saveCb: saveMarkSetting
   }));
 });
+ResourceDiplayInfoSetting.displayName = 'ResourceDiplayInfoSetting';
 export default ResourceDiplayInfoSetting;

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.1.10" === 'string' ? "3.1.10" : null;
+var version = typeof "3.1.13" === 'string' ? "3.1.13" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -12,6 +12,7 @@ import PropTypes from 'prop-types';
 import service from "../../../../services/overview";
 import ResourceOverview from "./components/ResourceOverview";
 import styles from "./index.module.scss";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 
 function Title(_ref) {
   var id = _ref.id,
@@ -197,11 +198,11 @@ function ResourceDetail(props) {
         type = data.type,
         ciType = data.ciType,
         ciName = data.ciName,
-        operation = data.operation; // 仅展示资源和链路的概览
-
-    if (!['node', 'link', 'linkGroup'].includes(type)) return; // 没有权限不显示
-
-    if (!operation) return;
+        operation = data.operation;
+    if ( // 仅展示资源和链路的概览
+    !['node', 'link', 'linkGroup'].includes(type) || // 没有权限不显示
+    !operation || // 没有citype不显示
+    !ciType) return;
     var htElement = topo.getDataModel().getDataByTag(id);
 
     if (!canShow(htElement)) {
@@ -242,6 +243,10 @@ function ResourceDetail(props) {
         ciTypeMeta = topo.ciTyeCache.getCiType(ciType);
       }
 
+      if (!ciTypeMeta) {
+        return;
+      }
+
       var _ciTypeMeta = ciTypeMeta,
           metrics = _ciTypeMeta.metrics; // 同步需要实时展示的指标
 

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

@@ -5,6 +5,12 @@ import ResourceDetail from "./ResourceDetail";
 function ResourceDetailPlugin(props) {
   var viewerProps = props.viewerProps;
   var resourceDetailProps = viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps;
+  var hideResourceDetailDrawer = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.hideResourceDetailDrawer) === true;
+
+  if (hideResourceDetailDrawer) {
+    return null;
+  }
+
   return /*#__PURE__*/React.createElement(ResourceDetail, _extends({}, props, resourceDetailProps));
 }