@riil-frontend/component-topology 6.0.0-alpha.2 → 6.0.0-alpha.21

package/es/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -1,15 +1,15 @@
 import _Box from "@alifd/next/es/box";
+import _extends from "@babel/runtime/helpers/extends";
 import _Dialog from "@alifd/next/es/dialog";
 import _Button from "@alifd/next/es/button";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import classnames from 'classnames';
 import TitleWidget from "../../../components/titlebar/widgets/TitleWidget";
 import styles from "../../../components/titlebar/TitleBar.module.scss";
-import { useState } from 'react';
-import { useEffect } from 'react';
 import DebugTools from "./widgets/DebugTools";
+import SettingButtonWidget from "../../../viewer/components/titlebar/widgets/SettingButtonWidget";
 export default function TopoEditorTitleBar(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi;
@@ -132,5 +132,9 @@ export default function TopoEditorTitleBar(props) {
         }
       });
     }
-  }, "\u9000\u51FA"))));
+  }, "\u9000\u51FA"), /*#__PURE__*/React.createElement(SettingButtonWidget, _extends({
+    isEditor: true
+  }, props, {
+    viewerProps: topo.viewProps.viewerProps
+  })))));
 }

package/es/core/editor/hooks/useLayerAddResource.js

@@ -0,0 +1,28 @@
+import { useState } from 'react';
+export default function useLayerAddResource(props) {
+  var topo = props.topo,
+      layer = props.layer,
+      topoEdit = props.topoEdit;
+
+  var _useState = useState(false),
+      drawerVisible = _useState[0],
+      setDrawerVisible = _useState[1];
+
+  return {
+    open: function open() {
+      return setDrawerVisible(true);
+    },
+    close: function close() {
+      return setDrawerVisible(false);
+    },
+    drawerProps: {
+      visible: drawerVisible,
+      setVisible: setDrawerVisible,
+      onClose: function onClose() {
+        setDrawerVisible(false);
+      },
+      topo: topo,
+      topoEdit: topoEdit
+    }
+  };
+}

package/es/core/{store/models → editor/store}/topoEdit.js

