@riil-frontend/component-topology 13.0.0-dev.3 → 13.0.0-dev.5

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

@@ -129,7 +129,7 @@ var Topology = function Topology(props) {
     topo.selectionModel.init();
     var htHistoryManager = topo.getDataModel().getHistoryManager();
 
-    if (isEditMode && htHistoryManager) {
+    if (topo.store.getState().topoMod.viewState === 'edit' && htHistoryManager) {
       topo.historyManager = new HistoryManager(topo, htHistoryManager);
       topo.historyManager.clear();
       rlog.info('TopoView.handleGraphDataLoaded: 初始化HistoryManager ', topo.historyManager.toString());

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

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

@@ -50,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:');

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,18 +1,20 @@
 import _extends from "@babel/runtime/helpers/extends";
 // 关联拓扑数据
-
+import { topoLinks } from "./__tests__/relateTopoData";
 /**
  * 升级历史数据：子拓扑节点序列化数据
  * 构造子拓扑节点
  * 构造子拓扑链路
  * @param {*} ctx 
  */
+
 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
   });
 }
@@ -46,11 +48,22 @@ export function buildTopoNode(topoId) {
     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 upgradeSerializeOldTopoNode(serialize) {
   if (serialize) {
     var isOldTopoNode = function isOldTopoNode(ele) {

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

@@ -167,7 +167,7 @@ var Topology = function Topology(props) {
     topo.selectionModel.init();
     var htHistoryManager = topo.getDataModel().getHistoryManager();
 
-    if (isEditMode && htHistoryManager) {
+    if (topo.store.getState().topoMod.viewState === 'edit' && htHistoryManager) {
       topo.historyManager = new _HistoryManager["default"](topo, htHistoryManager);
       topo.historyManager.clear();
       rlog.info('TopoView.handleGraphDataLoaded: 初始化HistoryManager ', topo.historyManager.toString());

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

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

@@ -73,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:');

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

@@ -9,6 +9,8 @@ exports.processByConditionTopoData = processByConditionTopoData;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _relateTopoData = require("./__tests__/relateTopoData");
+
 // 关联拓扑数据
 
 /**
@@ -23,6 +25,7 @@ function processBothTopoData(topoData) {
   var serialize = upgradeSerializeOldTopoNode(topoData.serialize);
   return (0, _extends2["default"])({}, topoData, {
     nodes: [].concat(nodes, buildTopoNodeDatasFromSerialize(serialize)),
+    links: buildTopoLinks(links),
     serialize: serialize
   });
 }
@@ -58,6 +61,16 @@ function buildTopoNode(topoId) {
     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 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "13.0.0-dev.3",
+  "version": "13.0.0-dev.5",
   "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.3/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.5/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }