@riil-frontend/component-topology 5.0.7 → 5.0.9

package/es/core/components/titlebar/TitleBar.module.scss

@@ -12,7 +12,7 @@
   }
 
   &.titlebarViewMode {
-    padding: 16px;
+    padding: 16px 16px 0 16px;
   }
 
   &.titlebarEditMode {

package/es/core/hooks/useTopoEdit.js

@@ -457,6 +457,20 @@ var useTopoEdit = function useTopoEdit(params) {
     });
     return newLinkElements;
   }
+  /**
+   * 获得未存在的元素
+   * @param {Array} elements 
+   * @returns 
+   */
+
+
+  function findUNExistedElements(elements) {
+    var dm = topo.getDataModel();
+    var newLinkElements = elements.filter(function (element) {
+      return !isExistedElement(topo.getHtTopo(), dm, element);
+    });
+    return newLinkElements;
+  }
   /**
    * 关联容器的资源
    */
@@ -599,7 +613,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, data;
+      var _yield$editDispatcher4, elements, newElements;
 
       return _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) {
@@ -617,24 +631,14 @@ var useTopoEdit = function useTopoEdit(params) {
             case 5:
               _yield$editDispatcher4 = _context15.sent;
               elements = _yield$editDispatcher4.elements;
-              // 过滤出新增的资源和链路
-              data = {
-                groups: elements.filter(function (ele) {
-                  return ele.type === 'group';
-                }),
-                nodes: elements.filter(function (ele) {
-                  return ele.type === 'node';
-                }),
-                lines: elements.filter(function (ele) {
-                  return ele.type === 'link';
-                })
-              }; // 添加到分层
-
-              _context15.next = 10;
-              return topo.updateElements(data);
+              // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
+              newElements = findUNExistedElements(elements);
+              rlog.debug('添加分层资源', {
+                layer: group,
+                newElements: newElements
+              });
+              topo.getHtTopo().addElements(newElements); // 临时放这里，仅拓扑中心有
 
-            case 10:
-              // 临时放这里，仅拓扑中心有
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "5.0.7" === 'string' ? "5.0.7" : null;
+var version = typeof "5.0.9" === 'string' ? "5.0.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.js

@@ -4,6 +4,7 @@ import _Icon from "@alifd/next/es/icon";
 import _Overlay from "@alifd/next/es/overlay";
 import React, { useEffect, useRef, useState } from "react";
 import AlarmListPanel from "../../../../components/AlarmListPanel";
+import styles from "./AlarmListShowButton.module.scss";
 var Popup = _Overlay.Popup;
 /**
  * 元素拖拽开关
@@ -14,8 +15,7 @@ var Popup = _Overlay.Popup;
 export default function AlarmListShowButton(props) {
   var topo = props.topo,
       style = props.style,
-      _props$offSetLeft = props.offSetLeft,
-      offSetLeft = _props$offSetLeft === void 0 ? 112 : _props$offSetLeft,
+      offSetLeft = props.offSetLeft,
       alarmPanelIsOpen = props.alarmPanelIsOpen,
       alarmData = props.alarmData; // const { AlarmListPanel } = viewerProps;
 
@@ -39,6 +39,33 @@ export default function AlarmListShowButton(props) {
     setVisible(false);
   };
 
+  if (offSetLeft) {
+    // FIXME 临时兼容业务拓扑
+    return /*#__PURE__*/React.createElement(Popup, {
+      trigger: /*#__PURE__*/React.createElement(_Button, {
+        style: style,
+        ref: alarmBtn,
+        title: "\u544A\u8B66"
+      }, /*#__PURE__*/React.createElement(_Icon, {
+        type: "warning"
+      })),
+      cache: true,
+      defaultVisible: true,
+      canCloseByOutSideClick: false,
+      canCloseByTrigger: false,
+      visible: visible,
+      onVisibleChange: onVisibleChange,
+      offset: [offSetLeft, 5],
+      triggerType: "click",
+      safeNode: function safeNode() {
+        return alarmBtn;
+      }
+    }, /*#__PURE__*/React.createElement(AlarmListPanel, _extends({}, props, {
+      alarmData: alarmData,
+      onClose: onClose
+    })));
+  }
+
   return /*#__PURE__*/React.createElement(Popup, {
     trigger: /*#__PURE__*/React.createElement(_Button, {
       style: style,
@@ -52,12 +79,17 @@ export default function AlarmListShowButton(props) {
     canCloseByOutSideClick: false,
     canCloseByTrigger: false,
     visible: visible,
-    onVisibleChange: onVisibleChange,
-    offset: [offSetLeft, 5],
+    onVisibleChange: onVisibleChange // offset={[0, 5]}
+    ,
     triggerType: "click",
     safeNode: function safeNode() {
       return alarmBtn;
-    }
+    },
+    align: false,
+    container: function container(trigger) {
+      return trigger.parentNode.parentNode.parentNode.parentNode;
+    },
+    className: styles.popup
   }, /*#__PURE__*/React.createElement(AlarmListPanel, _extends({}, props, {
     alarmData: alarmData,
     onClose: onClose

package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.module.scss

@@ -0,0 +1,5 @@
+.popup {
+  position: absolute;
+  top: 49px;
+  right: 16px;
+}

package/es/utils/topoData.js

@@ -726,6 +726,20 @@ export var combSaveTopoData = function combSaveTopoData(_ref4) {
     extraConfig: extraConfig
   };
 };
+export function transtormElementsToMap(elements) {
+  var data = {
+    groups: elements.filter(function (ele) {
+      return ele.type === 'group';
+    }),
+    nodes: elements.filter(function (ele) {
+      return ele.type === 'node';
+    }),
+    lines: elements.filter(function (ele) {
+      return ele.type === 'link';
+    })
+  };
+  return data;
+}
 /**
  * 从拓扑数据中获取区域的子区域、子节点
  * @param {*} elements 

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -12,7 +12,7 @@
   }
 
   &.titlebarViewMode {
-    padding: 16px;
+    padding: 16px 16px 0 16px;
   }
 
   &.titlebarEditMode {

package/lib/core/hooks/useTopoEdit.js

@@ -487,6 +487,20 @@ var useTopoEdit = function useTopoEdit(params) {
     });
     return newLinkElements;
   }
+  /**
+   * 获得未存在的元素
+   * @param {Array} elements 
+   * @returns 
+   */
+
+
+  function findUNExistedElements(elements) {
+    var dm = topo.getDataModel();
+    var newLinkElements = elements.filter(function (element) {
+      return !(0, _htElementUtils.isExistedElement)(topo.getHtTopo(), dm, element);
+    });
+    return newLinkElements;
+  }
   /**
    * 关联容器的资源
    */
@@ -631,7 +645,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, data;
+      var _yield$editDispatcher4, elements, newElements;
 
       return _regenerator["default"].wrap(function _callee15$(_context15) {
         while (1) {
@@ -649,24 +663,16 @@ var useTopoEdit = function useTopoEdit(params) {
             case 5:
               _yield$editDispatcher4 = _context15.sent;
               elements = _yield$editDispatcher4.elements;
-              // 过滤出新增的资源和链路
-              data = {
-                groups: elements.filter(function (ele) {
-                  return ele.type === 'group';
-                }),
-                nodes: elements.filter(function (ele) {
-                  return ele.type === 'node';
-                }),
-                lines: elements.filter(function (ele) {
-                  return ele.type === 'link';
-                })
-              }; // 添加到分层
-
-              _context15.next = 10;
-              return topo.updateElements(data);
+              // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
+              newElements = findUNExistedElements(elements);
+
+              _rlog["default"].debug('添加分层资源', {
+                layer: group,
+                newElements: newElements
+              });
+
+              topo.getHtTopo().addElements(newElements); // 临时放这里，仅拓扑中心有
 
-            case 10:
-              // 临时放这里，仅拓扑中心有
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "5.0.7" === 'string' ? "5.0.7" : null;
+var version = typeof "5.0.9" === 'string' ? "5.0.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _AlarmListPanel = _interopRequireDefault(require("../../../../components/AlarmListPanel"));
 
+var _AlarmListShowButtonModule = _interopRequireDefault(require("./AlarmListShowButton.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; }
@@ -31,8 +33,7 @@ var Popup = _overlay["default"].Popup;
 function AlarmListShowButton(props) {
   var topo = props.topo,
       style = props.style,
-      _props$offSetLeft = props.offSetLeft,
-      offSetLeft = _props$offSetLeft === void 0 ? 112 : _props$offSetLeft,
+      offSetLeft = props.offSetLeft,
       alarmPanelIsOpen = props.alarmPanelIsOpen,
       alarmData = props.alarmData; // const { AlarmListPanel } = viewerProps;
 
@@ -56,6 +57,33 @@ function AlarmListShowButton(props) {
     setVisible(false);
   };
 
+  if (offSetLeft) {
+    // FIXME 临时兼容业务拓扑
+    return /*#__PURE__*/_react["default"].createElement(Popup, {
+      trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        style: style,
+        ref: alarmBtn,
+        title: "\u544A\u8B66"
+      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: "warning"
+      })),
+      cache: true,
+      defaultVisible: true,
+      canCloseByOutSideClick: false,
+      canCloseByTrigger: false,
+      visible: visible,
+      onVisibleChange: onVisibleChange,
+      offset: [offSetLeft, 5],
+      triggerType: "click",
+      safeNode: function safeNode() {
+        return alarmBtn;
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_AlarmListPanel["default"], (0, _extends2["default"])({}, props, {
+      alarmData: alarmData,
+      onClose: onClose
+    })));
+  }
+
   return /*#__PURE__*/_react["default"].createElement(Popup, {
     trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
       style: style,
@@ -69,12 +97,17 @@ function AlarmListShowButton(props) {
     canCloseByOutSideClick: false,
     canCloseByTrigger: false,
     visible: visible,
-    onVisibleChange: onVisibleChange,
-    offset: [offSetLeft, 5],
+    onVisibleChange: onVisibleChange // offset={[0, 5]}
+    ,
     triggerType: "click",
     safeNode: function safeNode() {
       return alarmBtn;
-    }
+    },
+    align: false,
+    container: function container(trigger) {
+      return trigger.parentNode.parentNode.parentNode.parentNode;
+    },
+    className: _AlarmListShowButtonModule["default"].popup
   }, /*#__PURE__*/_react["default"].createElement(_AlarmListPanel["default"], (0, _extends2["default"])({}, props, {
     alarmData: alarmData,
     onClose: onClose

package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.module.scss

@@ -0,0 +1,5 @@
+.popup {
+  position: absolute;
+  top: 49px;
+  right: 16px;
+}

package/lib/utils/topoData.js

@@ -15,7 +15,9 @@ exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
 exports.getMonitorTemplateCodes = getMonitorTemplateCodes;
 exports.parseTopoData = parseTopoData;
-exports.updateCiDoc = exports.updateAllCiDoc = exports.sortList = void 0;
+exports.sortList = void 0;
+exports.transtormElementsToMap = transtormElementsToMap;
+exports.updateCiDoc = exports.updateAllCiDoc = void 0;
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
@@ -790,6 +792,23 @@ var combSaveTopoData = function combSaveTopoData(_ref4) {
     extraConfig: extraConfig
   };
 };
+
+exports.combSaveTopoData = combSaveTopoData;
+
+function transtormElementsToMap(elements) {
+  var data = {
+    groups: elements.filter(function (ele) {
+      return ele.type === 'group';
+    }),
+    nodes: elements.filter(function (ele) {
+      return ele.type === 'node';
+    }),
+    lines: elements.filter(function (ele) {
+      return ele.type === 'link';
+    })
+  };
+  return data;
+}
 /**
  * 从拓扑数据中获取区域的子区域、子节点
  * @param {*} elements 
@@ -798,8 +817,6 @@ var combSaveTopoData = function combSaveTopoData(_ref4) {
  */
 
 
-exports.combSaveTopoData = combSaveTopoData;
-
 function findGroupChildren(elements, group) {
   var id = group.id,
       tag = group.tag;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.7",
+  "version": "5.0.9",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.7/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.9/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }