@riil-frontend/component-topology 3.1.6 → 3.1.9

package/demo/1/345/237/272/346/234/254//345/256/232/345/210/266/345/214/226/350/265/204/346/272/220/346/246/202/350/247/210.md

@@ -0,0 +1,11 @@
+---
+title: 定制化概览
+order: 9
+---
+
+<br/>
+
+```jsx
+<DemoCode src="../../demo-src/basic/customResourceOverview/CustomResourceOverviewDemo.jsx" />
+```
+

package/demo/1/345/237/272/346/234/254//350/207/252/345/256/232/344/271/211/346/240/207/346/263/250/345/222/214/346/202/254/346/265/256/346/241/206.md

@@ -0,0 +1,11 @@
+---
+title: 自定义属性和指标
+order: 8
+---
+
+<br/>
+
+```jsx
+<DemoCode src="../../demo-src/basic/CustomAttrAndMetric/CustomAttrAndMetric.jsx" />
+```
+

package/demo/2/347/274/226/350/276/221/346/250/241/345/274/217//345/261/236/346/200/247/351/235/242/346/235/277.md

@@ -0,0 +1,11 @@
+---
+title: 属性面板
+order: 10
+---
+
+<br/>
+
+
+```jsx
+<DemoCode src="../../demo-src/editor/PropertyPanel.jsx" />
+```

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,11 +6,11 @@ order: 8
 <br/>
 
 - 关闭内置的属性指标推送
-- 设置CiType默认的属性指标显示
+- 自定义链路标注、悬浮框显示
 
 <br/>
 
 ```jsx
-<DemoCode src="../../demo-src/basic/CustomAttrAndMetric.jsx" />
+<DemoCode src="../../demo-src/basic/CustomAttrAndMetric/CustomAttrAndMetric.jsx" />
 ```
 

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,8 +49,6 @@ export default (function (props) {
 
   var save = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _viewerProps$displayS;
-
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -73,7 +71,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.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
 
               if (extraOnOk) {
                 extraOnOk();

package/es/core/editor/components/settings/propertyViews/group/DataTab/RelateData.js

@@ -2,8 +2,8 @@ import _Collapse from "@alifd/next/es/collapse";
 import React, { useEffect } from 'react';
 import GroupNodeList from "./GroupNodeList";
 import GroupAddResourceButton from "./GroupAddResourceButton";
-import CollapseFullheightStyles from "../../../common/GroupNodeList/CollapseFullheight.module.scss";
 import CollapsePanel from "../../../../../../../components/collapse/Panel";
+import CollapseFullheightStyles from "../../../common/GroupNodeList/CollapseFullheight.module.scss";
 export default function GroupRelateData(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi,
@@ -12,15 +12,28 @@ export default function GroupRelateData(props) {
       editorProps = props.editorProps;
 
   var createResourcePanel = function createResourcePanel() {
-    return /*#__PURE__*/React.createElement(CollapsePanel, {
-      key: "\u5173\u8054\u8D44\u6E90",
-      title: "\u5173\u8054\u8D44\u6E90",
-      extra: /*#__PURE__*/React.createElement(GroupAddResourceButton, {
+    var _groupDataViewProps$r;
+
+    var groupDataViewProps = editorProps.groupDataViewProps;
+    var headerExtra;
+
+    if ((groupDataViewProps === null || groupDataViewProps === void 0 ? void 0 : (_groupDataViewProps$r = groupDataViewProps.relateDataProps) === null || _groupDataViewProps$r === void 0 ? void 0 : _groupDataViewProps$r.headerExtra) !== undefined) {
+      var _groupDataViewProps$r2;
+
+      headerExtra = groupDataViewProps === null || groupDataViewProps === void 0 ? void 0 : (_groupDataViewProps$r2 = groupDataViewProps.relateDataProps) === null || _groupDataViewProps$r2 === void 0 ? void 0 : _groupDataViewProps$r2.headerExtra;
+    } else {
+      headerExtra = /*#__PURE__*/React.createElement(GroupAddResourceButton, {
         topo: topo,
         topoEdit: topoEditApi,
         group: group,
         groupData: values
-      }),
+      });
+    }
+
+    return /*#__PURE__*/React.createElement(CollapsePanel, {
+      key: "\u5173\u8054\u8D44\u6E90",
+      title: "\u5173\u8054\u8D44\u6E90",
+      extra: headerExtra,
       className: CollapseFullheightStyles.panelFullHeight
     }, /*#__PURE__*/React.createElement(GroupNodeList, {
       topo: topo,