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

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -0,0 +1,81 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.getElementTextStyle = getElementTextStyle;
+exports.getTextStyle = getTextStyle;
+exports.setTextStyle = setTextStyle;
+
+var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
+
+var _elements = _interopRequireDefault(require("./elements"));
+
+function getElementType(element) {
+  if ((0, _htElementUtils.isText)(element)) {
+    return 'text';
+  } else if ((0, _htElementUtils.isGroup)(element)) {
+    return 'groupTitle';
+  } else if ((0, _htElementUtils.isNode)(element)) {
+    return 'nodeTag';
+  } else if ((0, _htElementUtils.isEdge)(element)) {
+    return 'edgeTag';
+  } else if ((0, _htElementUtils.isLayer)(element)) {
+    return 'layerTitle';
+  }
+
+  return null;
+}
+
+function getElementTextStyle(element) {
+  var type = getElementType(element);
+  var handler = _elements["default"][type];
+
+  if (handler) {
+    return handler.getTextStyle(element);
+  }
+
+  return null;
+}
+
+function getTextStyle(htSelection, styleNames) {
+  if (htSelection.length === 1) {
+    var element = htSelection[0];
+    return getElementTextStyle(element);
+  } else if (htSelection.length) {
+    // 多选时值相同返回？
+    var values = htSelection.map(function (element) {
+      return getElementTextStyle(element);
+    }).filter(function (item) {
+      return !!item;
+    });
+
+    if (!values.length) {
+      return null;
+    }
+
+    var value = {};
+    styleNames.forEach(function (styleName) {
+      var val = values[0][styleName];
+      var different = values.filter(function (obj) {
+        return obj[styleName] !== val;
+      });
+
+      if (!different.length) {
+        value[styleName] = val;
+      }
+    });
+    return Object.keys(value).length ? value : null;
+  }
+
+  return null;
+}
+
+function setTextStyle(element, style) {
+  var type = getElementType(element);
+  var handler = _elements["default"][type];
+
+  if (handler) {
+    handler.setTextStyle(element, style);
+  }
+}

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _globalTag = require("./globalTag");
+
+var _excluded = ["Component"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function GlobalTagStyleSetting(props) {
+  var topo = props.topo;
+  var Component = props.Component,
+      widgetProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+  var values = (0, _globalTag.useValues)(topo);
+  var setStyle = (0, _react.useMemo)(function () {
+    return function (style) {
+      return (0, _globalTag.setGlobalTagStyle)(topo, style);
+    };
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
+    style: values,
+    setStyle: setStyle
+  }, widgetProps));
+}
+
+var _default = GlobalTagStyleSetting;
+exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.setGlobalTagStyle = void 0;
+exports.setStyle = setStyle;
+exports.useValues = useValues;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var defaultStyle = {
+  color: '#AFB9C2',
+  fontFamily: '微软雅黑'
+};
+
+function useValues(topo) {
+  var displayConfigState = topo.store.useModelState('displayConfig');
+  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
+      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
+  return {
+    color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
+    fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+  };
+}
+
+var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
+  var _topo$store$getModel = topo.store.getModel('displayConfig'),
+      displayConfigState = _topo$store$getModel[0],
+      displayConfigDispatchers = _topo$store$getModel[1];
+
+  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
+      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
+  var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, styleData);
+  topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
+  var globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, styleData);
+  topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
+  displayConfigDispatchers.update({
+    nodeLabelStyle: globalNodeLabelStyle,
+    defaultEdgeLabelStyle: globalEdgeTagStyle
+  });
+};
+
+exports.setGlobalTagStyle = setGlobalTagStyle;
+
+function setStyle() {}

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/textStyleSettingRouter.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _ElementTextStyleSetting = _interopRequireDefault(require("./ElementTextStyleSetting/ElementTextStyleSetting"));
+
+var _GlobalTagStyleSetting = _interopRequireDefault(require("./GlobalTagStyleSetting/GlobalTagStyleSetting"));
+
+function textStyleSettingRouter(Component, options) {
+  var names = (options === null || options === void 0 ? void 0 : options.names) || [];
+  return function TextStyleSettingButton(props) {
+    var topo = props.topo;
+    var selection = topo.selectionManager.useHtSelection();
+    var Widget = !selection.length ? _GlobalTagStyleSetting["default"] : _ElementTextStyleSetting["default"];
+    return /*#__PURE__*/_react["default"].createElement(Widget, (0, _extends2["default"])({
+      Component: Component
+    }, props, {
+      styleNames: names
+    }));
+  };
+}
+
+var _default = textStyleSettingRouter;
+exports["default"] = _default;