@@ -10,7 +10,14 @@ import topoService from '@riil-frontend/component-topology-common/es/services/to
 export default {
   // 定义 model 的初始 state
   state: {
-    saving: false
+    // 是否就绪
+    ready: false,
+    // 保存状态
+    saving: false,
+    // 选择/拖动模式模式。默认选择模式 select|move
+    viewMouseMode: 'select',
+    // 资源面板展开项
+    resourceTabactiveKey: null
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -0,0 +1,96 @@
+import { getEdges } from "../../../utils/htElementUtils";
+var ht = window.ht;
+export function getEdgesBySelection(topo) {
+  var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
+    var nodeIds = nodes.map(function (node) {
+      return node.getId();
+    });
+    nodes.forEach(function (node) {
+      if (node instanceof ht.Group) {
+        var children = node.getChildren().toArray();
+        nodeIds.push.apply(nodeIds, getChildrenNodeIds(children));
+      }
+    });
+    return nodeIds;
+  };
+
+  var getSelectedEdges = function getSelectedEdges(topo) {
+    var gv = topo.getGraphView();
+    var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
+
+    var edges = selection.filter(function (element) {
+      return element instanceof ht.Edge;
+    }); // 查询选中节点间的连线
+
+    var nodes = selection.filter(function (element) {
+      return element instanceof ht.Node;
+    });
+    var nodeIds = getChildrenNodeIds(nodes);
+    var dm = gv.getDataModel();
+    getEdges(dm).forEach(function (edge) {
+      if (nodeIds.find(function (nodeId) {
+        return nodeId === edge.getSource().getId();
+      }) && nodeIds.find(function (nodeId) {
+        return nodeId === edge.getTarget().getId();
+      }) && !edges.find(function (item) {
+        return item === edge;
+      })) {
+        edges.push(edge);
+      }
+    });
+    return edges;
+  };
+
+  return getSelectedEdges(topo);
+}
+/**
+ * 遍历连线及子连线
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
+  var htTopo = topo.getHtTopo();
+  edges.forEach(function (edge) {
+    operateEdgeFn(edge);
+
+    if (edge.isEdgeGroupAgent()) {
+      // 连线组折叠时同时设置子连线
+      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
+      edgeChildren.forEach(function (edgeChild) {
+        operateEdgeFn(edgeChild);
+      });
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
+    }
+  });
+}
+/**
+ * 设置连线及子连线。带回退事务控制
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+  topo.historyManager.beginTransaction();
+  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  topo.historyManager.endTransaction();
+}
+/**
+ * 批量设置连线线形
+ * 
+ * @param {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+export function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  setEdgesAndChildren(topo, edges, function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+  });
+}

package/es/core/hooks/useCanvasTheme.js

@@ -0,0 +1,35 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useEffect } from 'react';
+var themeMap = [{
+  value: 'white',
+  label: '白色',
+  color: '#FFFFFF'
+}, {
+  value: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF'
+}, {
+  value: 'yellow',
+  label: '黄色',
+  color: '#FFFDE6'
+}, {
+  value: 'green',
+  label: '绿色',
+  color: '#EAFFE8'
+}, {
+  value: 'dark',
+  label: '深色',
+  color: '#031425'
+}].reduce(function (map, item) {
+  var _extends2;
+
+  return _extends({}, map, (_extends2 = {}, _extends2[item.value] = item, _extends2));
+}, {});
+export default function useCanvasTheme(props) {
+  var canvasTheme = props.canvasTheme;
+  useEffect(function () {// 设置
+  }, [canvasTheme]);
+  return {
+    canvasColor: themeMap[canvasTheme].color
+  };
+}

package/es/core/hooks/useTopoEdit.js

@@ -43,8 +43,6 @@ var useTopoEdit = function useTopoEdit(params) {
       editDispatchers = _store$useModel[1];
 
   var topoDispatchers = store.useModelDispatchers("topoMod");
-  var _editState$groups = editState.groups,
-      groups = _editState$groups === void 0 ? [] : _editState$groups;
 
   var _useState = useState(false),
       showComboResDrawer = _useState[0],
@@ -288,55 +286,6 @@ var useTopoEdit = function useTopoEdit(params) {
   var deleteNode = function deleteNode(node) {
     emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, node);
   };
-  /**
-   * 删除视图内的资源
-   */
-
-
-  var deleteViewNode = function deleteViewNode(node) {
-    var nodeId = node.id;
-    var viewResources = resourceConfig.getViewResources();
-    var index = viewResources["static"].indexOf(nodeId);
-
-    if (index > -1) {
-      editDispatchers.updateResources({
-        "static": viewResources["static"].filter(function (item) {
-          return item !== nodeId;
-        })
-      });
-    }
-  };
-  /**
-   * 删除容器内的单个资源
-   *
-   * @param allGroups
-   * @param node 资源
-   */
-
-
-  var deleteGroupNode = function deleteGroupNode(allGroups, node) {
-    var nodeId = node.id; // 更新容器内的资源
-
-    var newGroups = allGroups.map(function (g) {
-      var newGroup = g;
-
-      if (resourceConfig.isGroupContainsNode(g, node)) {
-        newGroup = _extends({}, g, {
-          resources: resourceConfig.removeStaticResource(g.resources, nodeId)
-        });
-      }
-
-      return newGroup;
-    });
-    rlog.info("删除容器内的单个资源", {
-      groups: groups,
-      node: node,
-      newGroups: newGroups
-    });
-    editDispatchers.update({
-      groups: newGroups
-    });
-  };
 
   var handleDeleteNode = function handleDeleteNode(element) {
     var _topo$options$editor;
@@ -490,14 +439,15 @@ var useTopoEdit = function useTopoEdit(params) {
             case 0:
               id = group.id, tag = group.tag;
               rlog.debug("bindGroupResources--id, tag", id, tag);
-              _context12.next = 4;
+              topo.historyManager.beginTransaction();
+              _context12.next = 5;
               return resourceConfig.updateGroupResources(group, resources);
 
-            case 4:
-              _context12.next = 6;
+            case 5:
+              _context12.next = 7;
               return editDispatchers.fetchDataByConfig();
 
-            case 6:
+            case 7:
               _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -513,7 +463,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -644,8 +596,13 @@ var useTopoEdit = function useTopoEdit(params) {
               }
 
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
-            case 12:
+              topoEditDispatchers.update({
+                resourceTabactiveKey: null
+              });
+
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -699,6 +656,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
@@ -727,8 +690,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
+              topoEditDispatchers.update({
+                resourceTabactiveKey: null
+              });
 
-            case 10:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -1113,6 +1080,16 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var effectsState = store.useModelEffectsState("topoConfig");
   var topoLoading = effectsState.getTopoByConditions.isLoading;
+  /**
+   * 设置视图鼠标模式
+   */
+
+  var setViewMouseMode = useCallback(function (mode) {
+    topo.getHtTopo().setViewMouseMode(mode);
+    topoEditDispatchers.update({
+      viewMouseMode: mode
+    });
+  }, []);
   return {
     resourceConfig: resourceConfig,
 
@@ -1120,6 +1097,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 拓扑结构加载中状态
      */
     topoLoading: topoLoading,
+    setViewMouseMode: setViewMouseMode,
 
     /**
      * 资源绑定（多选）抽屉显示状态

package/es/core/models/HistoryManager.js

@@ -71,13 +71,20 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
+    }, // 单多链路
+    {
       modelName: 'displayConfig',
       property: 'expandAllEdges'
-    }, {
+    }, // 节点标注
+    {
       modelName: 'displayConfig',
       property: 'nodeLabelStyle'
-    }, {
+    }, // 画布主题
+    {
+      modelName: 'displayConfig',
+      property: 'canvasTheme'
+    }, // 背景
+    {
       modelName: 'background',
       property: 'current'
     }];

package/es/core/models/SelectionManager.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import useHtElements from "../common/hooks/useHtElements";
 
 var SelectionManager = /*#__PURE__*/function () {
   function SelectionManager(topo) {
@@ -12,7 +13,10 @@ var SelectionManager = /*#__PURE__*/function () {
       var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
 
       selectionDispatchers.update({
-        selection: selection
+        selection: selection,
+        selectionIds: selection.map(function (item) {
+          return item.id;
+        })
       });
     };
 
@@ -58,6 +62,17 @@ var SelectionManager = /*#__PURE__*/function () {
     return selection;
   };
 
+  _proto.useHtSelection = function useHtSelection() {
+    var _this$topo$store$useM2 = this.topo.store.useModelState('selection'),
+        selectionIds = _this$topo$store$useM2.selectionIds;
+
+    var elements = useHtElements({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     rlog.info('Selection handleSelectionChange', e);
     this.updateSelection();

package/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.2" === 'string' ? "6.0.0-alpha.2" : null;
+var version = typeof "6.0.0-alpha.21" === 'string' ? "6.0.0-alpha.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/TopoGraphView.js

@@ -26,10 +26,16 @@ var TopoGraphView = /*#__PURE__*/function () {
     this.contextMenu = new ContextMenu();
   };
 
-  _proto.getHtDataModel = function getHtDataModel() {
+  _proto.getHtGraphView = function getHtGraphView() {
     var _this$topoClient;
 
-    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getDataModel();
+    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getGraphView();
+  };
+
+  _proto.getHtDataModel = function getHtDataModel() {
+    var _this$topoClient2;
+
+    return (_this$topoClient2 = this.topoClient) === null || _this$topoClient2 === void 0 ? void 0 : _this$topoClient2.getDataModel();
   }
   /**
    * 缩放平移整个拓扑以展示所有的图元

package/es/core/models/utils/linkUtils.js

@@ -31,7 +31,7 @@ export function isCrucialLink(link) {
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 export function isAggLink(link) {
   return link.attributes["network_link.connect_type"] === "agg";

package/es/core/store/coreModels.js

@@ -2,12 +2,12 @@ import topoMod from "./models/topoMod";
 import customIcon from "./models/customIcon";
 import ciModel from "./models/ciModel";
 import topoBizMod from "./models/topoBizMod";
-import topoConfig from "./models/topoConfig";
-import topoEdit from "./models/topoEdit";
-import background from "./models/background";
-import selection from "./models/selection";
-import historyManager from "./models/historyManager";
-import topoGraphView from "./models/topoGraphView"; // 显示模式
+import topoConfig from "./models/topoConfig"; // 编辑模式
+
+import topoEdit from "../editor/store/topoEdit";
+import background from "../editor/store/background";
+import historyManager from "../editor/store/historyManager";
+import selection from "./models/selection"; // 显示模式
 
 import topoAlarm from "./models/topoAlarm";
 import displayConfig from "./models/displayConfig";
@@ -21,7 +21,6 @@ export default {
   topoConfig: topoConfig,
   historyManager: historyManager,
   background: background,
-  topoGraphView: topoGraphView,
   ciModel: ciModel,
   topoEdit: topoEdit,
   // 显示模式

package/es/core/store/models/selection.js

@@ -9,7 +9,8 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 export default {
   // 定义 model 的初始 state
   state: {
-    selection: []
+    selection: [],
+    selectionIds: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/es/core/viewer/components/titlebar/widgets/SettingButton.js

@@ -11,7 +11,8 @@ import DisplaySettingDrawer from "../../../../components/DisplaySettingDrawer";
 export default function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
 
   var _useState = useState(false),
       visible = _useState[0],
@@ -40,6 +41,7 @@ export default function SettingButton(props) {
   })), /*#__PURE__*/React.createElement(DisplaySettingDrawer, {
     visible: visible,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

package/es/core/viewer/components/titlebar/widgets/SettingButtonWidget.js

@@ -9,11 +9,13 @@ import SettingButton from "./SettingButton";
 export default function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
   return /*#__PURE__*/React.createElement(SettingButton, {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style
+    style: style,
+    isEditor: isEditor
   });
 }
 ;

package/es/networkTopo/createTopo.js

@@ -1,7 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import TopoCenter from "./models/TopoCenter";
+import services from "./services";
 export function createTopo(options) {
   var topoApp = new TopoCenter(_extends({}, options));
+  topoApp.serverApi = services;
   return topoApp;
 }
 export default createTopo;

package/es/networkTopo/services/link.js

@@ -156,10 +156,10 @@ export default {
               // const idtxt = `'${ids[0]}','${ids[1]}'`;
               stag = ids[0];
               ttag = ids[1];
-              condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "'";
+              condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "'";
 
               if (ttag) {
-                condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+                condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
               }
 
               parm = {

package/es/networkTopo/store/topoTreeMod.js

@@ -2,7 +2,6 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "../services";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { formatTree, loopTree, loopTreeFun, findParentIdsById, treeNodeCount } from "../../utils/tree";
 
@@ -88,7 +87,7 @@ export default function (topoApp) {
                     }
 
                     _context2.next = 4;
-                    return topoService.getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -97,7 +96,7 @@ export default function (topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return topoService.getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -163,7 +162,7 @@ export default function (topoApp) {
 
                     rlog.debug('editTopoOnTree', conditions);
                     _context4.next = 4;
-                    return topoService.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
                     resTreeData = _context4.sent;
@@ -247,7 +246,7 @@ export default function (topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return topoService.deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -271,7 +270,7 @@ export default function (topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return topoService.deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -299,7 +298,7 @@ export default function (topoApp) {
 
                     rlog.debug('setDefTopoOnTree', conditions);
                     _context6.next = 4;
-                    return topoService.setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;

package/es/style.js

@@ -41,4 +41,5 @@ import '@alifd/next/es/number-picker/style';
 
 import '@alifd/next/es/tag/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
+import '@alifd/next/es/range/style';
 import './index.scss';

package/es/utils/topoData.js

@@ -317,6 +317,7 @@ function buildGlobal(_ref2) {
       showLinkName: false,
       // 是否显示链路名称
       nodeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.nodeLabelStyle,
+      defaultEdgeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.defaultEdgeLabelStyle,
       edgeFlow: edgeFlow
     }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal2 = result.customGlobal) === null || _result$customGlobal2 === void 0 ? void 0 : _result$customGlobal2.topoDisplayConfig) || {}),
     linkTo: linkTo,