@riil-frontend/component-topology 2.12.4 → 2.12.6-alpha.0

package/lib/hooks/useTopoEdit.js

@@ -85,10 +85,6 @@ var useTopoEdit = function useTopoEdit(params) {
       showSingleResDrawer = _useState4[0],
       setShowSingleResDrawer = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(null),
-      singleResKey = _useState5[0],
-      setSingleResKey = _useState5[1];
-
   var _useDynamicList = (0, _ahooks.useDynamicList)([]),
       deletedNodes = _useDynamicList.list,
       addDeletedNode = _useDynamicList.push,
@@ -141,7 +137,7 @@ var useTopoEdit = function useTopoEdit(params) {
     switch (type) {
       case _componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE:
         {
-          bindNodeResource(data);
+          openBindNodeResourceDrawer(data);
         }
         break;
 
@@ -209,23 +205,6 @@ var useTopoEdit = function useTopoEdit(params) {
     setComboResData(res);
     setShowComboResDrawer(true);
   };
-  /**
-   * 打开节点关联/重新关联资源
-   */
-
-
-  var bindNodeResource = function bindNodeResource(node) {
-    var _ref4 = node || {},
-        id = _ref4.id;
-
-    if (!(0, _utils.isNull)(id)) {
-      setSingleResKey(id);
-    } else {
-      setSingleResKey(null);
-    }
-
-    setShowSingleResDrawer(true);
-  };
 
   var onDeleteElement = function onDeleteElement(data) {
     var _topoApp$options$edit;
@@ -495,11 +474,11 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _bindGroupResourcesConfig() {
-    _bindGroupResourcesConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(group, data) {
+    _bindGroupResourcesConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(group, data) {
       var id, tag, name, index, newGroup;
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               id = group.id, tag = group.tag, name = group.name;
               index = findGroupIndex(groups, {
@@ -508,18 +487,18 @@ var useTopoEdit = function useTopoEdit(params) {
               });
 
               if (!(index > -1)) {
-                _context6.next = 7;
+                _context7.next = 7;
                 break;
               }
 
-              _context6.next = 5;
+              _context7.next = 5;
               return editDispatchers.updateGroupResourcesByIndex({
                 index: index,
                 resources: data
               });
 
             case 5:
-              _context6.next = 8;
+              _context7.next = 8;
               break;
 
             case 7:
@@ -535,10 +514,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 8:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return _bindGroupResourcesConfig.apply(this, arguments);
   }
@@ -552,24 +531,24 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
   function _bindGroupResources() {
-    _bindGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(group, data) {
-      var id, tag, _yield$editDispatcher, elements, groupElement;
+    _bindGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(group, data) {
+      var id, tag, _yield$editDispatcher2, elements, groupElement;
 
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               id = group.id, tag = group.tag;
-              _context7.next = 3;
+              _context8.next = 3;
               return bindGroupResourcesConfig(group, data);
 
             case 3:
-              _context7.next = 5;
+              _context8.next = 5;
               return editDispatchers.refreshDataByConfig();
 
             case 5:
-              _yield$editDispatcher = _context7.sent;
-              elements = _yield$editDispatcher.topoDataTrans;
+              _yield$editDispatcher2 = _context8.sent;
+              elements = _yield$editDispatcher2.topoDataTrans;
 
               _rlog["default"].debug('bindGroupResources--id, tag', id, tag);
 
@@ -587,10 +566,10 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 11:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return _bindGroupResources.apply(this, arguments);
   }
@@ -600,31 +579,31 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _bindViewResources() {
-    _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(data) {
-      var _yield$editDispatcher2, elements;
+    _bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(data) {
+      var _yield$editDispatcher3, elements;
 
-      return _regenerator["default"].wrap(function _callee8$(_context8) {
+      return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.next = 2;
+              _context9.next = 2;
               return editDispatchers.updateViewResources(data);
 
             case 2:
-              _context8.next = 4;
+              _context9.next = 4;
               return editDispatchers.refreshDataByConfig();
 
             case 4:
-              _yield$editDispatcher2 = _context8.sent;
-              elements = _yield$editDispatcher2.topoDataTrans;
+              _yield$editDispatcher3 = _context9.sent;
+              elements = _yield$editDispatcher3.topoDataTrans;
               saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements);
 
             case 7:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee8);
+      }, _callee9);
     }));
     return _bindViewResources.apply(this, arguments);
   }
@@ -634,12 +613,12 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _addResourceToFirstLayer() {
-    _addResourceToFirstLayer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(data) {
-      var group, config, _yield$editDispatcher3, topoData;
+    _addResourceToFirstLayer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(data) {
+      var group, config, _yield$editDispatcher4, topoData;
 
-      return _regenerator["default"].wrap(function _callee9$(_context9) {
+      return _regenerator["default"].wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
               group = groups[0];
               config = {
@@ -653,30 +632,30 @@ var useTopoEdit = function useTopoEdit(params) {
                   data: [].concat(group.resources["static"].data, data)
                 }
               };
-              _context9.next = 4;
+              _context10.next = 4;
               return bindGroupResourcesConfig(group, config);
 
             case 4:
-              _context9.next = 6;
+              _context10.next = 6;
               return editDispatchers.refreshDataByConfig();
 
             case 6:
-              _yield$editDispatcher3 = _context9.sent;
-              topoData = _yield$editDispatcher3.topoData;
+              _yield$editDispatcher4 = _context10.sent;
+              topoData = _yield$editDispatcher4.topoData;
               topoApp.updateElements(topoData);
 
             case 9:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
         }
-      }, _callee9);
+      }, _callee10);
     }));
     return _addResourceToFirstLayer.apply(this, arguments);
   }
 
   var onSaveComboRes = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
+    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(data) {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -721,72 +700,36 @@ var useTopoEdit = function useTopoEdit(params) {
     }));
 
     return function onSaveComboRes(_x7) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
-  var onSaveSingleRes = function onSaveSingleRes(selectedResKey) {
-    _rlog["default"].debug('onSaveSingleRes', selectedResKey);
-
-    var selected = staticRes.selected,
-        data = staticRes.data;
-    var exist = data.indexOf(selectedResKey) !== -1;
-
-    if (selected && exist) {
-      // 资源已被选
-      _message["default"].warning('所选资源在图上已存在，请重新选择一个。');
-
-      return false;
-    } else {
-      var list = data;
-
-      if (singleResKey) {
-        list = list.filter(function (item) {
-          return item !== singleResKey;
-        });
-      }
-
-      if (!exist) {
-        list = [].concat(list, [selectedResKey]);
-      }
-
-      setSingleResKey(selectedResKey);
-      editDispatchers.updateResources({
-        "static": {
-          selected: true,
-          data: list
-        }
-      });
-      return true;
-    }
-  };
-
   function checkSavePermission(_x8) {
     return _checkSavePermission.apply(this, arguments);
   }
 
   function _checkSavePermission() {
-    _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(id) {
+    _checkSavePermission = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(id) {
       var permission;
-      return _regenerator["default"].wrap(function _callee10$(_context10) {
+      return _regenerator["default"].wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
-              _context10.next = 2;
+              _context11.next = 2;
               return topoDispatchers.getTopoPermission({
                 id: id,
                 update: false
               });
 
             case 2:
-              permission = _context10.sent;
+              permission = _context11.sent;
 
               if (!_topoPermissionUtil["default"].isEditable(permission)) {
-                _context10.next = 5;
+                _context11.next = 5;
                 break;
               }
 
-              return _context10.abrupt("return", true);
+              return _context11.abrupt("return", true);
 
             case 5:
               _dialog["default"].alert({
@@ -798,20 +741,20 @@ var useTopoEdit = function useTopoEdit(params) {
                 onOk: function onOk() {}
               });
 
-              return _context10.abrupt("return", false);
+              return _context11.abrupt("return", false);
 
             case 7:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }
-      }, _callee10);
+      }, _callee11);
     }));
     return _checkSavePermission.apply(this, arguments);
   }
 
   var onSaveTopo = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data) {
+    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(data) {
       var id, config, global, serialize, saveConfig, valid, _config$layout2, template, layout;
 
       return _regenerator["default"].wrap(function _callee5$(_context5) {
@@ -826,7 +769,7 @@ var useTopoEdit = function useTopoEdit(params) {
               }
 
               saveConfig = /*#__PURE__*/function () {
-                var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+                var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
                   var _config$layout, template, layout;
 
                   return _regenerator["default"].wrap(function _callee4$(_context4) {
@@ -852,7 +795,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 }));
 
                 return function saveConfig() {
-                  return _ref7.apply(this, arguments);
+                  return _ref6.apply(this, arguments);
                 };
               }();
 
@@ -923,7 +866,7 @@ var useTopoEdit = function useTopoEdit(params) {
     }));
 
     return function onSaveTopo(_x9) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -996,17 +939,17 @@ var useTopoEdit = function useTopoEdit(params) {
   }
 
   function _refreshDataByConfig() {
-    _refreshDataByConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(config) {
+    _refreshDataByConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(config) {
       var resources, groups, dRes, sRes, query;
-      return _regenerator["default"].wrap(function _callee11$(_context11) {
+      return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
               resources = config.resources, groups = config.groups;
               dRes = resources.dynamic, sRes = resources["static"];
 
               if (!(dRes.selected && dRes.condition || sRes.selected && (0, _utils.isAvailableArray)(sRes.data) || (0, _utils.isAvailableArray)(groups))) {
-                _context11.next = 7;
+                _context12.next = 7;
                 break;
               }
 
@@ -1019,15 +962,15 @@ var useTopoEdit = function useTopoEdit(params) {
               _rlog["default"].debug('useEffect', editState, isEditing, topoId, resources, groups); // editDispatchers.update({ resources, groups });
 
 
-              _context11.next = 7;
+              _context12.next = 7;
               return editDispatchers.getTopoByConditions(query);
 
             case 7:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
         }
-      }, _callee11);
+      }, _callee12);
     }));
     return _refreshDataByConfig.apply(this, arguments);
   }
