@riil-frontend/component-topology 6.0.0-alpha.8 → 6.0.1

package/lib/core/models/HistoryManager.js

@@ -18,6 +18,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.storeHistory = [];
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
+    htHistoryManager.clear();
 
     _rlog["default"].info('HistoryManager 初始化', htHistoryManager);
 
@@ -76,6 +77,10 @@ var HistoryManager = /*#__PURE__*/function () {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
+    var displayConfigProperties = [// 单多链路
+    'expandAllEdges', // 节点标注
+    'nodeLabelStyle', // 画布主题
+    'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
     var items = [{
       modelName: 'topoMod',
       property: 'data'
@@ -83,16 +88,16 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
-      modelName: 'displayConfig',
-      property: 'expandAllEdges'
-    }, {
-      modelName: 'displayConfig',
-      property: 'nodeLabelStyle'
-    }, {
+    }].concat(displayConfigProperties.map(function (property) {
+      return {
+        modelName: 'displayConfig',
+        property: property
+      };
+    }), [// 背景
+    {
       modelName: 'background',
       property: 'current'
-    }];
+    }]);
     this.storeHistory = items.map(function (item) {
       return (0, _extends2["default"])({}, item, {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]

package/lib/core/models/{SelectionManager.js → SelectionModel.js}

@@ -9,21 +9,17 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var SelectionManager = /*#__PURE__*/function () {
-  function SelectionManager(topo) {
+var _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElements"));
+
+var _ignoreList = _interopRequireDefault(require("./selection/ignoreList"));
+
+var SelectionModel = /*#__PURE__*/function () {
+  function SelectionModel(topo) {
     var _this = this;
 
     this.topo = null;
     this.inited = false;
 
-    this.setSelection = function (selection) {
-      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
-
-      selectionDispatchers.update({
-        selection: selection
-      });
-    };
-
     this.updateSelection = function () {
       try {
         var selectionModel = _this.topo.getSelectionModel();
@@ -32,18 +28,30 @@ var SelectionManager = /*#__PURE__*/function () {
 
         var selectionArr = htSelection.map(getElementData); // rlog.info("updateSelection", selectionArr.map((element) => element.id));
 
-        _this.setSelection(selectionArr);
+        _this.updateStoreSelection(selectionArr);
       } catch (e) {
         _rlog["default"].error('updateSelection error', e);
       }
     };
 
+    this.updateStoreSelection = function (selection) {
+      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
+
+      _this.selectionIds = selection.map(function (item) {
+        return item.id;
+      });
+      selectionDispatchers.update({
+        selection: selection,
+        selectionIds: _this.selectionIds
+      });
+    };
+
     this.topo = topo;
     this.handleSelectionChange = this.handleSelectionChange.bind(this);
     this.handleDataPropertyChange = this.handleDataPropertyChange.bind(this);
   }
 
-  var _proto = SelectionManager.prototype;
+  var _proto = SelectionModel.prototype;
 
   _proto.init = function init() {
     if (this.inited) {
@@ -56,6 +64,11 @@ var SelectionManager = /*#__PURE__*/function () {
   };
 
   _proto.destroy = function destroy() {
+    var selectionDispatchers = this.topo.store.getModelDispatchers('selection');
+    selectionDispatchers.update({
+      selection: [],
+      selectionIds: []
+    });
     this.removeListener();
   };
 
@@ -66,6 +79,26 @@ var SelectionManager = /*#__PURE__*/function () {
     return selection;
   };
 
+  _proto.useHtSelection = function useHtSelection() {
+    var _this$topo$store$useM2 = this.topo.store.useModelState('selection'),
+        selectionIds = _this$topo$store$useM2.selectionIds;
+
+    var elements = (0, _useHtElements["default"])({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
+  _proto.getSelection = function getSelection() {
+    var selectionModel = this.topo.getSelectionModel();
+    return selectionModel.getSelection().getArray();
+  }
+  /**
+   * 同步选中元素到store
+   */
+  ;
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     _rlog["default"].info('Selection handleSelectionChange', e);
 
@@ -76,19 +109,21 @@ var SelectionManager = /*#__PURE__*/function () {
     var property = e.property,
         data = e.data;
 
-    if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+    if (!this.selectionIds.includes(data.getId())) {
       return;
     }
 
-    var selectionModel = this.topo.getSelectionModel();
-    var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
-      return item.getId();
-    });
+    if (_ignoreList["default"].indexOf(property) !== -1) {
+      return;
+    }
 
-    if (selectionIds.indexOf(data.getId()) > -1) {
-      // console.info('PropertyChangeListener', e);
-      this.updateSelection();
+    if (!window.aa) {
+      window.aa = [];
     }
+
+    window.aa.push(e); // console.info('PropertyChangeListener', e);
+
+    this.updateSelection();
   };
 
   _proto.initListener = function initListener() {
@@ -113,10 +148,10 @@ var SelectionManager = /*#__PURE__*/function () {
     dataModel.removeDataPropertyChangeListener(this.handleDataPropertyChange);
   };
 
-  return SelectionManager;
+  return SelectionModel;
 }();
 
-exports["default"] = SelectionManager;
+exports["default"] = SelectionModel;
 ; // 构造元素数据
 
 var map = {

package/lib/core/models/TopoApp.js

@@ -17,6 +17,8 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _lodash = require("lodash");
+
 var _CiTypeCache = _interopRequireDefault(require("./cache/CiTypeCache"));
 
 var _Alarm = _interopRequireDefault(require("./Alarm"));
@@ -49,10 +51,10 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
-var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
+var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.8" === 'string' ? "6.0.0-alpha.8" : null;
+var version = typeof "6.0.1" === 'string' ? "6.0.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -108,7 +110,7 @@ var Topo = /*#__PURE__*/function () {
 
     this.test = new _Test["default"](this);
     this.uid = _topoFactory["default"].add(options.name, this);
-    this.selectionManager = new _SelectionManager["default"](this);
+    this.selectionModel = new _SelectionModel["default"](this);
   };
 
   _proto.destroy = function destroy() {
@@ -270,7 +272,7 @@ var Topo = /*#__PURE__*/function () {
           switch (_context4.prev = _context4.next) {
             case 0:
               _data$groups2 = data.groups, groups = _data$groups2 === void 0 ? [] : _data$groups2, _data$nodes2 = data.nodes, nodes = _data$nodes2 === void 0 ? [] : _data$nodes2, links = data.links, lines = data.lines;
-              this.view.topoClient.updateElements({
+              this.view.topoClient.updateElements((0, _lodash.cloneDeep)({
                 groups: (0, _topoData.formatGroups)(groups),
                 nodes: nodes.map(function (node) {
                   return (0, _extends2["default"])({}, node, {
@@ -284,7 +286,7 @@ var Topo = /*#__PURE__*/function () {
                     dtype: 'link'
                   });
                 })
-              }); // TODO 更新store，触发属性、指标模型加载，更新指标
+              })); // TODO 更新store，触发属性、指标模型加载，更新指标
 
             case 2:
             case "end":

package/lib/core/models/selection/ignoreList.js

@@ -0,0 +1,6 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var _default = ['position', 'childChange', 'a:scale', 'icons', 'a:dataSource', 'a:dataTipSource', 'agentChange', 'a:runtimeStyles', 'a:linkArrow', '*', 'a:link_ind_left_arrow', 'a:link_ind_right_arrow', 'a:link_ind_area', 'a:middle_area', 'a:areaRect', 'a:outAreaRect', 'a:link_ind_area_right'];
+exports["default"] = _default;

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

@@ -54,7 +54,7 @@ function isCrucialLink(link) {
 
 
 function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
 function isAggLink(link) {
@@ -204,7 +204,7 @@ function _getLinksDetail() {
 function buildTopoLinkData() {}
 
 var compatibleWith = function compatibleWith(value) {
-  console.log("compatibleWith", value);
+  // console.log("compatibleWith",value);
   var pluralType = value !== null && value !== void 0 ? value : 2;
 
   if (value === false) {
@@ -232,8 +232,8 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
   var topo = props.topo,
-      showType = props.showType;
-  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+      showType = props.showType; // console.log("showLinkByConfig-----------------------------", props, showType);
+  //const displayConfig = topo.store.getModelState("displayConfig");
 
   var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
@@ -242,8 +242,7 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0;
-  console.log("edges----types", showType, types, showPhy, showAgg);
+  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {

package/lib/core/store/models/customIcon.js

@@ -122,10 +122,8 @@ function _default(engine) {
 
                   case 2:
                     icons = _context2.sent;
-                    // 通知ht
-                    engine.view.topoClient.emitEvent('topo_shape_load', (0, _icon.getEditorIcons)(engine));
 
-                  case 4:
+                  case 3:
                   case "end":
                     return _context2.stop();
                 }

package/lib/core/store/models/selection.js

@@ -19,7 +19,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var _default = {
   // 定义 model 的初始 state
   state: {
-    selection: []
+    selection: [],
+    selectionIds: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/lib/core/store/models/topoBizMod.js

@@ -25,9 +25,6 @@ function _default(engine) {
       allCiSet: {},
       ciSetDoc: {},
       pollingSwitch: false,
-      // alarmDoc: {},
-      // alarmRecord: [],
-      setConfig: null,
 
       /**
       * 资源和链路的属性、指标，格式见：https://shimo.im/docs/VKt3HCKHYgJ9kvGP#anchor-PFq4

package/lib/core/store/models/topoConfig.js

@@ -336,8 +336,7 @@ function _default(topoApp) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
-                    _rlog["default"].debug("getTopoByConditions--------", params);
-
+                    // rlog.debug("getTopoByConditions--------", params);
                     topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
@@ -345,30 +344,22 @@ function _default(topoApp) {
                         layout: (0, _topoData2.getLayoutId)(group.layout),
                         resources: (0, _topoData2.resToConditions)(group.resources)
                       });
-                    });
+                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
-                    _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
-
-                    _context4.next = 7;
+                    _context4.next = 5;
                     return _topo["default"].getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
-                  case 7:
+                  case 5:
                     data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------data", data);
-
-                    _context4.next = 11;
+                    _context4.next = 8;
                     return (0, _getTopoData.buildData)(data);
 
-                  case 11:
+                  case 8:
                     data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------", data, groupInfo);
-
-                    _context4.next = 15;
+                    _context4.next = 11;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 15:
+                  case 11:
                     _yield$Promise$all = _context4.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
@@ -396,7 +387,7 @@ function _default(topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 23:
+                  case 19:
                   case "end":
                     return _context4.stop();
                 }

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

@@ -11,10 +11,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _moment = _interopRequireDefault(require("moment"));
 
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _topoData = require("../../../utils/topoData");
@@ -319,7 +319,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -387,46 +387,44 @@ function _default(topoApp) {
 
                   case 18:
                     if (!data) {
-                      _context6.next = 30;
+                      _context6.next = 29;
                       break;
                     }
 
+                    graphConfig = {};
+
                     if (!topoId) {
-                      _context6.next = 27;
+                      _context6.next = 26;
                       break;
                     }
 
-                    _context6.next = 22;
-                    return topoApp.options.loadData(topoId);
+                    _context6.next = 23;
+                    return _topo["default"].getTopoData(topoId);
 
-                  case 22:
+                  case 23:
                     topoConfig = _context6.sent;
                     if (!topoConfig) _rlog["default"].error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
-                    result = (0, _extends2["default"])({}, data, {
+                    graphConfig = {
                       global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                       customGlobal: data.global,
                       serialize: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.serialize
-                    });
-                    _context6.next = 28;
-                    break;
-
-                  case 27:
-                    result = (0, _extends2["default"])({}, data);
+                    };
 
-                  case 28:
-                    _context6.next = 33;
+                  case 26:
+                    result = (0, _extends2["default"])({}, data, graphConfig);
+                    _context6.next = 32;
                     break;
 
-                  case 30:
-                    _context6.next = 32;
+                  case 29:
+                    _context6.next = 31;
                     return topoApp.options.loadData(topoId);
 
-                  case 32:
+                  case 31:
                     result = _context6.sent;
 
-                  case 33:
+                  case 32:
                     if (result) {
-                      _context6.next = 37;
+                      _context6.next = 36;
                       break;
                     }
 
@@ -441,16 +439,16 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 37:
+                  case 36:
                     result = (0, _topoData.parseTopoData)(result);
 
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
-                    _context6.next = 41;
+                    _context6.next = 40;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
-                  case 41:
+                  case 40:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
@@ -459,13 +457,13 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    _context6.next = 48;
                     return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 49:
+                  case 48:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -496,7 +494,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 57:
                   case "end":
                     return _context6.stop();
                 }
@@ -627,7 +625,7 @@ function _default(topoApp) {
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
                     _context11.next = 4;
-                    return _topo["default"].auth.getTopoPermission(id);
+                    return topoApp.serverApi.auth.getTopoPermission(id);
 
                   case 4:
                     topoPermission = _context11.sent;

package/lib/core/utils/edgeUtil.js

@@ -15,6 +15,8 @@ var _linkUtils = require("../models/utils/linkUtils");
  * @param {*} topo
  */
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$historyManager, _topo$historyManager2;
+
   var _topo$store$getModelS = topo.store.getModelState("topoMod"),
       viewState = _topo$store$getModelS.viewState;
 
@@ -29,6 +31,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
 
 
+  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
+
   if (expandAllEdges === 1) {
     (0, _linkUtils.showLinkByConfig)({
       topo: topo,
@@ -47,6 +51,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     _rlog["default"].debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
   }
 
+  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
+
   if (topo.linkDynamicStyleExecutor) {
     topo.linkDynamicStyleExecutor.execute();
   }

package/lib/core/utils/showGraphManageStatusUtil.js

@@ -59,10 +59,16 @@ function showManageStatus(options) {
 function removeManageStatus(options) {
   var topo = options.topo,
       resources = options.resources;
+  var dm = topo.getDataModel();
+
+  if (!dm) {
+    return;
+  }
+
   resources.forEach(function (resource) {
     var type = resource.type,
         id = resource.id;
-    var element = topo.getDataModel().getDataByTag(id);
+    var element = dm.getDataByTag(id);
     if (!element) return;
 
     if (type === 'node') {

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -29,7 +29,8 @@ function useMetricPolling(_ref) {
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
-    linkMetrics: []
+    linkMetrics: [],
+    linkMetricsTs: null
   }),
       data = _useState[0],
       setData = _useState[1]; // 轮询hooks
@@ -41,9 +42,7 @@ function useMetricPolling(_ref) {
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      setData((0, _extends2["default"])({}, data, {
-        linkMetrics: result
-      }));
+      setData((0, _extends2["default"])({}, data, result));
 
       _rlog["default"].info('链路拓扑指标轮询', result);
     }
@@ -63,20 +62,26 @@ function useMetricPolling(_ref) {
     return item;
   }).sort().join(',');
   (0, _react.useEffect)(function () {
-    _rlog["default"].info('链路拓扑指标轮询 切换', {
-      linkCi: linkCi,
-      linkMetricCodes: linkMetricCodes
-    });
+    if (linkId) {
+      _rlog["default"].info('链路拓扑指标轮询 切换', {
+        linkCi: linkCi,
+        linkMetricCodes: linkMetricCodes
+      });
+
+      queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
+    }
 
-    queryLinkMetricsRequest.run(linkCi, linkMetricCodes);
     return function () {};
   }, [linkId, linkMetricCodesStr]);
   (0, _react.useEffect)(function () {
-    _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
-      linkCi: linkCi
-    });
+    if (linkId) {
+      _rlog["default"].info('链路拓扑指标轮询 queryInterfaceMetricsRequest 开始', {
+        linkCi: linkCi
+      });
+
+      queryInterfaceMetricsRequest.run(linkCi);
+    }
 
-    queryInterfaceMetricsRequest.run(linkCi);
     return function () {};
   }, [linkId]);
   return data;