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

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

@@ -1,15 +1,121 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+/* eslint-disable jsx-a11y/alt-text */
 import React, { useState } from 'react';
 import DropdownButton from "./components/DropdownButton";
 import WidgetBox from "./WidgetBox";
+import ColorPanel from "../../../../../components/ColorPanel";
+import FontColorRange from "../../../../../components/ColorPanel/components/FontColorRange";
+import styles from "./FontColorButton.module.scss";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
+function FontColorDropdown(props) {
+  var color = props.color,
+      onChange = props.onChange,
+      topo = props.topo,
+      opacity = props.opacity,
+      background = props.background,
+      setStyle = props.setStyle;
 
   var _useState = useState(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
+  var backOpacityChange = function backOpacityChange(value) {
+    topo.historyManager.beginTransaction();
+    onChange({
+      opacity: Math.round(value / 100)
+    });
+    topo.historyManager.endTransaction();
+  };
+
+  var colorChang = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, type) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(type === 'select')) {
+                _context.next = 7;
+                break;
+              }
+
+              topo.historyManager.beginTransaction();
+              _context.next = 4;
+              return setStyle({
+                color: value
+              });
+
+            case 4:
+              topo.historyManager.endTransaction();
+              _context.next = 8;
+              break;
+
+            case 7:
+              setStyle({
+                background: value
+              });
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function colorChang(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  var backgroundChang = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value, type) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(type === 'select')) {
+                _context2.next = 7;
+                break;
+              }
+
+              topo.historyManager.beginTransaction();
+              _context2.next = 4;
+              return setStyle({
+                background: value
+              });
+
+            case 4:
+              topo.historyManager.endTransaction();
+              _context2.next = 8;
+              break;
+
+            case 7:
+              setStyle({
+                background: value
+              });
+
+            case 8:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function backgroundChang(_x3, _x4) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  var onFocus = function onFocus() {// topo.historyManager.beginTransaction();
+  };
+
+  var onBlur = function onBlur() {// topo.historyManager.endTransaction();
+  };
+
   var icon = disabled ? /*#__PURE__*/React.createElement("img", {
     src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
     alt: ""
@@ -19,26 +125,70 @@ function FontFamilySelect(props) {
   });
   return /*#__PURE__*/React.createElement(DropdownButton, {
     disabled: disabled,
-    trigger: icon,
-    onChange: onChange
-  }, "xxxx");
+    trigger: icon
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.fontColor
+  }, /*#__PURE__*/React.createElement("span", null, "\u5B57\u4F53\u989C\u8272"), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px'
+    }
+  }, /*#__PURE__*/React.createElement(ColorPanel, {
+    value: color,
+    onChange: colorChang,
+    onPickerFocus: onFocus,
+    onPickerBlur: onBlur
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: styles.backgroundColor
+  }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
+    className: styles.backOpacity
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/\u80CC\u666F\u586B\u5145.svg"
+  }), /*#__PURE__*/React.createElement(FontColorRange, {
+    max: 100,
+    min: 0,
+    unit: "%",
+    list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
+    onChange: backOpacityChange,
+    defaultValue: opacity === undefined ? opacity : Math.round(opacity * 100)
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '10px',
+      marginLeft: '-4px',
+      marginBottom: '3px'
+    }
+  }, /*#__PURE__*/React.createElement(ColorPanel, {
+    showClear: true,
+    value: background,
+    onChange: backgroundChang,
+    onPickerFocus: onFocus,
+    onPickerBlur: onBlur
+  })))));
 }
 
 function FontColorButton(props) {
-  var showLabel = props.showLabel;
-
-  var _useState2 = useState('微软雅黑'),
-      value = _useState2[0],
-      setValue = _useState2[1];
-
+  var showLabel = props.showLabel,
+      topo = props.topo,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(FontFamilySelect, {
-    value: value,
-    onChange: setValue
+  }, /*#__PURE__*/React.createElement(FontColorDropdown, {
+    color: style.color,
+    background: style.background,
+    opacity: style.opacity,
+    setStyle: setStyle,
+    onChange: function onChange(val) {
+      setStyle(val);
+    },
+    topo: topo
   }));
 }
 
-export default FontColorButton;
+export default textStyleSettingRouter(FontColorButton, {
+  names: ['color', 'background', 'opacity']
+});

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

@@ -0,0 +1,42 @@
+.content {
+  margin: 4px 0px 0px 6px;
+ .fontColor{
+  width: 100%;
+  margin-bottom: 16px;
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 8px;
+  }
+  &>span{
+    font-size: 12px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #4D6277;
+    line-height: 17px;
+   }
+   
+ }
+ .backgroundColor{
+  width: 100%;
+  height: 159px;
+  .colorPanelBox{
+    padding: 9px;
+    padding-top: 0px;
+  }
+  &>span{
+    font-size: 12px;
+    color: black;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #4D6277;
+    line-height: 17px;
+   }
+   .backOpacity{
+    margin-top: 5px;
+    margin-bottom: 5px;
+    line-height: 8px;
+    display: flex;
+    flex-direction: row;
+   }
+ }
+}

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

@@ -1,5 +1,6 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import DropdownMenu from "./components/DropdownMenu";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
 
 function FontFamilySelect(props) {
@@ -7,8 +8,15 @@ function FontFamilySelect(props) {
       onChange = props.onChange;
   var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
   return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
-    onChange: onChange
+    value: (items.includes(value) ? value : null) || '',
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 48
+        }
+      }, val || '微软雅黑');
+    },
+    onSelect: onChange
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
       key: item
@@ -21,20 +29,26 @@ function FontFamilySelect(props) {
 }
 
 function FontFamilyWidget(props) {
-  var showLabel = props.showLabel;
-
-  var _useState = useState('微软雅黑'),
-      value = _useState[0],
-      setValue = _useState[1];
-
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      style = props.style,
+      setStyle = props.setStyle;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u5B57\u4F53",
     tooltip: "\u5B57\u4F53",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(FontFamilySelect, {
-    value: value,
-    onChange: setValue
+    value: style.fontFamily,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle({
+        fontFamily: val
+      });
+      topo.historyManager.endTransaction();
+    }
   }));
 }
 
-export default FontFamilyWidget;
+export default textStyleSettingRouter(FontFamilyWidget, {
+  names: ['fontFamily']
+});

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

@@ -1,14 +1,26 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import DropdownMenu from "./components/DropdownMenu";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
 
 function FontSizeSelect(props) {
   var value = props.value,
+      disabled = props.disabled,
       onChange = props.onChange;
   var items = [9, 10, 11, 12, 14, 16, 18, 20, 24, 30, 36];
   return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
-    onChange: onChange
+    value: "" + (value || ''),
+    valueRender: function valueRender(val) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 18
+        }
+      }, val || 12);
+    },
+    disabled: disabled,
+    onSelect: function onSelect(val) {
+      return onChange(parseInt(val, 10));
+    }
   }, items.map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
       key: item
@@ -17,19 +29,32 @@ function FontSizeSelect(props) {
 }
 
 function FontSizeWidget(props) {
-  var showLabel = props.showLabel;
-
-  var _useState = useState(12),
-      fontSize = _useState[0],
-      setFontSize = _useState[1];
+  var topo = props.topo,
+      showLabel = props.showLabel,
+      style = props.style,
+      fieldDisabled = props.fieldDisabled,
+      setStyle = props.setStyle;
+  var disabled = fieldDisabled.fontSize; // 选中的元素
 
+  var selection = topo.selectionModel.useHtSelection();
+  useEffect(function () {}, [selection]);
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u5B57\u53F7",
-    showLabel: showLabel
+    showLabel: showLabel,
+    disabled: disabled
   }, /*#__PURE__*/React.createElement(FontSizeSelect, {
-    value: fontSize,
-    onChange: setFontSize
+    value: style.fontSize,
+    disabled: disabled,
+    onChange: function onChange(val) {
+      topo.historyManager.beginTransaction();
+      setStyle({
+        fontSize: val
+      });
+      topo.historyManager.endTransaction();
+    }
   }));
 }
 
-export default FontSizeWidget;
+export default textStyleSettingRouter(FontSizeWidget, {
+  names: ['fontSize']
+});

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

@@ -1,62 +1,115 @@
 import React, { useState, useEffect } from 'react';
+import { isText } from "../../../../../utils/htElementUtils";
 import DropdownMenu from "./components/DropdownMenu";
+import textStyleSettingRouter from "./components/textStyleSetting/textStyleSettingRouter.js";
 import WidgetBox from "./WidgetBox";
+var items = [{
+  key: 'bold',
+  label: '加粗',
+  icon: 'bold'
+}, {
+  key: 'italic',
+  label: '斜体',
+  icon: 'Italics'
+}, {
+  key: 'underline',
+  label: '下划线',
+  icon: 'Underline'
+}];
 
-function FontFamilySelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  var icon = disabled ? /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/bold/Disable.svg",
-    alt: ""
-  }) : /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/bold/Normal.svg",
-    alt: ""
+function buildValue(obj) {
+  return Object.keys(obj).filter(function (key) {
+    return !!obj[key];
   });
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
-    valueRender: function valueRender() {
-      return icon;
-    },
-    onChange: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
 }
 
 function FontStyleButton(props) {
   var topo = props.topo,
-      showLabel = props.showLabel;
+      showLabel = props.showLabel,
+      style = props.style,
+      setStyle = props.setStyle;
+
+  var _useState = useState(true),
+      disabled = _useState[0],
+      setDisabled = _useState[1];
 
-  var _useState = useState('微软雅黑'),
-      value = _useState[0],
-      setValue = _useState[1];
+  var bold = style.bold,
+      italic = style.italic,
+      underline = style.underline;
 
-  var _useState2 = useState(true),
-      disabled = _useState2[0],
-      setDisabled = _useState2[1]; // 选中的元素
+  var _useState2 = useState(buildValue({
+    bold: bold,
+    italic: italic,
+    underline: underline
+  })),
+      value = _useState2[0],
+      setValue = _useState2[1]; // 选中的元素
 
 
-  var selection = topo.selectionManager.useSelection();
+  var selection = topo.selectionModel.useHtSelection();
   useEffect(function () {
-    setDisabled(false);
+    var containText = selection.filter(function (ele) {
+      return isText(ele);
+    }).length;
+    setDisabled(!containText);
   }, [selection]);
+  useEffect(function () {
+    setValue(buildValue({
+      bold: bold,
+      italic: italic,
+      underline: underline
+    }));
+  }, [bold, italic, underline]);
+  /**
+   * 
+   * @param {Array} selectedKeys 
+   */
+
+  var handleSelect = function handleSelect(selectedKeys, item, extra) {
+    var _setStyle;
+
+    var key = extra.key,
+        select = extra.select;
+    topo.historyManager.beginTransaction();
+    setStyle((_setStyle = {}, _setStyle[key] = select, _setStyle));
+    topo.historyManager.endTransaction();
+  };
+
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u6837\u5F0F",
     tooltip: "\u6587\u5B57\u6837\u5F0F",
+    disabled: disabled,
     showLabel: showLabel
-  }, /*#__PURE__*/React.createElement(FontFamilySelect, {
+  }, /*#__PURE__*/React.createElement(DropdownMenu, {
     value: value,
+    valueRender: function valueRender() {
+      return /*#__PURE__*/React.createElement("img", {
+        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+        alt: ""
+      });
+    },
+    multiple: true,
     disabled: disabled,
-    onChange: setValue
-  }));
+    onSelect: handleSelect
+  }, items.map(function (item) {
+    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
+      key: item.key
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement("img", {
+      src: "/img/topo/editor/toolbar/" + item.icon + "/Normal.svg",
+      alt: ""
+    }), /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#4d6277'
+      }
+    }, item.label)));
+  })));
 }
 
-export default FontStyleButton;
+export default textStyleSettingRouter(FontStyleButton, {
+  names: ['bold', 'italic', 'underline']
+});

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

@@ -15,7 +15,7 @@ function HistoryRedoButton(props) {
     tooltip: "\u6062\u590D",
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(ButtonBox, null, /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+    src: "/img/topo/editor/toolbar/undo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
     alt: ""
   })));
 }

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

@@ -14,7 +14,7 @@ function HistoryUndoButton(props) {
   return /*#__PURE__*/React.createElement(WidgetBox, {
     disabled: disabled,
     label: "\u64A4\u9500",
-    tooltip: "\u64A4\u9500",
+    tooltip: disabled ? '无法撤销' : '撤销（Ctrl/ ⌘+Z）',
     showLabel: showLabel
   }, /*#__PURE__*/React.createElement(ButtonBox, {
     disabled: disabled,
@@ -22,7 +22,7 @@ function HistoryUndoButton(props) {
       topo.historyManager.undo();
     }
   }, /*#__PURE__*/React.createElement("img", {
-    src: "/img/topo/editor/toolbar/undo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
+    src: "/img/topo/editor/toolbar/redo/" + (disabled ? 'Disable' : 'Normal') + ".svg",
     alt: ""
   })));
 }

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

@@ -0,0 +1,109 @@
+import _Select from "@alifd/next/es/select";
+import React, { useState, useEffect, useImperativeHandle } from 'react';
+import styles from "./index.module.scss";
+import PopUpContent from "./popUpContent";
+
+var TopoIconSelect = function TopoIconSelect(props, ref) {
+  // 传入参数
+  var value = props.value,
+      iconList = props.iconList,
+      onChange = props.onChange;
+
+  var _useState = useState(value),
+      valueData = _useState[0],
+      setValue = _useState[1];
+
+  var _useState2 = useState(),
+      selectItem = _useState2[0],
+      setSelect = _useState2[1];
+
+  var _useState3 = useState(false),
+      visible = _useState3[0],
+      setVisible = _useState3[1];
+
+  useEffect(function () {
+    if (value) {
+      for (var i = 0; i < iconList.length; i++) {
+        var icons = iconList[i].icons;
+        var flag = false;
+
+        for (var m = 0; m < icons.length; m++) {
+          if (value === icons[m].id) {
+            flag = true;
+            setSelect(icons[m]);
+            break;
+          }
+        }
+
+        if (flag) {
+          break;
+        }
+      }
+    }
+  }, [value]);
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectData: getSelectData
+    };
+  });
+
+  var handleChange = function handleChange(v) {
+    console.log('handleChange: ', v);
+
+    if (typeof onChange === 'function') {
+      onChange(v.id);
+    }
+
+    setSelect(v);
+    setValue(v.id);
+    setVisible(false);
+  };
+
+  var getSelectData = function getSelectData() {
+    return valueData;
+  };
+
+  var valueRender = function valueRender(v) {
+    return selectItem ? /*#__PURE__*/React.createElement("span", {
+      className: styles.selected
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.iconImgWrapper
+    }, /*#__PURE__*/React.createElement("img", {
+      className: styles.iconImg,
+      alt: "",
+      src: selectItem === null || selectItem === void 0 ? void 0 : selectItem.url
+    })), /*#__PURE__*/React.createElement("span", {
+      className: styles.icontitle
+    }, selectItem === null || selectItem === void 0 ? void 0 : selectItem.name)) : null;
+  };
+
+  var onVisibleChange = function onVisibleChange(v) {
+    setVisible(v);
+  };
+
+  var popupContent = /*#__PURE__*/React.createElement(PopUpContent, {
+    iconList: iconList,
+    selectedId: selectItem === null || selectItem === void 0 ? void 0 : selectItem.id,
+    onChange: handleChange
+  });
+  var popupProps = {
+    triggerClickKeycode: [13, 32, 40] // space, enter, down-arrow
+
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.TopoIconSelect
+  }, /*#__PURE__*/React.createElement(_Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    visible: visible,
+    className: styles.iconSelect,
+    onVisibleChange: onVisibleChange,
+    value: valueData,
+    valueRender: valueRender,
+    dataSource: iconList,
+    onChange: handleChange,
+    popupProps: popupProps,
+    popupContent: popupContent
+  }));
+};
+
+export default /*#__PURE__*/React.forwardRef(TopoIconSelect);