@riil-frontend/component-topology 7.0.0-dev.24 → 7.0.0-dev.26

package/es/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -16,12 +16,18 @@ function FontColorDropdown(props) {
       topo = props.topo,
       opacity = props.opacity,
       background = props.background,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
 
   var _useState = useState(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
+  var backgroundEnabled = fieldDisabled.background !== true;
+  var opacityEnabled = fieldDisabled.opacity !== true;
+  console.error(backgroundEnabled, opacityEnabled, fieldDisabled);
+
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
     onChange({
@@ -140,7 +146,7 @@ function FontColorDropdown(props) {
     onChange: colorChang,
     onPickerFocus: onFocus,
     onPickerBlur: onBlur
-  }))), /*#__PURE__*/React.createElement("div", {
+  }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/React.createElement("div", {
     className: styles.backgroundColor
   }, /*#__PURE__*/React.createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/React.createElement("div", {
     className: styles.backOpacity
@@ -173,7 +179,8 @@ function FontColorButton(props) {
   var showLabel = props.showLabel,
       topo = props.topo,
       style = props.style,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      fieldDisabled = props.fieldDisabled;
   return /*#__PURE__*/React.createElement(WidgetBox, {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
@@ -182,6 +189,7 @@ function FontColorButton(props) {
     color: style.color,
     background: style.background,
     opacity: style.opacity,
+    fieldDisabled: fieldDisabled,
     setStyle: setStyle,
     onChange: function onChange(val) {
       setStyle(val);

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import { isClusterHtElement } from "../../../../../../../../../utils/clusterUtil";
 import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 import nodeTag from "./nodeTag";
@@ -43,7 +44,12 @@ export function setTextStyle(element, style, topo) {
 }
 export function getEnabledFields(element) {
   if (!element.isExpanded()) {
-    return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color', 'background', 'opacity'];
+  } // 集群禁用背景颜色设置
+
+
+  if (isClusterHtElement(element)) {
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color'];
   }
 
   return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js

@@ -1,14 +1,24 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
-import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
-  var underline = !!element.a('node.tag.fontUnderline');
+  var opacity = element.a('node.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return _extends({
-    color: parseColor(element.a('ht.color')),
-    underline: underline
-  }, fontStyleUtil.toMap(element.a('ht.font')), parseBackground(element.a('ht.background')));
+    color: parseColor(element.a('node.tag.color')),
+    fontFamily: element.a('node.tag.fontFamily') || '微软雅黑',
+    fontSize: element.a('node.tag.fontSize'),
+    bold: !!element.a('node.tag.fontBold'),
+    italic: !!element.a('node.tag.fontItalic'),
+    underline: !!element.a('node.tag.fontUnderline')
+  }, parseBackground(element.a('node.tag.background')), {
+    opacity: opacity
+  });
 }
 export function setTextStyle(element, style, topo) {
   var color = style.color,

package/es/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js

@@ -4,6 +4,11 @@ function PlatformDisplay(props) {
   var topo = props.topo,
       node = props.node;
   var data = topo.dataModel.useDataById(node.getTag());
+
+  if (!data) {
+    return '';
+  }
+
   return data.isSubResource ? data.attributes.platform : '本级平台';
 }
 

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 "7.0.0-dev.24" === 'string' ? "7.0.0-dev.24" : null;
+var version = typeof "7.0.0-dev.26" === 'string' ? "7.0.0-dev.26" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -34,12 +34,18 @@ function FontColorDropdown(props) {
       topo = props.topo,
       opacity = props.opacity,
       background = props.background,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      _props$fieldDisabled = props.fieldDisabled,
+      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
 
   var _useState = (0, _react.useState)(false),
       disabled = _useState[0],
       setDisabled = _useState[1];
 
+  var backgroundEnabled = fieldDisabled.background !== true;
+  var opacityEnabled = fieldDisabled.opacity !== true;
+  console.error(backgroundEnabled, opacityEnabled, fieldDisabled);
+
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
     onChange({
@@ -158,7 +164,7 @@ function FontColorDropdown(props) {
     onChange: colorChang,
     onPickerFocus: onFocus,
     onPickerBlur: onBlur
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), (backgroundEnabled || opacityEnabled) && /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backgroundColor
   }, /*#__PURE__*/_react["default"].createElement("span", null, "\u80CC\u666F\u586B\u5145"), /*#__PURE__*/_react["default"].createElement("div", {
     className: _FontColorButtonModule["default"].backOpacity
@@ -191,7 +197,8 @@ function FontColorButton(props) {
   var showLabel = props.showLabel,
       topo = props.topo,
       style = props.style,
-      setStyle = props.setStyle;
+      setStyle = props.setStyle,
+      fieldDisabled = props.fieldDisabled;
   return /*#__PURE__*/_react["default"].createElement(_WidgetBox["default"], {
     label: "\u6587\u5B57\u989C\u8272",
     tooltip: "\u6587\u5B57\u989C\u8272",
@@ -200,6 +207,7 @@ function FontColorButton(props) {
     color: style.color,
     background: style.background,
     opacity: style.opacity,
+    fieldDisabled: fieldDisabled,
     setStyle: setStyle,
     onChange: function onChange(val) {
       setStyle(val);

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

@@ -11,6 +11,8 @@ exports.setTextStyle = setTextStyle;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _clusterUtil = require("../../../../../../../../../utils/clusterUtil");
+
 var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
 
 var _colorUtil = require("../colorUtil");
@@ -63,7 +65,12 @@ function setTextStyle(element, style, topo) {
 
 function getEnabledFields(element) {
   if (!element.isExpanded()) {
-    return ['fontFamily', 'fontSize', 'color', 'background', 'opacity'];
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color', 'background', 'opacity'];
+  } // 集群禁用背景颜色设置
+
+
+  if ((0, _clusterUtil.isClusterHtElement)(element)) {
+    return ['fontFamily', 'fontSize', 'bold', 'italic', 'underline', 'color'];
   }
 
   return ['fontFamily', 'fontSize', 'bold', 'italic', 'color', 'background', 'opacity'];

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

@@ -13,18 +13,27 @@ 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("../colorUtil");
 
 var _excluded = ["color", "background", "opacity", "bold", "italic", "underline"];
 
 function getTextStyle(element) {
-  var underline = !!element.a('node.tag.fontUnderline');
+  var opacity = element.a('node.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return (0, _extends2["default"])({
-    color: (0, _colorUtil.parseColor)(element.a('ht.color')),
-    underline: underline
-  }, _fontStyleUtil["default"].toMap(element.a('ht.font')), (0, _colorUtil.parseBackground)(element.a('ht.background')));
+    color: (0, _colorUtil.parseColor)(element.a('node.tag.color')),
+    fontFamily: element.a('node.tag.fontFamily') || '微软雅黑',
+    fontSize: element.a('node.tag.fontSize'),
+    bold: !!element.a('node.tag.fontBold'),
+    italic: !!element.a('node.tag.fontItalic'),
+    underline: !!element.a('node.tag.fontUnderline')
+  }, (0, _colorUtil.parseBackground)(element.a('node.tag.background')), {
+    opacity: opacity
+  });
 }
 
 function setTextStyle(element, style, topo) {

package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js

@@ -11,6 +11,11 @@ function PlatformDisplay(props) {
   var topo = props.topo,
       node = props.node;
   var data = topo.dataModel.useDataById(node.getTag());
+
+  if (!data) {
+    return '';
+  }
+
   return data.isSubResource ? data.attributes.platform : '本级平台';
 }
 

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 "7.0.0-dev.24" === 'string' ? "7.0.0-dev.24" : null;
+var version = typeof "7.0.0-dev.26" === 'string' ? "7.0.0-dev.26" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.24",
+  "version": "7.0.0-dev.26",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.24/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.26/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }