@riil-frontend/component-topology 6.0.0-alpha.5 → 6.0.0-alpha.7

package/lib/core/editor/components/Sidebar/views/CanvasPanel/CanvasPanel.module.scss

@@ -0,0 +1,74 @@
+@import "~@alifd/next/variables.scss";
+
+  .canvasToggle {
+    display: flex;
+    flex-wrap: wrap;
+    .canvas {
+      .tag {
+        border: 1px solid #E4E9EE;
+        width: 110px;
+        height: 62px;
+        border-radius: 2px;
+        margin: 16px 0 0 16px;
+      :global {
+        .#{$css-prefix}tag-body {
+          width: 100%;
+          padding: 0;
+          cursor: pointer;
+        }
+      }
+      .box {
+        position: relative;
+        height: 100%;
+        user-select: none;
+        .bgColor {
+          max-width: 100%;
+          max-height: 100%;
+          display: block;
+          margin: auto;
+          position: absolute;
+          left: 0;
+          top: 0;
+          bottom: 0;
+          right: 0;
+        }
+      }
+      &::before,
+      &::after {
+        z-index: 1;
+      }
+      &:hover {
+        .operation {
+          display: block;
+        }
+      }
+      .operation {
+        display: none;
+        // z-index: -1;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        height: 22px;
+        text-align: center;
+        background: rgba(0, 0, 0, 0.4);
+        button {
+          height: 100%;
+          color: #fff;
+          vertical-align: text-bottom;
+        }
+      }
+     }
+      .canvasText{
+        width: 49px;
+        height: 12px;
+        margin: 8px 0 0 46px;
+        text-align: center;
+      }
+    }
+    .canvas:nth-child(2n){
+      margin-left: -7px;
+    }
+  }
+
+

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -38,8 +38,7 @@ var LINE_TYPE_OPTIONS = [{
 }];
 
 function LineType(props) {
-  var handleChange = function handleChange(node) {};
-
+  var onChange = props.onChange;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _LineTypeModule["default"].lineType
   }, LINE_TYPE_OPTIONS.map(function (item, index, array) {
@@ -48,7 +47,7 @@ function LineType(props) {
       title: item.label,
       className: "" + _LineTypeModule["default"].redioBtn,
       onClick: function onClick() {
-        handleChange(item);
+        onChange(item.value);
       }
     }, /*#__PURE__*/_react["default"].createElement("img", {
       src: "/img/topo/editor/lineType/" + item.icon + ".svg",

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

@@ -9,6 +9,8 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
+
 var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -31,15 +33,32 @@ function EdgeTypeButton(props) {
       showLabel = props.showLabel,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
 
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.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();
   (0, _react.useEffect)(function () {
-    setDisabled(false);
-  }, [selection]);
+    if (graphLoaded) {
+      var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
+      console.info('xxxx', edges, selection);
+      setDisabled(!edges.length);
+    }
+  }, [selection, graphLoaded]);
+
+  var handleChange = function handleChange(name, value) {
+    var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
+
+    if (name === 'lineButton') {
+      (0, _edgeTypeStyleUtil.setEdgesType)(edges, value, topo);
+    }
+  };
+
   var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
     src: "/img/topo/editor/toolbar/\u7EBF\u5F62/Disable.svg",
     alt: ""
@@ -50,11 +69,14 @@ function EdgeTypeButton(props) {
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u7EBF\u5F62",
     tooltip: "\u7EBF\u5F62",
+    disabled: disabled,
     showLabel: showLabel
   }, /*#__PURE__*/_react["default"].createElement(_DropdownButton["default"], {
     disabled: disabled,
     trigger: icon
-  }, /*#__PURE__*/_react["default"].createElement(_EdgeType["default"], null)));
+  }, /*#__PURE__*/_react["default"].createElement(_EdgeType["default"], {
+    onChange: handleChange
+  })));
 }
 
 var _default = EdgeTypeButton;

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

@@ -51,7 +51,8 @@ function NodeSizeButton(props) {
   }, /*#__PURE__*/_react["default"].createElement(_BatchSetNodeSize["default"], {
     topo: topo,
     size: "small",
-    showLabel: false
+    showLabel: false,
+    hasTrigger: false
   })));
 }
 

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

@@ -35,7 +35,11 @@ function WidgetBox(props) {
 
   return /*#__PURE__*/_react["default"].createElement(_balloon["default"].Tooltip, {
     trigger: button,
-    align: "b"
+    align: "b" // 解决遮挡下拉浮层问题
+    ,
+    popupStyle: {
+      zIndex: 1000
+    }
   }, tooltip);
 }
 

package/lib/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/lib/core/editor/components/Toolbar/widgets/components/DropdownButton.js

@@ -21,6 +21,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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,
@@ -28,19 +29,21 @@ function DropdownButton(props) {
       children = props.children;
 
   var _useState = (0, _react.useState)(false),
-      visible = _useState[0],
-      setVisible = _useState[1];
+      active = _useState[0],
+      setActive = _useState[1];
 
   var button = /*#__PURE__*/_react["default"].createElement(_ButtonBox["default"], {
-    active: visible,
+    active: active,
+    disabled: disabled,
     showArrow: showArrow
   }, trigger);
 
   return /*#__PURE__*/_react["default"].createElement(_dropdown["default"], {
-    visible: visible,
+    visible: active,
+    disabled: disabled,
     trigger: button,
     triggerType: "click",
-    onVisibleChange: setVisible
+    onVisibleChange: setActive
   }, !showContainer ? children : /*#__PURE__*/_react["default"].createElement(PopupCard, null, children));
 }
 

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

@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _LineTypeModule = _interopRequireDefault(require("./LineType.module.scss"));
 
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -81,24 +83,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);
-      }
-    });
+    (0, _edgeTypeStyleUtil.setEdgesType)(edges, type, topo);
   };
 
   var handleChange = function handleChange(data) {

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

@@ -46,6 +46,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) {
@@ -92,6 +93,7 @@ function SizeInput(props) {
     step: step,
     placeholder: "\u8BF7\u8F93\u5165",
     size: size,
+    hasTrigger: hasTrigger,
     style: {
       width: '100%'
     },
@@ -123,6 +125,7 @@ function SizeInput(props) {
     step: step,
     placeholder: "\u8BF7\u8F93\u5165",
     size: size,
+    hasTrigger: hasTrigger,
     style: {
       width: '100%'
     },

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

@@ -7,7 +7,7 @@ exports["default"] = MultipleElementLineType;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _htElementUtils = require("../../../../../../utils/htElementUtils");
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
 
 var _LineType = _interopRequireDefault(require("../../common/LineType"));
 
@@ -16,43 +16,8 @@ function MultipleElementLineType(props) {
 
   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();
-    (0, _htElementUtils.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 (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
   };
 
   return /*#__PURE__*/_react["default"].createElement(_LineType["default"], {

package/lib/core/editor/store/topoEdit.js

@@ -21,6 +21,9 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 var _default = {
   // 定义 model 的初始 state
   state: {
+    // 是否就绪
+    ready: false,
+    // 保存状态
     saving: false,
     // 选择/拖动模式模式。默认选择模式 select|move
     viewMouseMode: 'select',

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

@@ -0,0 +1,82 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getEdgesBySelection = getEdgesBySelection;
+exports.setEdgesType = setEdgesType;
+
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+var ht = window.ht;
+
+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();
+    (0, _htElementUtils.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 
+ */
+
+
+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/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.5" === 'string' ? "6.0.0-alpha.5" : null;
+var version = typeof "6.0.0-alpha.7" === 'string' ? "6.0.0-alpha.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/TopoGraphView.js

@@ -36,10 +36,16 @@ var TopoGraphView = /*#__PURE__*/function () {
     this.contextMenu = new _ContextMenu["default"]();
   };
 
-  _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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.0-alpha.5",
+  "version": "6.0.0-alpha.7",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.5/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.7/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

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

@@ -1,36 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _extends from "@babel/runtime/helpers/extends";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
-/**
- * 拓扑图 Model
- */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-export default {
-  // 定义 model 的初始 state
-  state: {},
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
-      }
-    };
-  }
-};

package/lib/core/store/models/topoView.js

@@ -1,47 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
-/**
- * 拓扑图 Model
- */
-var _default = {
-  // 定义 model 的初始 state
-  state: {},
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return (0, _extends2["default"])({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-          return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
-      }
-    };
-  }
-};
-exports["default"] = _default;