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

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

@@ -1,13 +1,17 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "showLabel"];
-import React, { useEffect, useState } from 'react';
-import BatchSetNodeSize from "../../../settings/propertyViews/view/BatchSetNodeSize";
+import React, { useEffect, useState } from 'react'; // import BatchSetNodeSize from "../../../settings/propertyViews/view/BatchSetNodeSize";
+
+import BatchSetNodeSize from "../../../settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize";
+import NodeSizeInput from "../../../settings/common/NodeSizeInput/NodeSizeInput";
+import useSettingRuntimeState from "../../../settings/useSettingRuntimeState";
 import WidgetBox from "../WidgetBox";
-import BoxBackgroundSetting from "./BoxBackgroundSetting";
+import styles from "./NodeSizeButton.module.scss";
+import { isGroup, isNode } from "../../../../../../utils/htElementUtils";
 /**
  * 图片尺寸设置
- * @param {*} props 
- * @returns 
+ * @param {*} props
+ * @returns
  */
 
 function NodeSizeButton(props) {
@@ -17,25 +21,105 @@ function NodeSizeButton(props) {
 
   var _useState = useState(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 选中的元素
+      setDisabled = _useState[1];
+
+  var _useState2 = useState(),
+      size = _useState2[0],
+      setSize = _useState2[1]; // 选中的元素
 
 
   var selection = topo.selectionManager.useSelection();
+  var settingRuntimeState = useSettingRuntimeState();
   useEffect(function () {
-    setDisabled(false);
+    var elements = selection.map(function (item) {
+      return item.id;
+    }).map(function (id) {
+      return topo.getDataModel().getDataById(id);
+    });
+    var nodes = elements.filter(function (ele) {
+      return isGroup(ele) || isNode(ele);
+    });
+
+    if (nodes.length > 0) {
+      setDisabled(false);
+
+      if (selection.length === 1) {
+        setSize({
+          width: selection[0].width,
+          height: selection[0].height
+        });
+      }
+    } else {
+      setDisabled(true);
+      setSize({
+        width: null,
+        height: null
+      });
+    }
   }, [selection]);
+
+  var _onChange = function onChange(prop) {
+    var name = prop.name,
+        value = prop.value;
+    var element = topo.getSelectionModel().getFirstData();
+
+    if (name === 'width') {
+      element.setWidth(value);
+    } else if (name === 'height') {
+      element.setHeight(value);
+    }
+  };
+
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u56FE\u7247\u5C3A\u5BF8",
+    disabled: disabled,
     tooltip: "\u56FE\u7247\u5C3A\u5BF8",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: 136
+    className: styles.toolbarNodeSizeSetting
+  }, selection.length > 1 ? /*#__PURE__*/React.createElement(BatchSetNodeSize, {
+    topo: topo // size="small"
+    ,
+    value: size,
+    disabled: disabled,
+    showLabel: false,
+    numberPickerProps: {
+      hasTrigger: false,
+      placeholder: '-'
+    } // onChange={(size) => {
+    //   topo.historyManager.beginTransaction();
+    //   onChange({ name: "width", value: size.width });
+    //   onChange({ name: "height", value: size.height });
+    //   topo.historyManager.endTransaction();
+    // }}
+
+  }) : /*#__PURE__*/React.createElement(NodeSizeInput, {
+    topo: topo // size="small"
+    ,
+    value: size,
+    disabled: disabled,
+    showLabel: false,
+    hasTrigger: false,
+    numberPickerProps: {
+      hasTrigger: false,
+      placeholder: '-'
+    },
+    settingRuntimeState: settingRuntimeState,
+    onChange: function onChange(size) {
+      topo.historyManager.beginTransaction();
+
+      _onChange({
+        name: 'width',
+        value: size.width
+      });
+
+      _onChange({
+        name: 'height',
+        value: size.height
+      });
+
+      topo.historyManager.endTransaction();
     }
-  }, /*#__PURE__*/React.createElement(BatchSetNodeSize, {
-    topo: topo,
-    size: "small",
-    showLabel: false
   })));
 }
 

package/es/core/editor/components/Toolbar/widgets/NodeSizeButton/NodeSizeButton.module.scss

@@ -0,0 +1,28 @@
+@import '~@alifd/next/variables.scss';
+
+.toolbarNodeSizeSetting {
+  width: 144px;
+
+  // 图片尺寸输入框
+  :global {
+    .#{$css-prefix}input-inner {
+      padding-right: 8px;
+    }
+
+    .#{$css-prefix}input.#{$css-prefix}medium {
+      height: 24px;
+    }
+
+    .#{$css-prefix}input {
+      border: none;
+
+      &:hover:not(.#{$css-prefix}disabled) {
+        background: #F2F7FD;
+      }
+    }
+
+    .#{$css-prefix}input.#{$css-prefix}medium input {
+      height: 24px;
+    }
+  }
+}

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

@@ -1,9 +1,10 @@
+import _Balloon from "@alifd/next/es/balloon";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-import _Balloon from "@alifd/next/es/balloon";
-var _excluded = ["active", "disabled", "children"];
-import classNames from 'classnames';
+var _excluded = ["label", "showLabel", "tooltip", "disabled", "children"];
 import React from 'react';
+import classnames from 'classnames';
+import ButtonBox from "./components/ButtonBox";
 import styles from "./WidgetBox.module.scss";
 
 function WidgetBox(props) {
@@ -11,15 +12,16 @@ function WidgetBox(props) {
       showLabel = props.showLabel,
       tooltip = props.tooltip,
       disabled = props.disabled,
-      children = props.children;
-  var button = /*#__PURE__*/React.createElement("button", {
+      children = props.children,
+      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  var button = /*#__PURE__*/React.createElement("div", _extends({
     disabled: disabled,
-    type: "button",
     className: styles.container
-  }, /*#__PURE__*/React.createElement("div", {
+  }, otherProps), /*#__PURE__*/React.createElement("div", {
     className: styles.content
   }, children), showLabel !== false && /*#__PURE__*/React.createElement("div", {
-    className: styles.label
+    className: classnames(styles.label, disabled ? styles.disabledLabel : styles.normalLabel)
   }, label));
 
   if (!tooltip) {
@@ -28,22 +30,13 @@ function WidgetBox(props) {
 
   return /*#__PURE__*/React.createElement(_Balloon.Tooltip, {
     trigger: button,
-    align: "b"
+    align: "b" // 解决遮挡下拉浮层问题
+    ,
+    popupStyle: {
+      zIndex: 1000
+    }
   }, tooltip);
 }
 
-function ButtonBox(props) {
-  var _classNames;
-
-  var active = props.active,
-      disabled = props.disabled,
-      children = props.children,
-      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
-
-  return /*#__PURE__*/React.createElement("div", _extends({
-    className: classNames(styles.ButtonBox, (_classNames = {}, _classNames[styles.ButtonBoxActive] = active, _classNames[styles.ButtonBoxDisabled] = disabled, _classNames))
-  }, otherProps), children);
-}
-
 WidgetBox.ButtonBox = ButtonBox;
 export default WidgetBox;

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,
@@ -18,14 +19,29 @@ function DropdownButton(props) {
 
   var button = /*#__PURE__*/React.createElement(ButtonBox, {
     active: visible,
+    disabled: disabled,
     showArrow: showArrow
   }, trigger);
+
+  var renderContent = function renderContent() {
+    if (!visible) {
+      return /*#__PURE__*/React.createElement("div", null);
+    }
+
+    if (showContainer) {
+      return /*#__PURE__*/React.createElement(PopupCard, null, children);
+    }
+
+    return children;
+  };
+
   return /*#__PURE__*/React.createElement(_Dropdown, {
     visible: visible,
+    disabled: disabled,
     trigger: button,
     triggerType: "click",
     onVisibleChange: setVisible
-  }, !showContainer ? children : /*#__PURE__*/React.createElement(PopupCard, null, children));
+  }, renderContent());
 }
 
 DropdownButton.propTypes = {

package/es/core/editor/components/Toolbar/widgets/components/DropdownMenu.js

@@ -6,18 +6,21 @@ import DropdownButton from "./DropdownButton";
 function DropdownMenu(props) {
   var value = props.value,
       children = props.children,
+      multiple = props.multiple,
       onChange = props.onChange,
       valueRender = props.valueRender;
   var selectedKeys = Array.isArray(value) ? value : [value];
   var valueDisplay = valueRender ? valueRender(value) : value;
+  var selectMode = multiple ? 'multiple' : 'single';
+  var menu = /*#__PURE__*/React.createElement(_Menu, {
+    selectMode: selectMode,
+    selectedKeys: selectedKeys,
+    onSelect: onChange
+  }, children);
   return /*#__PURE__*/React.createElement(DropdownButton, {
     trigger: valueDisplay,
     showContainer: false
-  }, /*#__PURE__*/React.createElement(_Menu, {
-    selectMode: "single",
-    selectedKeys: selectedKeys,
-    onSelect: onChange
-  }, children));
+  }, multiple ? /*#__PURE__*/React.createElement("div", null, menu) : menu);
 }
 
 DropdownButton.propTypes = {

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

@@ -0,0 +1,33 @@
+import _ConfigProvider from "@alifd/next/es/config-provider";
+import _Icon from "@alifd/next/es/icon";
+import React from 'react';
+import styles from "./CloseablePanel.module.scss";
+
+function CloseablePanel(props) {
+  var prefix = props.prefix,
+      title = props.title,
+      onClose = props.onClose,
+      children = props.children;
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.panel
+  }, /*#__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", {
+    className: styles.body
+  }, children));
+}
+
+CloseablePanel.defaultProps = {
+  prefix: 'next-'
+};
+export default _ConfigProvider.config(CloseablePanel);

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

@@ -0,0 +1,9 @@
+.panel {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background: #FFFFFF;
+}
+.body {
+  flex: 1;
+}

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,52 @@
 import React from 'react';
+import classNames from 'classnames';
 import Settings from "./Settings";
+import OpenPropertyPanelListener from "./OpenPropertyPanelListener";
+import CloseablePanel from "./CloseablePanel";
 import styles from "./Settings.module.scss";
 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) {
-      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;