@riil-frontend/component-topology 6.0.0-alpha.9 → 6.0.2

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

@@ -1,12 +1,13 @@
 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
@@ -27,17 +28,26 @@ function NodeSizeButton(props) {
       setSize = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useSelection();
   var settingRuntimeState = useSettingRuntimeState();
   useEffect(function () {
-    if (selection && selection.length > 0) {
-      console.log("NodeSizeButton-selection", selection);
+    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) {
+        var element = nodes[0];
         setSize({
-          width: selection[0].width,
-          height: selection[0].height
+          width: element.getWidth(),
+          height: element.getHeight()
         });
       }
     } else {
@@ -50,67 +60,62 @@ function NodeSizeButton(props) {
   }, [selection]);
 
   var _onChange = function onChange(prop) {
-    console.log("onChange-prop", prop);
     var name = prop.name,
         value = prop.value;
-    var gv = topo.view.topoClient.getGraphView();
     var element = topo.getSelectionModel().getFirstData();
 
-    if (name === "width") {
+    if (name === 'width') {
       element.setWidth(value);
-    } else if (name === "height") {
+    } 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",
+    topo: topo // size="small"
+    ,
     value: size,
     disabled: disabled,
     showLabel: false,
-    hasTrigger: false,
-    onChange: function onChange(size) {
-      topo.historyManager.beginTransaction();
+    numberPickerProps: {
+      hasTrigger: false,
+      placeholder: '-'
+    } // onChange={(size) => {
+    //   topo.historyManager.beginTransaction();
+    //   onChange({ name: "width", value: size.width });
+    //   onChange({ name: "height", value: size.height });
+    //   topo.historyManager.endTransaction();
+    // }}
 
-      _onChange({
-        name: "width",
-        value: size.width
-      });
-
-      _onChange({
-        name: "height",
-        value: size.height
-      });
-
-      topo.historyManager.endTransaction();
-    }
   }) : /*#__PURE__*/React.createElement(NodeSizeInput, {
-    topo: topo,
-    size: "small",
+    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",
+        name: 'width',
         value: size.width
       });
 
       _onChange({
-        name: "height",
+        name: 'height',
         value: size.height
       });
 

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,5 +1,9 @@
 import _Balloon from "@alifd/next/es/balloon";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+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";
 
@@ -8,14 +12,16 @@ function WidgetBox(props) {
       showLabel = props.showLabel,
       tooltip = props.tooltip,
       disabled = props.disabled,
-      children = props.children;
-  var button = /*#__PURE__*/React.createElement("div", {
+      children = props.children,
+      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  var button = /*#__PURE__*/React.createElement("div", _extends({
     disabled: disabled,
     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) {

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

@@ -44,6 +44,14 @@
   text-align: center;
 }
 
+.disabledLabel {
+  color: #C9CED2;
+}
+
+.normalLabel {
+  color: #78849C;
+}
+
 .ButtonBox {
   height: 24px;
   display: flex;
@@ -57,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

@@ -18,12 +18,12 @@ function ButtonBox(props) {
       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[styles.disabled] = 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",
-    className: classNames(styles.icon, (_classNames2 = {}, _classNames2[styles.active] = active, _classNames2))
+    className: classNames(styles.icon, (_classNames2 = {}, _classNames2[styles.active] = active, _classNames2[styles.disabled] = disabled, _classNames2))
   })));
 }
 

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

@@ -19,6 +19,10 @@
 
 }
 
+.disabled {
+  color: #C9CED2 !important;
+}
+
 // 箭头图标
 .icon {
   color: #909090;

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

@@ -1,4 +1,5 @@
 import _Dropdown from "@alifd/next/es/dropdown";
+import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import ButtonBox from "./ButtonBox";
@@ -11,24 +12,34 @@ function DropdownButton(props) {
       showArrow = _props$showArrow === void 0 ? true : _props$showArrow,
       _props$showContainer = props.showContainer,
       showContainer = _props$showContainer === void 0 ? true : _props$showContainer,
+      buttonBoxProps = props.buttonBoxProps,
       children = props.children;
 
   var _useState = useState(false),
-      active = _useState[0],
-      setActive = _useState[1];
+      visible = _useState[0],
+      setVisible = _useState[1];
 
-  var button = /*#__PURE__*/React.createElement(ButtonBox, {
-    active: active,
+  var button = /*#__PURE__*/React.createElement(ButtonBox, _extends({
+    active: visible,
     disabled: disabled,
     showArrow: showArrow
-  }, trigger);
+  }, buttonBoxProps), trigger);
+
+  var renderContent = function renderContent() {
+    if (showContainer) {
+      return /*#__PURE__*/React.createElement(PopupCard, null, children);
+    }
+
+    return children;
+  };
+
   return /*#__PURE__*/React.createElement(_Dropdown, {
-    visible: active,
+    visible: visible,
     disabled: disabled,
     trigger: button,
     triggerType: "click",
-    onVisibleChange: setActive
-  }, !showContainer ? children : /*#__PURE__*/React.createElement(PopupCard, null, children));
+    onVisibleChange: setVisible
+  }, renderContent());
 }
 
 DropdownButton.propTypes = {

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

@@ -6,18 +6,32 @@ import DropdownButton from "./DropdownButton";
 function DropdownMenu(props) {
   var value = props.value,
       children = props.children,
-      onChange = props.onChange,
-      valueRender = props.valueRender;
+      multiple = props.multiple,
+      onSelect = props.onSelect,
+      valueRender = props.valueRender,
+      disabled = props.disabled;
   var selectedKeys = Array.isArray(value) ? value : [value];
   var valueDisplay = valueRender ? valueRender(value) : value;
+  var selectMode = multiple ? 'multiple' : 'single';
+
+  var handleChange = function handleChange(keys, item, extra) {
+    var selected = multiple ? keys : keys[0];
+
+    if (onSelect) {
+      onSelect(selected, item, extra);
+    }
+  };
+
+  var menu = /*#__PURE__*/React.createElement(_Menu, {
+    selectMode: selectMode,
+    selectedKeys: selectedKeys,
+    onSelect: handleChange
+  }, children);
   return /*#__PURE__*/React.createElement(DropdownButton, {
     trigger: valueDisplay,
+    disabled: disabled,
     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/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/ElementTextStyleSetting.js

@@ -0,0 +1,52 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["Component", "styleNames"];
+import React, { useMemo, useState } from 'react';
+import { getTextStyle, setTextStyle } from "./textStyleUtil";
+
+function ElementTextStyleSetting(props) {
+  var topo = props.topo;
+
+  var Component = props.Component,
+      styleNames = props.styleNames,
+      widgetProps = _objectWithoutPropertiesLoose(props, _excluded); // 拓扑图是否加载
+
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
+
+
+  var selection = topo.selectionModel.useSelection();
+  var htSelection = useMemo(function () {
+    if (!selection.length) {
+      return [];
+    }
+
+    return topo.getHtTopo().getGraphView().getSelectionModel().getSelection().toArray();
+  }, [selection, topo]);
+  var fieldProps = useMemo(function () {
+    if (!graphLoaded) {
+      return {
+        value: {},
+        fieldDisabled: {}
+      };
+    }
+
+    return getTextStyle(htSelection, styleNames, topo);
+  }, [graphLoaded, htSelection, topo]);
+  var setStyle = useMemo(function () {
+    return function (style) {
+      htSelection.forEach(function (element) {
+        setTextStyle(element, style, topo);
+      });
+    };
+  }, [htSelection]);
+  return /*#__PURE__*/React.createElement(Component, _extends({
+    disabled: true,
+    htSelection: htSelection
+  }, fieldProps, {
+    setStyle: setStyle
+  }, widgetProps));
+}
+
+export default ElementTextStyleSetting;

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/colorUtil.js

@@ -0,0 +1,67 @@
+import Color from 'color';
+/**
+ * 解析颜色字符串为对象
+ * 
+ * @param {string} colorStr 
+ * @returns {null|{hex, rgb:{r,g,b,a}}}
+ */
+
+export function parseColor(colorStr) {
+  if (!colorStr) {
+    return null;
+  }
+
+  var color = Color(colorStr);
+  var rgb = color.rgb();
+  return {
+    hex: color.hex(),
+    rgb: {
+      r: rgb.color[0],
+      g: rgb.color[1],
+      b: rgb.color[2],
+      a: rgb.valpha
+    }
+  };
+}
+export function parseBackground(colorStr) {
+  var background = parseColor(colorStr);
+  return {
+    background: background,
+    // 背景颜色，格式: {rgba: {}, hex: ''} | null
+    opacity: background ? background.rgb.a : 1 // 背景透明度。值范围 0-1, null，null表示无
+
+  };
+}
+export function formatHexColor(color) {
+  return color ? color.hex : null;
+}
+export function formatRgbaColor(color) {
+  if (!color) {
+    return null;
+  }
+
+  var rgb = color.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + rgb.a + ")";
+}
+/**
+ * 格式化背景rgba颜色
+ * @param {{background, opacity}} prevColor 原值
+ * @param {{background, opacity}} currentColor 新值
+ */
+
+export function formatBackgroundRgbaColor(prevColor, currentColor) {
+  if (!('background' in currentColor) && !('opacity' in currentColor)) {
+    return formatRgbaColor(prevColor.background);
+  }
+
+  var colorObj = Object.assign(prevColor, currentColor);
+  var background = colorObj.background,
+      opacity = colorObj.opacity;
+
+  if (!background) {
+    return null;
+  }
+
+  var rgb = background.rgb;
+  return "rgba(" + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + (opacity === null ? 1 : opacity) + ")";
+}

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/box.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/extends";
+import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
+import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
+export function getTextStyle(element) {
+  var underline = element.a('text.decoration') === 'underline';
+  return _extends({
+    color: parseColor(element.a('topLeftTextColor')),
+    underline: underline
+  }, fontStyleUtil.toMap(element.a('rectFont')), parseBackground(element.a('topLeftColor')));
+}
+export function setTextStyle(element, style, topo) {
+  if ('underline' in style) {}
+
+  if ('color' in style) {
+    element.a('topLeftTextColor', style.color.hex);
+  } // 背景颜色
+
+
+  var prevStyle = getTextStyle(element);
+  element.a('topLeftColor', formatBackgroundRgbaColor(prevStyle, style));
+
+  var fontStyle = _extends({}, getTextStyle(element), style);
+
+  var fontStr = fontStyleUtil.build(fontStyle);
+  element.a('rectFont', fontStr);
+  topo.getHtTopo().setRectangleText(element);
+}
+/**
+ * 
+ * @param {*} element 
+ * @returns {Array}
+ */
+
+export function getEnabledFields(element) {
+  return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
+}
+export default {
+  getTextStyle: getTextStyle,
+  setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields
+};

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -0,0 +1,65 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+import _extends from "@babel/runtime/helpers/extends";
+var _excluded = ["color", "background", "opacity", "bold", "italic"];
+import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
+import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
+export function getTextStyle(element) {
+  var underline = null;
+  return _extends({
+    color: parseColor(element.a('link_ind_left_color')),
+    underline: underline
+  }, fontStyleUtil.toMap(element.a('link_ind_left_font')), parseBackground(element.a('link_ind_background')));
+}
+export function setTextStyle(element, style, topo) {
+  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(style),
+      color = _fontStyleUtil$remove.color,
+      background = _fontStyleUtil$remove.background,
+      opacity = _fontStyleUtil$remove.opacity,
+      bold = _fontStyleUtil$remove.bold,
+      italic = _fontStyleUtil$remove.italic,
+      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded);
+
+  var tagStyle = _extends({}, otherStyle);
+
+  if ('color' in style) {
+    tagStyle.color = color.hex;
+  }
+
+  if ('bold' in style) {
+    tagStyle.fontBold = bold;
+  }
+
+  if ('italic' in style) {
+    tagStyle.fontItalic = italic;
+  }
+
+  if ('background' in style || 'opacity' in style) {
+    // 背景颜色
+    var prevStyle = getTextStyle(element);
+    tagStyle.background = formatBackgroundRgbaColor(prevStyle, style);
+  }
+
+  if (Object.keys(tagStyle).length) {
+    topo.getHtTopo().setEdgeLabelStyle(element, tagStyle);
+  }
+}
+/**
+ * 
+ * @param {*} element 
+ * @returns {Array}
+ */
+
+export function getEnabledFields(element) {
+  return ['fontFamily', 'color', 'background', 'opacity'];
+}
+export function getFieldDisabled(element) {
+  return {
+    fontSize: true
+  };
+}
+export default {
+  getTextStyle: getTextStyle,
+  setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields,
+  getFieldDisabled: getFieldDisabled
+};

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js

@@ -0,0 +1,65 @@
+import _extends from "@babel/runtime/helpers/extends";
+import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
+import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
+import nodeTag from "./nodeTag";
+export function getTextStyle(element) {
+  if (!element.isExpanded()) {
+    // eslint-disable-next-line import/no-named-as-default-member
+    return nodeTag.getTextStyle(element);
+  }
+
+  var underline = element.s('text.decoration') === 'underline';
+  var font = fontStyleUtil.toMap(element.s('group.title.font'));
+  return _extends({
+    color: parseColor(element.s('group.title.color')),
+    underline: underline
+  }, fontStyleUtil.toMap(element.s('group.title.font')), {
+    fontSize: font.fontSize || 12,
+    fontFamily: font.fontFamily || '微软雅黑'
+  }, parseBackground(element.s('group.title.background')));
+}
+export function setTextStyle(element, style, topo) {
+  if (!element.isExpanded()) {
+    // eslint-disable-next-line import/no-named-as-default-member
+    return nodeTag.setTextStyle(element, style, topo);
+  } // if ('underline' in style) {
+  // }
+
+
+  if ('color' in style) {
+    element.s('group.title.color', style.color.hex);
+  }
+
+  if ('background' in style || 'opacity' in style) {
+    // 背景颜色
+    var prevStyle = getTextStyle(element);
+    element.s('group.title.background', formatBackgroundRgbaColor(prevStyle, style));
+  }
+
+  var fontStyle = _extends({}, getTextStyle(element), style);
+
+  var fontStr = fontStyleUtil.build(fontStyle);
+  element.s('group.title.font', fontStr);
+}
+export function getEnabledFields(element) {
+  if (!element.isExpanded()) {
+    return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
+  }
+
+  return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];
+}
+export function getFieldDisabled(element) {
+  if (!element.isExpanded()) {
+    return {
+      fontSize: true
+    };
+  }
+
+  return {};
+}
+export default {
+  getTextStyle: getTextStyle,
+  setTextStyle: setTextStyle,
+  getEnabledFields: getEnabledFields,
+  getFieldDisabled: getFieldDisabled
+};

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/index.js

@@ -0,0 +1,14 @@
+import text from "./text";
+import nodeTag from "./nodeTag";
+import edgeTag from "./edgeTag";
+import groupTitle from "./groupTitle";
+import layerTitle from "./layerTitle";
+import box from "./box";
+export default {
+  nodeTag: nodeTag,
+  edgeTag: edgeTag,
+  text: text,
+  groupTitle: groupTitle,
+  layerTitle: layerTitle,
+  box: box
+};