@riil-frontend/component-topology 8.0.0-a.1 → 8.0.0-a.11

package/es/core/common/icons/basicIcons.js

@@ -19,7 +19,7 @@ export default [{
   'name': '人员',
   'url': '/img/topo/basicIcon/人员平面.svg'
 }, {
-  'id': 'system.building',
+  'id': 'system.楼宇',
   'name': '楼宇',
   'url': '/img/topo/basicIcon/楼宇平面.svg'
 }, {

package/es/core/common/icons/icon.js

@@ -37,11 +37,15 @@ export function getResourceIcons(topo) {
  */
 
 export function getBasicIcons(topo, containsGroupIcon) {
+  var nodeIcons = topoManager.iconLibManager.getNodeIcons().filter(function (icon) {
+    return !icon.ciType;
+  });
+
   if (containsGroupIcon === false) {
-    return basicIcons;
+    return [].concat(nodeIcons, basicIcons);
   }
 
-  return [topoManager.iconLibManager.getGroupIcon()].concat(basicIcons);
+  return [topoManager.iconLibManager.getGroupIcon()].concat(nodeIcons, basicIcons);
 }
 export function getGroupDefaultIcons(topo) {
   return [].concat(topoManager.iconLibManager.getIcons());

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -2,6 +2,7 @@ import _Field from "@alifd/next/es/field";
 import _Select from "@alifd/next/es/select";
 import _Form from "@alifd/next/es/form";
 import React, { useEffect } from 'react';
+import { getEdgesBySelection, loopEdgesAndChildren } from "../../../../utils/edgeTypeStyleUtil";
 import styles from "./EdgeType.module.scss";
 import LineType from "./LineType";
 var FormItem = _Form.Item;
@@ -60,43 +61,60 @@ var LINE_MOLD_OPTIONS = [{
   icon: 'topo_lineMold_dotted_two'
 }];
 
-function getValuesBySelection(selection) {
+function getValuesByEdges(topo) {
+  function getStartPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  function getEndPoint(edge) {
+    var icons = edge.s('icons') || {};
+    return ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].filter(function (name) {
+      return icons[name];
+    })[0] || 'nil';
+  }
+
+  var selectionEdges = getEdgesBySelection(topo);
+  var edgeValues = [];
+  loopEdgesAndChildren(topo, selectionEdges, function (edge) {
+    edgeValues.push({
+      lineButton: edge.s('edge.type'),
+      startPoint: getStartPoint(edge),
+      endPoint: getEndPoint(edge),
+      lineMold: edge.a('lineMode') || 'solidLine'
+    });
+  });
   var values = {
+    lineButton: undefined,
     startPoint: undefined,
     endPoint: undefined,
     lineMold: undefined
-  }; // 仅一条连线选中时回显
-
-  if (selection.length === 1) {
-    var edge = selection[0];
-    values = {
-      startPoint: 'nil',
-      endPoint: 'nil',
-      lineMold: edge.a('lineMode') || 'solidLine'
-    };
-    var icons = edge.s('icons') || {};
-    ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.startPoint = name;
-      }
+  };
+  Object.keys(values).forEach(function (name) {
+    var vals = edgeValues.map(function (item) {
+      return item[name];
     });
-    ['targetArrow', 'targetSolidCircle', 'targetNoneCircle'].forEach(function (name) {
-      if (icons[name]) {
-        values.endPoint = name;
-      }
-    });
-  }
+    var isSame = vals.filter(function (val) {
+      return val === vals[0];
+    }).length === vals.length;
 
+    if (isSame) {
+      values[name] = vals[0];
+    }
+  });
   return values;
 }
 
 function EdgeType(props) {
-  var selection = props.selection,
+  var topo = props.topo,
+      selection = props.selection,
       _onChange = props.onChange;
 
   var field = _Field.useField({
     autoUnmount: false,
-    values: getValuesBySelection(selection),
+    values: getValuesByEdges(topo),
     onChange: function onChange(name, value) {
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
@@ -107,7 +125,7 @@ function EdgeType(props) {
   });
 
   useEffect(function () {
-    field.setValues(getValuesBySelection(selection));
+    field.setValues(getValuesByEdges(topo));
   }, [selection]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.lineBox

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -1,6 +1,7 @@
 import _Button from "@alifd/next/es/button";
 import _Balloon from "@alifd/next/es/balloon";
 import React, { useState } from 'react';
+import classNames from 'classnames';
 import styles from "./LineType.module.scss";
 var Tooltip = _Balloon.Tooltip;
 var LINE_TYPE_OPTIONS = [{
@@ -25,11 +26,14 @@ var LINE_TYPE_OPTIONS = [{
   icon: 'topo_linear_icon_arcline'
 }];
 var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var onChange = props.onChange;
+  var value = props.value,
+      onChange = props.onChange;
 
   function lineButton(item) {
+    var _classNames;
+
     return /*#__PURE__*/React.createElement(_Button, {
-      className: "" + styles.redioBtn,
+      className: classNames(styles.redioBtn, (_classNames = {}, _classNames[styles.selected] = value === item.value, _classNames)),
       onClick: function onClick() {
         onChange(item.value);
       }
@@ -50,4 +54,5 @@ var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, item.label);
   }));
 });
+LineType.displayName = 'LineType';
 export default LineType;

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.module.scss

@@ -21,6 +21,10 @@
     &:hover {
       background: #F2F7FD !important;
     }
+
+    &.selected {
+      background: #F2F7FD !important;
+    }
   }
   .redioBtn:last-child{
     margin-right: 0;

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -109,6 +109,7 @@ function EdgeTypeButton(props) {
     disabled: disabled,
     trigger: icon
   }, !disabled && /*#__PURE__*/React.createElement(EdgeType, {
+    topo: topo,
     selection: selection,
     onChange: handleChange
   })));

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -14,8 +14,7 @@ export function getEdgesBySelection(topo) {
     return nodeIds;
   };
 
-  var getSelectedEdges = function getSelectedEdges(topo) {
-    var gv = topo.getGraphView();
+  var getSelectedEdges = function getSelectedEdges(gv) {
     var selection = gv.getSelectionModel().getSelection().toArray(); // 选中的连线
 
     var edges = selection.filter(function (element) {
@@ -41,7 +40,7 @@ export function getEdgesBySelection(topo) {
     return edges;
   };
 
-  return getSelectedEdges(topo);
+  return getSelectedEdges(topo.getGraphView());
 }
 /**
  * 遍历连线及子连线

package/es/core/hooks/usePolling.js

@@ -21,9 +21,9 @@ var usePolling = function usePolling(props) {
   var resIdsList = resAndMetrics === null || resAndMetrics === void 0 ? void 0 : resAndMetrics.resIdsList; // 轮询hooks
 
   var _useRequest = useRequest(refresh, {
-    pollingInterval: 1000 * 15,
-    // pollingWhenHidden: false,
-    // debounceInterval: 1000,
+    pollingInterval: 60 * 1000,
+    pollingWhenHidden: false,
+    // debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
       if (result) {

package/es/core/models/TopoApp.js

@@ -1,10 +1,10 @@
 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 { setRequest } from '@riil-frontend/component-topology-utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { cloneDeep } from 'lodash';
+import topoService from "../services/topo";
 import CiTypeCache from "./cache/CiTypeCache";
 import Alarm from "./Alarm";
 import TopoGraphView from "./TopoGraphView";
@@ -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 "8.0.0-a.1" === 'string' ? "8.0.0-a.1" : null;
+var version = typeof "8.0.0-a.11" === 'string' ? "8.0.0-a.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getLinkMtCodes, getMonitorTemplateCodesFromTopoData, getMtCodeCiTypeMap, getNodeMtCodes } from "./utils";
-import { getMetricsByMonitorTemplateCodes } from "../../services/topo";
+import { getMetricsByMonitorTemplateCodes } from "../../services/topo/tagtip";
 import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 
 var ElementTagTipConfig = /*#__PURE__*/function () {

package/es/core/models/topoData.js

@@ -4,8 +4,16 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export function getLayoutId(layout) {
-  if (!layout || typeof layout === "string") {
+  if (!layout) {
     return layout;
+  } // 拖拽添加分层后点击保存ht传参不正确，临时适配
+
+
+  if (typeof layout === "string") {
+    return {
+      v: 'towardeast',
+      h: 'towardsouth'
+    }[layout] || layout;
   }
 
   var id = layout.id,

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

@@ -1,12 +1,12 @@
-import _extends from "@babel/runtime/helpers/extends";
 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 _ from 'lodash';
 import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
 
-import { getEdges } from "../../../utils/htElementUtils"; // const interfaceTypeMap = {
+import { getEdges } from "../../../utils/htElementUtils";
+import CiTypeCache from "../cache/CiTypeCache"; // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
 //   },
@@ -33,40 +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 var getInterfaceObject = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(codes) {
-    var query, promises, result, ifDoc;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            query = _.compact(_.uniq(codes));
-            promises = query.map(queryModelAsset);
-            _context.next = 4;
-            return Promise.all(promises);
-
-          case 4:
-            result = _context.sent;
-            ifDoc = {};
-            result.map(function (ifItem) {
-              ifDoc[ifItem.code] = {
-                displayName: ifItem.displayName
-              };
-            });
-            return _context.abrupt("return", ifDoc);
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getInterfaceObject(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
 export function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
   var linkCiMap = keyBy(links, 'id');
   return links.map(function (link) {
@@ -110,57 +76,59 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc
     });
   });
 }
-export function getLinksDetail(_x2, _x3) {
+export function getLinksDetail(_x, _x2) {
   return _getLinksDetail.apply(this, arguments);
 }
 
 function _getLinksDetail() {
-  _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(links, nodes) {
+  _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(!links || !links.length)) {
-              _context2.next = 2;
+              _context.next = 2;
               break;
             }
 
-            return _context2.abrupt("return", []);
+            return _context.abrupt("return", []);
 
           case 2:
             // const linkCis = await topoService.relation.batchQueryRelation(
             //   links.map((link) => link.id)
             // );
             linkCis = links;
-            interfaceIds = [];
-            interfaceTypes = [];
-            linkCis.forEach(function (item) {
-              interfaceIds.push(item.attributes.source_id);
-              interfaceIds.push(item.attributes.destination_id);
-              interfaceTypes.push(item.attributes.source_type);
-              interfaceTypes.push(item.attributes.destination_type);
+            interfaceIds = [].concat(linkCis.map(function (item) {
+              return item.attributes.source_id;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_id;
+            }));
+            interfaceTypes = _.compact(_.uniq([].concat(linkCis.map(function (item) {
+              return item.attributes.source_type;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_type;
+            })))).filter(function (item) {
+              return item !== 'ip';
             });
-            _context2.next = 8;
+            _context.next = 7;
             return queryCisByIds(interfaceIds);
 
-          case 8:
-            interfaceCis = _context2.sent;
-            _context2.next = 11;
-            return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
-            }));
+          case 7:
+            interfaceCis = _context.sent;
+            _context.next = 10;
+            return CiTypeCache.getCiTypeMap(interfaceTypes);
 
-          case 11:
-            interfaceDoc = _context2.sent;
-            return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
+          case 10:
+            interfaceDoc = _context.sent;
+            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
 
-          case 13:
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getLinksDetail.apply(this, arguments);
 }

package/es/core/services/overview.js

@@ -1,7 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
-import { commonQueryCiDataByIds } from "./cmdb";
+import { commonQueryCiDataByIds } from "./cmdb"; // 机房可上架设备类型缓存数据
+
+var roomDeviceTypeList = null; // 资源子组件缓存
+
+var ciComponentsMap = {};
 export default {
   /**
    * 根据资源id获取风险
@@ -35,19 +39,31 @@ export default {
    */
   queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var components;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              components = ciComponentsMap[id];
+
+              if (components) {
+                _context2.next = 6;
+                break;
+              }
+
+              _context2.next = 4;
               return request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
                 id: id
               });
 
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
+            case 4:
+              components = _context2.sent;
+              ciComponentsMap[id] = components;
 
-            case 3:
+            case 6:
+              return _context2.abrupt("return", components);
+
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -186,13 +202,21 @@ export default {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.next = 2;
-              return request.post("/room/v1/api/device/type/list", {});
+              if (roomDeviceTypeList) {
+                _context8.next = 4;
+                break;
+              }
 
-            case 2:
-              return _context8.abrupt("return", _context8.sent);
+              _context8.next = 3;
+              return request.post("/room/v1/api/device/type/list", {});
 
             case 3:
+              roomDeviceTypeList = _context8.sent;
+
+            case 4:
+              return _context8.abrupt("return", roomDeviceTypeList);
+
+            case 5:
             case "end":
               return _context8.stop();
           }

package/es/core/services/topo/basic.js

@@ -0,0 +1,34 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { request } from '@riil-frontend/component-topology-utils';
+import { TOPO_API_ROOT } from "./constants";
+export default {
+  /**
+  * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
+  * @param {Number} id Topo ID
+  * @param {String} data ht拓扑序列化数据
+  * @returns
+  */
+  saveSerializeData: function saveSerializeData(id, data) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return request.post(TOPO_API_ROOT + "/structure/" + id, {
+                data: data
+              });
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};

package/es/core/services/topo/constants.js

@@ -0,0 +1 @@
+export var TOPO_API_ROOT = '/topo/v1/api';

package/es/core/services/topo/index.js

@@ -0,0 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
+import basic from "./basic";
+export default _extends({}, topoService, basic);

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

@@ -385,7 +385,12 @@ export default function (topoApp) {
                       alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                       extraConfig: JSON.stringify(_extends({}, displayConfig, {
                         // 背景图，便于加载拓扑直接显示背景图
-                        background: topoApp.store.getModelState("background").current
+                        background: topoApp.store.getModelState("background").current,
+                        // 增加保存日志，便于排查链路重复问题 2023-4-12 19:27:18
+                        saveHistories: [{
+                          date: new Date().toLocaleString(),
+                          version: topoApp.version
+                        }].concat(displayConfig.saveHistories || [])
                       }))
                     };
                     rlog.debug('saveGlobalConfig', config);