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

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

@@ -5,43 +5,67 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = PropertyView;
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _react = _interopRequireDefault(require("react"));
 
+var _CloseablePanel = _interopRequireDefault(require("./CloseablePanel"));
+
+var _OpenPropertyPanelListener = _interopRequireDefault(require("./OpenPropertyPanelListener"));
+
 var _Settings = _interopRequireDefault(require("./Settings"));
 
 var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
 
 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 (!propertyPanelVisible) {
       return null;
     }
 
-    return /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
+    return /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
+      topo: topo
+    }, /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
       topo: topo,
       topoShowType: topoShowType,
       topoEditApi: topo.topoEdit,
       selection: selection,
       editorProps: editorProps
-    });
+    }));
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _SettingsModule["default"].settingsPanel
-  }, renderContent());
+    className: (0, _classnames["default"])(_SettingsModule["default"].settingsPanel, (_classNames = {}, _classNames[_SettingsModule["default"].settingsPanelHide] = !propertyPanelVisible, _classNames))
+  }, /*#__PURE__*/_react["default"].createElement(_CloseablePanel["default"], {
+    title: "\u6570\u636E\u5C5E\u6027",
+    onClose: function onClose() {
+      topoEditDispatchers.update({
+        propertyPanelVisible: false
+      });
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
+    topo: topo
+  }, renderContent())));
 }

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

@@ -53,17 +53,10 @@ function Settings(props) {
       topoEditApi = props.topoEditApi,
       selection = props.selection,
       editorProps = props.editorProps;
-  var settingRuntimeState = (0, _useSettingRuntimeState["default"])(); // 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 = (0, _useSettingRuntimeState["default"])(); // 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.")) {
@@ -82,41 +75,8 @@ 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);
     }
   };
 
@@ -135,7 +95,7 @@ function Settings(props) {
     });
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _SettingsModule["default"].settings
+    className: _SettingsModule["default"].content
   }, /*#__PURE__*/_react["default"].createElement(PropertyView, {
     type: elementType,
     topo: topo,

package/lib/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/lib/core/editor/components/settings/common/AlignSetting/AlignSetting.module.scss

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

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

@@ -0,0 +1,97 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
+
+var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
+
+var _divider = _interopRequireDefault(require("@alifd/next/lib/divider"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _AlignSettingModule = _interopRequireDefault(require("./AlignSetting.module.scss"));
+
+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; }
+
+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 = (0, _react.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["default"].createElement("div", {
+    className: _AlignSettingModule["default"].AlignSetting
+  }, TREE_LAYOUT_OPTIONS.map(function (item, index, array) {
+    return item.value === 'divide' ? /*#__PURE__*/_react["default"].createElement(_divider["default"], {
+      key: index,
+      direction: "ver"
+    }) : /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      key: index,
+      className: "" + _AlignSettingModule["default"].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["default"].createElement(_icon["default"], {
+      type: item.icon
+    }));
+  }));
+};
+
+var _default = AlignTypeList;
+exports["default"] = _default;

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

@@ -3,91 +3,32 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = AlignSetting;
 
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
+var _react = _interopRequireDefault(require("react"));
 
-var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
+var _htElementUtils = require("../../../../../../utils/htElementUtils");
 
-var _divider = _interopRequireDefault(require("@alifd/next/lib/divider"));
+var _AlignTypeList = _interopRequireDefault(require("./AlignTypeList"));
 
-var _react = _interopRequireWildcard(require("react"));
+function AlignSetting(props) {
+  var topo = props.topo,
+      distributionDisabled = props.distributionDisabled;
 
-var _AlignSettingModule = _interopRequireDefault(require("./AlignSetting.module.scss"));
+  var alignOnChange = function alignOnChange(type) {
+    topo.historyManager.beginTransaction();
+    var selection = topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
+    var nodes = selection.filter(function (ele) {
+      return !(0, _htElementUtils.isLayer)(ele) && !(0, _htElementUtils.isEdge)(ele);
+    }); // console.info("element--selectList", element, selectList);
 
-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; }
-
-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 AlignSetting = function AlignSetting(props) {
-  var _props$selected = props.selected,
-      selected = _props$selected === void 0 ? "left" : _props$selected,
-      onChange = props.onChange;
-
-  var _useState = (0, _react.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["default"].createElement("div", {
-    className: _AlignSettingModule["default"].AlignSetting
-  }, TREE_LAYOUT_OPTIONS.map(function (item, index, array) {
-    return item.value === "divide" ? /*#__PURE__*/_react["default"].createElement(_divider["default"], {
-      key: index,
-      direction: "ver"
-    }) : /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      key: index,
-      className: "" + _AlignSettingModule["default"].redioBtn,
-      onClick: function onClick() {
-        handleChange(item);
-      },
-      title: item.label
-    }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
-      type: item.icon
-    }));
-  }));
-};
-
-var _default = AlignSetting;
-exports["default"] = _default;
+  return /*#__PURE__*/_react["default"].createElement(_AlignTypeList["default"], {
+    onChange: alignOnChange,
+    selected: "left",
+    distributionDisabled: distributionDisabled
+  });
+}

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

@@ -3,137 +3,24 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = LineTypeSetting;
 
-var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
+var _react = _interopRequireDefault(require("react"));
 
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
 
-var _react = _interopRequireWildcard(require("react"));
+var _LineType = _interopRequireDefault(require("../../../Toolbar/widgets/EdgeTypeButton/LineType"));
 
-var _LineTypeModule = _interopRequireDefault(require("./LineType.module.scss"));
-
-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; }
-
-//  直线 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 = (0, _react.useState)(selected),
-      value = _useState[0],
-      setValue = _useState[1];
+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 = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
+    (0, _edgeTypeStyleUtil.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["default"].createElement(_box["default"], {
-    spacing: 16,
-    wrap: true,
-    direction: "row",
-    className: _LineTypeModule["default"].LineType
-  }, LINE_TYPE_OPTIONS.map(function (item, index, array) {
-    return /*#__PURE__*/_react["default"].createElement(_button["default"], {
-      key: index,
-      className: "" + _LineTypeModule["default"].redioBtn,
-      title: item.label,
-      onClick: function onClick() {
-        handleChange(item);
-      }
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: "/img/topo/editor/lineType/" + item.icon + ".svg",
-      alt: "",
-      className: _LineTypeModule["default"].iconImg
-    }));
-  }));
-};
-
-var _default = LineType;
-exports["default"] = _default;
+  return /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
+    onChange: setLineType,
+    topo: topo
+  });
+}

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

@@ -124,14 +124,14 @@ function NodeSizeInput(props) {
     return val ? Math.round(val) : val;
   }
 
-  return /*#__PURE__*/_react["default"].createElement(_SizeInput["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_SizeInput["default"], (0, _extends3["default"])({}, props, {
     value: value,
     lock: lock,
     max: max,
     step: step,
     onChange: handleChange,
     onLockChange: switchLock
-  });
+  }));
 }
 
 NodeSizeInput.propTypes = {