@riil-frontend/component-topology 6.0.0-alpha.6 → 6.0.0-alpha.60

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;

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import SizeInput from "../SizeInput";
 var NODE_SIZE_LOCK = 'NODE_SIZE_LOCK';
 /**
@@ -103,14 +103,14 @@ function NodeSizeInput(props) {
     return val ? Math.round(val) : val;
   }
 
-  return /*#__PURE__*/React.createElement(SizeInput, {
+  return /*#__PURE__*/React.createElement(SizeInput, _extends({}, props, {
     value: value,
     lock: lock,
     max: max,
     step: step,
     onChange: handleChange,
     onLockChange: switchLock
-  });
+  }));
 }
 
 NodeSizeInput.propTypes = {

package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js

@@ -1,15 +1,12 @@
 import _Box from "@alifd/next/es/box";
 import _extends from "@babel/runtime/helpers/extends";
-import _Grid from "@alifd/next/es/grid";
 import _Form from "@alifd/next/es/form";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import NodeSizeNumberPicker from "./NodeSizeNumberPicker";
 import styles from "./NodeSizeInput.module.scss";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 var FormItem = _Form.Item;
-var Row = _Grid.Row,
-    Col = _Grid.Col;
 /**
  * 节点大小组件
  *
@@ -22,12 +19,13 @@ function SizeInput(props) {
       max = props.max,
       step = props.step,
       onChange = props.onChange,
-      lock = props.lock,
-      onLockChange = props.onLockChange,
       _props$showLabel = props.showLabel,
       showLabel = _props$showLabel === void 0 ? true : _props$showLabel,
-      hasTrigger = props.hasTrigger,
-      size = props.size;
+      numberPickerProps = props.numberPickerProps,
+      size = props.size,
+      lock = props.lock,
+      disabled = props.disabled,
+      onLockChange = props.onLockChange;
 
   var handleChange = function handleChange(name, attrValue) {
     var _extends2;
@@ -46,6 +44,18 @@ function SizeInput(props) {
     return val ? Math.round(val) : val;
   }
 
+  var renderLock = function renderLock() {
+    var imgSrc = "/img/topo/editor/toolbar/" + (lock ? 'lock' : 'unlock') + "/" + (disabled ? 'Disable' : 'Normal') + ".svg";
+    return /*#__PURE__*/React.createElement("div", {
+      className: styles.lockBtn,
+      onClick: switchLock
+    }, /*#__PURE__*/React.createElement("img", {
+      src: imgSrc,
+      alt: "",
+      width: 12
+    }));
+  };
+
   return /*#__PURE__*/React.createElement(_Form, {
     labelAlign: "top",
     component: "div",
@@ -66,28 +76,24 @@ function SizeInput(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, {
+  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, _extends({
     value: parseValue(value.width),
     label: showLabel ? '宽:' : '',
+    innerAfter: showLabel ? undefined : 'W',
     min: 1,
     max: max,
     step: step,
+    disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165",
-    size: size,
-    hasTrigger: hasTrigger,
+    size: size
+  }, numberPickerProps, {
     style: {
       width: '100%'
     },
     onChange: function onChange(val) {
       return handleChange('width', val);
     }
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: styles.lockBtn,
-    onClick: switchLock
-  }, /*#__PURE__*/React.createElement("img", {
-    src: require(lock ? './img/icon_锁.svg' : './img/icon_解锁.svg'),
-    alt: ""
-  })), /*#__PURE__*/React.createElement("div", {
+  })))), renderLock(), /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1
     }
@@ -97,23 +103,24 @@ function SizeInput(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, {
+  }, /*#__PURE__*/React.createElement(NodeSizeNumberPicker, _extends({
     value: parseValue(value.height),
-    label: showLabel ? '高:' : '' // addonTextAfter="H"
-    ,
+    label: showLabel ? '高:' : '',
+    innerAfter: showLabel ? undefined : 'H',
     min: 1,
     max: max,
     step: step,
+    disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165",
-    size: size,
-    hasTrigger: hasTrigger,
+    size: size
+  }, numberPickerProps, {
     style: {
       width: '100%'
     },
     onChange: function onChange(val) {
       return handleChange('height', val);
     }
-  }))))));
+  })))))));
 }
 
 SizeInput.propTypes = {

package/es/core/editor/components/settings/common/SizeInput/NodeSizeNumberPicker.js

@@ -1,8 +1,8 @@
 import _NumberPicker from "@alifd/next/es/number-picker";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["value", "onChange", "min", "onBlur", "onKeyDown"];
-import React, { useState, useEffect } from 'react';
+var _excluded = ["value", "onChange", "min", "onBlur", "onKeyDown", "disabled"];
+import React, { useState, useEffect } from "react";
 
 /**
  * 节点大小组件
@@ -16,6 +16,7 @@ export default function NodeSizeNumberPicker(props) {
       min = props.min,
       onBlur = props.onBlur,
       onKeyDown = props.onKeyDown,
+      disabled = props.disabled,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var _useState = useState(value),
@@ -48,13 +49,13 @@ export default function NodeSizeNumberPicker(props) {
 
   var handleChange = function handleChange(value, e) {
     // 失去焦点最大最小值
-    if (e.type === 'blur') {
+    if (e.type === "blur") {
       onChange(!value ? min : value);
       return;
     } // 加减号立即变更
 
 
-    if (e.triggerType === 'up' || e.triggerType === 'down') {
+    if (e.triggerType === "up" || e.triggerType === "down") {
       onChange(value);
       return;
     }
@@ -65,9 +66,9 @@ export default function NodeSizeNumberPicker(props) {
   return /*#__PURE__*/React.createElement(_NumberPicker, _extends({}, otherProps, {
     value: inputValue,
     min: min,
+    disabled: disabled,
     onChange: handleChange,
     onBlur: handleBlur,
     onKeyDown: handleKeyDown
   }));
-}
-;
+}

