@riil-frontend/component-topology 4.0.4 → 4.0.5

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

@@ -19,7 +19,7 @@ import useAlarm from "../../../hooks/useAlarm";
 import styles from "./TopoView.module.scss";
 import useRouterAdapter from "../../hooks/useRouterAdapter";
 import { fixLink } from "../../utils/graphLinkUtil";
-import { handleClusterNoPermission } from "../../../utils/clusterUtil";
+import { handleClusterNoPermission, upgradeV103GraphClusterNode } from "../../../utils/clusterUtil";
 
 var Topology = function Topology(props) {
   var _classnames, _graphViewProps$creat;
@@ -129,6 +129,7 @@ var Topology = function Topology(props) {
   var handleGraphDataLoaded = useCallback(function () {
     rlog.info("TopoView.handleGraphDataLoaded", topoData, topo.getDataModel().getDatas().toArray());
     fixLink(topo);
+    upgradeV103GraphClusterNode(topo, topoData);
     handleClusterNoPermission(topo);
     updateEdgeExpanded(topo);
     topoDispatchers.update({
@@ -142,6 +143,7 @@ var Topology = function Topology(props) {
   var handleGraphLoaded = useCallback(function () {
     rlog.info("TopoView.handleGraphLoaded", topoData, topo.getDataModel().getDatas().toArray());
     fixLink(topo);
+    upgradeV103GraphClusterNode(topo, topoData);
     handleClusterNoPermission(topo);
     updateEdgeExpanded(topo);
     topoDispatchers.update({

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "4.0.4" === 'string' ? "4.0.4" : null;
+var version = typeof "4.0.5" === 'string' ? "4.0.5" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/utils/clusterUtil.js

@@ -3,7 +3,10 @@ import _extends from "@babel/runtime/helpers/extends";
 /**
  * 集群处理工具类
  */
+import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { getGroups } from "./htElementUtils";
+import { findGroupChildren } from "./topoData";
 export function isCluster(node) {
   return !!node.cluster;
 }
@@ -86,4 +89,72 @@ export function handleClusterNoPermission(topo) {
       group.setExpanded(false);
     }
   });
+}
+/**
+ * fix NEWITOM-22562 【1.0.3升级包集成】【网络拓扑】升级前创建的拓扑图，包含VSU集群，升级后不显示VSU集群了
+ * @param {*} topo 
+ */
+
+export function upgradeV103GraphClusterNode(topo, topoData) {
+  var dm1 = topo.getDataModel();
+  dm1.removeDataByTag('00000000364831f0'); // FIXME
+
+  try {
+    doUpgrade();
+  } catch (error) {
+    rlog.error('upgradeV103GraphClusterNode', error);
+  }
+
+  function doUpgrade() {
+    // 查找图上未显示的集群、集群成员、关联的链路
+    var topoDataTrans = transformTopoElements(topoData);
+    var dm = topo.getDataModel();
+    var list = topoDataTrans.filter(function (data) {
+      return !dm.getDataByTag(data.id);
+    });
+
+    if (!list.length) {
+      return;
+    }
+
+    var groups = list.filter(function (item) {
+      return item.type === 'group';
+    });
+    var createElementsData = {
+      groups: groups,
+      nodes: list.filter(function (item) {
+        return item.type === 'node';
+      }),
+      links: list.filter(function (item) {
+        return item.type === 'link';
+      }),
+      linkGroups: list.filter(function (item) {
+        return item.type === 'linkGroup';
+      })
+    };
+    var htTopo = topo.getHtTopo();
+    htTopo.createElements(createElementsData);
+    groups.forEach(function (group) {
+      var groupElement = dm.getDataByTag(group.id); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
+
+      findGroupChildren(topoDataTrans, group).forEach(function (child) {
+        var childEle = dm.getDataByTag(child.id);
+
+        if (childEle) {
+          childEle.setParent(groupElement);
+        }
+      }); // 如果序列化有，恢复区域位置
+
+      var deserializeDm = new ht.DataModel();
+      var jsonDeserialize = new ht.JSONSerializer(deserializeDm);
+      jsonDeserialize.deserialize(topoData.serialize, null, true);
+      var oldNode = deserializeDm.getDataByTag(group.id);
+
+      if (oldNode) {
+        groupElement.setSize(oldNode.getSize());
+        groupElement.setPosition(oldNode.getPosition());
+        groupElement.setImage(oldNode.getImage());
+      }
+    }); // 恢复手工画的线
+  }
 }

package/es/utils/topoData.js

@@ -10,7 +10,7 @@ import buildEditorContextMenu from "../core/editor/contextmenu/buildContextmenu"
 import mergeContextmenu from "../core/common/contextmenu/mergeContextmenu";
 import { getEditorIcons } from "../core/common/icons/icon";
 import { getBackgroundImageUrl } from "../core/utils/backgroundUtil";
-import { processCluster } from "./clusterUtil";
+import { isClusterHtElement, processCluster } from "./clusterUtil";
 import { isGroup } from "./htElementUtils";
 /**
  * 查找数组中对应key的值为value的元素并返回,只查找第一个符合的元素
@@ -336,23 +336,32 @@ function buildGlobal(_ref2) {
     canDragElementToGroup: function canDragElementToGroup(element, group) {
       if (!isGroup(group)) {
         return true;
-      }
+      } // 区域不能拖拽到区域
+
 
       if (element.dtype === 'container' && isGroup(group)) {
         return false;
-      }
+      } // 元素不能拖拽到集群
+
 
-      if (isGroup(group) && group.a('cluster')) {
+      if (isClusterHtElement(group)) {
         return false;
       }
 
-      console.error(element, group);
+      rlog.debug(element, group);
       return true;
     },
     // 图上元素能否拖动到区域中
-    canDragGraphElementsToGroup: function canDragGraphElementsToGroup(elemetns, group) {
-      if (!isGroup(group)) {
-        return true;
+    canDragGraphElementsToGroup: function canDragGraphElementsToGroup(elements, targetGroup) {
+      rlog.debug('canDragGraphElementsToGroup', {
+        elements: elements,
+        targetGroup: targetGroup
+      }); // 非集群的区域不能拖拽到区域
+
+      if (elements.filter(function (ele) {
+        return isGroup(ele) && !isClusterHtElement(ele);
+      }).length && isGroup(targetGroup)) {
+        return false;
       }
 
       return true;

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

@@ -164,6 +164,7 @@ var Topology = function Topology(props) {
     _rlog["default"].info("TopoView.handleGraphDataLoaded", topoData, topo.getDataModel().getDatas().toArray());
 
     (0, _graphLinkUtil.fixLink)(topo);
+    (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
     topoDispatchers.update({
@@ -178,6 +179,7 @@ var Topology = function Topology(props) {
     _rlog["default"].info("TopoView.handleGraphLoaded", topoData, topo.getDataModel().getDatas().toArray());
 
     (0, _graphLinkUtil.fixLink)(topo);
+    (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
     topoDispatchers.update({

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.4" === 'string' ? "4.0.4" : null;
+var version = typeof "4.0.5" === 'string' ? "4.0.5" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/utils/clusterUtil.js

@@ -12,11 +12,18 @@ exports.isClusterMemberHtElement = isClusterMemberHtElement;
 exports.processCluster = processCluster;
 exports.processClusterChildNode = processClusterChildNode;
 exports.processClusterChildrenNodes = processClusterChildrenNodes;
+exports.upgradeV103GraphClusterNode = upgradeV103GraphClusterNode;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _utils = require("@riil-frontend/component-topology-graph/es/utils");
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _htElementUtils = require("./htElementUtils");
 
+var _topoData = require("./topoData");
+
 /**
  * 集群处理工具类
  */
@@ -110,4 +117,73 @@ function handleClusterNoPermission(topo) {
       group.setExpanded(false);
     }
   });
+}
+/**
+ * fix NEWITOM-22562 【1.0.3升级包集成】【网络拓扑】升级前创建的拓扑图，包含VSU集群，升级后不显示VSU集群了
+ * @param {*} topo 
+ */
+
+
+function upgradeV103GraphClusterNode(topo, topoData) {
+  var dm1 = topo.getDataModel();
+  dm1.removeDataByTag('00000000364831f0'); // FIXME
+
+  try {
+    doUpgrade();
+  } catch (error) {
+    _rlog["default"].error('upgradeV103GraphClusterNode', error);
+  }
+
+  function doUpgrade() {
+    // 查找图上未显示的集群、集群成员、关联的链路
+    var topoDataTrans = (0, _utils.transformTopoElements)(topoData);
+    var dm = topo.getDataModel();
+    var list = topoDataTrans.filter(function (data) {
+      return !dm.getDataByTag(data.id);
+    });
+
+    if (!list.length) {
+      return;
+    }
+
+    var groups = list.filter(function (item) {
+      return item.type === 'group';
+    });
+    var createElementsData = {
+      groups: groups,
+      nodes: list.filter(function (item) {
+        return item.type === 'node';
+      }),
+      links: list.filter(function (item) {
+        return item.type === 'link';
+      }),
+      linkGroups: list.filter(function (item) {
+        return item.type === 'linkGroup';
+      })
+    };
+    var htTopo = topo.getHtTopo();
+    htTopo.createElements(createElementsData);
+    groups.forEach(function (group) {
+      var groupElement = dm.getDataByTag(group.id); // 切换前图上如果存在集群内的节点，切换节点为集群后，移到集群内
+
+      (0, _topoData.findGroupChildren)(topoDataTrans, group).forEach(function (child) {
+        var childEle = dm.getDataByTag(child.id);
+
+        if (childEle) {
+          childEle.setParent(groupElement);
+        }
+      }); // 如果序列化有，恢复区域位置
+
+      var deserializeDm = new ht.DataModel();
+      var jsonDeserialize = new ht.JSONSerializer(deserializeDm);
+      jsonDeserialize.deserialize(topoData.serialize, null, true);
+      var oldNode = deserializeDm.getDataByTag(group.id);
+
+      if (oldNode) {
+        groupElement.setSize(oldNode.getSize());
+        groupElement.setPosition(oldNode.getPosition());
+        groupElement.setImage(oldNode.getImage());
+      }
+    }); // 恢复手工画的线
+  }
 }

package/lib/utils/topoData.js

@@ -383,23 +383,34 @@ function buildGlobal(_ref2) {
     canDragElementToGroup: function canDragElementToGroup(element, group) {
       if (!(0, _htElementUtils.isGroup)(group)) {
         return true;
-      }
+      } // 区域不能拖拽到区域
+
 
       if (element.dtype === 'container' && (0, _htElementUtils.isGroup)(group)) {
         return false;
-      }
+      } // 元素不能拖拽到集群
 
-      if ((0, _htElementUtils.isGroup)(group) && group.a('cluster')) {
+
+      if ((0, _clusterUtil.isClusterHtElement)(group)) {
         return false;
       }
 
-      console.error(element, group);
+      _rlog["default"].debug(element, group);
+
       return true;
     },
     // 图上元素能否拖动到区域中
-    canDragGraphElementsToGroup: function canDragGraphElementsToGroup(elemetns, group) {
-      if (!(0, _htElementUtils.isGroup)(group)) {
-        return true;
+    canDragGraphElementsToGroup: function canDragGraphElementsToGroup(elements, targetGroup) {
+      _rlog["default"].debug('canDragGraphElementsToGroup', {
+        elements: elements,
+        targetGroup: targetGroup
+      }); // 非集群的区域不能拖拽到区域
+
+
+      if (elements.filter(function (ele) {
+        return (0, _htElementUtils.isGroup)(ele) && !(0, _clusterUtil.isClusterHtElement)(ele);
+      }).length && (0, _htElementUtils.isGroup)(targetGroup)) {
+        return false;
       }
 
       return true;

package/package.json

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