@riil-frontend/component-topology 7.0.0-dev.13 → 7.0.0-dev.15

package/es/core/editor/components/Toolbar/buttons.js

@@ -32,7 +32,7 @@ export default function getButtons(isNetworkTopo) {
   Divider, NodeImageButton, // 替换图片
   NodeSizeButton, // 图片尺寸
   Divider, Layout, // 布局方式
-  NodeAlignWidget // 对齐方式
-  // SearchWidget, // 搜索
+  NodeAlignWidget, // 对齐方式
+  SearchWidget // 搜索
   ]);
 }

package/es/core/editor/components/settings/PropertyView.js

@@ -5,8 +5,11 @@ import { adapterGetEdgePropertyViewType, addEdgePropertyViews } from "./core/edg
 import PropertyViewManager from "./core/PropertyViewManager";
 import Settings from "./Settings";
 import styles from "./Settings.module.scss";
+
+function PropertyViewProvider(props) {}
+
 export default function PropertyPanel(props) {
-  var _classNames;
+  var _editorProps$property, _editorProps$property2, _classNames;
 
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -18,21 +21,19 @@ export default function PropertyPanel(props) {
   var _store$useModelState = store.useModelState('selection'),
       selection = _store$useModelState.selection;
 
-  var _topo$store$useModel = topo.store.useModel('topoEdit'),
-      topoEditState = _topo$store$useModel[0],
-      topoEditDispatchers = _topo$store$useModel[1];
-
+  var topoEditState = topo.store.useModelState('topoEdit');
   var propertyPanelVisible = topoEditState.propertyPanelVisible;
   var propertyViewManager = useMemo(function () {
     return new PropertyViewManager(topo);
-  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
-
-  addEdgePropertyViews(propertyViewManager, editorProps);
+  }, []);
+  propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
 
-  propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
+  propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
     return adapterGetEdgePropertyViewType(elements, editorProps);
-  };
+  }; // 临时适配连线属性面板类型，后期组件支持自定义适配
 
+
+  addEdgePropertyViews(propertyViewManager, editorProps);
   var PropertyView = propertyViewManager.getPropertyView();
   useEffect(function () {
     if (graphLoaded) {

package/es/core/editor/components/settings/Settings.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useMemo, useState } from 'react';
 import useSettingRuntimeState from "./useSettingRuntimeState";
 import updateElementProperty from "./core/updateElementProperty";
+import { isEdge } from "../../../../utils/htElementUtils";
 
 function buildElementValues(selection) {
   var values = _extends({}, selection[0]);
@@ -33,10 +34,16 @@ export default function PropertyViewContainer(props) {
   var elementProps = {};
 
   if (selection.length === 1) {
+    var element = selectionElements[0];
     elementProps = {
-      selectionElement: selectionElements[0],
+      element: element,
+      selectionElement: element,
       values: singleElementValues
     };
+
+    if (isEdge(element)) {
+      elementProps.edge = element;
+    }
   }
 
   return /*#__PURE__*/React.createElement(PropertyView, _extends({

package/es/core/editor/components/settings/core/PropertyViewManager.js

@@ -4,17 +4,18 @@ import _getPropertyViewType from "./getPropertyViewType";
 
 var PropertyViewManager = /*#__PURE__*/function () {
   function PropertyViewManager(topo) {
-    this.viewMap = propertyViews;
+    this.viewMap = _extends({}, propertyViews);
     this.topo = void 0;
     this.customGetViewType = void 0;
     this.topo = topo;
+    this.topo.propertyViewManager = this;
     this.open = this.open.bind(this);
   }
 
   var _proto = PropertyViewManager.prototype;
 
-  _proto.updateViews = function updateViews(viewMap) {
-    this.viewMap = _extends({}, propertyViews, viewMap);
+  _proto.addViews = function addViews(viewMap) {
+    Object.assign(this.viewMap, viewMap);
   };
 
   _proto.init = function init() {

package/es/core/editor/components/settings/core/edgePropertyViewAdapter.js

@@ -1,5 +1,4 @@
 import { isEdge } from "../../../../../utils/htElementUtils";
-import addEdgeProps from "../propertyViews/edge/addEdgeProps";
 export function adapterGetEdgePropertyViewType(selection, editorProps) {
   var fn = editorProps.getEdgePropertyViewType;
 
@@ -13,10 +12,5 @@ export function adapterGetEdgePropertyViewType(selection, editorProps) {
   return null;
 }
 export function addEdgePropertyViews(propertyViewManager, editorProps) {
-  var oldMap = editorProps.edgePropertyViews || {};
-  var map = {};
-  Object.keys(oldMap).forEach(function (name) {
-    map[name] = addEdgeProps(oldMap[name]);
-  });
-  propertyViewManager.updateViews(map);
+  propertyViewManager.addViews(editorProps.edgePropertyViews || {});
 }

package/es/core/hooks/usePolling.js

@@ -13,12 +13,7 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
-  var topoState = store.useModelState('topoMod');
-
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
-
+  var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');

package/es/core/hooks/useTopoEdit.js

@@ -53,8 +53,10 @@ var useTopoEdit = function useTopoEdit(params) {
       setComboResData = _useState2[1];
 
   var reset = function reset() {
+    var _topo$historyManager;
+
     topoEditDispatchers.reset();
-    topo.historyManager.destroy();
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.destroy();
   };
   /**
    * 增加资源到视图

package/es/core/models/Alarm.js

@@ -220,23 +220,11 @@ var Alarm = /*#__PURE__*/function () {
 
   _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
     var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
-      var _this$topo$store$getS, data, resAndMetrics, topoData, _this$getState2, alarmIsOpened, alarmOpening, nodeIdsList, linkIdsList, resIdsList, mainCiIdList, endTime, startTime, parms, result;
-
+      var mainCiIdList, endTime, startTime, parms, result;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
-              _this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening; // const { nodes, links } = data;
-
-              nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList; // rlog.debug(
-              //   "获取告警列表--resAndMetrics,topoData,data",
-              //   this.topo,
-              //   resAndMetrics,
-              //   topoData,
-              //   data
-              // );
-
               mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
                 return !!ci.operation;
               }) // 过滤掉权限
@@ -245,7 +233,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context3.next = 7;
+                _context3.next = 4;
                 break;
               }
 
@@ -255,7 +243,7 @@ var Alarm = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
 
-            case 7:
+            case 4:
               //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
@@ -280,10 +268,10 @@ var Alarm = /*#__PURE__*/function () {
                   endTime: endTime
                 }
               };
-              _context3.next = 12;
+              _context3.next = 9;
               return topoService.getAlarmByIds(parms);
 
-            case 12:
+            case 9:
               result = _context3.sent;
               rlog.debug("getAlarmById-result", result); // if (alarmIsOpened) {
               //   //this.topo.loadAlarm(result.datas);
@@ -294,7 +282,7 @@ var Alarm = /*#__PURE__*/function () {
               //   alarmPanelIsOpen: result.datas.length > 0,
               // });
 
-            case 14:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -389,14 +377,14 @@ var Alarm = /*#__PURE__*/function () {
     var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
       var _this2 = this;
 
-      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               // 如果当前拓扑图开启中或已开启则退出
-              _this$getState3 = this.getState(), alarmOpening = _this$getState3.alarmOpening, topoAlarmIsOpen = _this$getState3.topoAlarmIsOpen;
+              _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
 
               if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
                 _context6.next = 3;
@@ -456,14 +444,14 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
-      var _this$getState4, alarmIsOpened, alarmOpening;
+      var _this$getState3, alarmIsOpened, alarmOpening;
 
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               // 如果未开启则退出
-              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened, alarmOpening = _this$getState4.alarmOpening;
+              _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
 
               if (!(!alarmIsOpened && !alarmOpening)) {
                 _context7.next = 3;
@@ -550,13 +538,13 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(alertData) {
-      var _this$getState5, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
+      var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
 
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
             case 0:
-              _this$getState5 = this.getState(), alarmIsOpened = _this$getState5.alarmIsOpened;
+              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件

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

package/es/core/models/utils/linkUtils.js

@@ -33,9 +33,6 @@ export function isCrucialLink(link) {
 export function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
-export function isAggLink(link) {
-  return link.attributes["network_link.connect_type"] === "agg";
-}
 export var getInterfaceObject = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(codes) {
     var query, promises, result, ifDoc;

package/es/core/store/models/topoMod.js

@@ -606,15 +606,16 @@ export default function (topoApp) {
 
                   case 4:
                     topoPermission = _context11.sent;
-                    _context11.next = 10;
+                    rlog.debug('查询拓扑权限', topoPermission);
+                    _context11.next = 11;
                     break;
 
-                  case 7:
-                    _context11.prev = 7;
+                  case 8:
+                    _context11.prev = 8;
                     _context11.t0 = _context11["catch"](1);
                     rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
-                  case 10:
+                  case 11:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -623,12 +624,12 @@ export default function (topoApp) {
 
                     return _context11.abrupt("return", topoPermission);
 
-                  case 12:
+                  case 13:
                   case "end":
                     return _context11.stop();
                 }
               }
-            }, _callee11, null, [[1, 7]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };

package/es/networkTopo/getTopoData.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getLinksDetail } from "../core/models/utils/linkUtils";
-import { queryCisByIds } from "../core/services";
 import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil"; // import "./utils/__tests__/resourcePermissionUtil.test";
 
 export function addLinkData(_x, _x2) {
@@ -16,7 +15,7 @@ export function addLinkData(_x, _x2) {
 
 function _addLinkData() {
   _addLinkData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(oldLinks, nodes) {
-    var links;
+    var links, networkLinks, otherLinks;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -32,18 +31,24 @@ function _addLinkData() {
               }
 
               return true;
-            });
+            }); // 如果是网络链路，补充详情信息
+
             _context.next = 3;
-            return getLinksDetail(links, nodes);
+            return getLinksDetail(links.filter(function (link) {
+              return !link.ciType;
+            }), nodes);
 
           case 3:
-            links = _context.sent;
+            networkLinks = _context.sent;
+            otherLinks = links.filter(function (link) {
+              return !!link.ciType;
+            });
             return _context.abrupt("return", {
-              links: links,
+              links: [].concat(networkLinks, otherLinks),
               linkGroups: []
             });
 
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -72,7 +77,7 @@ export function buildData(_x3) {
 
 function _buildData() {
   _buildData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, nodeCis, linkData;
+    var newData, nodes, _yield$Promise$all, linkData;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -89,34 +94,18 @@ function _buildData() {
               });
             });
             _context2.next = 4;
-            return Promise.all([// 查询节点属性
-            queryCisByIds(nodes.map(function (node) {
-              return node.id;
-            })), addLinkData(data.links || [], nodes)]);
+            return Promise.all([addLinkData(data.links || [], nodes)]);
 
           case 4:
             _yield$Promise$all = _context2.sent;
-            nodeCis = _yield$Promise$all[0];
-            linkData = _yield$Promise$all[1];
-            nodes = nodes.map(function (node) {
-              var _node$attributes$find;
-
-              return _extends({}, node, {
-                ipAddress: Array.isArray(node.attributes) ? (_node$attributes$find = node.attributes.find(function (item) {
-                  return item.code === 'ipAddress';
-                })) === null || _node$attributes$find === void 0 ? void 0 : _node$attributes$find.value : null,
-                attributes: nodeCis.find(function (ci) {
-                  return ci.id === node.id;
-                }).attributes
-              });
-            });
+            linkData = _yield$Promise$all[0];
             newData = _extends({}, newData, {
               nodes: nodes
             }, linkData);
             newData = addTopoDataResourcePermission(newData);
             return _context2.abrupt("return", newData);
 
-          case 11:
+          case 9:
           case "end":
             return _context2.stop();
         }

package/es/networkTopo/hooks/editor/useDeleteEdges.js

@@ -4,7 +4,6 @@ import _Message from "@alifd/next/es/message";
 import _Dialog from "@alifd/next/es/dialog";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { isAggLink } from "../../../core/models/utils/linkUtils";
 import linkService from "../../services/link";
 import { getLinkPermission } from "../../utils/resourcePermissionUtil";
 /**
@@ -49,8 +48,7 @@ export default (function (_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isGroup = false; // isAggLink(link);
-
+              isGroup = false;
               _context.next = 4;
               return linkService.deleteLink(id);
 

package/lib/core/editor/components/Toolbar/buttons.js

@@ -57,7 +57,7 @@ function getButtons(isNetworkTopo) {
   _Divider["default"], _NodeImageButton["default"], // 替换图片
   _NodeSizeButton["default"], // 图片尺寸
   _Divider["default"], _Layout["default"], // 布局方式
-  _NodeAlignWidget["default"] // 对齐方式
-  // SearchWidget, // 搜索
+  _NodeAlignWidget["default"], // 对齐方式
+  _SearchWidget["default"] // 搜索
   ]);
 }

package/lib/core/editor/components/settings/PropertyView.js

@@ -23,8 +23,10 @@ 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 PropertyViewProvider(props) {}
+
 function PropertyPanel(props) {
-  var _classNames;
+  var _editorProps$property, _editorProps$property2, _classNames;
 
   var topo = props.topo,
       editorProps = props.editorProps;
@@ -36,21 +38,19 @@ function PropertyPanel(props) {
   var _store$useModelState = store.useModelState('selection'),
       selection = _store$useModelState.selection;
 
-  var _topo$store$useModel = topo.store.useModel('topoEdit'),
-      topoEditState = _topo$store$useModel[0],
-      topoEditDispatchers = _topo$store$useModel[1];
-
+  var topoEditState = topo.store.useModelState('topoEdit');
   var propertyPanelVisible = topoEditState.propertyPanelVisible;
   var propertyViewManager = (0, _react.useMemo)(function () {
     return new _PropertyViewManager["default"](topo);
-  }, []); // 临时适配连线属性面板类型，后期组件支持自定义适配
-
-  (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
+  }, []);
+  propertyViewManager.addViews((_editorProps$property = editorProps.propertyView) === null || _editorProps$property === void 0 ? void 0 : _editorProps$property.views);
 
-  propertyViewManager.customGetViewType = editorProps.getPropertyViewType || function (elements) {
+  propertyViewManager.customGetViewType = ((_editorProps$property2 = editorProps.propertyView) === null || _editorProps$property2 === void 0 ? void 0 : _editorProps$property2.getPropertyViewType) || function (elements) {
     return (0, _edgePropertyViewAdapter.adapterGetEdgePropertyViewType)(elements, editorProps);
-  };
+  }; // 临时适配连线属性面板类型，后期组件支持自定义适配
+
 
+  (0, _edgePropertyViewAdapter.addEdgePropertyViews)(propertyViewManager, editorProps);
   var PropertyView = propertyViewManager.getPropertyView();
   (0, _react.useEffect)(function () {
     if (graphLoaded) {

package/lib/core/editor/components/settings/Settings.js

@@ -13,6 +13,8 @@ var _useSettingRuntimeState = _interopRequireDefault(require("./useSettingRuntim
 
 var _updateElementProperty = _interopRequireDefault(require("./core/updateElementProperty"));
 
+var _htElementUtils = require("../../../../utils/htElementUtils");
+
 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; }
@@ -46,10 +48,16 @@ function PropertyViewContainer(props) {
   var elementProps = {};
 
   if (selection.length === 1) {
+    var element = selectionElements[0];
     elementProps = {
-      selectionElement: selectionElements[0],
+      element: element,
+      selectionElement: element,
       values: singleElementValues
     };
+
+    if ((0, _htElementUtils.isEdge)(element)) {
+      elementProps.edge = element;
+    }
   }
 
   return /*#__PURE__*/_react["default"].createElement(PropertyView, (0, _extends2["default"])({

package/lib/core/editor/components/settings/core/PropertyViewManager.js

@@ -13,17 +13,18 @@ var _getPropertyViewType2 = _interopRequireDefault(require("./getPropertyViewTyp
 
 var PropertyViewManager = /*#__PURE__*/function () {
   function PropertyViewManager(topo) {
-    this.viewMap = _propertyViews["default"];
+    this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"]);
     this.topo = void 0;
     this.customGetViewType = void 0;
     this.topo = topo;
+    this.topo.propertyViewManager = this;
     this.open = this.open.bind(this);
   }
 
   var _proto = PropertyViewManager.prototype;
 
-  _proto.updateViews = function updateViews(viewMap) {
-    this.viewMap = (0, _extends2["default"])({}, _propertyViews["default"], viewMap);
+  _proto.addViews = function addViews(viewMap) {
+    Object.assign(this.viewMap, viewMap);
   };
 
   _proto.init = function init() {

package/lib/core/editor/components/settings/core/edgePropertyViewAdapter.js

@@ -1,15 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.adapterGetEdgePropertyViewType = adapterGetEdgePropertyViewType;
 exports.addEdgePropertyViews = addEdgePropertyViews;
 
 var _htElementUtils = require("../../../../../utils/htElementUtils");
 
-var _addEdgeProps = _interopRequireDefault(require("../propertyViews/edge/addEdgeProps"));
-
 function adapterGetEdgePropertyViewType(selection, editorProps) {
   var fn = editorProps.getEdgePropertyViewType;
 
@@ -24,10 +20,5 @@ function adapterGetEdgePropertyViewType(selection, editorProps) {
 }
 
 function addEdgePropertyViews(propertyViewManager, editorProps) {
-  var oldMap = editorProps.edgePropertyViews || {};
-  var map = {};
-  Object.keys(oldMap).forEach(function (name) {
-    map[name] = (0, _addEdgeProps["default"])(oldMap[name]);
-  });
-  propertyViewManager.updateViews(map);
+  propertyViewManager.addViews(editorProps.edgePropertyViews || {});
 }

package/lib/core/hooks/usePolling.js

@@ -26,12 +26,7 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
-  var topoState = store.useModelState('topoMod');
-
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
-
+  var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');

package/lib/core/hooks/useTopoEdit.js

@@ -75,8 +75,10 @@ var useTopoEdit = function useTopoEdit(params) {
       setComboResData = _useState2[1];
 
   var reset = function reset() {
+    var _topo$historyManager;
+
     topoEditDispatchers.reset();
-    topo.historyManager.destroy();
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.destroy();
   };
   /**
    * 增加资源到视图