@riil-frontend/component-topology 13.0.0-dev.2 → 13.0.0-dev.4

package/es/core/editor/hooks/useKeyboardShortcut.js

@@ -25,6 +25,10 @@ function initKeyboardShortcuts(props) {
 
   hotkeys('ctrl+v, command+v', function (event) {
     return handlePasteHotkey(event, props);
+  }); // 删除
+
+  hotkeys('delete', function (event) {
+    topoEdit.batchDeleteSelectedElement();
   });
 }
 

package/es/core/hooks/useTopoEdit.js

@@ -307,6 +307,8 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
+  var batchDeleteSelectedElement = function batchDeleteSelectedElement() {};
+
   var onDeleteElement = function onDeleteElement(data) {
     var dtype = data.dtype;
     rlog.info("onDeleteElement", data);
@@ -1123,6 +1125,7 @@ var useTopoEdit = function useTopoEdit(params) {
     onCloseComboResDrawer: function onCloseComboResDrawer() {
       return setShowComboResDrawer(false);
     },
+    batchDeleteSelectedElement: batchDeleteSelectedElement,
 
     /**
      * 拓扑图元素（节点、连线、容器）删除回调

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "13.0.0-dev.2" === 'string' ? "13.0.0-dev.2" : null;
+var version = typeof "13.0.0-dev.4" === 'string' ? "13.0.0-dev.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -9,6 +9,7 @@ import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
 import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
+import * as processBothTopoDataUtil from "../../utils/relateTopoDataUtil";
 var API_ROOT = TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -49,7 +50,7 @@ function prepareResourceParams(conditions, query) {
   return {
     dynamicCondition: dynamicCondition,
     fixedConditionIdList: (staticRes || []).filter(function (ciId) {
-      return !ciId.startsWith('ip:');
+      return !ciId.includes(':');
     }),
     linkIps: (staticRes || []).filter(function (ciId) {
       return ciId.startsWith('ip:');
@@ -389,16 +390,19 @@ export default _extends({
 
           case 2:
             result = _context12.sent;
-            return _context12.abrupt("return", processExitLink(_extends({}, result, {
+            result = _extends({}, result, {
               nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
               links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                 return _extends({}, item, {
                   ciType: 'network_link'
                 });
               })
-            })));
+            });
+            result = processExitLink(result);
+            result = processBothTopoDataUtil.processBothTopoData(result);
+            return _context12.abrupt("return", result);
 
-          case 4:
+          case 7:
           case "end":
             return _context12.stop();
         }
@@ -439,16 +443,17 @@ export default _extends({
 
           case 5:
             result = _context13.sent;
-            return _context13.abrupt("return", processByConditionResult(_extends({}, result, {
+            result = _extends({}, result, {
               nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
               links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                 return _extends({}, item, {
                   ciType: 'network_link'
                 });
               })
-            }), obj.groups));
+            });
+            return _context13.abrupt("return", processByConditionResult(result, obj.groups));
 
-          case 7:
+          case 8:
           case "end":
             return _context13.stop();
         }

package/es/networkTopo/utils/__tests__/relateTopoData.js

@@ -0,0 +1,38 @@
+export var topoLinks = [// 子拓扑之间
+{
+  "id": "2-2",
+  "name": "子拓扑链路",
+  'sourceType': 'topo',
+  "source": "3",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "ciType": "network_link",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.18",
+    "network_link.destination_ipv4": "1.5.5.5",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 100,
+    "network_link.actual_bandwidth": 100,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "172.17.166.18(Fa 0/10) - 1.5.5.5",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.18",
+    "name": "172.17.166.18(Fa 0/10) - 1.5.5.5",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de8b2",
+    "network_link.source_device_id": "00000000010de861"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}];

package/es/networkTopo/utils/relateTopoDataUtil.js

@@ -1,16 +1,20 @@
 import _extends from "@babel/runtime/helpers/extends";
 // 关联拓扑数据
-
+import { topoLinks } from "./__tests__/relateTopoData";
 /**
  * 升级历史数据：子拓扑节点序列化数据
  * 构造子拓扑节点
  * 构造子拓扑链路
  * @param {*} ctx 
  */
-export function processBothTopoData(ctx) {
-  var topoData = ctx.topoData;
-  var serialize = upgradeSerializeRelateTopoNode(topoData.serialize);
+
+export function processBothTopoData(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = upgradeSerializeOldTopoNode(topoData.serialize);
   return _extends({}, topoData, {
+    nodes: [].concat(nodes, buildTopoNodeDatasFromSerialize(serialize)),
+    links: buildTopoLinks(links),
     serialize: serialize
   });
 }
@@ -22,17 +26,84 @@ export function processBothTopoData(ctx) {
 
 export function processByConditionTopoData(ctx) {
   var topoData = ctx.topoData;
+  var nodes = topoData.nodes,
+      links = topoData.links;
   return _extends({}, topoData);
 }
+export function buildTopoNode(topoId) {
+  return {
+    id: "topo:" + topoId,
+    //   name: ,
+    bindType: "topo",
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindIp: topoId,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    // 'attributes': [],
+    // 'metrics': [],
+    type: "node",
+    isbinding: true,
+    // 'dtype': 'device'
+    operation: "delete"
+  };
+}
+
+function buildTopoLinks(links) {
+  links.push.apply(links, topoLinks);
+  return links.map(function (link) {
+    return _extends({}, link, {
+      "source": link.sourceType ? link.sourceType + ':' + link.source : link.source,
+      "target": link.targetType ? link.targetType + ':' + link.target : link.target
+    });
+  });
+}
 /**
  * 升级历史数据：子拓扑节点序列化数据
  * @param {*} serialize 
  */
 
-function upgradeSerializeRelateTopoNode(serialize) {
+
+function upgradeSerializeOldTopoNode(serialize) {
+  if (serialize) {
+    var isOldTopoNode = function isOldTopoNode(ele) {
+      return isTopoNode(ele) && !ele.p.tag;
+    };
+
+    var oldTopoNodes = serialize.d.filter(isOldTopoNode);
+    oldTopoNodes.forEach(function (node) {
+      var _node$a;
+
+      var topoId = (_node$a = node.a) === null || _node$a === void 0 ? void 0 : _node$a.bindTopo;
+      node.a = _extends({}, node.a, buildTopoNode(topoId));
+      node.p.tag = "topo:" + topoId;
+    });
+  }
+
   return serialize;
 }
 
+function isTopoNode(ele) {
+  var _ele$a;
+
+  return !!((_ele$a = ele.a) !== null && _ele$a !== void 0 && _ele$a.bindTopo);
+}
+
+function buildTopoNodeDatasFromSerialize(serialize) {
+  if (!serialize) {
+    return [];
+  }
+
+  var topoNodes = serialize.d.filter(isTopoNode);
+  var topoNodeDatas = topoNodes.map(function (node) {
+    var _node$a2;
+
+    var topoId = (_node$a2 = node.a) === null || _node$a2 === void 0 ? void 0 : _node$a2.bindTopo;
+    return buildTopoNode(topoId);
+  });
+  return topoNodeDatas;
+}
+
 function getRelateTopoIdsFromSerialize(serialize) {
   return serialize;
 }

package/lib/core/editor/hooks/useKeyboardShortcut.js

@@ -34,6 +34,10 @@ function initKeyboardShortcuts(props) {
 
   (0, _hotkeysJs["default"])('ctrl+v, command+v', function (event) {
     return (0, _copyElementUtil.handlePasteHotkey)(event, props);
+  }); // 删除
+
+  (0, _hotkeysJs["default"])('delete', function (event) {
+    topoEdit.batchDeleteSelectedElement();
   });
 }
 

package/lib/core/hooks/useTopoEdit.js

@@ -336,6 +336,8 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
+  var batchDeleteSelectedElement = function batchDeleteSelectedElement() {};
+
   var onDeleteElement = function onDeleteElement(data) {
     var dtype = data.dtype;
     rlog.info("onDeleteElement", data);
@@ -1152,6 +1154,7 @@ var useTopoEdit = function useTopoEdit(params) {
     onCloseComboResDrawer: function onCloseComboResDrawer() {
       return setShowComboResDrawer(false);
     },
+    batchDeleteSelectedElement: batchDeleteSelectedElement,
 
     /**
      * 拓扑图元素（节点、连线、容器）删除回调

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "13.0.0-dev.2" === 'string' ? "13.0.0-dev.2" : null;
+var version = typeof "13.0.0-dev.4" === 'string' ? "13.0.0-dev.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -23,7 +23,14 @@ var _model = require("../model");
 
 var _exitLinkUtil = require("../../utils/exitLinkUtil");
 
+var processBothTopoDataUtil = _interopRequireWildcard(require("../../utils/relateTopoDataUtil"));
+
 var _excluded = ["groups", "resources"];
+
+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); }
+
+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; }
+
 var API_ROOT = _constants.TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -66,7 +73,7 @@ function prepareResourceParams(conditions, query) {
   return {
     dynamicCondition: dynamicCondition,
     fixedConditionIdList: (staticRes || []).filter(function (ciId) {
-      return !ciId.startsWith('ip:');
+      return !ciId.includes(':');
     }),
     linkIps: (staticRes || []).filter(function (ciId) {
       return ciId.startsWith('ip:');
@@ -406,16 +413,19 @@ var _default = (0, _extends2["default"])({
 
           case 2:
             result = _context12.sent;
-            return _context12.abrupt("return", (0, _exitLinkUtil.processExitLink)((0, _extends2["default"])({}, result, {
+            result = (0, _extends2["default"])({}, result, {
               nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
               links: ((_result$links = result.links) !== null && _result$links !== void 0 ? _result$links : []).map(function (item) {
                 return (0, _extends2["default"])({}, item, {
                   ciType: 'network_link'
                 });
               })
-            })));
+            });
+            result = (0, _exitLinkUtil.processExitLink)(result);
+            result = processBothTopoDataUtil.processBothTopoData(result);
+            return _context12.abrupt("return", result);
 
-          case 4:
+          case 7:
           case "end":
             return _context12.stop();
         }
@@ -456,16 +466,17 @@ var _default = (0, _extends2["default"])({
 
           case 5:
             result = _context13.sent;
-            return _context13.abrupt("return", (0, _exitLinkUtil.processByConditionResult)((0, _extends2["default"])({}, result, {
+            result = (0, _extends2["default"])({}, result, {
               nodes: (_result$nodes2 = result.nodes) !== null && _result$nodes2 !== void 0 ? _result$nodes2 : [],
               links: ((_result$links2 = result.links) !== null && _result$links2 !== void 0 ? _result$links2 : []).map(function (item) {
                 return (0, _extends2["default"])({}, item, {
                   ciType: 'network_link'
                 });
               })
-            }), obj.groups));
+            });
+            return _context13.abrupt("return", (0, _exitLinkUtil.processByConditionResult)(result, obj.groups));
 
-          case 7:
+          case 8:
           case "end":
             return _context13.stop();
         }

package/lib/networkTopo/utils/__tests__/relateTopoData.js

@@ -0,0 +1,43 @@
+"use strict";
+
+exports.__esModule = true;
+exports.topoLinks = void 0;
+var topoLinks = [// 子拓扑之间
+{
+  "id": "2-2",
+  "name": "子拓扑链路",
+  'sourceType': 'topo',
+  "source": "3",
+  'targetType': 'topo',
+  "target": "6",
+  "operation": "delete",
+  "ciType": "network_link",
+  "attributes": {
+    "network_link.source_device_ipv4": "172.17.166.18",
+    "network_link.destination_ipv4": "1.5.5.5",
+    "network_link.work_mode": "AandS",
+    "support_templates": "m.ethernet_link",
+    "rated_bandwidth": 100,
+    "network_link.actual_bandwidth": 100,
+    "source_type": "network.interface",
+    "network_link.connect_type": "phy",
+    "display_name": "172.17.166.18(Fa 0/10) - 1.5.5.5",
+    "asset_status": "2",
+    "network_link_type": "2",
+    "destination_type": "ip",
+    "network_link.role": "master",
+    "network_link.network_category": "CAN",
+    "dcs": "331268969",
+    "network_link.source_ipv4": "172.17.166.18",
+    "name": "172.17.166.18(Fa 0/10) - 1.5.5.5",
+    "distance_outlet": 2147483647,
+    "network_link.is_crucial": false,
+    "source_id": "00000000010de8b2",
+    "network_link.source_device_id": "00000000010de861"
+  },
+  "sourceCode": null,
+  "level": null,
+  "customType": null,
+  "manageStatus": 3
+}];
+exports.topoLinks = topoLinks;

package/lib/networkTopo/utils/relateTopoDataUtil.js

@@ -3,11 +3,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.buildTopoNode = buildTopoNode;
 exports.processBothTopoData = processBothTopoData;
 exports.processByConditionTopoData = processByConditionTopoData;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _relateTopoData = require("./__tests__/relateTopoData");
+
 // 关联拓扑数据
 
 /**
@@ -16,10 +19,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
  * 构造子拓扑链路
  * @param {*} ctx 
  */
-function processBothTopoData(ctx) {
-  var topoData = ctx.topoData;
-  var serialize = upgradeSerializeRelateTopoNode(topoData.serialize);
+function processBothTopoData(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = upgradeSerializeOldTopoNode(topoData.serialize);
   return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, buildTopoNodeDatasFromSerialize(serialize)),
+    links: buildTopoLinks(links),
     serialize: serialize
   });
 }
@@ -32,18 +38,85 @@ function processBothTopoData(ctx) {
 
 function processByConditionTopoData(ctx) {
   var topoData = ctx.topoData;
+  var nodes = topoData.nodes,
+      links = topoData.links;
   return (0, _extends2["default"])({}, topoData);
 }
+
+function buildTopoNode(topoId) {
+  return {
+    id: "topo:" + topoId,
+    //   name: ,
+    bindType: "topo",
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindIp: topoId,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    // 'attributes': [],
+    // 'metrics': [],
+    type: "node",
+    isbinding: true,
+    // 'dtype': 'device'
+    operation: "delete"
+  };
+}
+
+function buildTopoLinks(links) {
+  links.push.apply(links, _relateTopoData.topoLinks);
+  return links.map(function (link) {
+    return (0, _extends2["default"])({}, link, {
+      "source": link.sourceType ? link.sourceType + ':' + link.source : link.source,
+      "target": link.targetType ? link.targetType + ':' + link.target : link.target
+    });
+  });
+}
 /**
  * 升级历史数据：子拓扑节点序列化数据
  * @param {*} serialize 
  */
 
 
-function upgradeSerializeRelateTopoNode(serialize) {
+function upgradeSerializeOldTopoNode(serialize) {
+  if (serialize) {
+    var isOldTopoNode = function isOldTopoNode(ele) {
+      return isTopoNode(ele) && !ele.p.tag;
+    };
+
+    var oldTopoNodes = serialize.d.filter(isOldTopoNode);
+    oldTopoNodes.forEach(function (node) {
+      var _node$a;
+
+      var topoId = (_node$a = node.a) === null || _node$a === void 0 ? void 0 : _node$a.bindTopo;
+      node.a = (0, _extends2["default"])({}, node.a, buildTopoNode(topoId));
+      node.p.tag = "topo:" + topoId;
+    });
+  }
+
   return serialize;
 }
 
+function isTopoNode(ele) {
+  var _ele$a;
+
+  return !!((_ele$a = ele.a) !== null && _ele$a !== void 0 && _ele$a.bindTopo);
+}
+
+function buildTopoNodeDatasFromSerialize(serialize) {
+  if (!serialize) {
+    return [];
+  }
+
+  var topoNodes = serialize.d.filter(isTopoNode);
+  var topoNodeDatas = topoNodes.map(function (node) {
+    var _node$a2;
+
+    var topoId = (_node$a2 = node.a) === null || _node$a2 === void 0 ? void 0 : _node$a2.bindTopo;
+    return buildTopoNode(topoId);
+  });
+  return topoNodeDatas;
+}
+
 function getRelateTopoIdsFromSerialize(serialize) {
   return serialize;
 }

package/package.json

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