@riil-frontend/component-topology 5.0.6 → 5.0.7

package/es/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeIcon.js

@@ -2,16 +2,20 @@ import React from 'react';
 import { isGroup, isNode } from "../../../../../../utils/htElementUtils";
 import NodeIconSelect from "../node/NodeIconSelect";
 export default function BatchSetNodeIcon(props) {
-  var topo = props.topo;
+  var topo = props.topo; // 节点及折叠的区域可设置图标
 
   var setNodeIcon = function setNodeIcon(iconId) {
     topo.historyManager.beginTransaction();
     var selection = topo.getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (element) {
-      return isNode(element) && !isGroup(element);
+      return isNode(element);
     });
     nodes.forEach(function (node) {
-      node.setImage(iconId);
+      if (isGroup(node) && !node.isExpanded()) {
+        node.setImage(iconId);
+      } else if (!isGroup(node)) {
+        node.setImage(iconId);
+      }
     });
     topo.historyManager.endTransaction();
   };

package/es/core/models/TopoApp.js

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

package/lib/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeIcon.js

@@ -12,16 +12,20 @@ var _htElementUtils = require("../../../../../../utils/htElementUtils");
 var _NodeIconSelect = _interopRequireDefault(require("../node/NodeIconSelect"));
 
 function BatchSetNodeIcon(props) {
-  var topo = props.topo;
+  var topo = props.topo; // 节点及折叠的区域可设置图标
 
   var setNodeIcon = function setNodeIcon(iconId) {
     topo.historyManager.beginTransaction();
     var selection = topo.getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (element) {
-      return (0, _htElementUtils.isNode)(element) && !(0, _htElementUtils.isGroup)(element);
+      return (0, _htElementUtils.isNode)(element);
     });
     nodes.forEach(function (node) {
-      node.setImage(iconId);
+      if ((0, _htElementUtils.isGroup)(node) && !node.isExpanded()) {
+        node.setImage(iconId);
+      } else if (!(0, _htElementUtils.isGroup)(node)) {
+        node.setImage(iconId);
+      }
     });
     topo.historyManager.endTransaction();
   };

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "5.0.6" === 'string' ? "5.0.6" : null;
+var version = typeof "5.0.7" === 'string' ? "5.0.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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