@riil-frontend/component-topology 6.0.0-alpha.3 → 6.0.0-alpha.30

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

@@ -1,15 +1,12 @@
 import _Box from "@alifd/next/es/box";
 import _extends from "@babel/runtime/helpers/extends";
-import _Grid from "@alifd/next/es/grid";
 import _Form from "@alifd/next/es/form";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import NodeSizeNumberPicker from "./NodeSizeNumberPicker";
 import styles from "./NodeSizeInput.module.scss";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 var FormItem = _Form.Item;
-var Row = _Grid.Row,
-    Col = _Grid.Col;
 /**
  * 节点大小组件
  *
@@ -22,11 +19,13 @@ function SizeInput(props) {
       max = props.max,
       step = props.step,
       onChange = props.onChange,
-      lock = props.lock,
-      onLockChange = props.onLockChange,
       _props$showLabel = props.showLabel,
       showLabel = _props$showLabel === void 0 ? true : _props$showLabel,
-      size = props.size;
+      numberPickerProps = props.numberPickerProps,
+      size = props.size,
+      lock = props.lock,
+      disabled = props.disabled,
+      onLockChange = props.onLockChange;
 
   var handleChange = function handleChange(name, attrValue) {
     var _extends2;
@@ -45,6 +44,18 @@ function SizeInput(props) {
     return val ? Math.round(val) : val;
   }
 
+  var renderLock = function renderLock() {
+    var imgSrc = "/img/topo/editor/toolbar/" + (lock ? 'lock' : 'unlock') + "/" + (disabled ? 'Disable' : 'Normal') + ".svg";
+    return /*#__PURE__*/React.createElement("div", {
+      className: styles.lockBtn,
+      onClick: switchLock
+    }, /*#__PURE__*/React.createElement("img", {
+      src: imgSrc,
+      alt: "",
+      width: 12
+    }));
+  };
+
   return /*#__PURE__*/React.createElement(_Form, {
     labelAlign: "top",
     component: "div",
@@ -65,27 +76,24 @@ function SizeInput(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, {
+  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, _extends({
     value: parseValue(value.width),
     label: showLabel ? '宽:' : '',
+    innerAfter: showLabel ? undefined : 'W',
     min: 1,
     max: max,
     step: step,
+    disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165",
-    size: size,
+    size: size
+  }, numberPickerProps, {
     style: {
       width: '100%'
     },
     onChange: function onChange(val) {
       return handleChange('width', val);
     }
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: styles.lockBtn,
-    onClick: switchLock
-  }, /*#__PURE__*/React.createElement("img", {
-    src: require(lock ? './img/icon_锁.svg' : './img/icon_解锁.svg'),
-    alt: ""
-  })), /*#__PURE__*/React.createElement("div", {
+  })))), renderLock(), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
@@ -95,22 +103,24 @@ function SizeInput(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, {
+  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, _extends({
     value: parseValue(value.height),
-    label: showLabel ? '高:' : '' // addonTextAfter="H"
-    ,
+    label: showLabel ? '高:' : '',
+    innerAfter: showLabel ? undefined : 'H',
     min: 1,
     max: max,
     step: step,
+    disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165",
-    size: size,
+    size: size
+  }, numberPickerProps, {
     style: {
       width: '100%'
     },
     onChange: function onChange(val) {
       return handleChange('height', val);
     }
-  }))))));
+  })))))));
 }
 
 SizeInput.propTypes = {

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

@@ -1,8 +1,8 @@
 import _NumberPicker from "@alifd/next/es/number-picker";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["value", "onChange", "min", "onBlur", "onKeyDown"];
-import React, { useState, useEffect } from 'react';
+var _excluded = ["value", "onChange", "min", "onBlur", "onKeyDown", "disabled"];
+import React, { useState, useEffect } from "react";
 
 /**
  * 节点大小组件
@@ -16,6 +16,7 @@ export default function NodeSizeNumberPicker(props) {
       min = props.min,
       onBlur = props.onBlur,
       onKeyDown = props.onKeyDown,
+      disabled = props.disabled,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var _useState = useState(value),
@@ -48,13 +49,13 @@ export default function NodeSizeNumberPicker(props) {
 
   var handleChange = function handleChange(value, e) {
     // 失去焦点最大最小值
-    if (e.type === 'blur') {
+    if (e.type === "blur") {
       onChange(!value ? min : value);
       return;
     } // 加减号立即变更
 
 
-    if (e.triggerType === 'up' || e.triggerType === 'down') {
+    if (e.triggerType === "up" || e.triggerType === "down") {
       onChange(value);
       return;
     }
@@ -65,9 +66,9 @@ export default function NodeSizeNumberPicker(props) {
   return /*#__PURE__*/React.createElement(_NumberPicker, _extends({}, otherProps, {
     value: inputValue,
     min: min,
+    disabled: disabled,
     onChange: handleChange,
     onBlur: handleBlur,
     onKeyDown: handleKeyDown
   }));
-}
-;
+}

package/es/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js

@@ -71,13 +71,5 @@ export default function GroupExpandSetting(props) {
     setExpanded: function setExpanded(val) {
       return group.setExpanded(val);
     }
-  }))), /*#__PURE__*/React.createElement(CollapsePanel, {
-    key: "\u5BF9\u9F50\u65B9\u5F0F",
-    title: "\u5BF9\u9F50\u65B9\u5F0F"
-  }, /*#__PURE__*/React.createElement(_Form.Item, {
-    label: ""
-  }, /*#__PURE__*/React.createElement(AlignSetting, {
-    onChange: alignOnChange,
-    selected: "left"
   }))));
 }

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

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import React, { useState, useEffect, useRef, useCallback, useMemo } from "react";
 import SizeInput from "../../../common/SizeInput";
 
 var NodesSizeRatioMap = /*#__PURE__*/function () {
@@ -80,7 +80,7 @@ export default function BatchSetNodeSize(props) {
     if (lock) {
       var _setSize;
 
-      setSize((_setSize = {}, _setSize[name] = value, _setSize[name === 'width' ? 'height' : 'width'] = undefined, _setSize));
+      setSize((_setSize = {}, _setSize[name] = value, _setSize[name === "width" ? "height" : "width"] = undefined, _setSize));
     } else {
       var _extends2;
 
@@ -89,10 +89,10 @@ export default function BatchSetNodeSize(props) {
 
     topo.historyManager.beginTransaction();
     nodes.forEach(function (node) {
-      if (name === 'width') {
+      if (name === "width") {
         if (lock) {
           var height = nodesSizeRatioMap.getNodeHeight(node, value);
-          rlog.debug('多元素锁定设置宽', node, value, height);
+          rlog.debug("多元素锁定设置宽", node, value, height);
           node.setHeight(height);
         }
 
@@ -117,11 +117,10 @@ export default function BatchSetNodeSize(props) {
     nodesSizeRatioMap.reset();
   };
 
-  return /*#__PURE__*/React.createElement(SizeInput, {
+  return /*#__PURE__*/React.createElement(SizeInput, _extends({}, props, {
     value: size,
     lock: lock,
     onChange: handleChange,
     onLockChange: onLockChange
-  });
-}
-;
+  }));
+}

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

@@ -1,52 +1,15 @@
 import React from 'react';
-import { getEdges } from "../../../../../../utils/htElementUtils";
-import LineType from "../../common/LineType";
+import { getEdgesBySelection, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
+import LineType from "../../../Toolbar/widgets/EdgeTypeButton/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;
+  var setLineType = function setLineType(type) {
+    var edges = getEdgesBySelection(topo);
+    setEdgesType(edges, type, topo);
   };
 
   return /*#__PURE__*/React.createElement(LineType, {
-    getEdges: getSelectedEdges,
     onChange: setLineType,
     topo: topo
   });

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

@@ -34,19 +34,7 @@ export default function MultipleElementPropertyView(props) {
 
   useEffect(function () {
     field.setValues(values);
-  }, [values]);
-
-  var alignOnChange = function alignOnChange(v) {
-    // console.log('setAlignmentBySelectionNodes', v);
-    topo.historyManager.beginTransaction();
-    topo.getHtTopo().setAlignmentBySelectionNodes(v);
-
-    _onChange('groupAlign', v); // topoEditApi.setAlignmentBySelectionNodes(v);
-
-
-    topo.historyManager.endTransaction();
-  }; // TODO 临时方案，满足应用部署拓扑多选元素属性面板不显示对齐
-
+  }, [values]); // TODO 临时方案，满足应用部署拓扑多选元素属性面板不显示对齐
 
   if (!(editorProps !== null && editorProps !== void 0 && (_editorProps$multiple = editorProps.multipleElementPropertyViewProps) !== null && _editorProps$multiple !== void 0 && _editorProps$multiple.showElementAlign) && topoShowType === TPL_TREE) {
     return /*#__PURE__*/React.createElement(ViewPropertyView, props);
@@ -78,8 +66,7 @@ export default function MultipleElementPropertyView(props) {
     key: "\u5BF9\u9F50\u65B9\u5F0F",
     title: "\u5BF9\u9F50\u65B9\u5F0F"
   }, /*#__PURE__*/React.createElement(AlignSetting, {
-    onChange: alignOnChange,
-    selected: "left"
+    topo: topo
   })), /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u7EBF\u5F62",
     title: "\u7EBF\u5F62"

package/es/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js

@@ -1,10 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-import SizeInput from "../../common/SizeInput";
+import React, { useState, useEffect, useRef, useCallback } from "react";
+import SizeInput from "../../common/SizeInput"; // 这个似乎不需要了
+
 export default function BatchSetNodeSize(props) {
-  var size = props.size;
+  var value = props.value,
+      size = props.size,
+      disabled = props.disabled;
   return /*#__PURE__*/React.createElement(SizeInput, _extends({}, props, {
-    value: {}
+    disabled: disabled,
+    value: value
   }));
-}
-;
+}

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/useKeyboardShortcut.js

@@ -0,0 +1,42 @@
+import React, { useEffect } from 'react';
+var ht = window.ht; // 快捷键
+
+export default function useKeyboardShortcut(props) {
+  var topo = props.topo,
+      topoEdit = props.topoEdit,
+      isEditMode = props.isEditMode;
+  useEffect(function () {
+    var handleKeyDown = function handleKeyDown(e) {
+      if (e.target.tagName === 'INPUT') {
+        return;
+      }
+
+      var isCtrlDown = ht.Default.isCtrlDown;
+
+      if (isCtrlDown(e)) {
+        if (e.keyCode === 90) {
+          // ctrl+z 撤销
+          topo.historyManager.undo();
+        } //  else if (e.keyCode == 89) {//ctrl+y 重做
+        //   this.redo();
+        // }
+
+      }
+
+      if (e.keyCode === 32) {
+        var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
+            viewMouseMode = _topo$store$getModelS.viewMouseMode;
+
+        topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
+      }
+    };
+
+    if (isEditMode) {
+      window.addEventListener('keydown', handleKeyDown);
+    }
+
+    return function () {
+      window.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [isEditMode]);
+}

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

@@ -0,0 +1,49 @@
+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 function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: {
+      // 是否就绪
+      ready: false,
+      // 保存状态
+      saving: false,
+      // 选择/拖动模式模式。默认选择模式 select|move
+      viewMouseMode: 'select',
+      // 资源面板展开项
+      resourceTabActiveKey: null,
+      // 属性面板是否显示
+      propertyPanelVisible: false
+    },
+    // 定义改变该模型状态的纯函数
+    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/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
+  };
+}