package/lib/core/editor/components/settings/PropertyView.js

@@ -5,15 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = PropertyView;
 
-var _react = _interopRequireDefault(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _Settings = _interopRequireDefault(require("./Settings"));
+var _react = _interopRequireDefault(require("react"));
+
+var _CloseablePanel = _interopRequireDefault(require("./CloseablePanel"));
 
 var _OpenPropertyPanelListener = _interopRequireDefault(require("./OpenPropertyPanelListener"));
 
-var _CloseablePanel = _interopRequireDefault(require("./CloseablePanel"));
+var _Settings = _interopRequireDefault(require("./Settings"));
 
 var _SettingsModule = _interopRequireDefault(require("./Settings.module.scss"));
 
@@ -41,6 +41,10 @@ function PropertyView(props) {
   }
 
   var renderContent = function renderContent() {
+    if (!propertyPanelVisible) {
+      return null;
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
       topo: topo
     }, /*#__PURE__*/_react["default"].createElement(_Settings["default"], {
@@ -61,5 +65,7 @@ function PropertyView(props) {
         propertyPanelVisible: false
       });
     }
-  }, renderContent()));
+  }, /*#__PURE__*/_react["default"].createElement(_OpenPropertyPanelListener["default"], {
+    topo: topo
+  }, renderContent())));
 }

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

@@ -12,7 +12,8 @@ var fontStyleUtil = {
     var arr = font.trim().split(' ');
     var bold = font.indexOf('bold') > -1;
     var italic = font.indexOf('italic') > -1;
-    var fontFamily, fontSize;
+    var fontFamily;
+    var fontSize;
 
     if (arr.length) {
       fontFamily = arr[arr.length - 1];
@@ -33,15 +34,15 @@ var fontStyleUtil = {
   build: function build(style) {
     var font = '';
 
-    if (style.font.bold) {
+    if (style.bold) {
       font += 'bold ';
     }
 
-    if (style.font.italic) {
+    if (style.italic) {
       font += 'italic ';
     }
 
-    return "" + font + style.font.fontSize + "px " + style.font.fontFamily;
+    return "" + font + style.fontSize + "px " + style.fontFamily;
   },
   getFontStyleMap: function getFontStyleMap(obj, prefix) {
     var map = {};

package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js

@@ -56,7 +56,7 @@ function TextPropertyView(props) {
 
         _onChange('styleMap.label.color', value.color, newValues);
 
-        var font = _fontStyleUtil["default"].build(value);
+        var font = _fontStyleUtil["default"].build(value.font);
 
         _onChange('styleMap.text.font', font, newValues);
 

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.31" === 'string' ? "6.0.0-alpha.31" : null;
+var version = typeof "6.0.0-alpha.33" === 'string' ? "6.0.0-alpha.33" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.0-alpha.31",
+  "version": "6.0.0-alpha.33",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.31/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.33/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/editor/components/Toolbar/hooks/useFontStyleSetting.js

@@ -1,52 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React, { useMemo } from 'react';
-import { isText } from "../../../../../utils/htElementDataUtil";
-import { isGroup, isLayer, isNode } from "../../../../../utils/htElementUtils";
-
-function useFontStyleSetting(props) {
-  var topo = props.topo;
-  var selectionElements = topo.selectionManager.useHtSelection();
-  var buttonEnabled = true; // 全局配置
-
-  var _topo$store$useModel = topo.store.useModel('displayConfig'),
-      displayConfigState = _topo$store$useModel[0],
-      displayConfigDispatchers = _topo$store$useModel[1];
-
-  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
-      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
-
-  var setGlobalTagStyle = function setGlobalTagStyle(styleData) {
-    var globalNodeLabelStyle = _extends({}, nodeLabelStyle, styleData);
-
-    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-
-    var globalEdgeTagStyle = _extends({}, defaultEdgeLabelStyle, styleData);
-
-    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
-    displayConfigDispatchers.update({
-      nodeLabelStyle: globalNodeLabelStyle,
-      defaultEdgeLabelStyle: globalEdgeTagStyle
-    });
-  };
-
-  var setStyle = function setStyle(styleData) {
-    topo.historyManager.beginTransaction(); // 全局调整（资源和链路）：无选择时，按钮亮起，即可修改全局资源和链路的标注，不影响“文本”、框名称、区域名称、分层名称的格式。
-
-    if (!selectionElements.length) {
-      setGlobalTagStyle(styleData);
-    } else {
-      selectionElements.forEach(function (element) {
-        if (isNode(element)) {} else if (isGroup(element)) {} else if (isText(element)) {} else if (isLayer(element)) {}
-      });
-    }
-
-    topo.historyManager.endTransaction();
-  };
-
-  return {
-    buttonEnabled: buttonEnabled,
-    setStyle: setStyle
-  };
-}
-
-export default useFontStyleSetting;

package/lib/core/editor/components/Toolbar/hooks/useFontStyleSetting.js

@@ -1,64 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _htElementDataUtil = require("../../../../../utils/htElementDataUtil");
-
-var _htElementUtils = require("../../../../../utils/htElementUtils");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function useFontStyleSetting(props) {
-  var topo = props.topo;
-  var selectionElements = topo.selectionManager.useHtSelection();
-  var buttonEnabled = true; // 全局配置
-
-  var _topo$store$useModel = topo.store.useModel('displayConfig'),
-      displayConfigState = _topo$store$useModel[0],
-      displayConfigDispatchers = _topo$store$useModel[1];
-
-  var nodeLabelStyle = displayConfigState.nodeLabelStyle,
-      defaultEdgeLabelStyle = displayConfigState.defaultEdgeLabelStyle;
-
-  var setGlobalTagStyle = function setGlobalTagStyle(styleData) {
-    var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, styleData);
-    topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-    var globalEdgeTagStyle = (0, _extends2["default"])({}, defaultEdgeLabelStyle, styleData);
-    topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
-    displayConfigDispatchers.update({
-      nodeLabelStyle: globalNodeLabelStyle,
-      defaultEdgeLabelStyle: globalEdgeTagStyle
-    });
-  };
-
-  var setStyle = function setStyle(styleData) {
-    topo.historyManager.beginTransaction(); // 全局调整（资源和链路）：无选择时，按钮亮起，即可修改全局资源和链路的标注，不影响“文本”、框名称、区域名称、分层名称的格式。
-
-    if (!selectionElements.length) {
-      setGlobalTagStyle(styleData);
-    } else {
-      selectionElements.forEach(function (element) {
-        if ((0, _htElementUtils.isNode)(element)) {} else if ((0, _htElementUtils.isGroup)(element)) {} else if ((0, _htElementDataUtil.isText)(element)) {} else if ((0, _htElementUtils.isLayer)(element)) {}
-      });
-    }
-
-    topo.historyManager.endTransaction();
-  };
-
-  return {
-    buttonEnabled: buttonEnabled,
-    setStyle: setStyle
-  };
-}
-
-var _default = useFontStyleSetting;
-exports["default"] = _default;