@riil-frontend/component-topology 3.1.6 → 3.1.7

package/demo//346/240/207/346/263/250/345/222/214/346/202/254/346/265/256/346/241/206//350/207/252/345/256/232/344/271/211/345/261/236/346/200/247/345/222/214/346/214/207/346/240/207.md

@@ -6,7 +6,7 @@ order: 8
 <br/>
 
 - 关闭内置的属性指标推送
-- 设置CiType默认的属性指标显示
+- 自定义链路标注、悬浮框显示
 
 <br/>
 

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

@@ -10044,5 +10044,157 @@
         "templateCode": "m.export_link"
       }
     ]
+  },
+  {
+    "code": "xx_link",
+    "name": "xx链路",
+    "icon": "xxLink",
+    "extend": null,
+    "domain": "network",
+    "parent": null,
+    "enable": true,
+    "source": "system",
+    "displayName": "网络链路",
+    "vendor": null,
+    "version": "v1.0",
+    "category": "resources",
+    "attributes": [
+      {
+        "id": "00000000080691f4",
+        "key": null,
+        "creator": null,
+        "createdTime": 1650018956291,
+        "updatedTime": 1650018956291,
+        "code": "name",
+        "name": "名称",
+        "label": "资源",
+        "type": "assets",
+        "metricCode": "",
+        "description": "名称",
+        "source": "system",
+        "dataType": "string",
+        "dataLength": "255",
+        "dataRange": "",
+        "unit": "",
+        "initValue": "",
+        "defaultValue": "",
+        "changeValue": "",
+        "userVisible": true,
+        "modifiable": false,
+        "required": true,
+        "enable": true,
+        "refCi": null,
+        "isPublic": true,
+        "dictCode": null,
+        "attrSource": "public",
+        "refTemplateCode": "t.base",
+        "refTemplateName": "基础模板",
+        "dataSource": "discover"
+      },
+      {
+        "id": "00000000080691f5",
+        "key": null,
+        "creator": null,
+        "createdTime": 1650018956293,
+        "updatedTime": 1650018956293,
+        "code": "display_name",
+        "name": "显示名称",
+        "label": "资源",
+        "type": "assets",
+        "metricCode": "",
+        "description": "显示名称",
+        "source": "system",
+        "dataType": "string",
+        "dataLength": "255",
+        "dataRange": "",
+        "unit": "",
+        "initValue": "name",
+        "defaultValue": "",
+        "changeValue": "",
+        "userVisible": true,
+        "modifiable": true,
+        "required": false,
+        "enable": true,
+        "refCi": null,
+        "isPublic": true,
+        "dictCode": null,
+        "attrSource": "public",
+        "refTemplateCode": "t.base",
+        "refTemplateName": "基础模板",
+        "dataSource": "discover, manual"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "code": "xxx",
+        "name": "xxx属性",
+        "label": "",
+        "type": "config",
+        "metricCode": "",
+        "description": "到网络出口的距离（跳数）",
+        "source": "system",
+        "dataType": "int",
+        "dataLength": "128",
+        "dataRange": "",
+        "unit": "",
+        "initValue": "",
+        "defaultValue": "2147483647",
+        "changeValue": "",
+        "userVisible": false,
+        "modifiable": false,
+        "required": false,
+        "enable": true,
+        "refCi": null,
+        "isPublic": null,
+        "dictCode": null,
+        "attrSource": "private",
+        "refTemplateCode": "t.base",
+        "refTemplateName": "基础模板",
+        "dataSource": "manual"
+      }
+    ],
+    "metrics": [
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx1",
+        "name": "xxx1指标",
+        "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": "xxx2",
+        "name": "xxx2指标",
+        "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

@@ -10044,5 +10044,157 @@
         "templateCode": "m.export_link"
       }
     ]
+  },
+  {
+    "code": "xx_link",
+    "name": "xx链路",
+    "icon": "xxLink",
+    "extend": null,
+    "domain": "network",
+    "parent": null,
+    "enable": true,
+    "source": "system",
+    "displayName": "网络链路",
+    "vendor": null,
+    "version": "v1.0",
+    "category": "resources",
+    "attributes": [
+      {
+        "id": "00000000080691f4",
+        "key": null,
+        "creator": null,
+        "createdTime": 1650018956291,
+        "updatedTime": 1650018956291,
+        "code": "name",
+        "name": "名称",
+        "label": "资源",
+        "type": "assets",
+        "metricCode": "",
+        "description": "名称",
+        "source": "system",
+        "dataType": "string",
+        "dataLength": "255",
+        "dataRange": "",
+        "unit": "",
+        "initValue": "",
+        "defaultValue": "",
+        "changeValue": "",
+        "userVisible": true,
+        "modifiable": false,
+        "required": true,
+        "enable": true,
+        "refCi": null,
+        "isPublic": true,
+        "dictCode": null,
+        "attrSource": "public",
+        "refTemplateCode": "t.base",
+        "refTemplateName": "基础模板",
+        "dataSource": "discover"
+      },
+      {
+        "id": "00000000080691f5",
+        "key": null,
+        "creator": null,
+        "createdTime": 1650018956293,
+        "updatedTime": 1650018956293,
+        "code": "display_name",
+        "name": "显示名称",
+        "label": "资源",
+        "type": "assets",
+        "metricCode": "",
+        "description": "显示名称",
+        "source": "system",
+        "dataType": "string",
+        "dataLength": "255",
+        "dataRange": "",
+        "unit": "",
+        "initValue": "name",
+        "defaultValue": "",
+        "changeValue": "",
+        "userVisible": true,
+        "modifiable": true,
+        "required": false,
+        "enable": true,
+        "refCi": null,
+        "isPublic": true,
+        "dictCode": null,
+        "attrSource": "public",
+        "refTemplateCode": "t.base",
+        "refTemplateName": "基础模板",
+        "dataSource": "discover, manual"
+      },
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "code": "xxx",
+        "name": "xxx属性",
+        "label": "",
+        "type": "config",
+        "metricCode": "",
+        "description": "到网络出口的距离（跳数）",
+        "source": "system",
+        "dataType": "int",
+        "dataLength": "128",
+        "dataRange": "",
+        "unit": "",
+        "initValue": "",
+        "defaultValue": "2147483647",
+        "changeValue": "",
+        "userVisible": false,
+        "modifiable": false,
+        "required": false,
+        "enable": true,
+        "refCi": null,
+        "isPublic": null,
+        "dictCode": null,
+        "attrSource": "private",
+        "refTemplateCode": "t.base",
+        "refTemplateName": "基础模板",
+        "dataSource": "manual"
+      }
+    ],
+    "metrics": [
+      {
+        "id": null,
+        "key": null,
+        "creator": null,
+        "createdTime": null,
+        "updatedTime": null,
+        "ref": null,
+        "code": "xxx1",
+        "name": "xxx1指标",
+        "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": "xxx2",
+        "name": "xxx2指标",
+        "desc": null,
+        "label": "",
+        "isGoldMetric": true,
+        "metricType": "capacity",
+        "unit": "%",
+        "dataType": "double",
+        "dataRange": "0-100",
+        "changeValue": "",
+        "templateCode": "m.agg_link"
+      }
+    ]
   }
 ]

package/es/core/components/DisplaySettingDrawer/DisplaySetting.js

@@ -17,16 +17,15 @@ import EdgeFlowDirection from "./EdgeFlowDirection";
 
 function DisplaySetting(props, ref) {
   var topo = props.topo,
-      viewerProps = props.viewerProps;
+      displaySettingProps = props.displaySettingProps;
   var displayConfig = topo.store.getModelState('displayConfig');
 
-  var _ref = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingDrawerProps) || {},
+  var _ref = displaySettingProps || {},
       linkTagConfig = _ref.linkTagConfig,
       linkTipConfig = _ref.linkTipConfig,
       showEdgeExpandConfig = _ref.showEdgeExpandConfig,
-      extraConfig = _ref.extraConfig;
-
-  var showLinkConfig = !!(viewerProps !== null && viewerProps !== void 0 && viewerProps.showLinkConfig);
+      extraConfig = _ref.extraConfig,
+      showLinkConfig = _ref.showLinkConfig;
 
   var field = _Field.useField({
     autoUnmount: false,

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -9,7 +9,7 @@ import useDisplaySetting from "./hooks/useDisplaySetting";
 export default function DisplaySettingDrawer(props) {
   var visible = props.visible,
       topo = props.topo,
-      viewerProps = props.viewerProps,
+      displaySettingProps = props.displaySettingProps,
       onClose = props.onClose;
   var settingRef = useRef();
 
@@ -76,7 +76,7 @@ export default function DisplaySettingDrawer(props) {
   }, visible && /*#__PURE__*/React.createElement(DisplaySetting, {
     ref: settingRef,
     topo: topo,
-    viewerProps: viewerProps
+    displaySettingProps: displaySettingProps
   }));
 }
 ;

package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default (function (props) {
   var topo = props.topo,
-      viewerProps = props.viewerProps,
+      displaySettingProps = props.displaySettingProps,
       settingRef = props.settingRef;
 
   var executeByConfig = /*#__PURE__*/function () {
@@ -17,7 +17,7 @@ export default (function (props) {
               // 更新节点名称显示隐藏
               topo.attributeMetricDisplay.updateNodesNameVisible(); // 更新连线展开折叠状态
 
-              if (viewerProps !== null && viewerProps !== void 0 && viewerProps.showLinkConfig) {
+              if (displaySettingProps !== null && displaySettingProps !== void 0 && displaySettingProps.showLinkConfig) {
                 if (config.expandAllEdges) {
                   topo.getHtTopo().expandAllEdgeGroups();
                 } else {
@@ -49,7 +49,7 @@ export default (function (props) {
 
   var save = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _viewerProps$displayS;
+      var _displaySettingProps$;
 
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -73,7 +73,7 @@ export default (function (props) {
               displayConfigDispatchers.update(displayConfig); // 按配置执行
 
               executeByConfig(displayConfig);
-              extraOnOk = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$displayS = viewerProps.displaySettingDrawerProps) === null || _viewerProps$displayS === void 0 ? void 0 : _viewerProps$displayS.onOk) || (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.onDisplaySettingDrawerOk);
+              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : (_displaySettingProps$ = displaySettingProps.displaySettingProps) === null || _displaySettingProps$ === void 0 ? void 0 : _displaySettingProps$.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
 
               if (extraOnOk) {
                 extraOnOk();

package/es/core/models/AttributeMetricDisplay.js

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoServer from '@riil-frontend/component-topology-common/es/services/topo';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { keyBy } from 'lodash';
-import { DEFAULT_LINK_TAG_COMMON_CONFIG, DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
+import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { findItem } from "../../utils/topoData";
 import { queryCisByIds } from "../services";
 import AttributeFormatter from "./attributeFormatter";
@@ -35,8 +35,10 @@ var filterByPermission = function filterByPermission(resource, items) {
 
 var AttributeMetricDisplay = /*#__PURE__*/function () {
   function AttributeMetricDisplay(topo) {
+    var _this$topo$options$ta;
+
     this.topo = topo;
-    var ExtElementTagTipBuilder = this.topo.options.ExtElementTagTipBuilder;
+    var ExtElementTagTipBuilder = (_this$topo$options$ta = this.topo.options.tagTip) === null || _this$topo$options$ta === void 0 ? void 0 : _this$topo$options$ta.ExtElementTagTipBuilder;
 
     if (ExtElementTagTipBuilder) {
       this.extElementTagTipBuilder = new ExtElementTagTipBuilder(this);
@@ -236,10 +238,12 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return filterUnExistedFields(items, ciTypeMeta);
     }
 
-    var defaultLinkTagTipConfig = this.topo.options.defaultLinkTagTipConfig;
+    var tagTipOptions = this.topo.options.tagTip;
+    var defaultLinkTagConfig = tagTipOptions !== null && tagTipOptions !== void 0 && tagTipOptions.getDefaultLinkTagConfig ? tagTipOptions === null || tagTipOptions === void 0 ? void 0 : tagTipOptions.getDefaultLinkTagConfig(link) : null;
+    var defaultLinkTipConfig = tagTipOptions !== null && tagTipOptions !== void 0 && tagTipOptions.getDefaultLinkTipConfig ? tagTipOptions === null || tagTipOptions === void 0 ? void 0 : tagTipOptions.getDefaultLinkTipConfig(link) : null;
     return {
-      tags: getItems(linkTag || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tag)),
-      tips: getItems(linkTip || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tip))
+      tags: getItems(linkTag || defaultLinkTagConfig),
+      tips: getItems(linkTip || defaultLinkTipConfig)
     };
   };
 

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