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

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;
@@ -43,6 +44,14 @@
   text-align: center;
 }
 
+.disabledLabel {
+  color: #C9CED2;
+}
+
+.normalLabel {
+  color: #78849C;
+}
+
 .ButtonBox {
   height: 24px;
   display: flex;
@@ -56,9 +65,10 @@
     background: rgba(76, 137, 255, 0.1);
     border-radius: 4px;
   }
+
   &.ButtonBoxDisabled:hover {
     background: transparent;
     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/CloseablePanel.js

@@ -0,0 +1,28 @@
+import _ConfigProvider from "@alifd/next/es/config-provider";
+import _Icon from "@alifd/next/es/icon";
+import React from 'react';
+
+function CloseablePanel(props) {
+  var prefix = props.prefix,
+      title = props.title,
+      onClose = props.onClose,
+      children = props.children;
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: prefix + "drawer-header",
+    role: "heading",
+    "aria-level": "1"
+  }, title, /*#__PURE__*/React.createElement("a", {
+    role: "button",
+    "aria-label": "\u5173\u95ED",
+    className: prefix + "drawer-close",
+    onClick: onClose
+  }, /*#__PURE__*/React.createElement(_Icon, {
+    type: "close",
+    className: "next-drawer-close-icon"
+  }))), /*#__PURE__*/React.createElement("div", null, children));
+}
+
+CloseablePanel.defaultProps = {
+  prefix: 'next-'
+};
+export default _ConfigProvider.config(CloseablePanel);

package/es/core/editor/components/settings/OpenPropertyPanelListener.js

@@ -0,0 +1,33 @@
+import React, { useEffect } from 'react';
+export default function OpenPropertyPanelListener(props) {
+  var topo = props.topo;
+  var topoEditDispatchers = topo.store.useModelDispatchers('topoEdit'); // 双击打开
+
+  useEffect(function () {
+    var notifier = topo.view.topoClient.notifier;
+    notifier.on('topo_element_double_click', handleDblClick);
+
+    function handleDblClick(element) {
+      topoEditDispatchers.update({
+        propertyPanelVisible: true
+      });
+    }
+
+    return function () {
+      notifier.off('topo_element_double_click', handleDblClick);
+      topoEditDispatchers.update({
+        propertyPanelVisible: false
+      });
+    };
+  }, []); // 未选择元素关闭
+
+  var selection = topo.selectionManager.useHtSelection();
+  useEffect(function () {
+    if (!selection.length) {
+      topoEditDispatchers.update({
+        propertyPanelVisible: false
+      });
+    }
+  }, [selection]);
+  return props.children;
+}

package/es/core/editor/components/settings/PropertyView.js

@@ -1,37 +1,56 @@
 import React from 'react';
+import classNames from 'classnames';
 import Settings from "./Settings";
 import styles from "./Settings.module.scss";
+import OpenPropertyPanelListener from "./OpenPropertyPanelListener";
+import CloseablePanel from "./CloseablePanel";
 export default function PropertyView(props) {
+  var _classNames;
+
   var topo = props.topo,
       editorProps = props.editorProps;
   var store = topo.store;
   var topoState = store.useModelState('topoMod');
+  var topoShowType = topoState.type,
+      graphLoaded = topoState.graphLoaded;
 
   var _store$useModelState = store.useModelState('selection'),
       selection = _store$useModelState.selection;
 
-  var topoId = topoState.topoId,
-      topoShowType = topoState.type;
+  var _topo$store$useModel = topo.store.useModel('topoEdit'),
+      topoEditState = _topo$store$useModel[0],
+      topoEditDispatchers = _topo$store$useModel[1];
+
+  var propertyPanelVisible = topoEditState.propertyPanelVisible;
 
-  if (!topoId || !topoShowType) {
+  if (!graphLoaded) {
     return null;
   }
 
   var renderContent = function renderContent() {
-    if (!topoId || !topoShowType) {
+    if (!graphLoaded) {
       return null;
     }
 
-    return /*#__PURE__*/React.createElement(Settings, {
+    return /*#__PURE__*/React.createElement(OpenPropertyPanelListener, {
+      topo: topo
+    }, /*#__PURE__*/React.createElement(Settings, {
       topo: topo,
       topoShowType: topoShowType,
       topoEditApi: topo.topoEdit,
       selection: selection,
       editorProps: editorProps
-    });
+    }));
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.settingsPanel
-  }, renderContent());
+    className: classNames(styles.settingsPanel, (_classNames = {}, _classNames[styles.settingsPanelHide] = !propertyPanelVisible, _classNames))
+  }, /*#__PURE__*/React.createElement(CloseablePanel, {
+    title: "\u6570\u636E\u5C5E\u6027",
+    onClose: function onClose() {
+      topoEditDispatchers.update({
+        propertyPanelVisible: false
+      });
+    }
+  }), renderContent());
 }

package/es/core/editor/components/settings/Settings.js

@@ -41,17 +41,10 @@ export default function Settings(props) {
       topoEditApi = props.topoEditApi,
       selection = props.selection,
       editorProps = props.editorProps;
-  var settingRuntimeState = useSettingRuntimeState(); // const selectionSize = selection.length;
-  // const selectionIds = selection.map((item) => item.id).join(",");
-  // useEffect(() => {
-  // const selectionModel = topo.getSelectionModel();
-  // console.info('selection change', selection)
-  // }, [selection]);
-  // TODO 待优化
+  var settingRuntimeState = useSettingRuntimeState(); // TODO 待优化
 
   var updateElementProperty = function updateElementProperty(name, value) {
     // const element = topo.getDataModel().getDataById(selection[0].id);
-    var gv = topo.view.topoClient.getGraphView();
     var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
 
     if (name.startsWith("attrObject.")) {
@@ -70,41 +63,8 @@ export default function Settings(props) {
       element.setImage(value);
     } else if (name === "layout") {
       // console.info("element----layout", element, value);
-      var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id; // console.info(
-      //   "element----layout",
-      //   topo.view.topoClient.htTopoClient,
-      //   layouType
-      // );
-
-      topo.getHtTopo().layoutInContainer(layouType); // let autoLayout = new ht.layout.AutoLayout(gv);
-      // const layouType=value.id==='toward'?`${value.id}${value.options.subId}`:value.id;
-      // gv.dm().sm().ss(element.getChildren());
-      // autoLayout.layout(layouType, function () {
-      //   gv.dm().sm().ss(element);
-      // });
-    } else if (name === "groupAlign") {
-      var selectList = [];
-
-      if (selection.length === 1) {
-        // 选择分层
-        if (element instanceof ht.Grid) {
-          // selectList = gv
-          //   .dm()
-          //   .toDatas((d) => d.getHost() === gv.dm().sm().ld())
-          //   .toArray();
-          selectList = element.getChildren().toArray();
-        } // 选择分区
-
-
-        if (element instanceof ht.Group) {
-          selectList = element.getChildren().toArray();
-        }
-      } else {
-        selectList = topo.getSelectionModel().getSelection().toArray();
-      } // console.info("element--selectList", element, selectList);
-
-
-      topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(value, selectList);
+      var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id;
+      topo.getHtTopo().layoutInContainer(layouType);
     }
   };
 
@@ -125,7 +85,7 @@ export default function Settings(props) {
     });
   });
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.settings
+    className: styles.content
   }, /*#__PURE__*/React.createElement(PropertyView, {
     type: elementType,
     topo: topo,

package/es/core/editor/components/settings/Settings.module.scss

@@ -7,14 +7,17 @@
   top: 0;
   right: 0;
   border-radius: 2px;
-  //border: 1px solid #E6E7EB;
-  //border-left: none;
+  border-left: 1px solid #E6E7EB;
 
   display: flex;
   flex-direction: column;
   overflow: hidden;
+  transition: width .1s linear;
 
-  //margin-top: 47px;
+  &.settingsPanelHide {
+    width: 0;
+    border-left: none;
+  }
 
   :global {
     // 滚动条
@@ -72,9 +75,10 @@
   }
 }
 
-.settings {
+.content {
   flex: 1;
   background: #FFFFFF;
   overflow: auto;
   // padding-bottom: 12px;
+
 }

package/es/core/editor/components/settings/common/AlignSetting/AlignTypeList.js

@@ -0,0 +1,76 @@
+import _Button from "@alifd/next/es/button";
+import _Icon from "@alifd/next/es/icon";
+import _Divider from "@alifd/next/es/divider";
+import React, { useState } from "react";
+import styles from "./AlignSetting.module.scss";
+var TREE_LAYOUT_OPTIONS = [{
+  value: "left",
+  label: "左对齐",
+  icon: "tuopu_zuoceduiqi"
+}, {
+  value: "center",
+  label: "水平居中",
+  icon: "tuopu_shuipingjuzhongduiqi"
+}, {
+  value: "right",
+  label: "右对齐",
+  icon: "tuopu_youceduiqi"
+}, {
+  value: "top",
+  label: "靠上对齐",
+  icon: "tuopu_dingbuduiqi"
+}, {
+  value: "middle",
+  label: "垂直居中",
+  icon: "tuopu_chuizhijuzhongduiqi"
+}, {
+  value: "bottom",
+  label: "靠下对齐",
+  icon: "tuopu_dibuduiqi"
+}, {
+  value: "divide"
+}, {
+  value: "distributeHorizontal",
+  label: "横向分布",
+  icon: "tuopu_shuipingdengjianjuduiqi"
+}, {
+  value: "distributeVertical",
+  label: "纵向分布",
+  icon: "tuopu_chuizhidengjianjuduiqi"
+}];
+
+var AlignTypeList = function AlignTypeList(props) {
+  var _props$selected = props.selected,
+      selected = _props$selected === void 0 ? "left" : _props$selected,
+      onChange = props.onChange;
+
+  var _useState = useState(selected),
+      value = _useState[0],
+      setValue = _useState[1];
+
+  var handleChange = function handleChange(data) {
+    // console.log("handleChange", data);
+    onChange && onChange(data.value);
+    setValue(data.value); // setValue(data)
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.AlignSetting
+  }, TREE_LAYOUT_OPTIONS.map(function (item, index, array) {
+    return item.value === "divide" ? /*#__PURE__*/React.createElement(_Divider, {
+      key: index,
+      direction: "ver"
+    }) : /*#__PURE__*/React.createElement(_Button, {
+      key: index,
+      className: "" + styles.redioBtn,
+      onClick: function onClick() {
+        handleChange(item);
+      },
+      title: item.label
+    }, /*#__PURE__*/React.createElement(_Icon, {
+      type: item.icon
+    }));
+  }));
+};
+
+export default AlignTypeList;

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

@@ -1,76 +1,25 @@
-import _Button from "@alifd/next/es/button";
-import _Icon from "@alifd/next/es/icon";
-import _Divider from "@alifd/next/es/divider";
-import React, { useState } from "react";
-import styles from "./AlignSetting.module.scss";
-var TREE_LAYOUT_OPTIONS = [{
-  value: "left",
-  label: "左对齐",
-  icon: "tuopu_zuoceduiqi"
-}, {
-  value: "center",
-  label: "水平居中",
-  icon: "tuopu_shuipingjuzhongduiqi"
-}, {
-  value: "right",
-  label: "右对齐",
-  icon: "tuopu_youceduiqi"
-}, {
-  value: "top",
-  label: "靠上对齐",
-  icon: "tuopu_dingbuduiqi"
-}, {
-  value: "middle",
-  label: "垂直居中",
-  icon: "tuopu_chuizhijuzhongduiqi"
-}, {
-  value: "bottom",
-  label: "靠下对齐",
-  icon: "tuopu_dibuduiqi"
-}, {
-  value: "divide"
-}, {
-  value: "distributeHorizontal",
-  label: "横向分布",
-  icon: "tuopu_shuipingdengjianjuduiqi"
-}, {
-  value: "distributeVertical",
-  label: "纵向分布",
-  icon: "tuopu_chuizhidengjianjuduiqi"
-}];
+import React from 'react';
+import { isEdge, isLayer } from "../../../../../../utils/htElementUtils";
+import AlignTypeList from "./AlignTypeList";
+export default function AlignSetting(props) {
+  var topo = props.topo,
+      getClickType = props.getClickType;
 
-var AlignSetting = function AlignSetting(props) {
-  var _props$selected = props.selected,
-      selected = _props$selected === void 0 ? "left" : _props$selected,
-      onChange = props.onChange;
+  var alignOnChange = function alignOnChange(type) {
+    getClickType(type);
+    topo.historyManager.beginTransaction();
+    var selection = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
+    var nodes = selection.filter(function (ele) {
+      return !isLayer(ele) && !isEdge(ele);
+    }); // console.info("element--selectList", element, selectList);
 
-  var _useState = useState(selected),
-      value = _useState[0],
-      setValue = _useState[1];
+    topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(type, nodes); // topo.view.topoClient.htTopoClient.setElementsSpace(nodes,'h',300)
 
-  var handleChange = function handleChange(data) {
-    // console.log("handleChange", data);
-    onChange && onChange(data.value);
-    setValue(data.value); // setValue(data)
+    topo.historyManager.endTransaction();
   };
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles.AlignSetting
-  }, TREE_LAYOUT_OPTIONS.map(function (item, index, array) {
-    return item.value === "divide" ? /*#__PURE__*/React.createElement(_Divider, {
-      key: index,
-      direction: "ver"
-    }) : /*#__PURE__*/React.createElement(_Button, {
-      key: index,
-      className: "" + styles.redioBtn,
-      onClick: function onClick() {
-        handleChange(item);
-      },
-      title: item.label
-    }, /*#__PURE__*/React.createElement(_Icon, {
-      type: item.icon
-    }));
-  }));
-};
-
-export default AlignSetting;
+  return /*#__PURE__*/React.createElement(AlignTypeList, {
+    onChange: alignOnChange,
+    selected: "left"
+  });
+}

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

@@ -1,123 +1,16 @@
-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. 弧线
-// 7. 弧线单向箭头 8. 内向双向箭头 9. 纵向折线 10. 纵向折线带箭头 11. 水平折线 12. 水平折线带箭头
-
-var LINE_TYPE_OPTIONS = [{
-  value: "boundary",
-  label: "直线",
-  icon: "topo_linear_icon_straightline"
-}, {
-  value: "boundary.arrow",
-  label: "直线单向箭头",
-  icon: "topo_linear_icon_oneway_straightline"
-}, {
-  value: "boundary.both.arrow",
-  label: "直线双向箭头",
-  icon: "topo_linear_icon_expanded_straightline"
-}, {
-  value: "ortho",
-  label: "双折线",
-  icon: "topo_linear_icon_bilinear"
-}, {
-  value: "ortho.arrow",
-  label: "双折线单向箭头",
-  icon: "topo_linear_icon_oneway_bilinear"
-}, {
-  value: "flex",
-  label: "弧线",
-  icon: "topo_linear_icon_arcline"
-}, {
-  value: "flex.arrow",
-  label: "弧线单向箭头",
-  icon: "topo_linear_icon_oneway_arcline"
-}, {
-  value: "oposite",
-  label: "内向双向箭头",
-  icon: "topo_linear_icon_narrow_straightline"
-}, {
-  value: "h.v",
-  label: "纵向折线",
-  icon: "topo_linear_icon_vertical_foldline"
-}, {
-  value: "h.v.arrow",
-  label: "纵向折线带箭头",
-  icon: "topo_linear_icon_oneway_vertical_foldline"
-}, {
-  value: "v.h",
-  label: "水平折线",
-  icon: "topo_linear_icon_horizontal_foldline"
-}, {
-  value: "v.h.arrow",
-  label: "水平折线带箭头",
-  icon: "topo_linear_icon_oneway_horizontal_foldline"
-}];
-
-var LineType = function LineType(props) {
-  var topo = props.topo,
-      getEdges = props.getEdges,
-      selected = props.selected,
-      onChange = props.onChange;
-
-  var _useState = useState(selected),
-      value = _useState[0],
-      setValue = _useState[1];
+import React from 'react';
+import { getEdgesBySelection, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
+import LineType from "../../../Toolbar/widgets/EdgeTypeButton/LineType";
+export default function LineTypeSetting(props) {
+  var topo = props.topo;
 
   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);
-      }
-    });
+    var edges = getEdgesBySelection(topo);
+    setEdgesType(edges, type, topo);
   };
 
-  var handleChange = function handleChange(data) {
-    // console.log("handleChange", data);
-    topo.historyManager.beginTransaction();
-
-    if (onChange) {
-      onChange(data.value);
-    }
-
-    setValue(data.value);
-    setLineType(data.value);
-    topo.historyManager.endTransaction();
-  };
-
-  return /*#__PURE__*/React.createElement(_Box, {
-    spacing: 16,
-    wrap: true,
-    direction: "row",
-    className: styles.LineType
-  }, LINE_TYPE_OPTIONS.map(function (item, index, array) {
-    return /*#__PURE__*/React.createElement(_Button, {
-      key: index,
-      className: "" + styles.redioBtn,
-      title: item.label,
-      onClick: function onClick() {
-        handleChange(item);
-      }
-    }, /*#__PURE__*/React.createElement("img", {
-      src: "/img/topo/editor/lineType/" + item.icon + ".svg",
-      alt: "",
-      className: styles.iconImg
-    }));
-  }));
-};
-
-export default LineType;
+  return /*#__PURE__*/React.createElement(LineType, {
+    onChange: setLineType,
+    topo: topo
+  });
+}

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import SizeInput from "../SizeInput";
 var NODE_SIZE_LOCK = 'NODE_SIZE_LOCK';
 /**
@@ -103,14 +103,14 @@ function NodeSizeInput(props) {
     return val ? Math.round(val) : val;
   }
 
-  return /*#__PURE__*/React.createElement(SizeInput, {
+  return /*#__PURE__*/React.createElement(SizeInput, _extends({}, props, {
     value: value,
     lock: lock,
     max: max,
     step: step,
     onChange: handleChange,
     onLockChange: switchLock
-  });
+  }));
 }
 
 NodeSizeInput.propTypes = {