@riil-frontend/component-topology 6.0.0-alpha.8 → 6.0.1

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

@@ -1,37 +1,76 @@
-import React from 'react';
+import classNames from 'classnames';
+import React, { useEffect, useMemo } from 'react';
+import CloseablePanel from "./CloseablePanel";
+import { adapterGetEdgePropertyViewType, addEdgePropertyViews } from "./core/edgePropertyViewAdapter";
+import PropertyViewManager from "./core/PropertyViewManager";
 import Settings from "./Settings";
 import styles from "./Settings.module.scss";
-export default function PropertyView(props) {
+export default function PropertyPanel(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;
+  var propertyViewManager = useMemo(function () {
+    return new PropertyViewManager(topo);
+  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
+
+  addEdgePropertyViews(propertyViewManager, editorProps);
+
+  propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
+    return adapterGetEdgePropertyViewType(elements, editorProps);
+  };
+
+  var PropertyView = propertyViewManager.getPropertyView();
+  useEffect(function () {
+    if (graphLoaded) {
+      propertyViewManager.init();
+    }
+
+    return function () {
+      propertyViewManager.destroy();
+    };
+  }, [graphLoaded, propertyViewManager]); // 没有视图关闭属性面板
 
-  if (!topoId || !topoShowType) {
-    return null;
-  }
+  useEffect(function () {
+    if (propertyPanelVisible && !PropertyView) {
+      propertyViewManager.close();
+    }
+  }, [propertyPanelVisible, PropertyView, propertyViewManager]);
 
   var renderContent = function renderContent() {
-    if (!topoId || !topoShowType) {
+    if (!propertyPanelVisible || !PropertyView) {
       return null;
     }
 
     return /*#__PURE__*/React.createElement(Settings, {
       topo: topo,
+      selection: selection,
+      PropertyView: PropertyView,
       topoShowType: topoShowType,
       topoEditApi: topo.topoEdit,
-      selection: selection,
       editorProps: editorProps
     });
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.settingsPanel
-  }, renderContent());
+    className: classNames(styles.propertyPanel, (_classNames = {}, _classNames[styles.hide] = !propertyPanelVisible, _classNames))
+  }, /*#__PURE__*/React.createElement(CloseablePanel, {
+    title: "\u6570\u636E\u5C5E\u6027",
+    onClose: function onClose() {
+      propertyViewManager.close();
+    }
+  }, renderContent()));
 }

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

@@ -1,141 +1,56 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from "react";
-import { isEdge, isGroup, isLayer, isNode, isText } from "../../../../utils/htElementDataUtil";
-import propertyPanelMap from "./propertyViews";
+import React, { useEffect, useMemo, useState } from 'react';
 import useSettingRuntimeState from "./useSettingRuntimeState";
-import styles from "./Settings.module.scss";
+import updateElementProperty from "./core/updateElementProperty";
 
-function getElementType(selection) {
-  var selectionElement = selection[0];
-  var selectionSize = selection.length;
-  var elementType;
-
-  if (!selectionSize) {
-    // 未选
-    elementType = "view";
-  } else if (selectionSize >= 2) {
-    // 多选
-    elementType = "multiple";
-  } else if (isGroup(selectionElement)) {
-    elementType = "group";
-  } else if (selectionElement.attrObject.topLeftText) {
-    // TODO 临时方式
-    elementType = "box";
-  } else if (isNode(selectionElement)) {
-    elementType = "node";
-  } else if (isEdge(selectionElement)) {
-    elementType = "edge";
-  } else if (isLayer(selectionElement)) {
-    // 分层
-    elementType = "layer";
-  } else if (isText(selectionElement)) {
-    elementType = "text";
-  }
+function buildElementValues(selection) {
+  var values = _extends({}, selection[0]);
 
-  return elementType;
+  var attrTypes = ['attrObject', 'position', 'styleMap'];
+  attrTypes.forEach(function (type) {
+    Object.keys(values[type] || {}).forEach(function (key) {
+      values[type + "." + key] = values[type][key];
+    });
+  });
+  return values;
 }
 
-export default function Settings(props) {
+export default function PropertyViewContainer(props) {
   var topo = props.topo,
       topoShowType = props.topoShowType,
       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 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.")) {
-      element.setAttr(name.replace("attrObject.", ""), value);
-    } else if (name.startsWith("position.")) {
-      element.setPosition(name.replace("position.", ""), value);
-    } else if (name.startsWith("styleMap.")) {
-      element.setStyle(name.replace("styleMap.", ""), value);
-    } else if (name === "name") {
-      element.setName(value);
-    } else if (name === "width") {
-      element.setWidth(value);
-    } else if (name === "height") {
-      element.setHeight(value);
-    } else if (name === "image") {
-      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 elementType = getElementType(selection);
-  var PropertyView = propertyPanelMap[elementType];
-
-  if (!PropertyView) {
-    return null;
+      editorProps = props.editorProps,
+      PropertyView = props.PropertyView;
+  var settingRuntimeState = useSettingRuntimeState();
+  var selectionElements = useMemo(function () {
+    return topo.selectionModel.getSelection();
+  }, [selection]); // 不建议使用，直接使用ht元素对象。待优化
+
+  var singleElementValues = useMemo(function () {
+    return selection.length === 1 ? buildElementValues(selection) : undefined;
+  }, [selection]);
+  var elementProps = {};
+
+  if (selection.length === 1) {
+    elementProps = {
+      selectionElement: selectionElements[0],
+      values: singleElementValues
+    };
   }
 
-  var attrTypes = ["attrObject", "position", "styleMap"];
-
-  var values = _extends({}, selection[0]);
-
-  attrTypes.forEach(function (type) {
-    Object.keys(values[type] || {}).forEach(function (key) {
-      values[type + "." + key] = values[type][key];
-    });
-  });
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles.settings
-  }, /*#__PURE__*/React.createElement(PropertyView, {
-    type: elementType,
+  return /*#__PURE__*/React.createElement(PropertyView, _extends({
     topo: topo,
+    selection: selection,
+    selectionElements: selectionElements,
     topoShowType: topoShowType,
     topoEdit: topoEditApi,
     topoEditApi: topoEditApi,
-    selection: selection,
-    values: values,
-    onChange: updateElementProperty,
-    editorProps: editorProps,
+    editorProps: editorProps
+  }, elementProps, {
+    onChange: function onChange(name, value) {
+      updateElementProperty(topo, name, value);
+    },
     settingRuntimeState: settingRuntimeState
   }));
 }

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

@@ -1,20 +1,23 @@
 @import '~@alifd/next/variables.scss';
 
-.settingsPanel {
+.propertyPanel {
   width: 280px;
   height: 100%;
   position: absolute;
   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;
+  &.hide {
+    width: 0;
+    border-left: none;
+  }
 
   :global {
     // 滚动条
@@ -71,10 +74,3 @@
     align-items: center;
   }
 }
-
-.settings {
-  flex: 1;
-  background: #FFFFFF;
-  overflow: auto;
-  // padding-bottom: 12px;
-}

package/es/core/editor/components/settings/common/AlignSetting/AlignSetting.module.scss

@@ -6,7 +6,7 @@
       background: #EBECF0;
       margin-right: 3px;
       height: 16px;
-
+      width:1px;
     }
   }
 
@@ -16,8 +16,8 @@
     border-radius: 4px;
     border: none !important;
     color: #4D6277;
-    padding-left: 6px;
-    margin-right: 3px;
+    padding-left: 2px;
+    margin-right: 4px;
 
     &:active {
       background: #F2F7FD !important;

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

@@ -0,0 +1,80 @@
+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,
+      distributionDisabled = props.distributionDisabled;
+
+  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,
+      text: true,
+      onClick: function onClick() {
+        handleChange(item);
+      },
+      title: item.label // eslint-disable-next-line no-unneeded-ternary
+      ,
+      disabled: (item.value === 'distributeHorizontal' || item.value === 'distributeVertical') && distributionDisabled
+    }, /*#__PURE__*/React.createElement(_Icon, {
+      type: item.icon
+    }));
+  }));
+};
+
+export default AlignTypeList;

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

@@ -1,76 +1,24 @@
-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,
+      distributionDisabled = props.distributionDisabled;
 
-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) {
+    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];
-
-  var handleChange = function handleChange(data) {
-    // console.log("handleChange", data);
-    onChange && onChange(data.value);
-    setValue(data.value); // setValue(data)
+    topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(type, nodes);
+    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",
+    distributionDisabled: distributionDisabled
+  });
+}

package/es/core/editor/components/settings/common/GroupNodeList/ResourceList.module.scss

@@ -2,6 +2,7 @@
 
 .list {
   max-height: 100%;
+  margin-top: -8px;
 
   .item{
     display: flex;

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

@@ -1,107 +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";
-import { setEdgesType } from "../../../../utils/edgeTypeStyleUtil"; //  直线 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 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/NameInput.js

@@ -0,0 +1,24 @@
+import _Input from "@alifd/next/es/input";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["multipleLine"];
+import React from 'react';
+var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var multipleLine = props.multipleLine,
+      inputProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  if (multipleLine) {
+    return /*#__PURE__*/React.createElement(_Input.TextArea, _extends({
+      ref: ref,
+      autoHeight: {
+        minRows: 4,
+        maxRows: 4
+      }
+    }, inputProps));
+  }
+
+  return /*#__PURE__*/React.createElement(_Input, _extends({
+    ref: ref
+  }, inputProps));
+});
+export default NameInput;