@riil-frontend/component-topology 4.0.0-beta.21 → 4.0.0-beta.24

package/lib/core/models/AttributeMetricDisplay.js

@@ -131,10 +131,6 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return (0, _extends2["default"])({}, link, {
         type: 'edge'
       });
-    }), linkGroups.map(function (link) {
-      return (0, _extends2["default"])({}, link, {
-        type: 'edgeGroup'
-      });
     }));
   };
 
@@ -258,8 +254,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     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;
+    var linkTagConfig = linkTag || defaultLinkTagConfig;
     return {
-      tags: getItems(linkTag || defaultLinkTagConfig),
+      tags: getItems(linkTagConfig),
+      tagLinkArrow: {
+        1: 'both',
+        2: 'from',
+        3: 'to'
+      }[linkTagConfig === null || linkTagConfig === void 0 ? void 0 : linkTagConfig.type] || undefined,
       tips: getItems(linkTip || defaultLinkTipConfig)
     };
   };
@@ -272,13 +274,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
       var tagTipConfig = _this2.getLinkTagTipConfig(link);
 
-      return {
+      return (0, _extends2["default"])({
         type: link.type,
         id: link.id,
-        ciType: ciType,
+        ciType: ciType
+      }, tagTipConfig, {
         tags: filterByPermission(link, tagTipConfig.tags),
         tips: filterByPermission(link, tagTipConfig.tips)
-      };
+      });
     });
   }
   /**
@@ -718,9 +721,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.buildTagsTips = function buildTagsTips() {
+    var _this6 = this;
+
     var data = this.getData(); // 获取标注、悬浮框配置
 
-    var formatter = new _attributeFormatter["default"](this.topo);
     var ciConfigs = this.getResourceTagTipConfig();
     var ciTagsAndTips = ciConfigs.map(function (ciConfig) {
       var ciDataItem = (0, _topoData.findItem)(data, 'id', ciConfig.id);
@@ -737,10 +741,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       var ciData = (0, _extends2["default"])({}, (0, _topoData.findItem)(data, 'id', ciConfig.id), {
         ciType: ciConfig.ciType
       });
+      var formatter = new _attributeFormatter["default"](_this6.topo);
+      var tags = formatter.formatAttrs(ciConfig.tags, ciData); // 链路标注箭头
+
+      if (ciConfig.type === 'edge') {
+        tags = {
+          data: tags,
+          linkArrow: ciConfig.tagLinkArrow
+        };
+      }
+
       return {
         type: ciConfig.type,
         id: ciConfig.id,
-        tags: formatter.formatAttrs(ciConfig.tags, ciData),
+        tags: tags,
         tips: formatter.formatAttrs(ciConfig.tips, ciData)
       };
     });

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.0-beta.21" === 'string' ? "4.0.0-beta.21" : null;
+var version = typeof "4.0.0-beta.24" === 'string' ? "4.0.0-beta.24" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -6,8 +6,6 @@ exports.__esModule = true;
 exports["default"] = void 0;
 exports.formatMetric = formatMetric;
 
-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");
@@ -37,28 +35,6 @@ function formatMetric(val, metricInfo) {
     return "" + val;
   }
 }
-
-function addLinkMetricUnderlineArrow(metricCode) {
-  var map = {
-    // 总流速和总带宽利用率：双向箭头
-    'interface_totalbps': 'both',
-    'bandwidth_utilization': 'both',
-    // 发送速率和发送带宽利用率：背向取值端口的箭头 指向目的
-    'out_rate': 'to',
-    'out_bandwidth_utilization': 'to',
-    // 接收速率和接收带宽利用率：指向取值端口的箭头 指向源
-    'in_rate': 'from',
-    'in_bandwidth_utilization': 'from'
-  };
-
-  if (map[metricCode]) {
-    return {
-      underlineArrow: map[metricCode]
-    };
-  }
-
-  return {};
-}
 /**
  * 标注值格式化
  */
@@ -100,7 +76,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
     }
 
-    return (0, _extends2["default"])({
+    return {
       type: item.type,
       code: item.code,
       // 属性code
@@ -109,7 +85,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       value: formatMetric(fieldValue, fieldMeta),
       // 属性值
       originValue: fieldValue
-    }, addLinkMetricUnderlineArrow(fieldCode));
+    };
   };
 
   _proto.attributeTransform = function attributeTransform(item, ciData) {

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

@@ -22,18 +22,28 @@ function BaseInfoBlock(props) {
       ciTypeMeta = props.ciTypeMeta,
       headerExtra = props.headerExtra,
       renderContent = props.renderContent,
-      baseInfo = props.baseInfo;
+      baseInfo = props.baseInfo,
+      isAppTopo = props.isAppTopo;
   var id = data.id,
       ciType = data.ciType,
       type = data.type,
       name = data.name;
+  console.log('111 data', data);
   return /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
     headerTitle: "\u57FA\u672C\u4FE1\u606F",
-    headerExtra: headerExtra ? headerExtra(props) : ciType === 'network_link' && /*#__PURE__*/_react["default"].createElement(_SingleResourceStrategyLink["default"], {
+    headerExtra: /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        display: 'flex'
+      }
+    }, !isAppTopo && ciType === 'network_link' ? /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        lineHeight: '28px'
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_SingleResourceStrategyLink["default"], {
       id: id,
       ciType: ciType,
       name: name
-    })
+    })) : '', headerExtra ? headerExtra(props) : '')
   }, loading ? /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     style: {
       width: '100%',

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

@@ -79,7 +79,7 @@ function formatUrl(url) {
 
 
 function ResourceOverview(props) {
-  var _viewerProps$resource, _data$attributes, _baseInfo$resource;
+  var _viewerProps$resource, _data$attributes;
 
   var topo = props.topo,
       id = props.id,
@@ -425,7 +425,7 @@ function ResourceOverview(props) {
                   icon: 'Overall_risk_full',
                   className: 'risk-icon',
                   title: "" + item.ciName + item.itemName,
-                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.ciName,
+                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.reportName,
                   time: item.firstFoundTime
                 };
               }); // console.log('告警和风险', alarmList, riskList);
@@ -540,7 +540,8 @@ function ResourceOverview(props) {
     id: id,
     ciType: ciType,
     type: type,
-    name: baseInfo === null || baseInfo === void 0 ? void 0 : (_baseInfo$resource = baseInfo.resource) === null || _baseInfo$resource === void 0 ? void 0 : _baseInfo$resource.display_name
+    // name: '123'
+    name: props.name
   }; // 基本信息设置改变
 
   function baseInfoColChange(_x5) {
@@ -839,6 +840,7 @@ function ResourceOverview(props) {
     data: elementData,
     ciTypeMeta: ciTypeMeta,
     baseInfo: baseInfo,
+    isAppTopo: isAppTopo,
     headerExtra: function headerExtra(p) {
       var _resourceOverviewProp3;
 

package/lib/topoCenter/components/TopoView.js

@@ -41,6 +41,8 @@ var _ViewerTools = _interopRequireDefault(require("./viewer/titlebar/ViewerTools
 
 var _useEdgeFlow = _interopRequireDefault(require("../hooks/viewer/useEdgeFlow"));
 
+var _LinkTagV = _interopRequireDefault(require("./viewer/displaySetting/LinkTagV2"));
+
 var _excluded = ["topo", "titleBar", "onEnterEdit", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
 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); }
@@ -139,7 +141,7 @@ function NetworkTopologyCore(props) {
         showLinkConfig: true,
         // 是否显示链路流动效果配置
         linkTagConfig: function linkTagConfig(params) {
-          return /*#__PURE__*/_react["default"].createElement(_LinkTag["default"], params);
+          return /*#__PURE__*/_react["default"].createElement(_LinkTagV["default"], params);
         },
         linkTipConfig: function linkTipConfig(params) {
           return /*#__PURE__*/_react["default"].createElement(_LinkTip["default"], params);

package/lib/topoCenter/components/viewer/displaySetting/LinkTagCommonRidioGroup.js

@@ -0,0 +1,34 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = LinkTagCommonRidioGroup;
+
+var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _LinkTagCommonRidioGroupModule = _interopRequireDefault(require("./LinkTagCommonRidioGroup.module.scss"));
+
+function LinkTagCommonRidioGroup(props) {
+  var value = props.value,
+      dataSource = props.dataSource,
+      limit = props.limit,
+      onChange = props.onChange;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _LinkTagCommonRidioGroupModule["default"].contaienr
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _LinkTagCommonRidioGroupModule["default"].checkboxGroupWrapper
+  }, /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
+    value: typeof value === 'string' ? value : undefined,
+    itemDirection: "ver",
+    onChange: onChange
+  }, dataSource.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+      value: item.value
+    }, item.label);
+  }))));
+}
+
+;

package/lib/topoCenter/components/viewer/displaySetting/LinkTagCommonRidioGroup.module.scss

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

package/lib/topoCenter/components/viewer/displaySetting/LinkTagV2.js

@@ -0,0 +1,100 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _ResourceInfoDisplay = require("../../../../constants/ResourceInfoDisplay");
+
+var _BasicConfig = _interopRequireDefault(require("../../../../core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig"));
+
+var _Setting = _interopRequireDefault(require("../../../../core/components/ResourceViewAttributeSetting/Setting"));
+
+var _LinkTagCommonRidioGroup = _interopRequireDefault(require("./LinkTagCommonRidioGroup"));
+
+// 默认中可配置内容包括总速率、带宽利用率、发送速率、发送带宽利用率、接收速率、接收带宽利用率
+var CommonOptions = [{
+  value: '1',
+  label: '总流速、带宽利用率',
+  options: {
+    data: ['metric:interface_totalbps', 'metric:bandwidth_utilization']
+  }
+}, {
+  value: '2',
+  label: '发送速率、发送带宽利用率',
+  options: {
+    data: ['metric:out_rate', 'metric:out_bandwidth_utilization']
+  }
+}, {
+  value: '3',
+  label: '接收速率、接收带宽利用率',
+  options: {
+    data: ['metric:in_rate', 'metric:in_bandwidth_utilization']
+  }
+}];
+
+var buildConfig = function buildConfig(item) {
+  return {
+    type: item.split(':')[0],
+    code: item.split(':')[1]
+  };
+};
+/**
+ * 资源标注配置
+ * @param {*} props 
+ * @returns 
+ */
+
+
+function LinkTagV2(props, ref) {
+  var value = props.value,
+      onChange = props.onChange;
+
+  var handleChange = function handleChange(newValue) {
+    console.error(111, newValue);
+
+    if (!newValue.isCustom) {
+      var _CommonOptions$find;
+
+      var type = newValue.data;
+      var config = ((_CommonOptions$find = CommonOptions.find(function (item) {
+        return item.value === type;
+      })) === null || _CommonOptions$find === void 0 ? void 0 : _CommonOptions$find.options) || {
+        data: []
+      };
+      onChange((0, _extends2["default"])({}, newValue, config, {
+        data: config.data.map(buildConfig),
+        type: type
+      }));
+    } else {
+      onChange(newValue);
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_BasicConfig["default"], (0, _extends2["default"])({
+    ref: ref
+  }, props, {
+    value: value ? (0, _extends2["default"])({}, value, {
+      data: value.type
+    }) : value,
+    limit: 1,
+    elementType: "link",
+    showType: "tag",
+    commonOptions: CommonOptions,
+    defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_LINK_TAG_COMMON_CONFIG,
+    commonSelectWidget: _LinkTagCommonRidioGroup["default"],
+    customSettingDrawer: function customSettingDrawer(params) {
+      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], params);
+    },
+    onChange: handleChange
+  }));
+}
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(LinkTagV2);
+
+exports["default"] = _default;

package/lib/topoCenter/models/TopoCenter.js

@@ -47,8 +47,8 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
         },
         getDefaultLinkTipConfig: function getDefaultLinkTipConfig() {
           return _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG;
-        },
-        ExtElementTagTipBuilder: _LinkTagsTipsBuilder["default"]
+        } // ExtElementTagTipBuilder: LinkTagsTipsBuilder,
+
       },
       onSwitchToEditModeBegin: function () {
         var _onSwitchToEditModeBegin = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "4.0.0-beta.21",
+  "version": "4.0.0-beta.24",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -42,7 +42,7 @@
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
-    "@riil-frontend/component-topo-icon-select": "^1.0.16",
+    "@riil-frontend/component-topo-icon-select": "^1.0.17",
     "@riil-frontend/component-topology-utils": "^2.1.0",
     "bizcharts": "^4.1.19",
     "classnames": "^2.2.3",
@@ -114,6 +114,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@4.0.0-beta.21/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@4.0.0-beta.24/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }