@riil-frontend/component-topology 6.0.0-alpha.57 → 6.0.0-alpha.59

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

@@ -91,7 +91,7 @@ function FontColorDropdown(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: opacity * 100
+    defaultValue: opacity === undefined ? opacity : opacity * 100
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '10px',

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

@@ -1,16 +1,25 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "showLabel"];
 import React, { useEffect, useState } from "react";
-import { isGroup, isNode } from "../../../../../../utils/htElementUtils";
+import { isGroup, isNode, isText } from "../../../../../../utils/htElementUtils";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
 import BoxBackgroundSetting from "./BoxBackgroundSetting";
+
+function isElementSetImageEnabled(element) {
+  if (isGroup(element)) {
+    return !element.isExpanded();
+  }
+
+  return isNode(element) && !isText(element) && element.a('type') !== 'box';
+}
 /**
  * 替换图片设置
  * @param {*} props
  * @returns
  */
 
+
 function NodeImageButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -27,9 +36,7 @@ function NodeImageButton(props) {
 
   var selection = topo.selectionModel.useHtSelection();
   useEffect(function () {
-    var nodes = selection.filter(function (ele) {
-      return isGroup(ele) || isNode(ele);
-    });
+    var nodes = selection.filter(isElementSetImageEnabled);
 
     if (nodes.length > 0) {
       setDisabled(false);
@@ -44,10 +51,12 @@ function NodeImageButton(props) {
     // const gv = topo.view.topoClient.getGraphView();
     //const element = topo.getSelectionModel().getFirstData();
 
-    var elements = topo.getSelectionModel();
+    var elements = selection;
     console.log("onChange-elements", elements);
-    elements.each(function (element) {
-      element.setImage(prop);
+    elements.forEach(function (element) {
+      if (isElementSetImageEnabled(element)) {
+        element.setImage(prop);
+      }
     }); // selection.map((element) => {
     //   element.setImage(prop);
     // });

package/es/core/models/TopoApp.js

@@ -22,7 +22,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.57" === 'string' ? "6.0.0-alpha.57" : null;
+var version = typeof "6.0.0-alpha.59" === 'string' ? "6.0.0-alpha.59" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -108,7 +108,7 @@ function FontColorDropdown(props) {
     unit: "%",
     list: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
     onChange: backOpacityChange,
-    defaultValue: opacity * 100
+    defaultValue: opacity === undefined ? opacity : opacity * 100
   })), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       marginTop: '10px',

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

@@ -23,11 +23,20 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 isElementSetImageEnabled(element) {
+  if ((0, _htElementUtils.isGroup)(element)) {
+    return !element.isExpanded();
+  }
+
+  return (0, _htElementUtils.isNode)(element) && !(0, _htElementUtils.isText)(element) && element.a('type') !== 'box';
+}
 /**
  * 替换图片设置
  * @param {*} props
  * @returns
  */
+
+
 function NodeImageButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
@@ -44,9 +53,7 @@ function NodeImageButton(props) {
 
   var selection = topo.selectionModel.useHtSelection();
   (0, _react.useEffect)(function () {
-    var nodes = selection.filter(function (ele) {
-      return (0, _htElementUtils.isGroup)(ele) || (0, _htElementUtils.isNode)(ele);
-    });
+    var nodes = selection.filter(isElementSetImageEnabled);
 
     if (nodes.length > 0) {
       setDisabled(false);
@@ -61,10 +68,12 @@ function NodeImageButton(props) {
     // const gv = topo.view.topoClient.getGraphView();
     //const element = topo.getSelectionModel().getFirstData();
 
-    var elements = topo.getSelectionModel();
+    var elements = selection;
     console.log("onChange-elements", elements);
-    elements.each(function (element) {
-      element.setImage(prop);
+    elements.forEach(function (element) {
+      if (isElementSetImageEnabled(element)) {
+        element.setImage(prop);
+      }
     }); // selection.map((element) => {
     //   element.setImage(prop);
     // });

package/lib/core/models/TopoApp.js

@@ -52,7 +52,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.57" === 'string' ? "6.0.0-alpha.57" : null;
+var version = typeof "6.0.0-alpha.59" === 'string' ? "6.0.0-alpha.59" : 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.57",
+  "version": "6.0.0-alpha.59",
   "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.57/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.59/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }