@riil-frontend/component-topology 5.0.10 → 5.0.12

package/es/core/components/DisplaySettingDrawer/LineExpandAllRadioGroup.js

@@ -18,10 +18,12 @@ var LineExpandAllRadioGroup = /*#__PURE__*/React.forwardRef(function LineExpandA
       showType = _useState[0],
       setShowType = _useState[1];
 
-  var _useState2 = useState((_plurals = plurals[value !== null && value !== void 0 ? value : 2]) !== null && _plurals !== void 0 ? _plurals : []),
+  var _useState2 = useState((_plurals = plurals[value === false ? 2 : value]) !== null && _plurals !== void 0 ? _plurals : []),
       pluralType = _useState2[0],
       setPluralType = _useState2[1];
 
+  console.log("LineExpandAllRadioGroup-value", value, pluralType);
+
   var handleTypeChange = function handleTypeChange(newValue) {
     setShowType(newValue);
 

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

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

@@ -187,14 +187,14 @@ export var plurals = {
   4: ["phy", "agg"]
 };
 export var showLinkByConfig = function showLinkByConfig(props) {
-  var _plurals$showType;
+  var _plurals;
 
   var topo = props.topo,
       _props$showType = props.showType,
       showType = _props$showType === void 0 ? 2 : _props$showType;
   console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
 
-  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _plurals$showType : []; // 查询所有连线
+  var types = (_plurals = plurals[showType === false ? 2 : showType]) !== null && _plurals !== void 0 ? _plurals : []; // 查询所有连线
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();

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/DisplaySettingDrawer/LineExpandAllRadioGroup.js

@@ -37,10 +37,12 @@ var LineExpandAllRadioGroup = /*#__PURE__*/_react["default"].forwardRef(function
       showType = _useState[0],
       setShowType = _useState[1];
 
-  var _useState2 = (0, _react.useState)((_plurals = _linkUtils.plurals[value !== null && value !== void 0 ? value : 2]) !== null && _plurals !== void 0 ? _plurals : []),
+  var _useState2 = (0, _react.useState)((_plurals = _linkUtils.plurals[value === false ? 2 : value]) !== null && _plurals !== void 0 ? _plurals : []),
       pluralType = _useState2[0],
       setPluralType = _useState2[1];
 
+  console.log("LineExpandAllRadioGroup-value", value, pluralType);
+
   var handleTypeChange = function handleTypeChange(newValue) {
     setShowType(newValue);
 

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

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

@@ -217,14 +217,14 @@ var plurals = {
 exports.plurals = plurals;
 
 var showLinkByConfig = function showLinkByConfig(props) {
-  var _plurals$showType;
+  var _plurals;
 
   var topo = props.topo,
       _props$showType = props.showType,
       showType = _props$showType === void 0 ? 2 : _props$showType;
   console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
 
-  var types = (_plurals$showType = plurals[showType]) !== null && _plurals$showType !== void 0 ? _plurals$showType : []; // 查询所有连线
+  var types = (_plurals = plurals[showType === false ? 2 : showType]) !== null && _plurals !== void 0 ? _plurals : []; // 查询所有连线
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();

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.10",
+  "version": "5.0.12",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.10/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }