@riil-frontend/component-topology 2.15.38 → 2.15.41

package/es/components/Drawer/index.js

@@ -2,26 +2,24 @@ import _Drawer from "@alifd/next/es/drawer";
 import _extends from "@babel/runtime/helpers/extends";
 import _Button from "@alifd/next/es/button";
 import React from 'react';
+import classnames from 'classnames';
 import styles from "./index.module.scss";
 var headerStyle = {
-  position: 'absolute',
-  top: 0,
-  left: 0,
-  width: '100%',
   zIndex: 1000
 };
-var bodyStyle = {
-  margin: '46px auto',
-  padding: '16px 24px'
-};
+var bodyStyle = {};
 
 var Drawer = function Drawer(props) {
   var visible = props.visible,
       disabled = props.disabled,
       loading = props.loading,
       title = props.title,
+      _props$footer = props.footer,
+      footer = _props$footer === void 0 ? true : _props$footer,
       _props$buttons = props.buttons,
       buttons = _props$buttons === void 0 ? props.buttons || ['保存', '取消'] : _props$buttons,
+      _props$footerActions = props.footerActions,
+      footerActions = _props$footerActions === void 0 ? ['确定', '取消'] : _props$footerActions,
       onClose = props.onClose,
       onSave = props.onSave,
       drawerProps = props.drawerProps,
@@ -32,12 +30,14 @@ var Drawer = function Drawer(props) {
     width: "40%",
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
-    closeMode: ['close', 'esc'],
-    className: styles.drawer
+    closeMode: ['close', 'esc']
   }, drawerProps, {
+    className: classnames(styles.drawer, drawerProps.className),
     visible: visible,
     onClose: onClose
-  }), children, /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classnames(styles.content, drawerProps.bodyClassName)
+  }, children), footer && /*#__PURE__*/React.createElement("div", {
     className: styles.footer
   }, /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,

package/es/components/Drawer/index.module.scss

@@ -3,26 +3,35 @@
 .drawer {
   & > div {
     display: flex;
+    flex-direction: column;
   }
 
   :global {
+    .#{$css-prefix}drawer-header {
+    }
     .#{$css-prefix}drawer-body {
       flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding: 0;
+      overflow: auto;
     }
   }
 }
 
+.content {
+  flex: 1;
+  padding: 16px 24px;
+  overflow: auto;
+
+}
 
 .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
+  background: #fff;
   border-top: 1px solid #e8e8e8;
+  border-radius: 0 0 4px 4px;
   padding: 10px 16px;
   text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 4px 4px;
 
   & .button {
     &:not(:first-child) {

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -91,7 +91,7 @@ function ResourceSelectDrawer(props) {
     onClose: onClose,
     drawerProps: {
       width: '616px',
-      className: styles.drawer
+      bodyClassName: styles.body
     },
     buttons: ['确定', '取消']
   }, visible && /*#__PURE__*/React.createElement(ResourceSelectList, {

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.module.scss

@@ -1,14 +1,5 @@
 @import '~@alifd/next/variables.scss';
 
-.drawer {
-  & > div {
-    display: flex;
-  }
-
-  :global {
-    .#{$css-prefix}drawer-body {
-      flex: 1;
-      padding: 0 8px !important;
-    }
-  }
+.body {
+  padding: 0 8px !important;
 }

package/es/core/components/AlarmListPanel/index.module.scss

@@ -24,6 +24,10 @@
     line-height: 24px;
   }
 
+  .listTitleLink:hover {
+    color: #75A8FF;
+  }
+
   :global {
     .#{$css-prefix}dialog-body {
       padding: 0px;

package/es/core/models/AttributeMetricDisplay.js

@@ -4,13 +4,12 @@ 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 groupBy from 'lodash/groupBy';
 import { DEFAULT_LINK_TAG_COMMON_CONFIG, DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
-import { getEdgeGroupByNodeTags } from "../../utils/htElementUtils";
 import { findItem } from "../../utils/topoData";
 import { queryCisByIds } from "../services";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
+import LinkTagsTipsBuilder from "./link/LinkTagsTipsBuilder";
 
 function isGraphField(item) {
   return item.type === 'graph';
@@ -38,6 +37,7 @@ var filterByPermission = function filterByPermission(resource, items) {
 var AttributeMetricDisplay = /*#__PURE__*/function () {
   function AttributeMetricDisplay(topo) {
     this.topo = topo;
+    this.edgeTagsTipsBuilder = new LinkTagsTipsBuilder(this);
   }
 
   var _proto = AttributeMetricDisplay.prototype;
@@ -668,176 +668,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tips: formatter.formatAttrs(ciConfig.tips, ciData)
       };
     });
-    var elementTagsAndTips = [].concat(ciTagsAndTips, this.getEdgeGroupTagsAndTips(data, ciConfigs)); // 刷新标注、浮层
+    var elementTagsAndTips = [].concat(ciTagsAndTips, this.edgeTagsTipsBuilder.getEdgeGroupTagsAndTips(data, ciConfigs)); // 刷新标注、浮层
     // rlog.debug('AttributeMetricDisplay.buildTagsTips', {tagsAndTips: elementTagsAndTips, ciConfigs});
 
     return elementTagsAndTips;
-  }
-  /**
-   * 获得未关联聚合链路的连线组标注和悬浮框数据
-   * @param {*} ciTagsAndTips 
-   * @param {*} data 
-   * @param {*} ciConfigs 
-   * @returns 
-   */
-  ;
-
-  _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips(data, ciConfigs) {
-    var _this5 = this;
-
-    // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
-        links = _this$topo$dataModel$.links,
-        linkGroups = _this$topo$dataModel$.linkGroups;
-
-    var getLinkUId = function getLinkUId(link) {
-      return [link.source, link.target].sort().join('-');
-    };
-
-    var linkGroupUIds = linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      return getLinkUId(link);
-    }); // 查询没有聚合链路的物理链路/出口链路
-
-    var noParentLinks = links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      return _extends({}, link, {
-        linkUId: getLinkUId(link)
-      });
-    }).filter(function (link) {
-      return linkGroupUIds.indexOf(link.linkUId) === -1;
-    });
-    var groupMap = groupBy(noParentLinks, 'linkUId'); // 参与计算的链路指标
-
-    var metrics = [// 总流速
-    {
-      code: 'total_flow_rate',
-      calcType: 'sum'
-    }, // 带宽利用率
-    {
-      code: 'bandwidth_utilization',
-      calcType: 'avg'
-    }, // 发送带宽利用率
-    {
-      code: 'out_bandwidth_utilization',
-      calcType: 'avg',
-      showWhenSameSource: true
-    }, // 接收带宽利用率
-    {
-      code: 'in_bandwidth_utilization',
-      calcType: 'avg',
-      showWhenSameSource: true
-    }, {
-      code: 'out_rate',
-      calcType: 'sum',
-      showWhenSameSource: true
-    }, {
-      code: 'in_rate',
-      calcType: 'sum',
-      showWhenSameSource: true
-    }];
-    var connectTypePrefixMap = {
-      phy: 'physical_link.',
-      exit: 'export_link.'
-    };
-    var calcFnMap = {
-      sum: function sum(values) {
-        return values.reduce(function (total, val) {
-          return total + parseInt(val || 0, 10);
-        }, 0);
-      },
-      avg: function avg(values) {
-        return values.reduce(function (total, val) {
-          return total + parseFloat(val || 0, 10);
-        }, 0) / values.length;
-      }
-    };
-
-    var filterField = function filterField(item, linkChildren) {
-      var fieldConfig = metrics.find(function (m) {
-        return item.code.endsWith(m.code);
-      });
-
-      if (item.type !== 'metric' || !fieldConfig) {
-        return false;
-      } // 如果需要校验取值接口，如果取值接口为不同设备的接口，则不显示这四个指标
-
-
-      if (fieldConfig.showWhenSameSource) {
-        var sources = [];
-        linkChildren.forEach(function (link) {
-          if (sources.indexOf(link.source) === -1) {
-            sources.push(link.source);
-          }
-        });
-
-        if (sources.length > 1) {
-          return false;
-        }
-      }
-
-      return true;
-    }; // 计算标注和指标
-
-
-    var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
-    .filter(function (groupId) {
-      var linkChildren = groupMap[groupId];
-      var edgeGroup = getEdgeGroupByNodeTags(_this5.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
-      return !!edgeGroup;
-    }).map(function (groupId) {
-      var linkChildren = groupMap[groupId]; // 查询配置，过滤不在范围内的属性
-
-      var config = ciConfigs.find(function (item) {
-        return item.id === linkChildren[0].id;
-      });
-      config = _extends({}, config, {
-        tags: config.tags.filter(function (item) {
-          return filterField(item, linkChildren);
-        }),
-        tips: config.tips.filter(function (item) {
-          return filterField(item, linkChildren);
-        })
-      }); // 构造数据，计算指标值
-
-      var linkChildrenData = linkChildren.map(function (link) {
-        return data.find(function (item) {
-          return item.id === link.id;
-        });
-      });
-      var mergeData = {
-        ciType: 'network_link',
-        metricMap: {}
-      };
-      var connectType = linkChildren[0].attributes['network_link.connect_type'];
-      metrics.forEach(function (m) {
-        var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
-        try {
-          var values = linkChildrenData.map(function (linkData) {
-            return linkData.metricMap[metricCode];
-          });
-          mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
-        } catch (error) {
-          rlog.warn('连线组指标计算异常', error);
-        }
-      }); // console.error(groupId, {config, linkChildrenData, mergeData})
-      // 构造标注、悬浮框数据
-
-      var formatter = new AttributeFormatter(_this5.topo);
-      return {
-        type: 'edgeGroup',
-        edgeGroupId: groupId,
-        tags: formatter.formatAttrs(config.tags, mergeData),
-        tips: formatter.formatAttrs(config.tips, mergeData)
-      };
-    }); // console.error({
-    //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, data
-    // })
-
-    return edgeGroupsTagsTips;
   };
 
   return AttributeMetricDisplay;

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

package/es/core/models/link/LinkTagsTipsBuilder.js

@@ -0,0 +1,210 @@
+import _extends from "@babel/runtime/helpers/extends";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import groupBy from 'lodash/groupBy';
+import { getEdgeGroupByNodeTags } from "../../../utils/htElementUtils";
+import AttributeFormatter from "../attributeFormatter"; // 参与计算的链路指标
+
+var metrics = [// 总流速
+{
+  code: 'total_flow_rate',
+  calcType: 'sum'
+}, // 带宽利用率
+{
+  code: 'bandwidth_utilization',
+  calcType: 'avg'
+}, // 发送带宽利用率
+{
+  code: 'out_bandwidth_utilization',
+  calcType: 'avg',
+  showWhenSameSource: true
+}, // 接收带宽利用率
+{
+  code: 'in_bandwidth_utilization',
+  calcType: 'avg',
+  showWhenSameSource: true
+}, {
+  code: 'out_rate',
+  calcType: 'sum',
+  showWhenSameSource: true
+}, {
+  code: 'in_rate',
+  calcType: 'sum',
+  showWhenSameSource: true
+}];
+var connectTypePrefixMap = {
+  phy: 'physical_link.',
+  exit: 'export_link.'
+};
+var calcFnMap = {
+  sum: function sum(values) {
+    return values.reduce(function (total, val) {
+      return total + parseInt(val || 0, 10);
+    }, 0);
+  },
+  avg: function avg(values) {
+    return values.reduce(function (total, val) {
+      return total + parseFloat(val || 0, 10);
+    }, 0) / values.length;
+  }
+};
+
+var LinkTagsTipsBuilder = /*#__PURE__*/function () {
+  function LinkTagsTipsBuilder(amDisplay) {
+    this.amDisplay = void 0;
+    this.topo = void 0;
+    this.amDisplay = amDisplay;
+    this.topo = amDisplay.topo;
+  }
+  /**
+   * 获得未关联聚合链路的连线组标注和悬浮框数据
+   * @param {*} ciTagsAndTips 
+   * @returns 
+   */
+
+
+  var _proto = LinkTagsTipsBuilder.prototype;
+
+  _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips() {
+    var _this = this;
+
+    var ciConfigs = this.amDisplay.getResourceTagTipConfig();
+    var data = this.amDisplay.getData(); // 查询没有关联链路的连线组及对应子链路列表
+
+    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
+        links = _this$topo$dataModel$.links,
+        linkGroups = _this$topo$dataModel$.linkGroups;
+
+    var getLinkUId = function getLinkUId(link) {
+      return [link.source, link.target].sort().join('-');
+    };
+
+    var linkGroupUIds = linkGroups.filter(function (link) {
+      return link.ciType === 'network_link';
+    }).map(function (link) {
+      return getLinkUId(link);
+    }); // 查询没有聚合链路的物理链路/出口链路
+
+    var noParentLinks = links.filter(function (link) {
+      return link.ciType === 'network_link';
+    }).map(function (link) {
+      return _extends({}, link, {
+        linkUId: getLinkUId(link)
+      });
+    }).filter(function (link) {
+      return linkGroupUIds.indexOf(link.linkUId) === -1;
+    });
+    var groupMap = groupBy(noParentLinks, 'linkUId'); // 计算标注和指标
+
+    var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
+    .filter(function (groupId) {
+      var linkChildren = groupMap[groupId];
+      var edgeGroup = getEdgeGroupByNodeTags(_this.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
+      return !!edgeGroup;
+    }).map(function (groupId) {
+      var linkChildren = groupMap[groupId];
+      var config = ciConfigs.find(function (item) {
+        return item.id === linkChildren[0].id;
+      });
+      return _this.buildEdgeGroupTagTagsAndTips({
+        groupId: groupId,
+        config: config,
+        linkChildren: linkChildren,
+        data: data
+      });
+    }); // console.error({
+    //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, data
+    // })
+
+    return edgeGroupsTagsTips;
+  };
+
+  _proto.buildEdgeGroupTagTagsAndTips = function buildEdgeGroupTagTagsAndTips(_ref) {
+    var _this2 = this;
+
+    var groupId = _ref.groupId,
+        config = _ref.config,
+        linkChildren = _ref.linkChildren,
+        data = _ref.data;
+
+    // 查询配置，过滤不在范围内的属性
+    var finalConfig = _extends({}, config, {
+      tags: config.tags.filter(function (item) {
+        return _this2.filterField(item, linkChildren);
+      }),
+      tips: config.tips.filter(function (item) {
+        return _this2.filterField(item, linkChildren);
+      })
+    }); // 构造数据，计算指标值
+
+
+    var mergeData = this.buildData(data, linkChildren); // 构造标注、悬浮框数据
+
+    var formatter = new AttributeFormatter(this.topo);
+    return {
+      type: 'edgeGroup',
+      edgeGroupId: groupId,
+      tags: formatter.formatAttrs(finalConfig.tags, mergeData),
+      tips: formatter.formatAttrs(finalConfig.tips, mergeData)
+    };
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
+  _proto.filterField = function filterField(item, linkChildren) {
+    var fieldConfig = metrics.find(function (m) {
+      return item.code.endsWith("." + m.code);
+    });
+
+    if (item.type !== 'metric' || !fieldConfig) {
+      return false;
+    } // 如果需要校验取值接口，如果取值接口为不同设备的接口，则不显示这四个指标
+
+
+    if (fieldConfig.showWhenSameSource) {
+      var sources = [];
+      linkChildren.forEach(function (link) {
+        if (sources.indexOf(link.source) === -1) {
+          sources.push(link.source);
+        }
+      });
+
+      if (sources.length > 1) {
+        return false;
+      }
+    }
+
+    return true;
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
+  _proto.buildData = function buildData(data, linkChildren) {
+    var linkChildrenData = linkChildren.map(function (link) {
+      return data.find(function (item) {
+        return item.id === link.id;
+      });
+    });
+    var mergeData = {
+      ciType: 'network_link',
+      metricMap: {}
+    };
+    var connectType = linkChildren[0].attributes['network_link.connect_type'];
+    metrics.forEach(function (m) {
+      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
+
+      try {
+        var values = linkChildrenData.map(function (linkData) {
+          return linkData.metricMap[metricCode];
+        });
+        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+      } catch (error) {
+        rlog.warn('连线组指标计算异常', error);
+      }
+    }); // console.error(groupId, {config, linkChildrenData, mergeData})
+
+    return mergeData;
+  };
+
+  return LinkTagsTipsBuilder;
+}();
+
+export { LinkTagsTipsBuilder as default };
+;

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -353,7 +353,7 @@ export default function EditLinkInfo(props) {
     type: "primary",
     loading: loading,
     onClick: saveHandleChange
-  }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(_Button, {
+  }, isAdd ? "确定" : "保存"), /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,
     onClick: onClose
   }, "\u53D6\u6D88")));

package/lib/components/Drawer/index.js

@@ -13,27 +13,26 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var headerStyle = {
-  position: 'absolute',
-  top: 0,
-  left: 0,
-  width: '100%',
   zIndex: 1000
 };
-var bodyStyle = {
-  margin: '46px auto',
-  padding: '16px 24px'
-};
+var bodyStyle = {};
 
 var Drawer = function Drawer(props) {
   var visible = props.visible,
       disabled = props.disabled,
       loading = props.loading,
       title = props.title,
+      _props$footer = props.footer,
+      footer = _props$footer === void 0 ? true : _props$footer,
       _props$buttons = props.buttons,
       buttons = _props$buttons === void 0 ? props.buttons || ['保存', '取消'] : _props$buttons,
+      _props$footerActions = props.footerActions,
+      footerActions = _props$footerActions === void 0 ? ['确定', '取消'] : _props$footerActions,
       onClose = props.onClose,
       onSave = props.onSave,
       drawerProps = props.drawerProps,
@@ -44,12 +43,14 @@ var Drawer = function Drawer(props) {
     width: "40%",
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
-    closeMode: ['close', 'esc'],
-    className: _indexModule["default"].drawer
+    closeMode: ['close', 'esc']
   }, drawerProps, {
+    className: (0, _classnames["default"])(_indexModule["default"].drawer, drawerProps.className),
     visible: visible,
     onClose: onClose
-  }), children, /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_indexModule["default"].content, drawerProps.bodyClassName)
+  }, children), footer && /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     className: _indexModule["default"].button,

