@riil-frontend/component-topology 6.0.0-alpha.65 → 6.0.0-alpha.66

package/es/core/components/TopoView/topoView.js

@@ -268,14 +268,14 @@ var Topology = function Topology(props) {
     direction: "row",
     flex: 1,
     className: classnames((_classnames = {}, _classnames[editorStyles.borderLine] = isEditMode, _classnames))
-  }, isEditMode && /*#__PURE__*/React.createElement(Sidebar, {
+  }, isEditMode && /*#__PURE__*/React.createElement(Sidebar, _extends({
     topo: topo,
     topoEdit: topoEdit,
     topoContext: {
       urlParams: urlParams
     },
     editorProps: editorProps
-  }), renderCanvas(), isEditMode && graphLoaded && /*#__PURE__*/React.createElement(PropertyView, {
+  }, editorProps === null || editorProps === void 0 ? void 0 : editorProps.sidebarProps)), renderCanvas(), isEditMode && graphLoaded && /*#__PURE__*/React.createElement(PropertyView, {
     topo: topo,
     editorProps: editorProps
   })), !isEditMode && /*#__PURE__*/React.createElement(ViewerPlugin, {

package/es/core/editor/components/Sidebar/Sidebar.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import classNames from 'classnames';
 import Tab from "../../../../components/VerticalIconTab";
 import panes from "./panes";
@@ -8,7 +8,8 @@ import styles from "./Sidebar.module.scss";
 function Sidebar(props) {
   var _classNames;
 
-  var topo = props.topo;
+  var topo = props.topo,
+      getPanels = props.getPanels;
 
   var _topo$store$useModel = topo.store.useModel('topoEdit'),
       topoEditState = _topo$store$useModel[0],
@@ -19,6 +20,9 @@ function Sidebar(props) {
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       graphLoaded = _topo$store$useModelS.graphLoaded;
 
+  var visiblePanels = useMemo(function () {
+    return getPanels ? getPanels(panes) : panes;
+  }, [getPanels]);
   useEffect(function () {
     return function () {
       // 退出编辑模式，关闭资源面板状态
@@ -63,7 +67,7 @@ function Sidebar(props) {
         resourceTabActiveKey: key
       });
     }
-  }, panes.map(renderTabItem))));
+  }, visiblePanels.map(renderTabItem))));
 }
 
 export default Sidebar;

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

@@ -1,7 +1,9 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["color", "background", "opacity"];
-import { formatBackgroundRgbaColor, parseBackground } from "../ElementTextStyleSetting/colorUtil";
+var _excluded = ["color", "background", "opacity"],
+    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
+import fontStyleUtil from "../../../../../settings/common/text/fontStyleUtil";
+import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../ElementTextStyleSetting/colorUtil";
 var defaultStyle = {
   color: '#AFB9C2',
   fontFamily: '微软雅黑'
@@ -29,12 +31,13 @@ export var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
 
   var globalEdgeTagStyle = _extends({}, nodeLabelStyle, defaultEdgeLabelStyle, style);
 
-  topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-  topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
   displayConfigDispatchers.update({
     nodeLabelStyle: globalNodeLabelStyle,
     defaultEdgeLabelStyle: globalEdgeTagStyle
   });
+  var styles = setTextStyle(styleData, nodeLabelStyle);
+  topo.getHtTopo().setGlobalNodeLabelStyle(styles);
+  topo.getHtTopo().setGlobalEdgeTagStyle(styles);
 };
 
 function buildStyle(styleData, prevTagStyle) {
@@ -57,4 +60,40 @@ function buildStyle(styleData, prevTagStyle) {
   return style;
 }
 
+function setTextStyle(styleData, nodeLabelStyle) {
+  var _fontStyleUtil$remove = fontStyleUtil.removeBoldItalic(styleData),
+      color = _fontStyleUtil$remove.color,
+      background = _fontStyleUtil$remove.background,
+      opacity = _fontStyleUtil$remove.opacity,
+      bold = _fontStyleUtil$remove.bold,
+      italic = _fontStyleUtil$remove.italic,
+      otherStyle = _objectWithoutPropertiesLoose(_fontStyleUtil$remove, _excluded2);
+
+  var tagStyle = _extends({}, otherStyle);
+
+  if ('color' in styleData) {
+    tagStyle.color = color.hex;
+  }
+
+  if ('bold' in styleData) {
+    tagStyle.fontBold = bold;
+  }
+
+  if ('italic' in styleData) {
+    tagStyle.fontItalic = italic;
+  }
+
+  if ('background' in styleData) {
+    // 背景颜色
+    var prevBackgroundStyle = parseBackground(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background);
+    tagStyle.background = formatBackgroundRgbaColor(prevBackgroundStyle, styleData);
+  }
+
+  if ('opacity' in styleData) {
+    tagStyle.opacity = opacity;
+  }
+
+  return tagStyle;
+}
+
 export function setStyle() {}

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.65" === 'string' ? "6.0.0-alpha.65" : null;
+var version = typeof "6.0.0-alpha.66" === 'string' ? "6.0.0-alpha.66" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/components/TopoView/topoView.js

@@ -310,14 +310,14 @@ var Topology = function Topology(props) {
     direction: "row",
     flex: 1,
     className: (0, _classnames2["default"])((_classnames = {}, _classnames[_editorModule["default"].borderLine] = isEditMode, _classnames))
-  }, isEditMode && /*#__PURE__*/_react["default"].createElement(_Sidebar["default"], {
+  }, isEditMode && /*#__PURE__*/_react["default"].createElement(_Sidebar["default"], (0, _extends2["default"])({
     topo: topo,
     topoEdit: topoEdit,
     topoContext: {
       urlParams: urlParams
     },
     editorProps: editorProps
-  }), renderCanvas(), isEditMode && graphLoaded && /*#__PURE__*/_react["default"].createElement(_PropertyView["default"], {
+  }, editorProps === null || editorProps === void 0 ? void 0 : editorProps.sidebarProps)), renderCanvas(), isEditMode && graphLoaded && /*#__PURE__*/_react["default"].createElement(_PropertyView["default"], {
     topo: topo,
     editorProps: editorProps
   })), !isEditMode && /*#__PURE__*/_react["default"].createElement(_ViewerPlugin["default"], {

package/lib/core/editor/components/Sidebar/Sidebar.js

@@ -24,7 +24,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function Sidebar(props) {
   var _classNames;
 
-  var topo = props.topo;
+  var topo = props.topo,
+      getPanels = props.getPanels;
 
   var _topo$store$useModel = topo.store.useModel('topoEdit'),
       topoEditState = _topo$store$useModel[0],
@@ -35,6 +36,9 @@ function Sidebar(props) {
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       graphLoaded = _topo$store$useModelS.graphLoaded;
 
+  var visiblePanels = (0, _react.useMemo)(function () {
+    return getPanels ? getPanels(_panes["default"]) : _panes["default"];
+  }, [getPanels]);
   (0, _react.useEffect)(function () {
     return function () {
       // 退出编辑模式，关闭资源面板状态
@@ -79,7 +83,7 @@ function Sidebar(props) {
         resourceTabActiveKey: key
       });
     }
-  }, _panes["default"].map(renderTabItem))));
+  }, visiblePanels.map(renderTabItem))));
 }
 
 var _default = Sidebar;

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

@@ -11,9 +11,12 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _fontStyleUtil = _interopRequireDefault(require("../../../../../settings/common/text/fontStyleUtil"));
+
 var _colorUtil = require("../ElementTextStyleSetting/colorUtil");
 
-var _excluded = ["color", "background", "opacity"];
+var _excluded = ["color", "background", "opacity"],
+    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
 var defaultStyle = {
   color: '#AFB9C2',
   fontFamily: '微软雅黑'
@@ -40,12 +43,13 @@ var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
   var style = buildStyle(styleData, nodeLabelStyle);
   var globalNodeLabelStyle = (0, _extends2["default"])({}, nodeLabelStyle, style);
   var globalEdgeTagStyle = (0, _extends2["default"])({}, nodeLabelStyle, defaultEdgeLabelStyle, style);
-  topo.getHtTopo().setGlobalNodeLabelStyle(globalNodeLabelStyle);
-  topo.getHtTopo().setGlobalEdgeTagStyle(globalEdgeTagStyle);
   displayConfigDispatchers.update({
     nodeLabelStyle: globalNodeLabelStyle,
     defaultEdgeLabelStyle: globalEdgeTagStyle
   });
+  var styles = setTextStyle(styleData, nodeLabelStyle);
+  topo.getHtTopo().setGlobalNodeLabelStyle(styles);
+  topo.getHtTopo().setGlobalEdgeTagStyle(styles);
 };
 
 exports.setGlobalTagStyle = setGlobalTagStyle;
@@ -69,4 +73,40 @@ function buildStyle(styleData, prevTagStyle) {
   return style;
 }
 
+function setTextStyle(styleData, nodeLabelStyle) {
+  var _fontStyleUtil$remove = _fontStyleUtil["default"].removeBoldItalic(styleData),
+      color = _fontStyleUtil$remove.color,
+      background = _fontStyleUtil$remove.background,
+      opacity = _fontStyleUtil$remove.opacity,
+      bold = _fontStyleUtil$remove.bold,
+      italic = _fontStyleUtil$remove.italic,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(_fontStyleUtil$remove, _excluded2);
+
+  var tagStyle = (0, _extends2["default"])({}, otherStyle);
+
+  if ('color' in styleData) {
+    tagStyle.color = color.hex;
+  }
+
+  if ('bold' in styleData) {
+    tagStyle.fontBold = bold;
+  }
+
+  if ('italic' in styleData) {
+    tagStyle.fontItalic = italic;
+  }
+
+  if ('background' in styleData) {
+    // 背景颜色
+    var prevBackgroundStyle = (0, _colorUtil.parseBackground)(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background);
+    tagStyle.background = (0, _colorUtil.formatBackgroundRgbaColor)(prevBackgroundStyle, styleData);
+  }
+
+  if ('opacity' in styleData) {
+    tagStyle.opacity = opacity;
+  }
+
+  return tagStyle;
+}
+
 function setStyle() {}

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.65" === 'string' ? "6.0.0-alpha.65" : null;
+var version = typeof "6.0.0-alpha.66" === 'string' ? "6.0.0-alpha.66" : 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.65",
+  "version": "6.0.0-alpha.66",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.65/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.66/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }