@riil-frontend/component-topology 2.10.0 → 2.10.1

package/es/hooks/useTopoEdit.js

@@ -312,13 +312,18 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var deleteGroup = function deleteGroup(data) {
     var id = data.id,
-        tag = data.tag; // 因为新加的容器 tag 格式为 group_${id}
+        tag = data.tag; // 新加的容器 tag 格式为 group_${id}
 
-    var groupTag = typeof tag === 'string' ? tag.replace('group_', '') : tag;
-    var group = topoApp.getDataModel().getDataById(groupTag) || topoApp.getDataModel().getDataByTag(id);
+    var group = topoApp.getDataModel().getDataById(tag) || topoApp.getDataModel().getDataByTag(id) || topoApp.getDataModel().getDatas().toArray().filter(function (item) {
+      return item.a('tag') === tag;
+    })[0];
 
     if (!group) {
       return;
+    }
+
+    if (!group.getChildren().length) {
+      doDelete();
     } // 有子节点时需要确认
 
 
@@ -334,23 +339,13 @@ var useTopoEdit = function useTopoEdit(params) {
         },
         onOk: function () {
           var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var index;
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    index = groups.findIndex(function (group) {
-                      return id ? group.id === id : group.tag === tag;
-                    }); // Existing group
-
-                    if (index > -1) {
-                      editDispatchers.deleteGroup(index);
-                    } // FIXME 。如果命中其他的动态条件，则立即显示
-
-
-                    topoApp.view.topoClient.deleteGroup(data);
+                    doDelete();
 
-                  case 3:
+                  case 1:
                   case "end":
                     return _context2.stop();
                 }
@@ -366,6 +361,19 @@ var useTopoEdit = function useTopoEdit(params) {
         }()
       });
     }
+
+    function doDelete() {
+      var index = groups.findIndex(function (group) {
+        return id ? group.id === id : group.tag === tag;
+      }); // Existing group
+
+      if (index > -1) {
+        editDispatchers.deleteGroup(index);
+      } // FIXME 。如果命中其他的动态条件，则立即显示
+
+
+      topoApp.view.topoClient.deleteGroup(data);
+    }
   };
   /**
    * 删除容器内的单个资源

package/lib/hooks/useTopoEdit.js

@@ -336,13 +336,18 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var deleteGroup = function deleteGroup(data) {
     var id = data.id,
-        tag = data.tag; // 因为新加的容器 tag 格式为 group_${id}
+        tag = data.tag; // 新加的容器 tag 格式为 group_${id}
 
-    var groupTag = typeof tag === 'string' ? tag.replace('group_', '') : tag;
-    var group = topoApp.getDataModel().getDataById(groupTag) || topoApp.getDataModel().getDataByTag(id);
+    var group = topoApp.getDataModel().getDataById(tag) || topoApp.getDataModel().getDataByTag(id) || topoApp.getDataModel().getDatas().toArray().filter(function (item) {
+      return item.a('tag') === tag;
+    })[0];
 
     if (!group) {
       return;
+    }
+
+    if (!group.getChildren().length) {
+      doDelete();
     } // 有子节点时需要确认
 
 
@@ -358,23 +363,13 @@ var useTopoEdit = function useTopoEdit(params) {
         },
         onOk: function () {
           var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var index;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    index = groups.findIndex(function (group) {
-                      return id ? group.id === id : group.tag === tag;
-                    }); // Existing group
-
-                    if (index > -1) {
-                      editDispatchers.deleteGroup(index);
-                    } // FIXME 。如果命中其他的动态条件，则立即显示
-
-
-                    topoApp.view.topoClient.deleteGroup(data);
+                    doDelete();
 
-                  case 3:
+                  case 1:
                   case "end":
                     return _context2.stop();
                 }
@@ -390,6 +385,19 @@ var useTopoEdit = function useTopoEdit(params) {
         }()
       });
     }
+
+    function doDelete() {
+      var index = groups.findIndex(function (group) {
+        return id ? group.id === id : group.tag === tag;
+      }); // Existing group
+
+      if (index > -1) {
+        editDispatchers.deleteGroup(index);
+      } // FIXME 。如果命中其他的动态条件，则立即显示
+
+
+      topoApp.view.topoClient.deleteGroup(data);
+    }
   };
   /**
    * 删除容器内的单个资源

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -105,6 +105,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.10.0/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.10.1/build/index.html",
   "gitHead": "62eadeca07c85ed047f2e933676f62015eff98cc"
 }