@riil-frontend/component-topology 6.0.0-alpha.4 → 6.0.0-alpha.6

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -1,6 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "showLabel"];
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
+import { getEdgesBySelection, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
 import EdgeType from "./EdgeType";
@@ -15,15 +16,32 @@ function EdgeTypeButton(props) {
       showLabel = props.showLabel,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
-  var _useState = useState(true),
+  var _useState = useState(false),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1]; // 拓扑图是否加载
+
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
   var selection = topo.selectionManager.useSelection();
   useEffect(function () {
-    setDisabled(false);
-  }, [selection]);
+    if (graphLoaded) {
+      var edges = getEdgesBySelection(topo);
+      console.info('xxxx', edges, selection);
+      setDisabled(!edges.length);
+    }
+  }, [selection, graphLoaded]);
+
+  var handleChange = function handleChange(name, value) {
+    var edges = getEdgesBySelection(topo);
+
+    if (name === 'lineButton') {
+      setEdgesType(edges, value, topo);
+    }
+  };
+
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u7EBF\u5F62/Disable.svg",
     alt: ""
@@ -34,11 +52,14 @@ function EdgeTypeButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u7EBF\u5F62",
     tooltip: "\u7EBF\u5F62",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
     trigger: icon
-  }, /*#__PURE__*/React.createElement(EdgeType, null)));
+  }, /*#__PURE__*/React.createElement(EdgeType, {
+    onChange: handleChange
+  })));
 }
 
 export default EdgeTypeButton;

package/es/core/editor/components/Toolbar/widgets/HistoryRedoButton.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import WidgetBox from "./WidgetBox";
+import ButtonBox from "./components/ButtonBox";
 
 function HistoryRedoButton(props) {
   var topo = props.topo,
@@ -13,7 +14,7 @@ function HistoryRedoButton(props) {
     label: "\u6062\u590D",
     tooltip: "\u6062\u590D",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(WidgetBox.ButtonBox, null, /*#__PURE__*/React.createElement("img", {
+  }, /*#__PURE__*/React.createElement(ButtonBox, null, /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
     alt: ""
   })));

package/es/core/editor/components/Toolbar/widgets/HistoryUndoButton.js

@@ -1,4 +1,5 @@
-import React from 'react'; // import { Icon, Button } from '@alifd/next';
+import React from 'react';
+import ButtonBox from "./components/ButtonBox"; // import { Icon, Button } from '@alifd/next';
 
 import WidgetBox from "./WidgetBox";
 
@@ -15,7 +16,7 @@ function HistoryUndoButton(props) {
     label: "\u64A4\u9500",
     tooltip: "\u64A4\u9500",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(WidgetBox.ButtonBox, {
+  }, /*#__PURE__*/React.createElement(ButtonBox, {
     disabled: disabled,
     onClick: function onClick() {
       topo.historyManager.undo();

package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.js

@@ -35,7 +35,8 @@ function NodeSizeButton(props) {
   }, /*#__PURE__*/React.createElement(BatchSetNodeSize, {
     topo: topo,
     size: "small",
-    showLabel: false
+    showLabel: false,
+    hasTrigger: false
   })));
 }
 

package/es/core/editor/components/Toolbar/widgets/WidgetBox.js

@@ -1,9 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _Balloon from "@alifd/next/es/balloon";
-var _excluded = ["active", "disabled", "children"];
-import classNames from 'classnames';
 import React from 'react';
+import ButtonBox from "./components/ButtonBox";
 import styles from "./WidgetBox.module.scss";
 
 function WidgetBox(props) {
@@ -12,9 +9,8 @@ function WidgetBox(props) {
       tooltip = props.tooltip,
       disabled = props.disabled,
       children = props.children;
-  var button = /*#__PURE__*/React.createElement("button", {
+  var button = /*#__PURE__*/React.createElement("div", {
     disabled: disabled,
-    type: "button",
     className: styles.container
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.content
@@ -28,22 +24,13 @@ function WidgetBox(props) {
 
   return /*#__PURE__*/React.createElement(_Balloon.Tooltip, {
     trigger: button,
-    align: "b"
+    align: "b" // 解决遮挡下拉浮层问题
+    ,
+    popupStyle: {
+      zIndex: 1000
+    }
   }, tooltip);
 }
 
-function ButtonBox(props) {
-  var _classNames;
-
-  var active = props.active,
-      disabled = props.disabled,
-      children = props.children,
-      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
-
-  return /*#__PURE__*/React.createElement("div", _extends({
-    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames))
-  }, otherProps), children);
-}
-
 WidgetBox.ButtonBox = ButtonBox;
 export default WidgetBox;

package/es/core/editor/components/Toolbar/widgets/WidgetBox.module.scss

@@ -8,6 +8,7 @@
   border-width: 0;
   background-color: transparent;
   border-color: transparent;
+  user-select: none;
 
   &[disabled] {
     cursor: not-allowed;

package/es/core/editor/components/Toolbar/widgets/components/ButtonBox.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _Icon from "@alifd/next/es/icon";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["active", "disabled", "showArrow", "children"];
+var _excluded = ["active", "disabled", "showArrow", "children", "onClick"];
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -14,10 +14,12 @@ function ButtonBox(props) {
       disabled = props.disabled,
       showArrow = props.showArrow,
       children = props.children,
+      onClick = props.onClick,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   return /*#__PURE__*/React.createElement("div", _extends({
-    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames))
+    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames)),
+    onClick: disabled ? undefined : onClick
   }, otherProps), children, showArrow && /*#__PURE__*/React.createElement(React.Fragment, null, "\xA0", /*#__PURE__*/React.createElement(_Icon, {
     type: "tree_fold_arrow",
     size: "xxs",

package/es/core/editor/components/Toolbar/widgets/components/DropdownButton.js

@@ -6,6 +6,7 @@ import styles from "./DropdownButton.module.scss";
 
 function DropdownButton(props) {
   var trigger = props.trigger,
+      disabled = props.disabled,
       _props$showArrow = props.showArrow,
       showArrow = _props$showArrow === void 0 ? true : _props$showArrow,
       _props$showContainer = props.showContainer,
@@ -13,18 +14,20 @@ function DropdownButton(props) {
       children = props.children;
 
   var _useState = useState(false),
-      visible = _useState[0],
-      setVisible = _useState[1];
+      active = _useState[0],
+      setActive = _useState[1];
 
   var button = /*#__PURE__*/React.createElement(ButtonBox, {
-    active: visible,
+    active: active,
+    disabled: disabled,
     showArrow: showArrow
   }, trigger);
   return /*#__PURE__*/React.createElement(_Dropdown, {
-    visible: visible,
+    visible: active,
+    disabled: disabled,
     trigger: button,
     triggerType: "click",
-    onVisibleChange: setVisible
+    onVisibleChange: setActive
   }, !showContainer ? children : /*#__PURE__*/React.createElement(PopupCard, null, children));
 }
 

package/es/core/editor/components/settings/common/LineType/index.js

@@ -1,7 +1,8 @@
 import _Box from "@alifd/next/es/box";
 import _Button from "@alifd/next/es/button";
 import React, { useState } from "react";
-import styles from "./LineType.module.scss"; //  直线 2. 直线单向箭头 3. 直线双向箭头 4. 双折线 5. 双折线单向箭头 6. 弧线
+import styles from "./LineType.module.scss";
+import { setEdgesType } from "../../../../utils/edgeTypeStyleUtil"; //  直线 2. 直线单向箭头 3. 直线双向箭头 4. 双折线 5. 双折线单向箭头 6. 弧线
 // 7. 弧线单向箭头 8. 内向双向箭头 9. 纵向折线 10. 纵向折线带箭头 11. 水平折线 12. 水平折线带箭头
 
 var LINE_TYPE_OPTIONS = [{
@@ -66,24 +67,7 @@ var LineType = function LineType(props) {
 
   var setLineType = function setLineType(type) {
     var edges = getEdges();
-    var htTopo = topo.getHtTopo();
-    edges.forEach(function (edge) {
-      htTopo.setGraphLinear(edge, {
-        type: type
-      });
-
-      if (edge.isEdgeGroupAgent()) {
-        // 连线组折叠时同时设置子连线
-        var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
-        htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
-        edgeChildren.forEach(function (edgeChild) {
-          htTopo.setGraphLinear(edgeChild, {
-            type: type
-          });
-        });
-        htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
-      }
-    });
+    setEdgesType(edges, type, topo);
   };
 
   var handleChange = function handleChange(data) {

package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js

@@ -26,6 +26,7 @@ function SizeInput(props) {
       onLockChange = props.onLockChange,
       _props$showLabel = props.showLabel,
       showLabel = _props$showLabel === void 0 ? true : _props$showLabel,
+      hasTrigger = props.hasTrigger,
       size = props.size;
 
   var handleChange = function handleChange(name, attrValue) {
@@ -73,6 +74,7 @@ function SizeInput(props) {
     step: step,
     placeholder: "\u8BF7\u8F93\u5165",
     size: size,
+    hasTrigger: hasTrigger,
     style: {
       width: '100%'
     },
@@ -104,6 +106,7 @@ function SizeInput(props) {
     step: step,
     placeholder: "\u8BF7\u8F93\u5165",
     size: size,
+    hasTrigger: hasTrigger,
     style: {
       width: '100%'
     },

package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementLineType.js

@@ -1,48 +1,13 @@
 import React from 'react';
-import { getEdges } from "../../../../../../utils/htElementUtils";
+import { getEdgesBySelection } from "../../../../utils/edgeTypeStyleUtil";
 import LineType from "../../common/LineType";
 export default function MultipleElementLineType(props) {
   var topo = props.topo;
 
   var setLineType = function setLineType(type) {};
 
-  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() {
-    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 getEdgesBySelection(topo);
   };
 
   return /*#__PURE__*/React.createElement(LineType, {

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,73 @@
+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 {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+export function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  edges.forEach(function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+
+    if (edge.isEdgeGroupAgent()) {
+      // 连线组折叠时同时设置子连线
+      var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
+      edgeChildren.forEach(function (edgeChild) {
+        htTopo.setGraphLinear(edgeChild, {
+          type: type
+        });
+      });
+      htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
+    }
+  });
+}

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;
@@ -643,9 +592,13 @@ var useTopoEdit = function useTopoEdit(params) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-              topo.historyManager.endTransaction();
+              topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
 
-            case 12:
+              topoEditDispatchers.update({
+                resourceTabactiveKey: null
+              });
+
+            case 13:
             case "end":
               return _context15.stop();
           }
@@ -727,8 +680,11 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topoEditDispatchers.update({
+                resourceTabactiveKey: null
+              });
 
-            case 10:
+            case 11:
             case "end":
               return _context7.stop();
           }
@@ -1113,6 +1069,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 +1086,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 拓扑结构加载中状态
      */
     topoLoading: topoLoading,
+    setViewMouseMode: setViewMouseMode,
 
     /**
      * 资源绑定（多选）抽屉显示状态

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.4" === 'string' ? "6.0.0-alpha.4" : null;
+var version = typeof "6.0.0-alpha.6" === 'string' ? "6.0.0-alpha.6" : 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/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/lib/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -37,6 +37,10 @@
       &:hover {
         background-color: rgba(76, 137, 255, 0.1);
       }
+      
+      .tab-title {
+        margin-top: 3px;
+      }
     }
   }
 }
@@ -45,9 +49,9 @@
 .content {
   width: 260px;
   height: 100%;
-  transition: all .1s linear;
   border-left: none !important;
   border-right: 1px solid var(--tab-wrapped-border-line-color);
+  transition: width .1s linear;
 
   :global {
     .#{$css-prefix}tabs-tabpane {