@riil-frontend/component-topology 11.0.0 → 11.0.1

package/es/core/hooks/useTopoEdit.js

@@ -230,9 +230,14 @@ var useTopoEdit = function useTopoEdit(params) {
 
     _Dialog.confirm({
       title: "删除",
-      content: "若执行相关操作，此区域包含的内容也会一同被删除，确定删除吗？",
+      // content: "若执行相关操作，此区域包含的内容也会一同被删除，确定删除吗？",
+      content: "是否仅删除区域或将区域包含的内容一同删除？",
+      //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "确定"
+        children: "仅删除区域"
+      },
+      cancelProps: {
+        children: "全部删除"
       },
       messageProps: {
         type: "warning"
@@ -243,7 +248,7 @@ var useTopoEdit = function useTopoEdit(params) {
             while (1) {
               switch (_context4.prev = _context4.next) {
                 case 0:
-                  doDelete();
+                  doDeleteOnlyGroup();
 
                 case 1:
                 case "end":
@@ -258,9 +263,48 @@ var useTopoEdit = function useTopoEdit(params) {
         }
 
         return onOk;
+      }(),
+      onCancel: function () {
+        var _onCancel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+            while (1) {
+              switch (_context5.prev = _context5.next) {
+                case 0:
+                  doDelete();
+
+                case 1:
+                case "end":
+                  return _context5.stop();
+              }
+            }
+          }, _callee5);
+        }));
+
+        function onCancel() {
+          return _onCancel.apply(this, arguments);
+        }
+
+        return onCancel;
       }()
     });
 
+    function doDeleteOnlyGroup() {
+      // 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); // 解决集群从区域内移出时，连线位置未更新的问题
+
+        setTimeout(function () {
+          child.iv();
+          topo.historyManager.endTransaction();
+        }, 50);
+      });
+      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
+    }
+
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
@@ -296,20 +340,20 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   var deleteExLink = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(node) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(node) {
       var _node$getEdges$toArra, _node$getEdges;
 
       var config, edges, exportLinkIdList;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               config = resourceConfig.getConfig(); // console.log("删除关联在节点上的出口链路- node, config", node, config);
 
               edges = (_node$getEdges$toArra = (_node$getEdges = node.getEdges()) === null || _node$getEdges === void 0 ? void 0 : _node$getEdges.toArray()) !== null && _node$getEdges$toArra !== void 0 ? _node$getEdges$toArra : []; // const exLink = [];
 
               if (!(edges.length > 0)) {
-                _context5.next = 8;
+                _context6.next = 8;
                 break;
               }
 
@@ -323,15 +367,15 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               });
               config.exportLinkIdList = exportLinkIdList;
-              _context5.next = 8;
+              _context6.next = 8;
               return resourceConfig.updateConfig(config);
 
             case 8:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5);
+      }, _callee6);
     }));
 
     return function deleteExLink(_x3) {
@@ -416,25 +460,25 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _bindGroupResources() {
-    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(group, resources) {
+    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(group, resources) {
       var id, tag, _yield$editDispatcher2, elements, nodeElements, newLinkElements, updateElements;
 
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
               id = group.id, tag = group.tag;
               rlog.debug("bindGroupResources--id, tag", id, tag);
               topo.historyManager.beginTransaction();
-              _context11.next = 5;
+              _context12.next = 5;
               return resourceConfig.updateGroupResources(group, resources);
 
             case 5:
-              _context11.next = 7;
+              _context12.next = 7;
               return editDispatchers.fetchDataByConfig();
 
             case 7:
-              _yield$editDispatcher2 = _context11.sent;
+              _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
               nodeElements = findGroupChildren(elements, group);
@@ -453,10 +497,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 14:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
         }
-      }, _callee11);
+      }, _callee12);
     }));
     return _bindGroupResources.apply(this, arguments);
   }
@@ -470,11 +514,11 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _addGroupResources() {
-    _addGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(group, newResourceIds) {
+    _addGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
       var groupConfig, resources, groupData;
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
               groupConfig = resourceConfig.getGroupConfigByElement(group);
               resources = {
@@ -484,15 +528,15 @@ var useTopoEdit = function useTopoEdit(params) {
                 id: group.getTag(),
                 tag: group.a("tag")
               };
-              _context12.next = 5;
+              _context13.next = 5;
               return bindGroupResources(groupData, resources, newResourceIds);
 
             case 5:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
         }
-      }, _callee12);
+      }, _callee13);
     }));
     return _addGroupResources.apply(this, arguments);
   }