package/lib/components/Drawer/index.module.scss

@@ -3,26 +3,35 @@
 .drawer {
   & > div {
     display: flex;
+    flex-direction: column;
   }
 
   :global {
+    .#{$css-prefix}drawer-header {
+    }
     .#{$css-prefix}drawer-body {
       flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding: 0;
+      overflow: auto;
     }
   }
 }
 
+.content {
+  flex: 1;
+  padding: 16px 24px;
+  overflow: auto;
+
+}
 
 .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
+  background: #fff;
   border-top: 1px solid #e8e8e8;
+  border-radius: 0 0 4px 4px;
   padding: 10px 16px;
   text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 4px 4px;
 
   & .button {
     &:not(:first-child) {

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -108,7 +108,7 @@ function ResourceSelectDrawer(props) {
     onClose: onClose,
     drawerProps: {
       width: '616px',
-      className: _ResourceSelectDrawerModule["default"].drawer
+      bodyClassName: _ResourceSelectDrawerModule["default"].body
     },
     buttons: ['确定', '取消']
   }, visible && /*#__PURE__*/_react["default"].createElement(_ResourceSelectList["default"], {

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.module.scss

@@ -1,14 +1,5 @@
 @import '~@alifd/next/variables.scss';
 
-.drawer {
-  & > div {
-    display: flex;
-  }
-
-  :global {
-    .#{$css-prefix}drawer-body {
-      flex: 1;
-      padding: 0 8px !important;
-    }
-  }
+.body {
+  padding: 0 8px !important;
 }