@riil-frontend/component-topology 6.0.10 → 6.0.11

package/es/core/common/hooks/useHtElements.js

@@ -13,8 +13,12 @@ export default function useHtElements(props) {
     }
   }, [ids, idList]);
   var elements = useMemo(function () {
+    // 
     return idList.map(function (id) {
       return topo.getDataModel().getDataById(id);
+    }) // 多选删除时，被删除的元素是undefined
+    .filter(function (element) {
+      return !!element;
     });
   }, [topo, idList]);
   return elements;

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

@@ -1,5 +1,6 @@
-import React, { useEffect, useState } from 'react';
-import { isGroup, isLayer } from "../../../../../utils/htElementDataUtil";
+import React, { useEffect, useMemo, useState } from 'react';
+import { isClusterHtElement } from "../../../../../utils/clusterUtil";
+import { isGroup, isLayer } from "../../../../../utils/htElementUtils";
 import useLayerAddResource from "../../../hooks/useLayerAddResource";
 import LayerAddResourceDrawer from "../../settings/propertyViews/layer/DataTab/LayerAddResourceDrawer";
 import ButtonBox from "./components/ButtonBox";
@@ -10,8 +11,8 @@ function getAddType(selection) {
     var data = selection[0];
 
     if (isLayer(data)) {
-      return 'layer';
-    } else if (isGroup(data)) {
+      return 'layer'; // 集群视为添加到视图
+    } else if (isGroup(data) && !isClusterHtElement(data)) {
       return 'group';
     }
   }
@@ -24,13 +25,9 @@ function AddResourceButton(props) {
       editorProps = props.editorProps; // 选中的元素
 
   var selection = topo.selectionModel.useSelection();
-
-  var _useState = useState(getAddType(selection)),
-      addType = _useState[0],
-      setAddType = _useState[1];
-
-  useEffect(function () {
-    setAddType(getAddType(selection));
+  var addType = useMemo(function () {
+    var elements = selection.length ? topo.selectionModel.getSelection() : [];
+    return getAddType(elements);
   }, [selection]); // 选中分层添加
 
   var layerAddResource = useLayerAddResource({

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

package/lib/core/common/hooks/useHtElements.js

@@ -19,8 +19,12 @@ function useHtElements(props) {
     }
   }, [ids, idList]);
   var elements = (0, _react.useMemo)(function () {
+    // 
     return idList.map(function (id) {
       return topo.getDataModel().getDataById(id);
+    }) // 多选删除时，被删除的元素是undefined
+    .filter(function (element) {
+      return !!element;
     });
   }, [topo, idList]);
   return elements;

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

@@ -7,7 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _htElementDataUtil = require("../../../../../utils/htElementDataUtil");
+var _clusterUtil = require("../../../../../utils/clusterUtil");
+
+var _htElementUtils = require("../../../../../utils/htElementUtils");
 
 var _useLayerAddResource = _interopRequireDefault(require("../../../hooks/useLayerAddResource"));
 
@@ -25,9 +27,9 @@ function getAddType(selection) {
   if (selection.length === 1) {
     var data = selection[0];
 
-    if ((0, _htElementDataUtil.isLayer)(data)) {
-      return 'layer';
-    } else if ((0, _htElementDataUtil.isGroup)(data)) {
+    if ((0, _htElementUtils.isLayer)(data)) {
+      return 'layer'; // 集群视为添加到视图
+    } else if ((0, _htElementUtils.isGroup)(data) && !(0, _clusterUtil.isClusterHtElement)(data)) {
       return 'group';
     }
   }
@@ -40,13 +42,9 @@ function AddResourceButton(props) {
       editorProps = props.editorProps; // 选中的元素
 
   var selection = topo.selectionModel.useSelection();
-
-  var _useState = (0, _react.useState)(getAddType(selection)),
-      addType = _useState[0],
-      setAddType = _useState[1];
-
-  (0, _react.useEffect)(function () {
-    setAddType(getAddType(selection));
+  var addType = (0, _react.useMemo)(function () {
+    var elements = selection.length ? topo.selectionModel.getSelection() : [];
+    return getAddType(elements);
   }, [selection]); // 选中分层添加
 
   var layerAddResource = (0, _useLayerAddResource["default"])({

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

package/package.json

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