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

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;

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

@@ -0,0 +1,22 @@
+import { isEdge } from "../../../../../utils/htElementUtils";
+import addEdgeProps from "../propertyViews/edge/addEdgeProps";
+export function adapterGetEdgePropertyViewType(selection, editorProps) {
+  var fn = editorProps.getEdgePropertyViewType;
+
+  if (selection.length === 1 && isEdge(selection[0]) && fn) {
+    var type = fn({
+      edge: selection[0]
+    });
+    return type;
+  }
+
+  return null;
+}
+export function addEdgePropertyViews(propertyViewManager, editorProps) {
+  var oldMap = editorProps.edgePropertyViews || {};
+  var map = {};
+  Object.keys(oldMap).forEach(function (name) {
+    map[name] = addEdgeProps(oldMap[name]);
+  });
+  propertyViewManager.updateViews(map);
+}

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

@@ -0,0 +1,34 @@
+import { isEdge, isEdgeGroupAgent, isGroup, isLayer, isNode, isText } from "../../../../../utils/htElementUtils";
+
+function getPropertyViewType(selection) {
+  var selectionElement = selection[0];
+  var selectionSize = selection.length;
+  var viewType;
+
+  if (!selectionSize) {
+    // 未选
+    viewType = 'view';
+  } else if (selectionSize >= 2) {
+    // 多选
+    viewType = 'multiple';
+  } else if (isText(selectionElement)) {
+    viewType = 'text';
+  } else if (isGroup(selectionElement)) {
+    viewType = 'group';
+  } else if (selectionElement.a('type') === 'box') {
+    viewType = 'box';
+  } else if (isNode(selectionElement)) {
+    viewType = 'node';
+  } else if (isEdgeGroupAgent(selectionElement)) {
+    viewType = 'edgeGroup';
+  } else if (isEdge(selectionElement)) {
+    viewType = 'edge';
+  } else if (isLayer(selectionElement)) {
+    // 分层
+    viewType = 'layer';
+  }
+
+  return viewType;
+}
+
+export default getPropertyViewType;

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

@@ -0,0 +1,21 @@
+export default function updateElementProperty(topo, name, value) {
+  // const element = topo.getDataModel().getDataById(selection[0].id);
+  var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
+
+  if (name.startsWith('attrObject.')) {
+    element.setAttr(name.replace('attrObject.', ''), value);
+  } else if (name.startsWith('position.')) {
+    element.setPosition(name.replace('position.', ''), value);
+  } else if (name.startsWith('styleMap.')) {
+    element.setStyle(name.replace('styleMap.', ''), value);
+  } else if (name === 'name') {
+    element.setName(value);
+  } else if (name === 'width') {
+    element.setWidth(value);
+  } else if (name === 'height') {
+    element.setHeight(value);
+  } else if (name === 'image') {
+    element.setImage(value);
+  }
+}
+;

package/es/core/editor/components/settings/propertyViews/box/BoxPropertyView.js

@@ -14,11 +14,9 @@ function parseValues(values) {
 export default function BoxPropertyView(props) {
   var topo = props.topo,
       values = props.values,
-      _onChange = props.onChange;
-  var boxNode = useHtElement({
-    topo: topo,
-    id: values.id
-  });
+      _onChange = props.onChange,
+      selectionElement = props.selectionElement;
+  var boxNode = selectionElement;
 
   var field = _Field.useField({
     autoUnmount: false,
@@ -40,19 +38,14 @@ export default function BoxPropertyView(props) {
   }, [values]);
   return /*#__PURE__*/React.createElement(_Form, {
     field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ['标题区'],
+    labelAlign: "top",
     style: {
-      border: 'none'
+      margin: '12px 16px 0 32px'
     }
-  }, /*#__PURE__*/React.createElement(CollapsePanel, {
-    key: "\u6807\u9898\u533A",
-    title: "\u6807\u9898\u533A"
   }, /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u6807\u9898\u540D\u79F0"
   }, /*#__PURE__*/React.createElement(NameInput, {
     name: "attrObject.topLeftText",
     topo: topo
-  }))))));
+  })));
 }

package/es/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js

@@ -0,0 +1,58 @@
+import _Form from "@alifd/next/es/form";
+import _Field from "@alifd/next/es/field";
+import _extends from "@babel/runtime/helpers/extends";
+import _Collapse from "@alifd/next/es/collapse";
+import React, { useEffect } from 'react';
+import useHtElement from "../../../../../common/hooks/useHtElement";
+import NameInput from "./NameInput";
+var CollapsePanel = _Collapse.Panel;
+
+function parseValues(values) {
+  return _extends({}, values);
+}
+
+export default function BoxPropertyView(props) {
+  var topo = props.topo,
+      values = props.values,
+      _onChange = props.onChange;
+  var boxNode = useHtElement({
+    topo: topo,
+    id: values.id
+  });
+
+  var field = _Field.useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+
+      if (name === 'attrObject.topLeftText') {
+        // 修改框名称改变名称背景块大小
+        topo.getHtTopo().setRectangleText(boxNode);
+      }
+    }
+  });
+
+  useEffect(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+  return /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
+    defaultExpandedKeys: ['标题区'],
+    style: {
+      border: 'none'
+    }
+  }, /*#__PURE__*/React.createElement(CollapsePanel, {
+    key: "\u6807\u9898\u533A",
+    title: "\u6807\u9898\u533A"
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u6807\u9898\u540D\u79F0"
+  }, /*#__PURE__*/React.createElement(NameInput, {
+    name: "attrObject.topLeftText",
+    topo: topo
+  }))))));
+}

package/es/core/editor/components/settings/propertyViews/box/NameInput.js

@@ -1,7 +1,7 @@
-import _Input from "@alifd/next/es/input";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
-var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
+import NameInput from "../../common/NameInput";
+var BoxNameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onChange = props.onChange,
       topo = props.topo;
 
@@ -33,12 +33,13 @@ var NameInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     topo.historyManager.endTransaction();
   };
 
-  return /*#__PURE__*/React.createElement(_Input, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(NameInput, _extends({}, props, {
     ref: ref,
     value: value,
+    multipleLine: true,
     onChange: handleChange,
     onFocus: handleFocus,
     onBlur: handleBlur
   }));
 });
-export default NameInput;
+export default BoxNameInput;

package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -7,6 +7,7 @@ import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import React, { useEffect, useState } from "react";
 import ColorPicker from "../../../../../../common/components/ColorPicker";
 import LineType from "../../common/LineType";
+import addEdgeProps from "./addEdgeProps";
 var CollapsePanel = _Collapse.Panel;
 
 function parseValues(values, edge) {
@@ -16,7 +17,7 @@ function parseValues(values, edge) {
   });
 }
 
-export default function CommonEdgePropertyView(props) {
+function CommonEdgePropertyView(props) {
   var topo = props.topo,
       edge = props.edge,
       values = props.values,
@@ -41,8 +42,10 @@ export default function CommonEdgePropertyView(props) {
   }, [values]);
 
   var setLineColor = function setLineColor(color) {
-    var style = edge.a("styles") || {};
+    // 同时修改实线、虚线
     edge.s("edge.color", color);
+    edge.s("edge.dash.color", color);
+    var style = edge.a("styles") || {};
     edge.a("styles", _extends({}, style, {
       color: color
     }));
@@ -93,6 +96,10 @@ export default function CommonEdgePropertyView(props) {
     style: {
       width: "100%"
     },
+    onChange: function onChange(val) {
+      // 同时修改实线、虚线的线宽
+      edge.s('edge.dash.width', val);
+    },
     onFocus: function onFocus() {
       topo.historyManager.beginTransaction();
     },
@@ -121,4 +128,6 @@ export default function CommonEdgePropertyView(props) {
       }
     }
   })))), extraDisplaySetting))));
-}
+}
+
+export default addEdgeProps(CommonEdgePropertyView);

package/es/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js

@@ -1,10 +1,9 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
+import addEdgeProps from "./addEdgeProps";
 import EdgeGroupSetting from "./edgeGroup/EdgeGroupSetting";
-export default function EdgeGroupPropertyView(props) {
-  var topo = props.topo,
-      edge = props.edge,
-      values = props.values,
-      onChange = props.onChange,
-      editorProps = props.editorProps;
+
+function EdgeGroupPropertyView(props) {
   return /*#__PURE__*/React.createElement(EdgeGroupSetting, props);
-}
+}
+
+export default addEdgeProps(EdgeGroupPropertyView);

package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js

@@ -1,10 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useState, useEffect, useRef, useCallback } from "react";
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import useHtElement from "../../../../../common/hooks/useHtElement";
-import CommonEdgePropertyView from "./CommonEdgePropertyView";
 import EdgeGroupPropertyView from "./EdgeGroupPropertyView";
 var commonViews = {
-  edge: CommonEdgePropertyView,
   edgeGroup: EdgeGroupPropertyView
 };
 /**
@@ -14,31 +12,19 @@ var commonViews = {
 export default function EdgePropertyViewRoute(props) {
   var topo = props.topo,
       values = props.values,
+      selectionElement = props.selectionElement,
       editorProps = props.editorProps;
-  var edge = useHtElement({
-    topo: topo,
-    id: values.id
-  });
+  var edge = selectionElement;
   var type;
 
-  if (edge.isEdgeGroupAgent()) {
-    if (editorProps.getEdgeGroupPropertyViewType) {
-      type = editorProps.getEdgeGroupPropertyViewType(_extends({}, props, {
-        edge: edge
-      }));
-    }
-
-    type = type || "edgeGroup";
-  } else {
-    if (editorProps.getEdgePropertyViewType) {
-      type = editorProps.getEdgePropertyViewType(_extends({}, props, {
-        edge: edge
-      }));
-    }
-
-    type = type || "edge";
+  if (editorProps.getEdgePropertyViewType) {
+    type = editorProps.getEdgePropertyViewType(_extends({}, props, {
+      edge: edge
+    }));
   }
 
+  type = type || 'edge';
+
   var views = _extends({}, commonViews, editorProps.edgePropertyViews || {});
 
   var View = views[type];

package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js

@@ -0,0 +1,10 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+export default function addEdgeProps(Component) {
+  return function AdapterEdgeProps(props) {
+    var selectionElement = props.selectionElement;
+    return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
+      edge: selectionElement
+    }));
+  };
+}