@riil-frontend/component-topology 6.0.0-alpha.51 → 6.0.0-alpha.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/build/index.js +1 -1
  2. package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js +9 -2
  3. package/es/core/models/TopoApp.js +1 -1
  4. package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js +9 -2
  5. package/lib/core/models/TopoApp.js +1 -1
  6. package/package.json +2 -2
package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js CHANGED
@@ -1,4 +1,6 @@
1
+ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
1
2
  import _extends from "@babel/runtime/helpers/extends";
3
+ var _excluded = ["color", "background", "opacity"];
2
4
  import { formatBackgroundRgbaColor, parseBackground } from "../ElementTextStyleSetting/colorUtil";
3
5
  var defaultStyle = {
4
6
  color: '#AFB9C2',
@@ -35,10 +37,15 @@ export var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
35
37
  };
36
38
 
37
39
  function buildStyle(styleData, prevTagStyle) {
38
- var style = {};
40
+ var color = styleData.color,
41
+ background = styleData.background,
42
+ opacity = styleData.opacity,
43
+ otherStyle = _objectWithoutPropertiesLoose(styleData, _excluded);
44
+
45
+ var style = _extends({}, prevTagStyle, otherStyle);
39
46
 
40
47
  if ('color' in styleData) {
41
- style.color = styleData.color.hex;
48
+ style.color = color.hex;
42
49
  }
43
50
 
44
51
  if ('background' in styleData || 'opacity' in styleData) {
package/es/core/models/TopoApp.js CHANGED
@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
22
22
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
23
23
  import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
24
24
 
25
- var version = typeof "6.0.0-alpha.51" === 'string' ? "6.0.0-alpha.51" : null;
25
+ var version = typeof "6.0.0-alpha.52" === 'string' ? "6.0.0-alpha.52" : null;
26
26
  console.info("\u62D3\u6251\u7248\u672C: " + version);
27
27
  /**
28
28
  * 拓扑显示和编辑
package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js CHANGED
@@ -7,10 +7,13 @@ exports.setGlobalTagStyle = void 0;
7
7
  exports.setStyle = setStyle;
8
8
  exports.useValues = useValues;
9
9
 
10
+ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
11
+
10
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
13
 
12
14
  var _colorUtil = require("../ElementTextStyleSetting/colorUtil");
13
15
 
16
+ var _excluded = ["color", "background", "opacity"];
14
17
  var defaultStyle = {
15
18
  color: '#AFB9C2',
16
19
  fontFamily: '微软雅黑'
@@ -48,10 +51,14 @@ var setGlobalTagStyle = function setGlobalTagStyle(topo, styleData) {
48
51
  exports.setGlobalTagStyle = setGlobalTagStyle;
49
52
 
50
53
  function buildStyle(styleData, prevTagStyle) {
51
- var style = {};
54
+ var color = styleData.color,
55
+ background = styleData.background,
56
+ opacity = styleData.opacity,
57
+ otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(styleData, _excluded);
58
+ var style = (0, _extends2["default"])({}, prevTagStyle, otherStyle);
52
59
 
53
60
  if ('color' in styleData) {
54
- style.color = styleData.color.hex;
61
+ style.color = color.hex;
55
62
  }
56
63
 
57
64
  if ('background' in styleData || 'opacity' in styleData) {
package/lib/core/models/TopoApp.js CHANGED
@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
52
52
  var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
53
53
 
54
54
  // eslint-disable-next-line no-undef
55
- var version = typeof "6.0.0-alpha.51" === 'string' ? "6.0.0-alpha.51" : null;
55
+ var version = typeof "6.0.0-alpha.52" === 'string' ? "6.0.0-alpha.52" : null;
56
56
  console.info("\u62D3\u6251\u7248\u672C: " + version);
57
57
  /**
58
58
  * 拓扑显示和编辑
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "6.0.0-alpha.51",
3
+ "version": "6.0.0-alpha.52",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -116,6 +116,6 @@
116
116
  "access": "public"
117
117
  },
118
118
  "license": "MIT",
119
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.51/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.52/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }