@riil-frontend/component-topology 11.0.3 → 11.0.4

package/es/core/hooks/useTopoEdit.js

@@ -234,7 +234,8 @@ var useTopoEdit = function useTopoEdit(params) {
       content: "是否仅删除区域或将区域包含的内容一同删除？",
       //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "仅删除区域"
+        children: "仅删除区域",
+        type: "normal"
       },
       cancelProps: {
         children: "全部删除"
@@ -289,27 +290,30 @@ var useTopoEdit = function useTopoEdit(params) {
     });
 
     function doDeleteOnlyGroup() {
-      // console.log("仅删除区域", topo.view.topoClient, data);
+      topo.historyManager.beginTransaction(); // console.log("仅删除区域", topo.view.topoClient, data);
+
       var children = getGroupChildren(group);
       children.map(function (child) {
-        child.setParent(null);
-        var viewRect = topo.getGraphView().getViewRect();
-        var nodeRect = child.getRect();
-        child.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
+        child.setParent(null); // var viewRect = topo.getGraphView().getViewRect();
+        // var nodeRect = child.getRect();
+        // child.setPosition(
+        //   viewRect.x + nodeRect.width + 2,
+        //   viewRect.y + nodeRect.height + 4
+        // ); // 解决集群从区域内移出时，连线位置未更新的问题
 
         setTimeout(function () {
           child.iv();
           topo.historyManager.endTransaction();
         }, 50);
       });
-      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
+      topo.view.topoClient.deleteGroup(data);
+      topo.historyManager.endTransaction(); // console.log("仅删除区域", children, group);
     }
 
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
       topo.view.topoClient.deleteGroup(data);
-      topo.historyManager.endTransaction();
     }
   };
 

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

package/lib/core/hooks/useTopoEdit.js

@@ -263,7 +263,8 @@ var useTopoEdit = function useTopoEdit(params) {
       content: "是否仅删除区域或将区域包含的内容一同删除？",
       //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "仅删除区域"
+        children: "仅删除区域",
+        type: "normal"
       },
       cancelProps: {
         children: "全部删除"
@@ -318,27 +319,30 @@ var useTopoEdit = function useTopoEdit(params) {
     });
 
     function doDeleteOnlyGroup() {
-      // console.log("仅删除区域", topo.view.topoClient, data);
+      topo.historyManager.beginTransaction(); // console.log("仅删除区域", topo.view.topoClient, data);
+
       var children = (0, _htElementUtils.getGroupChildren)(group);
       children.map(function (child) {
-        child.setParent(null);
-        var viewRect = topo.getGraphView().getViewRect();
-        var nodeRect = child.getRect();
-        child.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
+        child.setParent(null); // var viewRect = topo.getGraphView().getViewRect();
+        // var nodeRect = child.getRect();
+        // child.setPosition(
+        //   viewRect.x + nodeRect.width + 2,
+        //   viewRect.y + nodeRect.height + 4
+        // ); // 解决集群从区域内移出时，连线位置未更新的问题
 
         setTimeout(function () {
           child.iv();
           topo.historyManager.endTransaction();
         }, 50);
       });
-      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
+      topo.view.topoClient.deleteGroup(data);
+      topo.historyManager.endTransaction(); // console.log("仅删除区域", children, group);
     }
 
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
       topo.view.topoClient.deleteGroup(data);
-      topo.historyManager.endTransaction();
     }
   };
 

package/lib/core/models/TopoApp.js

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

package/package.json

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