@@ -509,25 +553,25 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _bindViewResources() {
-    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(data) {
+    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(data) {
       var config, _yield$editDispatcher3, elements;
 
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context13.prev = _context13.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
               // console.log("关联视图的资源", data);
               config = resourceConfig.getConfig();
               config.resources = data;
-              _context13.next = 4;
+              _context14.next = 4;
               return resourceConfig.updateConfig(config);
 
             case 4:
-              _context13.next = 6;
+              _context14.next = 6;
               return editDispatchers.fetchDataByConfig();
 
             case 6:
-              _yield$editDispatcher3 = _context13.sent;
+              _yield$editDispatcher3 = _context14.sent;
               elements = _yield$editDispatcher3.elements;
               saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
 
@@ -537,10 +581,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 10:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
         }
-      }, _callee13);
+      }, _callee14);
     }));
     return _bindViewResources.apply(this, arguments);
   }
@@ -550,24 +594,24 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _addLayerResources() {
-    _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(group, newResourceIds) {
+    _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(group, newResourceIds) {
       var _yield$editDispatcher4, elements, newElements;
 
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) {
-          switch (_context14.prev = _context14.next) {
+          switch (_context15.prev = _context15.next) {
             case 0:
               topo.historyManager.beginTransaction(); // 构造新的配置
 
-              _context14.next = 3;
+              _context15.next = 3;
               return resourceConfig.addLayerStaticResources(group, newResourceIds);
 
             case 3:
-              _context14.next = 5;
+              _context15.next = 5;
               return editDispatchers.fetchDataByConfig();
 
             case 5:
-              _yield$editDispatcher4 = _context14.sent;
+              _yield$editDispatcher4 = _context15.sent;
               elements = _yield$editDispatcher4.elements;
               // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
               newElements = findUNExistedElements(elements);
@@ -590,10 +634,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 14:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
         }
-      }, _callee14);
+      }, _callee15);
     }));
     return _addLayerResources.apply(this, arguments);
   }
@@ -603,22 +647,22 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _addResourceToFirstLayer() {
-    _addResourceToFirstLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(data) {
+    _addResourceToFirstLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(data) {
       var group;
-      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
         while (1) {
-          switch (_context15.prev = _context15.next) {
+          switch (_context16.prev = _context16.next) {
             case 0:
               group = resourceConfig.getGroups()[0];
-              _context15.next = 3;
+              _context16.next = 3;
               return addLayerResources(group, data);
 
             case 3:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
         }
-      }, _callee15);
+      }, _callee16);
     }));
     return _addResourceToFirstLayer.apply(this, arguments);
   }
@@ -650,28 +694,28 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   var onSaveComboRes = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(data) {
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               rlog.debug("关联资源-----onSaveComboRes", data);
               topo.historyManager.beginTransaction();
 
               if (!(getAddResourceType() === "addToFirstLayer")) {
-                _context6.next = 7;
+                _context7.next = 7;
                 break;
               }
 
-              _context6.next = 5;
+              _context7.next = 5;
               return addResourceToFirstLayer(data);
 
             case 5:
-              _context6.next = 9;
+              _context7.next = 9;
               break;
 
             case 7:
-              _context6.next = 9;
+              _context7.next = 9;
               return bindViewResources(data);
 
             case 9:
@@ -683,10 +727,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 12:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
 
     return function onSaveComboRes(_x12) {
@@ -695,12 +739,12 @@ var useTopoEdit = function useTopoEdit(params) {
   }();
 
   var onSaveTopo = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(data) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(data) {
       var id, config, serialize, _config$layout, template, layout, saveConfig;
 
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               id = data.id, config = data.config, serialize = data.serialize;
               _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
@@ -708,12 +752,12 @@ var useTopoEdit = function useTopoEdit(params) {
               if (onSave) {
                 // 自定义保存
                 saveConfig = /*#__PURE__*/function () {
-                  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-                    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+                  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+                    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
                       while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context8.prev = _context8.next) {
                           case 0:
-                            _context7.next = 2;
+                            _context8.next = 2;
                             return editDispatchers.saveTopo({
                               id: id,
                               layout: layout,
@@ -722,10 +766,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
                           case 2:
                           case "end":
-                            return _context7.stop();
+                            return _context8.stop();
                         }
                       }
-                    }, _callee7);
+                    }, _callee8);
                   }));
 
                   return function saveConfig() {
@@ -742,10 +786,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 3:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee8);
+      }, _callee9);
     }));
 
     return function onSaveTopo(_x13) {
@@ -775,12 +819,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   var bindNodeResource = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(params) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(params) {
       var id, oldResId, newResId, node, parentGroupElement, htTopo, config, groupId, groupTag, _yield$editDispatcher, elements, newData, doBind, _doBind, replaceOrAddRes;
 
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
               replaceOrAddRes = function _replaceOrAddRes(resources, oldResId, newResId) {
                 return _extends({}, resources, {
@@ -791,11 +835,11 @@ var useTopoEdit = function useTopoEdit(params) {
               };
 
               _doBind = function _doBind3() {
-                _doBind = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+                _doBind = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
                   var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
-                  return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+                  return _regeneratorRuntime.wrap(function _callee10$(_context10) {
                     while (1) {
-                      switch (_context9.prev = _context9.next) {
+                      switch (_context10.prev = _context10.next) {
                         case 0:
                           dm = htTopo.getGraphView().dm(); // 创建
 
@@ -864,7 +908,7 @@ var useTopoEdit = function useTopoEdit(params) {
                           // node.a("customName", null);
                           // 删除关联在节点上的出口链路
 
-                          _context9.next = 12;
+                          _context10.next = 12;
                           return deleteExLink(node);
 
                         case 12:
@@ -875,10 +919,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
                         case 13:
                         case "end":
-                          return _context9.stop();
+                          return _context10.stop();
                       }
                     }
-                  }, _callee9);
+                  }, _callee10);
                 }));
                 return _doBind.apply(this, arguments);
               };
@@ -918,22 +962,22 @@ var useTopoEdit = function useTopoEdit(params) {
                 config.resources = replaceOrAddRes(config.resources, oldResId, newResId);
               }
 
-              _context10.next = 13;
+              _context11.next = 13;
               return resourceConfig.updateConfig(config);
 
             case 13:
-              _context10.next = 15;
+              _context11.next = 15;
               return editDispatchers.fetchDataByConfig();
 
             case 15:
-              _yield$editDispatcher = _context10.sent;
+              _yield$editDispatcher = _context11.sent;
               elements = _yield$editDispatcher.elements;
               newData = elements.find(function (item) {
                 return item.id === newResId;
               });
 
               if (newData) {
-                _context10.next = 23;
+                _context11.next = 23;
                 break;
               }
 
@@ -941,10 +985,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
               rlog.warn("关联资源失败");
               topo.historyManager.endTransaction();
-              return _context10.abrupt("return", false);
+              return _context11.abrupt("return", false);
 
             case 23:
-              _context10.next = 25;
+              _context11.next = 25;
               return doBind();
 
             case 25:
@@ -952,10 +996,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 26:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }
-      }, _callee10);
+      }, _callee11);
     }));
 
     return function bindNodeResource(_x14) {
@@ -972,19 +1016,19 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _relateNodeIp() {
-    _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(txtValue, nodeElement) {
+    _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(txtValue, nodeElement) {
       var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
-      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+      return _regeneratorRuntime.wrap(function _callee17$(_context17) {
         while (1) {
-          switch (_context16.prev = _context16.next) {
+          switch (_context17.prev = _context17.next) {
             case 0:
               if (txtValue) {
-                _context16.next = 2;
+                _context17.next = 2;
                 break;
               }
 
-              return _context16.abrupt("return");
+              return _context17.abrupt("return");
 
             case 2:
               // if (txtValue === nodeElement.a('bindIp')) {
@@ -996,12 +1040,12 @@ var useTopoEdit = function useTopoEdit(params) {
               isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 23;
+                _context17.next = 23;
                 break;
               }
 
               ip = buildIpNode(txtValue);
-              _context16.next = 8;
+              _context17.next = 8;
               return deleteExLink(nodeElement);
 
             case 8:
@@ -1010,15 +1054,15 @@ var useTopoEdit = function useTopoEdit(params) {
               nodeElement.setTag("ip:" + txtValue); // 获取配置
 
               configObj = topo.resourceConfig.getConfig();
-              _context16.next = 14;
+              _context17.next = 14;
               return resourceConfig.updateConfig(configObj);
 
             case 14:
-              _context16.next = 16;
+              _context17.next = 16;
               return editDispatchers.fetchDataByConfig();
 
             case 16:
-              configData = _context16.sent;
+              configData = _context17.sent;
               // console.log("configData",configObj, configData);
               _elements = configData.elements;
               newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
@@ -1046,10 +1090,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 23:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
         }
-      }, _callee16);
+      }, _callee17);
     }));
     return _relateNodeIp.apply(this, arguments);
   }

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