@@ -1043,21 +986,115 @@ var useTopoEdit = function useTopoEdit(params) {
     emitEvent(_componentTopologyGraph.TopoEvent.EVENT_DATA_RESULT, eventData); // 刷新链路动态样式
 
     linkDynamicStyleDispatcher.execute();
-  }; // 拓扑结构变化时，根据前序状态发送相应事件，更新拓扑图的展示
+  };
+  /**
+   * 打开节点关联/重新关联资源
+   */
 
 
-  (0, _ahooks.useUpdateEffect)(function () {
-    if (showSingleResDrawer) {
-      if ((0, _utils.isAvailableArray)(topo)) {
-        // 需要过滤出单选的节点及其相关连线
-        var nodeId = singleResKey;
-        var data = (0, _format.filterNode)(topo, nodeId);
-        saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, data);
-      }
+  var openBindNodeResourceDrawer = function openBindNodeResourceDrawer(node) {
+    setShowSingleResDrawer(true);
+  };
+  /**
+   * 资源绑定（单选）保存选择
+   *
+   * 场景：
+   * 关联到画布节点
+   * 重新关联到画布节点
+   * 关联到新区域里的节点
+   * 重新关联到新区域里的节点
+   * 关联到已有区域里的节点
+   * 重新关联到已有区域里的节点
+   */
+
+
+  var bindNodeResource = /*#__PURE__*/function () {
+    var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(params) {
+      var id, oldResId, newResId, newGroups, _yield$editDispatcher, elements, nodeRelatedData, existInResources, replaceRes;
+
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              replaceRes = function _replaceRes(resources, oldResId, newResId) {
+                return (0, _extends2["default"])({}, resources, {
+                  "static": {
+                    selected: true,
+                    data: [].concat(resources["static"].data.filter(function (item) {
+                      return item !== oldResId;
+                    }), [newResId])
+                  }
+                });
+              };
+
+              existInResources = function _existInResources(resources, id) {
+                return resources["static"].data.indexOf(id) !== -1;
+              };
+
+              id = params.id, oldResId = params.oldResId, newResId = params.newResId;
+
+              _rlog["default"].debug('bindNodeResource', params); // 节点所属容器
+              // 区域不存在，则新建
+              // 在画布上
+
+
+              if (!existInResources(resources, oldResId)) {
+                _context6.next = 9;
+                break;
+              }
+
+              _context6.next = 7;
+              return editDispatchers.updateResources(replaceRes(resources, oldResId, newResId));
+
+            case 7:
+              _context6.next = 12;
+              break;
+
+            case 9:
+              // 在容器中
+              newGroups = groups.map(function (group) {
+                if (!existInResources(group.resources, oldResId)) {
+                  return group;
+                }
+
+                return (0, _extends2["default"])({}, group, {
+                  resources: replaceRes(group.resources, oldResId, newResId)
+                });
+              });
+              _context6.next = 12;
+              return editDispatchers.updateGroups(newGroups);
+
+            case 12:
+              _context6.next = 14;
+              return editDispatchers.refreshDataByConfig();
+
+            case 14:
+              _yield$editDispatcher = _context6.sent;
+              elements = _yield$editDispatcher.topoDataTrans;
+              nodeRelatedData = (0, _format.filterNode)(topo, newResId);
+              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedData);
+
+            case 18:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6);
+    }));
+
+    return function bindNodeResource(_x11) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  /**
+   * 关闭资源绑定（单选）抽屉
+   */
+
+
+  var closeBindNodeResourceDrawer = function closeBindNodeResourceDrawer() {
+    setShowSingleResDrawer(false);
+  };
 
-      setShowSingleResDrawer(false);
-    }
-  }, [topo]);
   var effectsState = store.useModelEffectsState('topoCreateMod');
   var topoLoading = effectsState.getTopoByConditions.isLoading;
   return {
@@ -1071,11 +1108,6 @@ var useTopoEdit = function useTopoEdit(params) {
      */
     showSingleResDrawer: showSingleResDrawer,
 
-    /**
-     * 资源绑定（单选）已选择资源
-     */
-    initialSingleRes: singleResKey,
-
     /**
      * 资源绑定（多选）抽屉显示状态
      */
@@ -1117,26 +1149,24 @@ var useTopoEdit = function useTopoEdit(params) {
     addResourceToView: addResourceToView,
 
     /**
-     * 关联/重新关联资源
+     * 增加资源到容器
      */
-    bindNodeResource: bindNodeResource,
+    addResourceToGroup: addResourceToGroup,
 
     /**
-     * 增加资源到容器
+     * 关联/重新关联资源
      */
-    addResourceToGroup: addResourceToGroup,
+    openBindNodeResourceDrawer: openBindNodeResourceDrawer,
 
     /**
      * 资源绑定（单选）保存选择
      */
-    onSaveSingleRes: onSaveSingleRes,
+    bindNodeResource: bindNodeResource,
 
     /**
      * 关闭资源绑定（单选）抽屉
      */
-    onCloseSigleResDrawer: function onCloseSigleResDrawer() {
-      return setShowSingleResDrawer(false);
-    },
+    closeBindNodeResourceDrawer: closeBindNodeResourceDrawer,
 
     /**
      * 资源绑定（多选）保存选择

package/lib/models/topoCreateMod.js

@@ -214,6 +214,11 @@ function _default(topoApp) {
           resources: (0, _extends2["default"])({}, prevState.resources, resources)
         });
       },
+      updateGroups: function updateGroups(prevState, groups) {
+        return (0, _extends2["default"])({}, prevState, {
+          groups: groups
+        });
+      },
       updateResList: function updateResList(prevState, list) {
         return (0, _extends2["default"])({}, prevState, {
           resList: list