@riil-frontend/component-topology 7.0.8 → 8.0.0-a.1

package/es/networkTopo/getTopoData.js

@@ -1,11 +1,25 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getLinksDetail } from "../core/models/utils/linkUtils";
 import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil"; // import "./utils/__tests__/resourcePermissionUtil.test";
+// 过滤掉无两端节点数据的链路
 
-export function addLinkData(_x, _x2) {
-  return _addLinkData.apply(this, arguments);
+function filterLinkNoSourceTarget(data) {
+  var links = (data.links || []).filter(function (link) {
+    var sourceNode = (data.nodes || []).find(function (node) {
+      return node.id === link.source;
+    });
+
+    if (link.source && !sourceNode) {
+      return false;
+    }
+
+    return true;
+  });
+  return _extends({}, data, {
+    links: links
+  });
 }
 /**
  * 修正告警配置。因为：接口返回值没有全局告警配置时，返回null，代表开启
@@ -13,42 +27,65 @@ export function addLinkData(_x, _x2) {
  * @returns 
  */
 
+
+function fixAlarmConfig(data) {
+  var _data$global = data.global,
+      alarmSwitch = _data$global.alarmSwitch,
+      alarmListDefaultOpen = _data$global.alarmListDefaultOpen;
+  return _extends({}, data, {
+    global: _extends({}, data.global, {
+      alarmSwitch: alarmSwitch === null ? true : alarmSwitch,
+      alarmListDefaultOpen: alarmListDefaultOpen === null ? true : alarmListDefaultOpen
+    })
+  });
+} // 修正容器找不到时groupId设为空
+
+
+function fixNodeGroupId(data) {
+  var nodes = (data.nodes || [] // 修正容器找不到时groupId设为空
+  ).map(function (node) {
+    var groupExisted = !!(data.groups || []).filter(function (g) {
+      return g.id === node.groupId;
+    }).length;
+    return _extends({}, node, {
+      groupId: groupExisted ? node.groupId : null
+    });
+  });
+  return _extends({}, data, {
+    nodes: nodes
+  });
+}
+
+export function addLinkData(_x) {
+  return _addLinkData.apply(this, arguments);
+} // FIXME 业务拓扑不需要链路相关逻辑
+
 function _addLinkData() {
-  _addLinkData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(oldLinks, nodes) {
-    var links, networkLinks, otherLinks;
+  _addLinkData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
+    var links, nodes, networkLinks, otherLinks;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            // 过滤掉无两端节点数据的链路
-            links = oldLinks.filter(function (link) {
-              var sourceNode = nodes.find(function (node) {
-                return node.id === link.source;
-              });
-
-              if (link.source && !sourceNode) {
-                return false;
-              }
-
-              return true;
-            }); // 如果是网络链路，补充详情信息
+            links = data.links || [];
+            nodes = data.nodes || []; // 如果是网络链路，补充详情信息
 
-            _context.next = 3;
+            _context.next = 4;
             return getLinksDetail(links.filter(function (link) {
-              return !link.ciType;
+              return link.ciType === 'network_link';
             }), nodes);
 
-          case 3:
+          case 4:
             networkLinks = _context.sent;
             otherLinks = links.filter(function (link) {
-              return !!link.ciType;
+              return link.ciType !== 'network_link';
             });
-            return _context.abrupt("return", {
+            return _context.abrupt("return", _extends({}, data, {
               links: [].concat(networkLinks, otherLinks),
               linkGroups: []
-            });
+            }));
 
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -58,54 +95,25 @@ function _addLinkData() {
   return _addLinkData.apply(this, arguments);
 }
 
-function fixAlarmConfig(data) {
-  var _data$global = data.global,
-      alarmSwitch = _data$global.alarmSwitch,
-      alarmListDefaultOpen = _data$global.alarmListDefaultOpen;
-  return _extends({}, data, {
-    global: _extends({}, data.global, {
-      alarmSwitch: alarmSwitch === null ? true : alarmSwitch,
-      alarmListDefaultOpen: alarmListDefaultOpen === null ? true : alarmListDefaultOpen
-    })
-  });
-} // FIXME 业务拓扑不需要链路相关逻辑
-
-
-export function buildData(_x3) {
+export function buildData(_x2) {
   return _buildData.apply(this, arguments);
 }
 
 function _buildData() {
-  _buildData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, linkData;
-
+  _buildData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(oldData) {
+    var data;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            newData = _extends({}, data);
-            nodes = (data.nodes || [] // 修正容器找不到时groupId设为空
-            ).map(function (node) {
-              var groupExisted = !!(data.groups || []).filter(function (g) {
-                return g.id === node.groupId;
-              }).length;
-              return _extends({}, node, {
-                groupId: groupExisted ? node.groupId : null
-              });
-            });
-            _context2.next = 4;
-            return Promise.all([addLinkData(data.links || [], nodes)]);
+            data = oldData;
+            data = fixNodeGroupId(data);
+            data = filterLinkNoSourceTarget(data); // data = await addLinkData(data)
 
-          case 4:
-            _yield$Promise$all = _context2.sent;
-            linkData = _yield$Promise$all[0];
-            newData = _extends({}, newData, {
-              nodes: nodes
-            }, linkData);
-            newData = addTopoDataResourcePermission(newData);
-            return _context2.abrupt("return", newData);
-
-          case 9:
+            data = addTopoDataResourcePermission(data);
+            return _context2.abrupt("return", data);
+
+          case 5:
           case "end":
             return _context2.stop();
         }
@@ -115,7 +123,7 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-export default function getTopoData(_x4, _x5) {
+export default function getTopoData(_x3, _x4) {
   return _getTopoData.apply(this, arguments);
 }
 

package/es/networkTopo/models/TopoCenter.js

@@ -30,87 +30,7 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
           return DEFAULT_TIP_COMMON_CONFIG;
         } // ExtElementTagTipBuilder: LinkTagsTipsBuilder,
 
-      },
-      onSwitchToEditModeBegin: function () {
-        var _onSwitchToEditModeBegin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(topo) {
-          var topoDispatchers;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  topoDispatchers = topo.store.getModelDispatchers('topoMod'); // topoDispatchers.update({ topoData: null });
-
-                  _context.next = 3;
-                  return topoDispatchers.refreshTopo();
-
-                case 3:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }));
-
-        function onSwitchToEditModeBegin(_x) {
-          return _onSwitchToEditModeBegin.apply(this, arguments);
-        }
-
-        return onSwitchToEditModeBegin;
-      }(),
-      onSwitchToEditMode: function () {
-        var _onSwitchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(topo) {
-          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  _context2.next = 2;
-                  return topo.resourceConfig.loadConfig();
-
-                case 2:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2);
-        }));
-
-        function onSwitchToEditMode(_x2) {
-          return _onSwitchToEditMode.apply(this, arguments);
-        }
-
-        return onSwitchToEditMode;
-      }(),
-      onSwitchToViewMode: function () {
-        var _onSwitchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(topo) {
-          var topoModDispatchers;
-          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-            while (1) {
-              switch (_context3.prev = _context3.next) {
-                case 0:
-                  topoModDispatchers = topo.store.getModelDispatchers('topoMod');
-                  _context3.next = 3;
-                  return topoModDispatchers.openTopoPage({
-                    id: topo.id
-                  });
-
-                case 3:
-                  _context3.next = 5;
-                  return topoModDispatchers.refreshTopoTree();
-
-                case 5:
-                case "end":
-                  return _context3.stop();
-              }
-            }
-          }, _callee3);
-        }));
-
-        function onSwitchToViewMode(_x3) {
-          return _onSwitchToViewMode.apply(this, arguments);
-        }
-
-        return onSwitchToViewMode;
-      }()
+      }
     })) || this;
     _this.resourceConfig = null;
     var menuCommands = createMenuCommands(_assertThisInitialized(_this));
@@ -131,25 +51,25 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(params) {
+    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context.prev = _context.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context4.next = 3;
+              _context.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context4.stop();
+              return _context.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee, this);
     }));
 
-    function initData(_x4) {
+    function initData(_x) {
       return _initData.apply(this, arguments);
     }
 
@@ -168,22 +88,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context5.next = 3;
+              _context2.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context5.stop();
+              return _context2.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee2, this);
     }));
 
     function exit() {

package/es/networkTopo/services/topo/basic.js

@@ -401,6 +401,8 @@ export default _extends({
   */
   getTopoData: function getTopoData(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+      var _result$links, result;
+
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
@@ -410,20 +412,27 @@ export default _extends({
               return request.get(API_ROOT + "/structure/both/" + id);
 
             case 3:
-              return _context12.abrupt("return", _context12.sent);
+              result = _context12.sent;
+              return _context12.abrupt("return", _extends({}, result, {
+                links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
+                  return _extends({}, item, {
+                    ciType: 'network_link'
+                  });
+                })
+              }));
 
-            case 6:
-              _context12.prev = 6;
+            case 7:
+              _context12.prev = 7;
               _context12.t0 = _context12["catch"](0);
               rlog.debug('getTopoData-error', _context12.t0);
               return _context12.abrupt("return", null);
 
-            case 10:
+            case 11:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 6]]);
+      }, _callee12, null, [[0, 7]]);
     }))();
   },
 
@@ -436,7 +445,9 @@ export default _extends({
   */
   getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      var data, obj;
+      var _result$links2;
+
+      var data, obj, result;
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) {
           switch (_context13.prev = _context13.next) {
@@ -458,9 +469,16 @@ export default _extends({
               }));
 
             case 5:
-              return _context13.abrupt("return", _context13.sent);
+              result = _context13.sent;
+              return _context13.abrupt("return", _extends({}, result, {
+                links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
+                  return _extends({}, item, {
+                    ciType: 'network_link'
+                  });
+                })
+              }));
 
-            case 6:
+            case 7:
             case "end":
               return _context13.stop();
           }

package/es/networkTopo/utils/resourcePermissionUtil.js

@@ -88,7 +88,7 @@ export function addTopoDataResourcePermission(data) {
         permission: getNodePermission(node)
       });
     }),
-    links: addLinksPermission(links),
-    linkGroups: addLinksPermission(linkGroups)
+    links: addLinksPermission(links || []),
+    linkGroups: addLinksPermission(linkGroups || [])
   });
 }

package/es/utils/topoData.js

@@ -3,7 +3,6 @@ import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["extraConfig"];
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
-import topoPermissionUtil from "./topoPermissionUtil";
 import buildViewerContextMenu from "../core/viewer/contextmenu/buildContextmenu";
 import buildEditorContextMenu from "../core/editor/contextmenu/buildContextmenu";
 import mergeContextmenu from "../core/common/contextmenu/mergeContextmenu";
@@ -68,7 +67,7 @@ function updateNodeInfo(topoEngine, topoData) {
     nodes: topoData.nodes.map(function (node) {
       var attributes = node.attributes;
       return _extends({}, node, {
-        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipAddress) || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
+        ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
         isShowName: topoEngine.attributeMetricDisplay.getNodeNameVisible(node)
       });
     })
@@ -97,87 +96,6 @@ export function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-/**
- * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
- * @param {} ciTypeObj
- * @returns
- */
-
-var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
-  var tips = globalSetting[type + "Tip"];
-  var tags = globalSetting[type + "Tag"];
-  var tipArr = [];
-  var tagArr = [];
-
-  if (tips !== null && tips !== void 0 && tips.isCustom) {
-    var _tips$data$code;
-
-    (_tips$data$code = tips.data[code]) === null || _tips$data$code === void 0 ? void 0 : _tips$data$code.map(function (item) {
-      tipArr.push(item.code + "-" + item.type);
-    });
-  }
-
-  if (tags !== null && tags !== void 0 && tags.isCustom) {
-    var _tags$data$code;
-
-    (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
-      tagArr.push(item.code + "-" + item.type);
-    });
-  } // rlog.debug(
-  //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
-  //   globalSetting,
-  //   tipArr,
-  //   tagArr
-  // );
-
-
-  var custom = [];
-
-  if (type === "node") {
-    custom.push({
-      id: "name-graph",
-      code: "name",
-      name: "图片名称",
-      type: "custom",
-      tag: tagArr.indexOf("name-graph") >= 0,
-      tip: tipArr.indexOf("name-graph") >= 0
-    });
-    custom.push({
-      id: "display_name-ciType",
-      code: "ciType",
-      name: "资源类型",
-      type: "custom",
-      tag: tagArr.indexOf("display_name-ciType") >= 0,
-      tip: tipArr.indexOf("display_name-ciType") >= 0
-    });
-  }
-
-  var attributes = ciTypeObj.attributes.filter(function (attr) {
-    return !!attr.userVisible;
-  }).map(function (item) {
-    var aid = item.code + "-attribute";
-    return {
-      id: aid,
-      code: item.code,
-      name: item.name,
-      type: "attribute",
-      tag: tagArr.indexOf(aid) >= 0,
-      tip: tipArr.indexOf(aid) >= 0
-    };
-  });
-  var metrics = ciTypeObj.metrics.map(function (item) {
-    var mid = item.code + "-metric";
-    return {
-      id: mid,
-      code: item.code,
-      name: item.name,
-      type: "metric",
-      tag: tagArr.indexOf(mid) >= 0,
-      tip: tipArr.indexOf(mid) >= 0
-    };
-  });
-  return [].concat(custom, attributes, metrics);
-};
 /**
  * 格式化拓扑数据
  *
@@ -185,7 +103,6 @@ var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
  * @returns
  */
 
-
 export function parseTopoData(result) {
   var _result$global;
 
@@ -211,7 +128,6 @@ function buildGlobal(_ref2) {
   var _result$config, _engine$viewProps, _result$global2, _result$customGlobal, _result$customGlobal2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
 
   var result = _ref2.data,
-      permission = _ref2.permission,
       linkTo = _ref2.linkTo,
       globalConfig = _ref2.globalConfig,
       engine = _ref2.engine;
@@ -239,7 +155,7 @@ function buildGlobal(_ref2) {
     // 背景图
     backgroundImgUrl: (_engine$viewProps = engine.viewProps) !== null && _engine$viewProps !== void 0 && _engine$viewProps.hideBackground ? null : getBackgroundImageUrl(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
     control: _extends({
-      editable: topoPermissionUtil.isEditable(permission),
+      editable: true,
       // 是否可编辑----控制[编辑]按钮
       moveable: true,
       // 节点是否可移动
@@ -324,10 +240,8 @@ export var combTopoData = function combTopoData(_ref3) {
   var _result$groups;
 
   var data = _ref3.data,
-      permission = _ref3.permission,
       linkTo = _ref3.linkTo,
       globalConfig = _ref3.globalConfig,
-      ciTypeMap = _ref3.ciTypeMap,
       engine = _ref3.engine;
   var result = processCluster(updateNodeInfo(engine, data)); // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
 
@@ -338,7 +252,6 @@ export var combTopoData = function combTopoData(_ref3) {
 
   var global = buildGlobal({
     data: result,
-    permission: permission,
     linkTo: linkTo,
     globalConfig: globalConfig,
     engine: engine
@@ -369,18 +282,11 @@ export var combTopoData = function combTopoData(_ref3) {
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);
-
-  var resAndMetrics = _extends({
+  var resAndMetrics = {
     // topo所有ci的id集合
     resIdsList: allCis.map(function (item) {
       return item.id;
     }),
-    ciTypes: getCiTypes(data),
-    // ci类型集合
-    ciTypeMap: ciTypeMap,
-    // ci类型模型map
-    metrics: [],
-    // 所有指标
     nodeIdsList: data.nodes.map(function (item) {
       return {
         ciId: item.id,
@@ -393,84 +299,13 @@ export var combTopoData = function combTopoData(_ref3) {
         operation: linkObj.operation
       };
     })
-  }, getCiModSet({
-    engine: engine,
-    data: data,
-    allCis: allCis,
-    ciTypeMap: ciTypeMap,
-    globalConfig: globalConfig
-  })); // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
-
+  }; // rlog.debug("combTopoData-格式化后数据", topoData, resAndMetrics);
 
   return {
     topoData: topoData,
     resAndMetrics: resAndMetrics
   };
 };
-export function getCiModSet(params) {
-  var data = params.data,
-      engine = params.engine,
-      allCis = params.allCis,
-      ciTypeMap = params.ciTypeMap,
-      globalConfig = params.globalConfig; // 当前拓扑资源字典
-
-  var ciDoc = {};
-  var ciTypesDoc = {};
-  var allCiModSet = getNodeModSet();
-
-  function getNodeModSet() {
-    var ciTypes = getCiTypesFromCiElements(data.nodes);
-    return getModSet(ciTypes);
-  }
-  /**
-   *
-   * @param {array} ciTypeCodes
-   * @returns
-   */
-
-
-  function getModSet(ciTypeCodes) {
-    var modSet = {};
-    Object.keys(ciTypeMap).filter(function (item) {
-      return ciTypeCodes.includes(item);
-    }).forEach(function (key) {
-      var ciTypeObj = ciTypeMap[key];
-      modSet[key] = {
-        name: ciTypeObj.displayName,
-        code: ciTypeObj.code,
-        icon: ciTypeObj.icon,
-        list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
-      };
-    }); // console.log("modSet--------------------", modSet);
-
-    return modSet;
-  }
-
-  if (allCis.length > 0) {
-    allCis.forEach(function (element, index) {
-      var ciType = element.ciType;
-      ciDoc[element.id] = {
-        code: element.ciType,
-        name: element.name,
-        tag: [],
-        tip: []
-      };
-      ciTypesDoc[ciType] = ciTypesDoc[ciType] || [];
-      ciTypesDoc[element.ciType].push({
-        ciId: element.id
-      });
-    });
-  }
-
-  return {
-    ciDoc: ciDoc,
-    // ci信息集合
-    ciTypesDoc: ciTypesDoc,
-    // 每种ci含有的ci
-    allCiModSet: allCiModSet // 资源类型含有属性和指标集合
-
-  };
-}
 /**
  * 获得两个节点间的连线列表
  * @param {*} links

package/lib/components/BatchAttrMetric/setting.js

@@ -53,10 +53,6 @@ var Setting = function Setting(_ref) {
       saveCb = props.saveCb,
       elementType = props.elementType;
 
-  _rlog["default"].debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, elementType);
-
-  _rlog["default"].debug("Setting----allCiSet", allCiSet);
-
   var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
       ciType = _useState[0],
       setCiType = _useState[1];