package/es/core/editor/components/settings/common/text/fontStyleUtil.js

@@ -1,3 +1,5 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["bold", "italic"];
 var fontStyleUtil = {
   // 字体样式格式: bold italic 12px 黑体 或 12px 黑体
   toMap: function toMap(font) {
@@ -5,17 +7,17 @@ var fontStyleUtil = {
       font = '';
     }
 
-    var arr = font.trim().split(' ');
+    var str = font.trim();
     var bold = font.indexOf('bold') > -1;
     var italic = font.indexOf('italic') > -1;
-    var fontFamily, fontSize;
+    str = str.trim().replace('bold ', '').trim().replace('italic ', '').trim();
+    var arr = str.split(' ');
+    var fontSizeStr = arr[0];
+    var fontFamily = str.replace(fontSizeStr, '').trim() || null;
+    var fontSize = null;
 
-    if (arr.length) {
-      fontFamily = arr[arr.length - 1];
-    }
-
-    if (arr.length >= 2) {
-      fontSize = parseInt(arr[arr.length - 2].replace('px', ''), 10);
+    if (fontSizeStr) {
+      fontSize = parseInt(fontSizeStr.replace('px', ''), 10);
     }
 
     return {
@@ -27,17 +29,9 @@ var fontStyleUtil = {
   },
   // 字体样式格式: bold italic 12px 黑体 或 12px 黑体
   build: function build(style) {
-    var font = '';
-
-    if (style.font.bold) {
-      font += 'bold ';
-    }
-
-    if (style.font.italic) {
-      font += 'italic ';
-    }
-
-    return "" + font + style.font.fontSize + "px " + style.font.fontFamily;
+    return [style.bold ? 'bold' : null, style.italic ? 'italic' : null, style.fontSize ? style.fontSize + "px" : null, style.fontFamily].filter(function (item) {
+      return item !== null;
+    }).join(' ');
   },
   getFontStyleMap: function getFontStyleMap(obj, prefix) {
     var map = {};
@@ -47,6 +41,14 @@ var fontStyleUtil = {
       }
     });
     return map;
+  },
+  // TODO 临时方法
+  removeBoldItalic: function removeBoldItalic(obj) {
+    var bold = obj.bold,
+        italic = obj.italic,
+        ohter = _objectWithoutPropertiesLoose(obj, _excluded);
+
+    return ohter;
   }
 };
 export default fontStyleUtil;

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

@@ -0,0 +1,81 @@
+import _extends from "@babel/runtime/helpers/extends";
+import propertyViews from "../propertyViews";
+import _getPropertyViewType from "./getPropertyViewType";
+
+var PropertyViewManager = /*#__PURE__*/function () {
+  function PropertyViewManager(topo) {
+    this.viewMap = propertyViews;
+    this.topo = void 0;
+    this.customGetViewType = void 0;
+    this.topo = topo;
+    this.open = this.open.bind(this);
+  }
+
+  var _proto = PropertyViewManager.prototype;
+
+  _proto.updateViews = function updateViews(viewMap) {
+    this.viewMap = _extends({}, propertyViews, viewMap);
+  };
+
+  _proto.init = function init() {
+    var notifier = this.topo.getHtTopo().getNotifier();
+    notifier.on('topo_element_double_click', this.open);
+  };
+
+  _proto.destroy = function destroy() {
+    var _this$topo$getHtTopo;
+
+    var notifier = (_this$topo$getHtTopo = this.topo.getHtTopo()) === null || _this$topo$getHtTopo === void 0 ? void 0 : _this$topo$getHtTopo.getNotifier();
+
+    if (!notifier) {
+      return;
+    }
+
+    notifier.off('topo_element_double_click', this.open);
+  };
+
+  _proto.open = function open() {
+    var view = this.getPropertyView();
+
+    if (!view) {
+      return;
+    }
+
+    var topoEditDispatchers = this.topo.store.getModelDispatchers('topoEdit');
+    topoEditDispatchers.update({
+      propertyPanelVisible: true
+    });
+  };
+
+  _proto.close = function close() {
+    var topoEditDispatchers = this.topo.store.getModelDispatchers('topoEdit');
+    topoEditDispatchers.update({
+      propertyPanelVisible: false
+    });
+  };
+
+  _proto.getPropertyView = function getPropertyView() {
+    var elementType = this.getPropertyViewType();
+    var PropertyView = this.viewMap[elementType];
+    return PropertyView;
+  };
+
+  _proto.getPropertyViewType = function getPropertyViewType() {
+    var selection = this.topo.selectionModel.getSelection();
+    var type;
+
+    if (this.customGetViewType) {
+      type = this.customGetViewType(selection);
+
+      if (type) {
+        return type;
+      }
+    }
+
+    return _getPropertyViewType(selection);
+  };
+
+  return PropertyViewManager;
+}();
+
+export default PropertyViewManager;