@riil-frontend/component-topology 3.1.13 → 3.4.0

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

@@ -1,22 +1,22 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import keyBy from 'lodash/keyBy';
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
+import keyBy from "lodash/keyBy";
 import { queryCisByIds } from "../../services";
 var interfaceTypeMap = {
-  'network.interface': {
-    displayName: '网络接口'
+  "network.interface": {
+    displayName: "网络接口"
   },
-  'network.agg_interface': {
-    displayName: '聚合接口'
+  "network.agg_interface": {
+    displayName: "聚合接口"
   }
 };
 export function isAggLink(link) {
-  return link.attributes['network_link.connect_type'] === 'agg';
+  return link.attributes["network_link.connect_type"] === "agg";
 }
 export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
-  var linkCiMap = keyBy(linkCis, 'id');
+  var linkCiMap = keyBy(linkCis, "id");
   return links.map(function (link) {
     var _nodes$find, _nodes$find2, _interfaceCis$find, _interfaceCis$find2;
 
@@ -31,14 +31,14 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
       name: linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes.name,
       attributes: _extends({}, attributes, {
         // 源/目的设备
-        'network_link.source_device_id_object': {
+        "network_link.source_device_id_object": {
           displayName: (_nodes$find = nodes.find(function (node) {
-            return node.id === attributes['network_link.source_device_id'];
+            return node.id === attributes["network_link.source_device_id"];
           })) === null || _nodes$find === void 0 ? void 0 : _nodes$find.name
         },
-        'network_link.destination_device_id_object': {
+        "network_link.destination_device_id_object": {
           displayName: (_nodes$find2 = nodes.find(function (node) {
-            return node.id === attributes['network_link.destination_device_id'];
+            return node.id === attributes["network_link.destination_device_id"];
           })) === null || _nodes$find2 === void 0 ? void 0 : _nodes$find2.name
         },
         // 源/目的接口类型
@@ -48,12 +48,12 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
         source_id_object: {
           displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
             return node.id === attributes.source_id;
-          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes['display_name']
+          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes["display_name"]
         },
         destination_id_object: {
           displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
             return node.id === attributes.destination_id;
-          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes['display_name']
+          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes["display_name"]
         }
       })
     });

package/es/hooks/useResourceConfig.js

@@ -43,7 +43,8 @@ export default function (props) {
     var config = getConfigFromHt();
     return {
       resources: config.resources,
-      groups: config.groups
+      groups: config.groups,
+      exportLinkIdList: config.exportLinkIdList
     };
   };
 
@@ -257,7 +258,7 @@ export default function (props) {
   }
 
   function getConfigFromHt() {
-    return ResourceConfigUtil.getResourceConfigFromHt(topo.getDataModel());
+    return ResourceConfigUtil.getResourceConfigFromHt(topo);
   }
 
   var getAllNodeResourceIds = function getAllNodeResourceIds() {

package/es/hooks/useSelection.js

@@ -1,13 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
-import { useCallback } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { useCallback } from "react";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 /**
  * Selection
  */
 
 function useSelection(props) {
   var topo = props.topo;
-  var selectionDispatchers = topo.store.useModelDispatchers('selection');
+  var selectionDispatchers = topo.store.useModelDispatchers("selection");
 
   var setSelection = function setSelection(selection) {
     selectionDispatchers.update({
@@ -20,27 +20,29 @@ function useSelection(props) {
       var selectionModel = topo.getSelectionModel();
       var htSelection = selectionModel.getSelection().getArray(); // TODO 对比变更更新
 
-      var selectionArr = htSelection.map(getElementData); // rlog.info('updateSelection', selectionArr.map(element => element.id));
-
+      var selectionArr = htSelection.map(getElementData);
+      rlog.info("updateSelection", selectionArr.map(function (element) {
+        return element.id;
+      }));
       setSelection(selectionArr);
     } catch (e) {
-      rlog.error('updateSelection error', e);
+      rlog.error("updateSelection error", e);
     }
   }, []);
   var initSelection = useCallback(function () {
-    rlog.info('初始化Selection');
+    rlog.info("初始化Selection");
     var dataModel = topo.getDataModel();
     var selectionModel = topo.getSelectionModel();
     updateSelection();
     selectionModel.addSelectionChangeListener(function (e) {
-      rlog.info('selectionChangeListener', e);
+      rlog.info("selectionChangeListener", e);
       updateSelection();
     });
     dataModel.addDataPropertyChangeListener(function (e) {
       var property = e.property,
           data = e.data;
 
-      if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+      if (["position", "childChange", "a:scale"].indexOf(property) !== -1) {
         return;
       }
 
@@ -67,7 +69,7 @@ function useSelection(props) {
 
 
 var map = {
-  'common': function common(element) {
+  common: function common(element) {
     var className = element.getClassName();
     return {
       className: className,
@@ -79,15 +81,15 @@ var map = {
       styleMap: JSON.parse(JSON.stringify(element.getStyleMap() || {}))
     };
   },
-  'ht.Edge': function htEdge(element) {
+  "ht.Edge": function htEdge(element) {
     return _extends({}, map.common(element));
   },
-  'ht.Group': function htGroup(element) {
-    return _extends({}, map['ht.Node'](element), {
+  "ht.Group": function htGroup(element) {
+    return _extends({}, map["ht.Node"](element), {
       expanded: element.isExpanded()
     });
   },
-  'ht.Node': function htNode(element) {
+  "ht.Node": function htNode(element) {
     return _extends({}, map.common(element), {
       image: element.getImage(),
       width: element.getWidth(),

package/es/models/topoConfig.js

@@ -34,6 +34,7 @@ var initialState = {
     "static": []
   },
   groups: [],
+  exportLinkIdList: [],
   // config: {
   //   view: null,
   //   groups: [],
@@ -243,18 +244,19 @@ export default function (topoApp) {
           var _this2 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, query, data;
+            var editState, resources, _editState$groups, groups, _editState$exportLink, exportLinkIdList, query, data;
 
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoConfig;
-                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
+                    resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$exportLink = editState.exportLinkIdList, exportLinkIdList = _editState$exportLink === void 0 ? [] : _editState$exportLink;
                     query = {
                       id: rootState.topoMod.topoId,
                       resources: resources,
-                      groups: groups
+                      groups: groups,
+                      exportLinkIdList: exportLinkIdList
                     };
                     _context2.next = 5;
                     return _this2.getTopoByConditions(query);
@@ -306,14 +308,14 @@ export default function (topoApp) {
           var _this4 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, ciTypeMap, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, ciTypeMap, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
                     rlog.debug("getTopoByConditions--------", params);
-                    topoId = params.id, resources = params.resources, groups = params.groups;
+                    topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
                     viewConditions = resToConditions(resources);
                     groupInfo = isAvailableArray(groups) && groups.map(function (group) {
                       return _extends({}, group, {
@@ -321,21 +323,23 @@ export default function (topoApp) {
                         resources: resToConditions(group.resources)
                       });
                     });
-                    _context4.next = 6;
-                    return topoService.getTopoDataByResource(topoId, viewConditions, groupInfo);
+                    rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
+                    _context4.next = 7;
+                    return topoService.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
-                  case 6:
+                  case 7:
                     data = _context4.sent;
-                    _context4.next = 9;
+                    rlog.debug("getTopoByConditions--------data", data);
+                    _context4.next = 11;
                     return addLinkData(data);
 
-                  case 9:
+                  case 11:
                     data = _context4.sent;
                     rlog.debug("getTopoByConditions--------", data, groupInfo);
-                    _context4.next = 13;
+                    _context4.next = 15;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 13:
+                  case 15:
                     _yield$Promise$all = _context4.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     _combTopoData = combTopoData({
@@ -363,7 +367,7 @@ export default function (topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 21:
+                  case 23:
                   case "end":
                     return _context4.stop();
                 }
@@ -378,12 +382,12 @@ export default function (topoApp) {
               while (1) {
                 switch (_context5.prev = _context5.next) {
                   case 0:
-                    displayConfig = topoApp.store.getModelState('displayConfig');
+                    displayConfig = topoApp.store.getModelState("displayConfig");
                     config = {
                       // alarmSwitch: true,
                       extraConfig: JSON.stringify(_extends({}, displayConfig, {
                         // 背景图，便于加载拓扑直接显示背景图
-                        background: topoApp.store.getModelState('background').current
+                        background: topoApp.store.getModelState("background").current
                       }))
                     };
                     _context5.next = 4;
@@ -408,7 +412,7 @@ export default function (topoApp) {
               while (1) {
                 switch (_context6.prev = _context6.next) {
                   case 0:
-                    currentBackground = topoApp.store.getModelState('background').current;
+                    currentBackground = topoApp.store.getModelState("background").current;
                     _context6.next = 3;
                     return _saveTopo(_extends({}, data, {
                       viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,

package/es/models/topoMod.js

@@ -381,6 +381,7 @@ export default function (topoApp) {
                     topoConfig = _context6.sent;
                     result = _extends({}, data, {
                       global: topoConfig.global,
+                      customGlobal: data.global,
                       serialize: topoConfig.serialize
                     });
                     _context6.next = 27;

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -4,23 +4,29 @@ import LindInfoPreview from "../../link/LinkInfoPreview";
 import styles from "../../link/LinkInfoPreview.module.scss";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { getLinkPermission } from "../../../../../../utils/linPermissionUtil";
+import { useState, useEffect } from "react";
 export default function LinkDataTab(props) {
   var topo = props.topo,
-      edge = props.edge,
-      editorProps = props.editorProps; // const operation = props.edge.a("operation");
+      edge = props.edge;
+  var nodes = topo.dataModel.getNodes();
 
-  var nodes = topo.dataModel.getNodes(); //rlog.debug("LinkDataTab--edge", edge, nodes);
-  // const disabled = ["delete", "write"].indexOf(operation) < 0;
+  var _useState = useState(),
+      link = _useState[0],
+      setLink = _useState[1]; // 节点间只有连线组时，显示连线组的数据
 
-  var permission = getLinkPermission(edge.getAttrObject(), nodes); //rlog.debug("LinkDataTab--", permission);
-  // 节点间只有连线组时，显示连线组的数据
 
   var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
       links = _topo$store$useModelS.links,
       linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
+  var linkData = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
-  });
+  }); // rlog.debug("LinkDataTab-------linkData", linkData);
+
+  useEffect(function () {
+    rlog.debug("LinkDataTab--edge-linkData", edge, linkData);
+    setLink(linkData);
+  }, [edge, linkData]);
+  var permission = getLinkPermission(edge, nodes, link);
 
   var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -1,11 +1,24 @@
 import _Tab from "@alifd/next/es/tab";
-import React from 'react';
+import React from "react";
 import TabView from "../../../../../../core/editor/components/settings/common/tab/TabView";
 import Data from "./Data";
 import Setting from "./Setting";
+import { getLinkPermission } from "../../../../../../topoCenter/utils/linPermissionUtil.js";
+import { getNodes } from "../../../../../../utils/htElementUtils.js";
 export default function LinkPropertyView(props) {
-  // 无权限不显示数据页签
-  var operation = props.edge.a('operation');
+  var edge = props.edge,
+      topo = props.topo;
+  console.log("LinkPropertyView-----", edge, edge.getSource()); // 无权限不显示数据页签
+  // const operation = props.edge.a('operation');
+
+  var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
+      links = _topo$store$useModelS.links,
+      linkGroups = _topo$store$useModelS.linkGroups;
+  var link = [].concat(links, linkGroups).find(function (item) {
+    return item.id === edge.getTag();
+  }); // console.log("LinkPropertyView--getLinkPermission", links, link);
+
+  var operation = getLinkPermission(edge, topo.getNodes(topo.dataModel), link);
 
   if (!operation) {
     return /*#__PURE__*/React.createElement(Setting, props);

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js

@@ -2,7 +2,7 @@ import _Form from "@alifd/next/es/form";
 import _Field from "@alifd/next/es/field";
 import _extends from "@babel/runtime/helpers/extends";
 import _Collapse from "@alifd/next/es/collapse";
-import React, { useEffect } from 'react';
+import React, { useEffect } from "react";
 // import LineType from '../../../../../../../core/editor/components/settings/common/LineType';
 var CollapsePanel = _Collapse.Panel;
 
@@ -33,9 +33,9 @@ export default function LinkSetting(props) {
     field: field,
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ['显示设置'],
+    defaultExpandedKeys: ["显示设置"],
     style: {
-      border: 'none'
+      border: "none"
     }
   }, /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u663E\u793A\u8BBE\u7F6E",