@riil-frontend/component-topology 2.10.0 → 2.12.1

package/es/components/MultiResourceDrawer/index.js

@@ -5,7 +5,7 @@ import ResourceSelectDrawer from "../ResourceSelectDrawer";
 
 var MultiResourceDrawer = function MultiResourceDrawer(props) {
   var visible = props.visible,
-      loading = props.loading,
+      isLayerTopo = props.isLayerTopo,
       initialData = props.initialData,
       totalSelection = props.totalSelection,
       onSave = props.onSave,
@@ -18,20 +18,25 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              result = {
-                dynamic: {
-                  selected: false,
-                  condition: null,
-                  data: null
-                },
-                "static": {
-                  selected: true,
-                  data: [].concat(initialData["static"].data, selected)
-                }
-              };
+              result = selected;
+
+              if (!isLayerTopo) {
+                result = {
+                  dynamic: {
+                    selected: false,
+                    condition: null,
+                    data: null
+                  },
+                  "static": {
+                    selected: true,
+                    data: [].concat(initialData["static"].data, selected)
+                  }
+                };
+              }
+
               onSave(result);
 
-            case 2:
+            case 3:
             case "end":
               return _context.stop();
           }

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

@@ -18,7 +18,7 @@ import styles from "./TopoView.module.scss";
 import Settings from "../../editor/components/settings/Settings";
 
 var TopoView = function TopoView(props) {
-  var _classnames, _topoApp$options$edit;
+  var _topoData$config, _classnames, _topoApp$options$edit;
 
   var engine = props.engine,
       topo = props.topo,
@@ -30,7 +30,10 @@ var TopoView = function TopoView(props) {
       nodeDeleteable = props.nodeDeleteable,
       onNodeDelete = props.onNodeDelete,
       onLineDelete = props.onLineDelete,
-      onLoaded = props.onLoaded;
+      onReady = props.onReady,
+      onDestroy = props.onDestroy,
+      onLoaded = props.onLoaded,
+      buildLoadOptions = props.buildLoadOptions;
   var topoApp = engine || topo;
   var store = topoApp.store;
 
@@ -53,7 +56,13 @@ var TopoView = function TopoView(props) {
       viewState = topoState.viewState,
       topoData = topoState.topoData,
       urlParams = topoState.urlParams;
-  var isEditMode = viewState === 'edit'; // rlog.debug('TopoView---income', topoId, viewState);
+  var isEditMode = viewState === 'edit';
+  var topoShowType = topoData === null || topoData === void 0 ? void 0 : (_topoData$config = topoData.config) === null || _topoData$config === void 0 ? void 0 : _topoData$config.showType;
+
+  var _useState = useState(buildLoadOptions ? buildLoadOptions(topoData) : topoData),
+      tData = _useState[0],
+      setTData = _useState[1]; // rlog.debug('TopoView---income', topoId, viewState);
+
 
   var resAndMetrics = bizState.resAndMetrics;
   var topoEditApi = useTopoEdit({
@@ -63,7 +72,8 @@ var TopoView = function TopoView(props) {
     onSave: onSave,
     nodeDeleteable: nodeDeleteable,
     onNodeDelete: onNodeDelete,
-    onLineDelete: onLineDelete
+    onLineDelete: onLineDelete,
+    topoShowType: topoShowType
   });
   var topoLoading = topoEditApi.topoLoading,
       showSingleResDrawer = topoEditApi.showSingleResDrawer,
@@ -80,11 +90,6 @@ var TopoView = function TopoView(props) {
       onDeleteElement = topoEditApi.onDeleteElement,
       onSaveTopo = topoEditApi.onSaveTopo,
       onTopoRelatedImage = topoEditApi.onTopoRelatedImage;
-
-  var _useState = useState(topoData),
-      tData = _useState[0],
-      setTData = _useState[1];
-
   var containerLinkTopo = useContainerLinkTopo({
     topoApp: topoApp
   });
@@ -106,7 +111,7 @@ var TopoView = function TopoView(props) {
   }, [topoId, viewState]);
   useEffect(function () {
     rlog.debug('TopoView.useEffect topoData', topoData);
-    setTData(topoData);
+    setTData(buildLoadOptions ? buildLoadOptions(topoData) : topoData);
 
     if (topoData) {
       // TODO 移到模型中
@@ -114,11 +119,15 @@ var TopoView = function TopoView(props) {
         currentTopo: topoData.config
       });
     }
-  }, [topoData, resAndMetrics]);
+  }, [topoData]);
   var onCreatedTopo = useCallback(function (topoClient) {
     topoApp.view.onCreatedView(topoClient);
     rlog.info('TopoView.onCreatedTopo');
     initSelection();
+
+    if (onReady) {
+      onReady();
+    }
   }, []);
   var handleLoaded = useCallback(function () {
     if (topoApp.alarms) {
@@ -218,7 +227,7 @@ var TopoView = function TopoView(props) {
     enableRelateResource: ((_topoApp$options$edit = topoApp.options.editor) === null || _topoApp$options$edit === void 0 ? void 0 : _topoApp$options$edit.enableRelateResource) !== false,
     onCreate: onCreatedTopo,
     onLoaded: handleLoaded,
-    onDestroy: function onDestroy() {},
+    onDestroy: onDestroy,
     onEvent: onEvent,
     style: {
       width: '100%',
@@ -244,6 +253,7 @@ var TopoView = function TopoView(props) {
     loading: topoLoading,
     initialData: initialComboRes,
     totalSelection: resSelections,
+    isLayerTopo: topoShowType === 'layers',
     onSave: onSaveComboRes,
     onClose: onCloseComboResDrawer
   }), /*#__PURE__*/React.createElement(ViewerPlugin, {

package/es/hooks/useRelateTopo.js

@@ -0,0 +1 @@
+export default function useRelateTopo(props) {}

package/es/hooks/useTopoEdit.js

@@ -19,7 +19,8 @@ var useTopoEdit = function useTopoEdit(params) {
       isEditing = params.isEditing,
       onSave = params.onSave,
       onLineDelete = params.onLineDelete,
-      onNodeDelete = params.onNodeDelete;
+      onNodeDelete = params.onNodeDelete,
+      topoShowType = params.topoShowType;
   var store = topoApp.store;
   var emitEvent = useCallback(function (eventType, eventData) {
     topoApp.view.topoClient.emitEvent(eventType, eventData);
@@ -312,13 +313,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 +340,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 。如果命中其他的动态条件，则立即显示
-
+                    doDelete();
 
-                    topoApp.view.topoClient.deleteGroup(data);
-
-                  case 3:
+                  case 1:
                   case "end":
                     return _context2.stop();
                 }
@@ -366,6 +362,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);
+    }
   };
   /**
    * 删除容器内的单个资源
@@ -430,22 +439,36 @@ var useTopoEdit = function useTopoEdit(params) {
 
     return index;
   }
-  /**
-   * 关联容器的资源
-   */
 
+  function findGroup(groups, group) {
+    var id = group.id,
+        tag = group.tag;
 
-  function bindGroupResources(_x, _x2) {
-    return _bindGroupResources.apply(this, arguments);
+    if (id) {
+      // Existing group
+      return groups.filter(function (group) {
+        return group.id === id;
+      })[0];
+    } else if (tag) {
+      return groups.filter(function (group) {
+        return group.tag === tag;
+      })[0];
+    }
+
+    return undefined;
+  }
+
+  function bindGroupResourcesConfig(_x, _x2) {
+    return _bindGroupResourcesConfig.apply(this, arguments);
   }
   /**
-   * 关联视图的资源
+   * 关联容器的资源
    */
 
 
-  function _bindGroupResources() {
-    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(group, data) {
-      var id, tag, name, index, newGroup, elements, groupElement;
+  function _bindGroupResourcesConfig() {
+    _bindGroupResourcesConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(group, data) {
+      var id, tag, name, index, newGroup;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
@@ -456,13 +479,23 @@ var useTopoEdit = function useTopoEdit(params) {
                 tag: tag
               });
 
-              if (index > -1) {
-                // Existing group
-                editDispatchers.updateGroupResourcesByIndex({
-                  index: index,
-                  resources: data
-                });
-              } else if (tag) {
+              if (!(index > -1)) {
+                _context5.next = 7;
+                break;
+              }
+
+              _context5.next = 5;
+              return editDispatchers.updateGroupResourcesByIndex({
+                index: index,
+                resources: data
+              });
+
+            case 5:
+              _context5.next = 8;
+              break;
+
+            case 7:
+              if (tag) {
                 // New group
                 newGroup = _extends({}, DEFAULT_GROUP, {
                   resources: data,
@@ -472,11 +505,43 @@ var useTopoEdit = function useTopoEdit(params) {
                 editDispatchers.addGroup(newGroup);
               }
 
-              _context5.next = 5;
+            case 8:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5);
+    }));
+    return _bindGroupResourcesConfig.apply(this, arguments);
+  }
+
+  function bindGroupResources(_x3, _x4) {
+    return _bindGroupResources.apply(this, arguments);
+  }
+  /**
+   * 关联视图的资源
+   */
+
+
+  function _bindGroupResources() {
+    _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(group, data) {
+      var id, tag, _yield$editDispatcher, elements, groupElement;
+
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              id = group.id, tag = group.tag;
+              _context6.next = 3;
+              return bindGroupResourcesConfig(group, data);
+
+            case 3:
+              _context6.next = 5;
               return editDispatchers.refreshDataByConfig();
 
             case 5:
-              elements = _context5.sent;
+              _yield$editDispatcher = _context6.sent;
+              elements = _yield$editDispatcher.topoDataTrans;
               rlog.debug('useUpdateEffect--id, tag', id, tag);
 
               if (id) {
@@ -491,55 +556,108 @@ var useTopoEdit = function useTopoEdit(params) {
 
               setFocusedGroup(null);
 
-            case 10:
+            case 11:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return _bindGroupResources.apply(this, arguments);
   }
 
-  function bindViewResources(_x3) {
+  function bindViewResources(_x5) {
     return _bindViewResources.apply(this, arguments);
   }
 
   function _bindViewResources() {
-    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(data) {
-      var elements;
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+    _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+      var _yield$editDispatcher2, elements;
+
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return editDispatchers.updateViewResources(data);
 
             case 2:
-              _context6.next = 4;
+              _context7.next = 4;
               return editDispatchers.refreshDataByConfig();
 
             case 4:
-              elements = _context6.sent;
+              _yield$editDispatcher2 = _context7.sent;
+              elements = _yield$editDispatcher2.topoDataTrans;
               saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements);
 
-            case 6:
+            case 7:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return _bindViewResources.apply(this, arguments);
   }
 
+  function addResourceToFirstLayer(_x6) {
+    return _addResourceToFirstLayer.apply(this, arguments);
+  }
+
+  function _addResourceToFirstLayer() {
+    _addResourceToFirstLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(data) {
+      var group, config, _yield$editDispatcher3, topoData;
+
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) {
+          switch (_context8.prev = _context8.next) {
+            case 0:
+              group = groups[0];
+              config = {
+                dynamic: {
+                  selected: false,
+                  condition: null,
+                  data: null
+                },
+                "static": {
+                  selected: true,
+                  data: [].concat(group.resources["static"].data, data)
+                }
+              };
+              _context8.next = 4;
+              return bindGroupResourcesConfig(group, config);
+
+            case 4:
+              _context8.next = 6;
+              return editDispatchers.refreshDataByConfig();
+
+            case 6:
+              _yield$editDispatcher3 = _context8.sent;
+              topoData = _yield$editDispatcher3.topoData;
+              topoApp.updateElements(topoData);
+
+            case 9:
+            case "end":
+              return _context8.stop();
+          }
+        }
+      }, _callee8);
+    }));
+    return _addResourceToFirstLayer.apply(this, arguments);
+  }
+
   var onSaveComboRes = function onSaveComboRes(data) {
     rlog.debug('关联资源-----onSaveComboRes', data, focusedGroup);
 
-    if (focusedGroup) {
-      bindGroupResources(focusedGroup, data);
+    if (topoShowType !== 'layers') {
+      if (focusedGroup) {
+        bindGroupResources(focusedGroup, data);
+      } else {
+        bindViewResources(data);
+      }
     } else {
-      bindViewResources(data);
+      // 分层拓扑，添加到第一层
+      addResourceToFirstLayer(data);
     }
   };
 
@@ -579,32 +697,32 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
-  function checkSavePermission(_x4) {
+  function checkSavePermission(_x7) {
     return _checkSavePermission.apply(this, arguments);
   }
 
   function _checkSavePermission() {
-    _checkSavePermission = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
+    _checkSavePermission = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id) {
       var permission;
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
-              _context7.next = 2;
+              _context9.next = 2;
               return topoDispatchers.getTopoPermission({
                 id: id,
                 update: false
               });
 
             case 2:
-              permission = _context7.sent;
+              permission = _context9.sent;
 
               if (!topoPermissonUtil.isEditable(permission)) {
-                _context7.next = 5;
+                _context9.next = 5;
                 break;
               }
 
-              return _context7.abrupt("return", true);
+              return _context9.abrupt("return", true);
 
             case 5:
               _Dialog.alert({
@@ -616,14 +734,14 @@ var useTopoEdit = function useTopoEdit(params) {
                 onOk: function onOk() {}
               });
 
-              return _context7.abrupt("return", false);
+              return _context9.abrupt("return", false);
 
             case 7:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
         }
-      }, _callee7);
+      }, _callee9);
     }));
     return _checkSavePermission.apply(this, arguments);
   }
@@ -740,7 +858,7 @@ var useTopoEdit = function useTopoEdit(params) {
       }, _callee4);
     }));
 
-    return function onSaveTopo(_x5) {
+    return function onSaveTopo(_x8) {
       return _ref5.apply(this, arguments);
     };
   }();
@@ -807,22 +925,22 @@ var useTopoEdit = function useTopoEdit(params) {
    * @return {Promise<void>}
    */
 
-  function refreshDataByConfig(_x6) {
+  function refreshDataByConfig(_x9) {
     return _refreshDataByConfig.apply(this, arguments);
   }
 
   function _refreshDataByConfig() {
-    _refreshDataByConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(config) {
+    _refreshDataByConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(config) {
       var resources, groups, dRes, sRes, query;
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
               resources = config.resources, groups = config.groups;
               dRes = resources.dynamic, sRes = resources["static"];
 
               if (!(dRes.selected && dRes.condition || sRes.selected && isAvailableArray(sRes.data) || isAvailableArray(groups))) {
-                _context8.next = 7;
+                _context10.next = 7;
                 break;
               }
 
@@ -833,15 +951,15 @@ var useTopoEdit = function useTopoEdit(params) {
               };
               rlog.debug('useEffect', editState, isEditing, topoId, resources, groups); // editDispatchers.update({ resources, groups });
 
-              _context8.next = 7;
+              _context10.next = 7;
               return editDispatchers.getTopoByConditions(query);
 
             case 7:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
         }
-      }, _callee8);
+      }, _callee10);
     }));
     return _refreshDataByConfig.apply(this, arguments);
   }

package/es/models/topoCreateMod.js

@@ -371,7 +371,7 @@ export default function (topoApp) {
 
                   case 5:
                     data = _context2.sent;
-                    return _context2.abrupt("return", data);
+                    return _context2.abrupt("return", data.topoDataTrans);
 
                   case 7:
                   case "end":
@@ -478,7 +478,10 @@ export default function (topoApp) {
                     // });
                     // 返回查询后的数据，便于外部获取到数据后像HT通知更新
 
-                    return _context4.abrupt("return", topoDataTrans);
+                    return _context4.abrupt("return", {
+                      topoData: topoData,
+                      topoDataTrans: topoDataTrans
+                    });
 
                   case 19:
                   case "end":

package/es/topoCenter/components/TopoTreeSelect.js

@@ -0,0 +1,5 @@
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+export default function TopoTreeSelect(props) {
+  return /*#__PURE__*/React.createElement("div", null);
+}
+;

package/es/topoCenter/viewer/createTopoViewer.js

@@ -1,5 +1,4 @@
 import _extends from "@babel/runtime/helpers/extends";
-import createMenuCommands from "../../contextmenu/createMenuCommands";
 import TopoCenter from "../models/TopoCenter";
 export function createTopoViewer(options) {
   var topoApp = new TopoCenter(_extends({}, options));

package/lib/components/MultiResourceDrawer/index.js

@@ -17,7 +17,7 @@ var _ResourceSelectDrawer = _interopRequireDefault(require("../ResourceSelectDra
 
 var MultiResourceDrawer = function MultiResourceDrawer(props) {
   var visible = props.visible,
-      loading = props.loading,
+      isLayerTopo = props.isLayerTopo,
       initialData = props.initialData,
       totalSelection = props.totalSelection,
       onSave = props.onSave,
@@ -30,20 +30,25 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              result = {
-                dynamic: {
-                  selected: false,
-                  condition: null,
-                  data: null
-                },
-                "static": {
-                  selected: true,
-                  data: [].concat(initialData["static"].data, selected)
-                }
-              };
+              result = selected;
+
+              if (!isLayerTopo) {
+                result = {
+                  dynamic: {
+                    selected: false,
+                    condition: null,
+                    data: null
+                  },
+                  "static": {
+                    selected: true,
+                    data: [].concat(initialData["static"].data, selected)
+                  }
+                };
+              }
+
               onSave(result);
 
-            case 2:
+            case 3:
             case "end":
               return _context.stop();
           }