@riil-frontend/component-topology 2.15.31 → 2.15.34

package/es/core/components/TopoView/topoView.js

@@ -232,7 +232,8 @@ var TopoView = function TopoView(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.topoView
+    className: styles.topoView,
+    "data-version": topo.version
   }, titleBar !== false && (titleBar || /*#__PURE__*/React.createElement(TitleBar, {
     topo: topo,
     viewerProps: viewerProps,

package/es/core/editor/components/settings/PropertyView.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import Settings from "./Settings";
+import styles from "./Settings.module.scss";
 export default function PropertyView(props) {
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -16,11 +17,21 @@ export default function PropertyView(props) {
     return null;
   }
 
-  return /*#__PURE__*/React.createElement(Settings, {
-    topo: topo,
-    topoShowType: topoShowType,
-    topoEditApi: topo.topoEdit,
-    selection: selection,
-    editorProps: editorProps
-  });
+  var renderContent = function renderContent() {
+    if (!topoId || !topoShowType) {
+      return null;
+    }
+
+    return /*#__PURE__*/React.createElement(Settings, {
+      topo: topo,
+      topoShowType: topoShowType,
+      topoEditApi: topo.topoEdit,
+      selection: selection,
+      editorProps: editorProps
+    });
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.settingsPanel
+  }, renderContent());
 }

package/es/core/editor/components/settings/Settings.js

@@ -1,9 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from "react";
-import styles from "./Settings.module.scss";
 import { isEdge, isGroup, isLayer, isNode, isText } from "../../../../utils/htElementDataUtil";
 import propertyPanelMap from "./propertyViews";
 import useSettingRuntimeState from "./useSettingRuntimeState";
+import styles from "./Settings.module.scss";
 
 function getElementType(selection) {
   var selectionElement = selection[0];
@@ -124,8 +124,6 @@ export default function Settings(props) {
     });
   });
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.settingsPanel
-  }, /*#__PURE__*/React.createElement("div", {
     className: styles.settings
   }, /*#__PURE__*/React.createElement(PropertyView, {
     type: elementType,
@@ -138,5 +136,5 @@ export default function Settings(props) {
     onChange: updateElementProperty,
     editorProps: editorProps,
     settingRuntimeState: settingRuntimeState
-  })));
+  }));
 }

package/es/core/models/AttributeMetricDisplay.js

@@ -711,28 +711,32 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     });
     var groupMap = groupBy(noParentLinks, 'linkUId'); // 参与计算的链路指标
 
-    var metrics = [{
+    var metrics = [// 总流速
+    {
       code: 'total_flow_rate',
       calcType: 'sum'
-    }, {
+    }, // 带宽利用率
+    {
       code: 'bandwidth_utilization',
       calcType: 'avg',
       showWhenSameSource: true
-    }, {
+    }, // 发送带宽利用率
+    {
       code: 'out_bandwidth_utilization',
       calcType: 'avg',
       showWhenSameSource: true
-    }, {
+    }, // 接收带宽利用率
+    {
       code: 'in_bandwidth_utilization',
       calcType: 'avg',
       showWhenSameSource: true
     }, {
       code: 'out_rate',
-      calcType: 'avg',
+      calcType: 'sum',
       showWhenSameSource: true
     }, {
       code: 'in_rate',
-      calcType: 'avg',
+      calcType: 'sum',
       showWhenSameSource: true
     }];
     var connectTypePrefixMap = {
@@ -765,7 +769,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       if (fieldConfig.showWhenSameSource) {
         var sources = [];
         linkChildren.forEach(function (link) {
-          if (sources.indexOf(link.source) !== -1) {
+          if (sources.indexOf(link.source) === -1) {
             sources.push(link.source);
           }
         });

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

package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -17,7 +17,20 @@ import service from "../../../../../../services/overview";
 import alarmService from "../../../../../../services/alarm";
 import DictCache from "../../../../../../models/cache/DictCache";
 import { queryCisByIds } from "../../../../../../services";
-import styles from "./index.module.scss"; // 基本信息
+import styles from "./index.module.scss"; // url 处理，UICBB 的地址需截取前缀
+
+function formatUrl(url) {
+  var _window, _window$location;
+
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
+} // 基本信息
+
 
 function BaseInfoRender(type, data) {
   var _itemCols$type;
@@ -39,7 +52,7 @@ function BaseInfoRender(type, data) {
           title: display_name
         }, valueData ? /*#__PURE__*/React.createElement(Link, {
           className: styles.link,
-          to: link
+          to: formatUrl(link)
         }, display_name) : '-'));
       }
     }, {
@@ -388,7 +401,7 @@ export default function ResourceOverview(props) {
                 resource: modelAttributeMap['display_name'] ? {
                   display_name: attributeMap.display_name,
                   // 资源名称/显示名称
-                  link: "/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
+                  link: "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
 
                 } : false,
                 ipv4_address: modelAttributeMap['ipv4_address'] ? attributeMap.ipv4_address : false,
@@ -408,7 +421,7 @@ export default function ResourceOverview(props) {
                   icon: 'gaojing-3',
                   className: "alarm-color-icon-lv" + item.alertLevel,
                   title: "[" + item.alertObject + "] " + item.alertTitle,
-                  link: "/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
                   time: item.createTime,
                   status: item.status,
                   params: [{
@@ -621,7 +634,7 @@ export default function ResourceOverview(props) {
         className: styles["alarm-color-icon"] + " " + record.className
       }), /*#__PURE__*/React.createElement(Link, {
         className: styles.link,
-        to: record.link
+        to: formatUrl(record.link)
       }, value));
     }
   }, {
@@ -665,7 +678,7 @@ export default function ResourceOverview(props) {
 
   function _alarmRiskOperation() {
     _alarmRiskOperation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(type, params) {
-      var res, _topo$ciTyeCache$getC, modelMetrics, topModelMetrics;
+      var res, _topo$ciTyeCache$getC, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics;
 
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -685,9 +698,9 @@ export default function ResourceOverview(props) {
               _Message.success('受理成功');
 
               if (isAppTopo) {
-                _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), modelMetrics = _topo$ciTyeCache$getC.metrics;
+                _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), modelMetrics = _topo$ciTyeCache$getC.metrics, ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
                 topModelMetrics = modelMetrics.slice(0, 6);
-                initAppTopo(topModelMetrics);
+                initAppTopo(topModelMetrics, modelAttributeMap, ciName, domain);
               } else {
                 getAlarmRiskData(id);
               }

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

@@ -350,7 +350,7 @@ function AddLinkDrawer(props) {
         //   htTopo.createEdge(source, target, linkData);
         // }
         var edge = htTopo.createEdge(source, target, linkData);
-        console.error(edge); // htTopo.toggleEdgeGroup(source, target, true);
+        rlog.debug("添加链路 绘图", edge); // htTopo.toggleEdgeGroup(source, target, true);
       } // TODO 选中
 
 

package/lib/core/components/TopoView/topoView.js

@@ -268,7 +268,8 @@ var TopoView = function TopoView(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _TopoViewModule["default"].topoView
+    className: _TopoViewModule["default"].topoView,
+    "data-version": topo.version
   }, titleBar !== false && (titleBar || /*#__PURE__*/_react["default"].createElement(_TitleBar["default"], {
     topo: topo,
     viewerProps: viewerProps,

package/lib/core/editor/components/settings/PropertyView.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _Settings = _interopRequireDefault(require("./Settings"));
 
+var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
+
 function PropertyView(props) {
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -25,11 +27,21 @@ function PropertyView(props) {
     return null;
   }
 
-  return /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
-    topo: topo,
-    topoShowType: topoShowType,
-    topoEditApi: topo.topoEdit,
-    selection: selection,
-    editorProps: editorProps
-  });
+  var renderContent = function renderContent() {
+    if (!topoId || !topoShowType) {
+      return null;
+    }
+
+    return /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
+      topo: topo,
+      topoShowType: topoShowType,
+      topoEditApi: topo.topoEdit,
+      selection: selection,
+      editorProps: editorProps
+    });
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _SettingsModule["default"].settingsPanel
+  }, renderContent());
 }

package/lib/core/editor/components/settings/Settings.js

@@ -9,14 +9,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireDefault(require("react"));
 
-var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
-
 var _htElementDataUtil = require("../../../../utils/htElementDataUtil");
 
 var _propertyViews = _interopRequireDefault(require("./propertyViews"));
 
 var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntimeState"));
 
+var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
+
 function getElementType(selection) {
   var selectionElement = selection[0];
   var selectionSize = selection.length;
@@ -134,8 +134,6 @@ function Settings(props) {
     });
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _SettingsModule["default"].settingsPanel
-  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _SettingsModule["default"].settings
   }, /*#__PURE__*/_react["default"].createElement(PropertyView, {
     type: elementType,
@@ -148,5 +146,5 @@ function Settings(props) {
     onChange: updateElementProperty,
     editorProps: editorProps,
     settingRuntimeState: settingRuntimeState
-  })));
+  }));
 }

package/lib/core/models/AttributeMetricDisplay.js

@@ -730,28 +730,32 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     });
     var groupMap = (0, _groupBy["default"])(noParentLinks, 'linkUId'); // 参与计算的链路指标
 
-    var metrics = [{
+    var metrics = [// 总流速
+    {
       code: 'total_flow_rate',
       calcType: 'sum'
-    }, {
+    }, // 带宽利用率
+    {
       code: 'bandwidth_utilization',
       calcType: 'avg',
       showWhenSameSource: true
-    }, {
+    }, // 发送带宽利用率
+    {
       code: 'out_bandwidth_utilization',
       calcType: 'avg',
       showWhenSameSource: true
-    }, {
+    }, // 接收带宽利用率
+    {
       code: 'in_bandwidth_utilization',
       calcType: 'avg',
       showWhenSameSource: true
     }, {
       code: 'out_rate',
-      calcType: 'avg',
+      calcType: 'sum',
       showWhenSameSource: true
     }, {
       code: 'in_rate',
-      calcType: 'avg',
+      calcType: 'sum',
       showWhenSameSource: true
     }];
     var connectTypePrefixMap = {
@@ -784,7 +788,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       if (fieldConfig.showWhenSameSource) {
         var sources = [];
         linkChildren.forEach(function (link) {
-          if (sources.indexOf(link.source) !== -1) {
+          if (sources.indexOf(link.source) === -1) {
             sources.push(link.source);
           }
         });

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

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -49,7 +49,20 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-// 基本信息
+// url 处理，UICBB 的地址需截取前缀
+function formatUrl(url) {
+  var _window, _window$location;
+
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
+} // 基本信息
+
+
 function BaseInfoRender(type, data) {
   var _itemCols$type;
 
@@ -70,7 +83,7 @@ function BaseInfoRender(type, data) {
           title: display_name
         }, valueData ? /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
           className: _indexModule["default"].link,
-          to: link
+          to: formatUrl(link)
         }, display_name) : '-'));
       }
     }, {
@@ -419,7 +432,7 @@ function ResourceOverview(props) {
                 resource: modelAttributeMap['display_name'] ? {
                   display_name: attributeMap.display_name,
                   // 资源名称/显示名称
-                  link: "/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
+                  link: "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
 
                 } : false,
                 ipv4_address: modelAttributeMap['ipv4_address'] ? attributeMap.ipv4_address : false,
@@ -439,7 +452,7 @@ function ResourceOverview(props) {
                   icon: 'gaojing-3',
                   className: "alarm-color-icon-lv" + item.alertLevel,
                   title: "[" + item.alertObject + "] " + item.alertTitle,
-                  link: "/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
                   time: item.createTime,
                   status: item.status,
                   params: [{
@@ -652,7 +665,7 @@ function ResourceOverview(props) {
         className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
       }), /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
         className: _indexModule["default"].link,
-        to: record.link
+        to: formatUrl(record.link)
       }, value));
     }
   }, {
@@ -696,7 +709,7 @@ function ResourceOverview(props) {
 
   function _alarmRiskOperation() {
     _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(type, params) {
-      var res, _topo$ciTyeCache$getC, modelMetrics, topModelMetrics;
+      var res, _topo$ciTyeCache$getC, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
@@ -716,9 +729,9 @@ function ResourceOverview(props) {
               _message["default"].success('受理成功');
 
               if (isAppTopo) {
-                _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), modelMetrics = _topo$ciTyeCache$getC.metrics;
+                _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), modelMetrics = _topo$ciTyeCache$getC.metrics, ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
                 topModelMetrics = modelMetrics.slice(0, 6);
-                initAppTopo(topModelMetrics);
+                initAppTopo(topModelMetrics, modelAttributeMap, ciName, domain);
               } else {
                 getAlarmRiskData(id);
               }

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -391,7 +391,9 @@ function AddLinkDrawer(props) {
         //   htTopo.createEdge(source, target, linkData);
         // }
         var edge = htTopo.createEdge(source, target, linkData);
-        console.error(edge); // htTopo.toggleEdgeGroup(source, target, true);
+
+        _rlog["default"].debug("添加链路 绘图", edge); // htTopo.toggleEdgeGroup(source, target, true);
+
       } // TODO 选中
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.31",
+  "version": "2.15.34",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -43,7 +43,6 @@
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.10",
     "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
-    "resize-observer-polyfill": "^1.5.1",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
     "react-color": "^2.19.3",
@@ -69,7 +68,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.0.9",
-    "@riil-frontend/component-topology-graph": "^2.5.6",
+    "@riil-frontend/component-topology-graph": "^2.5.8",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -111,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.31/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.34/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }