@riil-frontend/component-topology 2.15.48 → 2.15.51

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

@@ -44,23 +44,23 @@ export default (function (props) {
 
   var save = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var values, displayConfig, displayConfigDispatchers;
+      var values, prevDisplayConfig, displayConfig, displayConfigDispatchers;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               values = settingRef.current.getValues();
               console.info('保存显示配置', values); // 保存配置
-              // const prevDisplayConfig = topo.store.getModelState('displayConfig');
 
-              displayConfig = _extends({}, values);
-              _context2.next = 5;
+              prevDisplayConfig = topo.store.getModelState('displayConfig');
+              displayConfig = _extends({}, prevDisplayConfig, values);
+              _context2.next = 6;
               return topoService.saveTopoSettings(topo.id, {
                 // alarmSwitch: true,
                 extraConfig: JSON.stringify(_extends({}, displayConfig))
               });
 
-            case 5:
+            case 6:
               // 刷新指标配置
               displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
               displayConfigDispatchers.update(displayConfig); // 按配置执行
@@ -68,7 +68,7 @@ export default (function (props) {
               executeByConfig(displayConfig);
               (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.onDisplaySettingDrawerOk) && viewerProps.onDisplaySettingDrawerOk();
 
-            case 9:
+            case 10:
             case "end":
               return _context2.stop();
           }

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

package/es/core/models/cache/CiTyeCache.js

@@ -72,12 +72,25 @@ var CiTyeCache = /*#__PURE__*/function () {
               ciTypeMetas = _context2.sent;
               cache = _extends({}, this.cache);
               ciTypeMetas.forEach(function (ciTypeMeta) {
-                var attributes = ciTypeMeta.attributes || [];
+                var attributes = (ciTypeMeta.attributes || []).map(function (attr) {
+                  if (ciTypeMeta.code !== 'network_link') {
+                    return attr;
+                  } // 链路属性名称转化，临时方案
+
+
+                  var name = {
+                    source_id: '源端口',
+                    destination_id: '目的端口'
+                  }[attr.code] || attr.name;
+                  return _extends({}, attr, {
+                    name: name
+                  });
+                });
                 var metrics = ciTypeMeta.metrics || [];
                 cache[ciTypeMeta.code] = _extends({}, ciTypeMeta, {
                   attributes: attributes,
-                  metrics: metrics,
                   attributeMap: keyBy(attributes, 'code'),
+                  metrics: metrics,
                   metricMap: keyBy(metrics, 'code')
                 });
               });

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

@@ -58,7 +58,8 @@ function Title(_ref) {
       }
     }, isAvailableArray(filterNodes) && filterNodes.length ? filterNodes.map(function (item) {
       return /*#__PURE__*/React.createElement(_MenuButton.Item, {
-        key: item.id
+        key: item.id,
+        disabled: !item.operation
       }, item.name);
     }) : /*#__PURE__*/React.createElement("div", {
       className: styles['not-data']
@@ -79,7 +80,8 @@ function BaseInfo(props) {
       topoDispatchers = _topo$store$useModel[1];
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
-      topoId = _topo$store$useModelS.topoId;
+      topoId = _topo$store$useModelS.topoId,
+      topoModData = _topo$store$useModelS.data;
 
   var _useState2 = useState(false),
       visible = _useState2[0],
@@ -208,17 +210,6 @@ function BaseInfo(props) {
       type: type === 'linkGroup' ? 'link' : type,
       ciType: ciType,
       ciName: ciName
-    });
-
-    var _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType),
-        metrics = _topo$ciTyeCache$getC.metrics;
-
-    topoDispatchers.update({
-      id: id,
-      metricCodes: metrics.slice(0, 6).map(function (item) {
-        return item.code;
-      }) // 需要展示的关键指标 code
-
     }); // 显示隐藏
 
     targetType === 'doubleClick' && setVisible(true); // userId
@@ -226,6 +217,39 @@ function BaseInfo(props) {
     getUser();
   }
 
+  useEffect(function () {
+    console.log('topoData', activeData.ciType, topoModData);
+
+    if (topoModData && activeData !== null && activeData !== void 0 && activeData.id) {
+      var id = activeData.id,
+          ciType = activeData.ciType;
+      var ciTypeMeta;
+
+      if (ciType === 'network_link') {
+        // 网络链路要按链路类型查询属性、指标
+        var linkGroups = topoModData.linkGroups,
+            links = topoModData.links;
+        var link = [].concat(linkGroups, links).find(function (item) {
+          return item.id === id;
+        });
+        var linkConnectType = link.attributes['network_link.connect_type'];
+        ciTypeMeta = topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
+      } else {
+        ciTypeMeta = topo.ciTyeCache.getCiType(ciType);
+      }
+
+      var _ciTypeMeta = ciTypeMeta,
+          metrics = _ciTypeMeta.metrics; // 同步需要实时展示的指标
+
+      topoDispatchers.update({
+        id: id,
+        metricCodes: metrics.slice(0, 6).map(function (item) {
+          return item.code;
+        }) // 需要展示的关键指标 code
+
+      });
+    }
+  }, [topoModData, activeData]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Drawer, {
     className: styles.baseInfo,
     closeMode: ['close', 'esc'],

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

@@ -212,7 +212,7 @@ export default function EditLinkInfo(props) {
   }, /*#__PURE__*/React.createElement(_Form, {
     field: field
   }, /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
@@ -228,7 +228,7 @@ export default function EditLinkInfo(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.label
   }, targetValue.name)))), /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
@@ -252,7 +252,7 @@ export default function EditLinkInfo(props) {
     name: "network_link.destination_ipv4",
     maxLength: 128
   })))), /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
@@ -284,7 +284,7 @@ export default function EditLinkInfo(props) {
     },
     dataSource: targetValue.ports
   }) : "-"))), /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "12"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
@@ -300,7 +300,7 @@ export default function EditLinkInfo(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.label
   }, targetValue.ciName)))), /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "24"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
@@ -317,12 +317,12 @@ export default function EditLinkInfo(props) {
     name: "display_name",
     maxLength: 128
   })))), /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "24"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
     labelAlign: labelAlign,
-    label: "\u5B9E\u9645\u5E26\u5BBD"
+    label: "\u5B9E\u9645\u5E26\u5BBD\uFF08Mbps\uFF09"
   }), /*#__PURE__*/React.createElement(_NumberPicker, {
     hasTrigger: false,
     style: {
@@ -332,7 +332,7 @@ export default function EditLinkInfo(props) {
     name: "network_link.actual_bandwidth",
     placeholder: "\u8BF7\u8F93\u5165"
   })))), /*#__PURE__*/React.createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/React.createElement(Col, {
     span: "24"
   }, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {

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

@@ -55,23 +55,23 @@ var _default = function _default(props) {
 
   var save = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-      var values, displayConfig, displayConfigDispatchers;
+      var values, prevDisplayConfig, displayConfig, displayConfigDispatchers;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               values = settingRef.current.getValues();
               console.info('保存显示配置', values); // 保存配置
-              // const prevDisplayConfig = topo.store.getModelState('displayConfig');
 
-              displayConfig = (0, _extends2["default"])({}, values);
-              _context2.next = 5;
+              prevDisplayConfig = topo.store.getModelState('displayConfig');
+              displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
+              _context2.next = 6;
               return _topo["default"].saveTopoSettings(topo.id, {
                 // alarmSwitch: true,
                 extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
               });
 
-            case 5:
+            case 6:
               // 刷新指标配置
               displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
               displayConfigDispatchers.update(displayConfig); // 按配置执行
@@ -79,7 +79,7 @@ var _default = function _default(props) {
               executeByConfig(displayConfig);
               (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.onDisplaySettingDrawerOk) && viewerProps.onDisplaySettingDrawerOk();
 
-            case 9:
+            case 10:
             case "end":
               return _context2.stop();
           }

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

package/lib/core/models/cache/CiTyeCache.js

@@ -84,12 +84,25 @@ var CiTyeCache = /*#__PURE__*/function () {
               ciTypeMetas = _context2.sent;
               cache = (0, _extends2["default"])({}, this.cache);
               ciTypeMetas.forEach(function (ciTypeMeta) {
-                var attributes = ciTypeMeta.attributes || [];
+                var attributes = (ciTypeMeta.attributes || []).map(function (attr) {
+                  if (ciTypeMeta.code !== 'network_link') {
+                    return attr;
+                  } // 链路属性名称转化，临时方案
+
+
+                  var name = {
+                    source_id: '源端口',
+                    destination_id: '目的端口'
+                  }[attr.code] || attr.name;
+                  return (0, _extends2["default"])({}, attr, {
+                    name: name
+                  });
+                });
                 var metrics = ciTypeMeta.metrics || [];
                 cache[ciTypeMeta.code] = (0, _extends2["default"])({}, ciTypeMeta, {
                   attributes: attributes,
-                  metrics: metrics,
                   attributeMap: (0, _keyBy["default"])(attributes, 'code'),
+                  metrics: metrics,
                   metricMap: (0, _keyBy["default"])(metrics, 'code')
                 });
               });

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

@@ -81,7 +81,8 @@ function Title(_ref) {
       }
     }, (0, _utils.isAvailableArray)(filterNodes) && filterNodes.length ? filterNodes.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement(_menuButton["default"].Item, {
-        key: item.id
+        key: item.id,
+        disabled: !item.operation
       }, item.name);
     }) : /*#__PURE__*/_react["default"].createElement("div", {
       className: _indexModule["default"]['not-data']
@@ -102,7 +103,8 @@ function BaseInfo(props) {
       topoDispatchers = _topo$store$useModel[1];
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
-      topoId = _topo$store$useModelS.topoId;
+      topoId = _topo$store$useModelS.topoId,
+      topoModData = _topo$store$useModelS.data;
 
   var _useState2 = (0, _react.useState)(false),
       visible = _useState2[0],
@@ -231,17 +233,6 @@ function BaseInfo(props) {
       type: type === 'linkGroup' ? 'link' : type,
       ciType: ciType,
       ciName: ciName
-    });
-
-    var _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType),
-        metrics = _topo$ciTyeCache$getC.metrics;
-
-    topoDispatchers.update({
-      id: id,
-      metricCodes: metrics.slice(0, 6).map(function (item) {
-        return item.code;
-      }) // 需要展示的关键指标 code
-
     }); // 显示隐藏
 
     targetType === 'doubleClick' && setVisible(true); // userId
@@ -249,6 +240,39 @@ function BaseInfo(props) {
     getUser();
   }
 
+  (0, _react.useEffect)(function () {
+    console.log('topoData', activeData.ciType, topoModData);
+
+    if (topoModData && activeData !== null && activeData !== void 0 && activeData.id) {
+      var id = activeData.id,
+          ciType = activeData.ciType;
+      var ciTypeMeta;
+
+      if (ciType === 'network_link') {
+        // 网络链路要按链路类型查询属性、指标
+        var linkGroups = topoModData.linkGroups,
+            links = topoModData.links;
+        var link = [].concat(linkGroups, links).find(function (item) {
+          return item.id === id;
+        });
+        var linkConnectType = link.attributes['network_link.connect_type'];
+        ciTypeMeta = topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
+      } else {
+        ciTypeMeta = topo.ciTyeCache.getCiType(ciType);
+      }
+
+      var _ciTypeMeta = ciTypeMeta,
+          metrics = _ciTypeMeta.metrics; // 同步需要实时展示的指标
+
+      topoDispatchers.update({
+        id: id,
+        metricCodes: metrics.slice(0, 6).map(function (item) {
+          return item.code;
+        }) // 需要展示的关键指标 code
+
+      });
+    }
+  }, [topoModData, activeData]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
     className: _indexModule["default"].baseInfo,
     closeMode: ['close', 'esc'],

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

@@ -242,7 +242,7 @@ function EditLinkInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field
   }, /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
@@ -258,7 +258,7 @@ function EditLinkInfo(props) {
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
   }, targetValue.name)))), /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
@@ -282,7 +282,7 @@ function EditLinkInfo(props) {
     name: "network_link.destination_ipv4",
     maxLength: 128
   })))), /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
@@ -314,7 +314,7 @@ function EditLinkInfo(props) {
     },
     dataSource: targetValue.ports
   }) : "-"))), /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
@@ -330,7 +330,7 @@ function EditLinkInfo(props) {
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].label
   }, targetValue.ciName)))), /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "24"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
@@ -347,12 +347,12 @@ function EditLinkInfo(props) {
     name: "display_name",
     maxLength: 128
   })))), /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "24"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
     labelAlign: labelAlign,
-    label: "\u5B9E\u9645\u5E26\u5BBD"
+    label: "\u5B9E\u9645\u5E26\u5BBD\uFF08Mbps\uFF09"
   }), /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], {
     hasTrigger: false,
     style: {
@@ -362,7 +362,7 @@ function EditLinkInfo(props) {
     name: "network_link.actual_bandwidth",
     placeholder: "\u8BF7\u8F93\u5165"
   })))), /*#__PURE__*/_react["default"].createElement(Row, {
-    gutter: "4"
+    gutter: "16"
   }, /*#__PURE__*/_react["default"].createElement(Col, {
     span: "24"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.48",
+  "version": "2.15.51",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.48/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.51/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }