@riil-frontend/component-topology 2.3.20-dev.1 → 2.4.1

package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -13,10 +15,6 @@ var _TitleWidget = _interopRequireDefault(require("../../../components/titlebar/
 
 var _TitleBarModule = _interopRequireDefault(require("../../../components/titlebar/TitleBar.module.scss"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 TopoEditorTitleBar(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi;
@@ -37,16 +35,15 @@ function TopoEditorTitleBar(props) {
       topoEditApi.addResourceToView();
     }
   }, "\u6DFB\u52A0\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
-    type: "primary",
     className: _TitleBarModule["default"].button,
     onClick: function onClick() {
       topo.save();
     }
   }, "\u4FDD\u5B58"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    className: _TitleBarModule["default"].button,
     onClick: function onClick() {
       topo.exitEditMode();
-    },
-    className: _TitleBarModule["default"].button
+    }
   }, "\u9000\u51FA"))));
 }
 

package/lib/core/editor/components/titlebar/widgets/SaveButton.js

@@ -1,14 +1,12 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 exports.__esModule = true;
 exports["default"] = SaveButton;
 
 var _react = _interopRequireWildcard(require("react"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 SaveButton(props) {
   return /*#__PURE__*/_react["default"].createElement("div", null);
 }

package/lib/core/editor/{buildContextmenu.d.ts → contextmenu/buildContextmenu.d.ts}

@@ -1,9 +1,6 @@
 export default function buildContextmenu(topoApp: any): {
     node: {
         enable: boolean;
-        items: {
-            label: string;
-            id: string;
-        }[];
+        items: any[];
     };
 };

package/lib/core/editor/{buildContextmenu.js → contextmenu/buildContextmenu.js}

@@ -7,13 +7,9 @@ function buildContextmenu(topoApp) {
   return {
     node: {
       enable: true,
-      items: [{
-        label: '打开属性设置',
-        id: 'openSet'
-      }, {
-        label: '打开全局属性设置',
-        id: 'openAllSet'
-      }]
+      items: [// { label: '打开属性设置', id: 'openSet' },
+        // { label: '打开全局属性设置', id: 'openAllSet' },
+      ]
     }
   };
 }

package/lib/core/models/cache/DictCache.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -13,10 +15,6 @@ var _utils = require("@riil-frontend/utils");
 
 var modelService = _interopRequireWildcard(require("@riil-frontend/component-topology-utils/es/services/model"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 /**
  * 数据字典缓存
  */

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawerPlugin.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 exports.__esModule = true;
 exports["default"] = ResourceDetailDrawerPlugin;
 
@@ -9,10 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _topoDrawer = _interopRequireDefault(require("./topoDrawer"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 ResourceDetailDrawerPlugin(props) {
   var topo = props.topo,
       store = props.store;

package/lib/core/viewer/components/plugins/ResourceDetail/topoDrawer.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -23,10 +25,6 @@ var _index2 = _interopRequireDefault(require("@riil-frontend/component-topology-
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 /**
  * 前台资源详情路由地址
  */

package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -23,10 +25,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _ResourceWebControllUrlSettingDialogModule = _interopRequireDefault(require("./ResourceWebControllUrlSettingDialog.module.scss"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 var FormItem = _form["default"].Item;
 
 function ResourceWebControllUrlSettingDialog(props) {

package/lib/core/viewer/components/titlebar/TopoViewerTitleBar.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -15,10 +17,6 @@ var _TitleWidget = _interopRequireDefault(require("../../../components/titlebar/
 
 var _TitleBarModule = _interopRequireDefault(require("../../../components/titlebar/TitleBar.module.scss"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 var Item = _menuButton["default"].Item;
 
 function TopoViewerTitleBar(props) {

package/lib/core/viewer/components/titlebar/ViewerTools.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -23,10 +25,6 @@ var _TitleBarModule = _interopRequireDefault(require("../../../components/titleb
 
 var _EditButton = _interopRequireDefault(require("./widgets/EditButton"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 ViewerTools(props) {
   var topo = props.topo,
       _props$showEditButton = props.showEditButton,

package/lib/core/viewer/components/titlebar/widgets/EditButton.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -13,10 +15,6 @@ var _topoPermissionUtil = _interopRequireDefault(require("../../../../../utils/t
 
 var _TitleBarModule = _interopRequireDefault(require("../../../../components/titlebar/TitleBar.module.scss"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 /**
  * @return {any}
  */

package/lib/core/viewer/components/titlebar/widgets/SearchWidget.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -11,10 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 var searchTypes = [{
   label: '设备名称',
   value: 'name'

package/lib/hooks/usePolling.js

@@ -61,7 +61,6 @@ var usePolling = function usePolling(props) {
         sendMetricsData(dd);
         sendAttributesData(dd); // 刷新链路动态样式
 
-        // 刷新链路动态样式
         linkDynamicStyleDispatcher.execute();
       }
     }

package/lib/hooks/useSelection.js

@@ -18,7 +18,9 @@ function getElementData(element) {
     // 业务id
     name: element.getName(),
     attrObject: element.getAttrObject(),
-    styleMap: element.getStyleMap()
+    attr: element.getAttrObject(),
+    styleMap: element.getStyleMap(),
+    style: element.getStyleMap()
   };
 
   if (className === 'ht.Edge') {
@@ -59,18 +61,22 @@ function _default(props) {
     var selectionModel = topoApp.getSelectionModel();
     updateSelection();
     selectionModel.addSelectionChangeListener(function (e) {
-      // console.info('SelectionChange');
+      // console.info('selectionChangeListener', e);
       updateSelection();
     });
     dataModel.addDataPropertyChangeListener(function (e) {
       var property = e.property,
           data = e.data;
+
+      if (['position'].indexOf(property) !== -1) {
+        return;
+      }
+
       var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
         return item.getId();
       });
 
       if (selectionIds.indexOf(data.getId()) > -1) {
-        // console.info('DataPropertyChange');
         updateSelection();
       }
     });

package/lib/hooks/useTopoEdit.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -33,10 +35,6 @@ var _template = require("../utils/template");
 
 var _topoPermissionUtil = _interopRequireDefault(require("../utils/topoPermissionUtil"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 var useTopoEdit = function useTopoEdit(params) {
   var topoApp = params.topoApp,
       topoId = params.topoId,

package/lib/models/topoBizMod.js

@@ -382,7 +382,7 @@ function _default(engine) {
                         } else {// rlog.debug('重复告警', item);
                         }
                       } else {// rlog.debug('这条告警不属于当前拓扑', resIdsList, item.id);
-                      }
+                        }
                     } // rlog.debug('准备发送的告警', doc, record);
 
 

package/lib/models/topoCreateMod.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 exports.__esModule = true;
 exports["default"] = _default;
 
@@ -29,10 +31,6 @@ var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _stateMapping;
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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; }
-
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
     group = _template.DEFAULT_GROUP;

package/lib/plugins/useSelectionPlugin.d.ts

@@ -0,0 +1,23 @@
+export default useTableSelectionPlugin;
+/**
+ * Modified version of @ahooksjs/use-selection-plugin.
+ * Selected keys can be persistent across page changes, if not be reset.
+ */
+declare function useTableSelectionPlugin(options?: {}): {
+    middlewares: (ctx: any, next: any) => any;
+    props: () => {
+        tableProps: {
+            rowSelection: {
+                onChange: (selectedRowKeys: any, records: any) => void;
+                selectedRowKeys: any;
+                mode: any;
+                getProps: (record: any) => {
+                    disabled: any;
+                };
+            };
+            primaryKey: any;
+        };
+        getSelectedRowKeys: () => any;
+        setSelectedRowKeys: (selectedRowKeys: any) => void;
+    };
+};

package/lib/plugins/useSelectionPlugin.js

@@ -0,0 +1,90 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = require("react");
+
+/**
+ * Modified version of @ahooksjs/use-selection-plugin.
+ * Selected keys can be persistent across page changes, if not be reset.
+ */
+var useTableSelectionPlugin = function useTableSelectionPlugin(options) {
+  if (options === void 0) {
+    options = {};
+  }
+
+  var _useState = (0, _react.useState)({
+    selectedRowKeys: options.defaultSelectedRowKeys || []
+  }),
+      state = _useState[0],
+      setSelectedRowKeys = _useState[1];
+
+  var _options = options,
+      _options$primaryKey = _options.primaryKey,
+      primaryKey = _options$primaryKey === void 0 ? 'id' : _options$primaryKey,
+      _options$mode = _options.mode,
+      mode = _options$mode === void 0 ? 'multiple' : _options$mode,
+      _options$checkIsNeedR = _options.checkIsNeedReset,
+      checkIsNeedReset = _options$checkIsNeedR === void 0 ? function () {
+    return true;
+  } : _options$checkIsNeedR,
+      checkIsDisabled = _options.checkIsDisabled;
+
+  var onChange = function onChange(selectedRowKeys, records) {
+    setSelectedRowKeys({
+      selectedRowKeys: selectedRowKeys
+    });
+  };
+
+  var getSelectedRowKeys = function getSelectedRowKeys() {
+    return state.selectedRowKeys;
+  };
+
+  var $setSelectedRowKeys = function $setSelectedRowKeys(selectedRowKeys) {
+    setSelectedRowKeys({
+      selectedRowKeys: selectedRowKeys
+    });
+  };
+
+  return {
+    middlewares: function middlewares(ctx, next) {
+      var isNeedReset = checkIsNeedReset(ctx);
+
+      if (isNeedReset) {
+        return next().then(function () {
+          setSelectedRowKeys({
+            selectedRowKeys: []
+          });
+        });
+      }
+
+      return next();
+    },
+    props: function props() {
+      var getProps = checkIsDisabled ? function (record) {
+        return {
+          disabled: checkIsDisabled(record)
+        };
+      } : undefined;
+      return {
+        tableProps: {
+          rowSelection: {
+            // onSelect,
+            // onSelectAll,
+            onChange: onChange,
+            selectedRowKeys: state.selectedRowKeys,
+            mode: mode,
+            getProps: getProps
+          },
+          primaryKey: primaryKey
+        },
+        getSelectedRowKeys: getSelectedRowKeys,
+        setSelectedRowKeys: $setSelectedRowKeys
+      };
+    }
+  };
+};
+
+var _default = useTableSelectionPlugin;
+exports["default"] = _default;

package/lib/style.js

@@ -1,17 +1,10 @@
-require('@riil-frontend/component-topology-graph/lib/style');
+
 require('@alifd/next/lib/dialog/style');
 require('@alifd/next/lib/message/style');
-require('@riil-frontend/utils/lib/style');
-require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/drawer/style');
 require('@alifd/next/lib/button/style');
 require('@alifd/next/lib/table/style');
 require('@alifd/next/lib/search/style');
-require('@riil-frontend/component-pager/lib/style');
-require('@riil-frontend/component-more-buttons-menu/lib/style');
-require('@riil-frontend/component-table-filter-tags/lib/style');
-require('@riil-frontend/component-table-layout/lib/style');
-require('@riil-frontend/component-res-advanced-search/lib/style');
 require('@alifd/next/lib/card/style');
 require('@alifd/next/lib/checkbox/style');
 require('@alifd/next/lib/loading/style');
@@ -22,14 +15,8 @@ require('@alifd/next/lib/field/style');
 require('@alifd/next/lib/form/style');
 require('@alifd/next/lib/number-picker/style');
 require('@alifd/next/lib/select/style');
-require('@riil-frontend/component-riil-rule-tree/lib/style');
 require('@alifd/next/lib/balloon/style');
 require('@alifd/next/lib/grid/style');
-require('@riil-frontend/component-action-tree/lib/style');
-require('@riil-frontend/hooks/lib/style');
-require('@riil-frontend/component-extra-title/lib/style');
-require('@riil-frontend/next-collapse/lib/style');
-require('@riil-frontend/component-row-delete-ballon/lib/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/menu-button/style');
 require('@alifd/next/lib/dropdown/style');
@@ -38,6 +25,7 @@ require('@alifd/next/lib/tab/style');
 require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/collapse/style');
 require('@alifd/next/lib/list/style');
+require('@alifd/next/lib/tree-select/style');
 require('@alifd/next/lib/avatar/style');
-require('@riil-frontend/component-topology-utils/lib/style');
+
 require('./index.scss');

package/lib/topoCenter/components/Topology.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -23,10 +25,6 @@ var cmdbService = _interopRequireWildcard(require("@riil-frontend/component-topo
 
 var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 Topology(props) {
   var engine = props.engine,
       topo = props.topo;

package/lib/topoCenter/viewer/components/TopologyViewer.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -13,10 +15,6 @@ var _Topo = _interopRequireDefault(require("../../../core/components/TopoView/To
 
 var _createTopoViewer = require("../createTopoViewer");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-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 TopologyViewer(props) {
   var request = props.request,
       titleBar = props.titleBar;

package/lib/utils/htElementDataUtil.js

@@ -24,5 +24,5 @@ function isEdge(element) {
 }
 
 function isText(element) {
-  return element.className === 'ht.Node' && element.attrObject.isText;
+  return element.className === 'ht.Text' && element.attrObject.isText;
 }

package/lib/utils/topoData.js

@@ -22,7 +22,7 @@ var _topoPermissionUtil = _interopRequireDefault(require("./topoPermissionUtil")
 
 var _buildContextmenu = _interopRequireDefault(require("../core/viewer/contextmenu/buildContextmenu"));
 
-var _buildContextmenu2 = _interopRequireDefault(require("../core/editor/buildContextmenu"));
+var _buildContextmenu2 = _interopRequireDefault(require("../core/editor/contextmenu/buildContextmenu"));
 
 var _topoIconUtil = require("./topoIconUtil");
 

package/lib/utils/tree.js

@@ -152,7 +152,7 @@ var treeNodeCount = function treeNodeCount(data) {
         children = item.children;
     var count = 0;
 
-    if (type === 0 && children !== null && children !== void 0 && children.length) {
+    if (children !== null && children !== void 0 && children.length) {
       loopTreeFun(children, function (item) {
         if (item.type === 1) {
           count++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.3.20-dev.1",
+  "version": "2.4.1",
   "description": "拓扑",
   "files": [
     "demo/",
@@ -55,8 +55,8 @@
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.1",
-    "@riil-frontend/component-topology-graph": "^2.1.10",
-    "@riil-frontend/component-topology-utils": "^2.0.11",
+    "@riil-frontend/component-topology-graph": "^2.1.12",
+    "@riil-frontend/component-topology-utils": "^2.0.13",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -72,7 +72,7 @@
   },
   "devDependencies": {
     "@alifd/next": "^1.21.16",
-    "@alifd/theme-19926": "^0.16.3",
+    "@alifd/theme-19926": "^0.17.0",
     "@iceworks/spec": "^1.0.0",
     "axios": "^0.21.1",
     "build-plugin-component": "^1.0.0",
@@ -99,6 +99,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.3.20-dev.1/build/index.html",
-  "gitHead": "ef8ed0c5415cf51b75d0396ef4cca2f803a00b38"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.4.1/build/index.html",
+  "gitHead": "4c30a81dfb48bf8ebfd910e644605ce85604fcb7"
 }

package/es/core/editor/buildContextmenu.js

@@ -1,14 +0,0 @@
-export default function buildContextmenu(topoApp) {
-  return {
-    node: {
-      enable: true,
-      items: [{
-        label: '打开属性设置',
-        id: 'openSet'
-      }, {
-        label: '打开全局属性设置',
-        id: 'openAllSet'
-      }]
-    }
-  };
-}