@riil-frontend/component-topology 12.1.0-dev.3 → 12.1.0-dev.4

package/es/core/models/TopoApp.js

@@ -10,7 +10,7 @@ import Alarm from "./Alarm";
 import TopoGraphView from "./TopoGraphView";
 import createStore from "../store/createStore";
 import buildProvider from "../components/buildProvider";
-import { getEdgeDatas, getGroupDatas, getNodeData, getNodeDatas, getNodes as _getNodes } from "../../utils/htElementUtils";
+import { getEdgeDatas, getGroupDatas, getNodeData, getNodeDatas, getNodes } from "../../utils/htElementUtils";
 import Test from "../test/Test";
 import { formatGroups } from "../../utils/topoData";
 import DictCache from "./cache/DictCache";
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.1.0-dev.3" === 'string' ? "12.1.0-dev.3" : null;
+var version = typeof "12.1.0-dev.4" === 'string' ? "12.1.0-dev.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -188,38 +188,29 @@ var Topo = /*#__PURE__*/function () {
 
   _proto.getData = function getData() {
     return {
-      groups: this.getGroups(),
-      nodes: this.getNodes(),
-      lines: this.getLines(),
+      groups: getGroupDatas(this.getDataModel()),
+      nodes: getNodes(this.getDataModel()).filter(function (node) {
+        return !!node.getTag();
+      }).map(getNodeData),
       customNodes: getNodeDatas(this.getDataModel()).filter(function (item) {
         return !item.id;
       }),
-      customLines: this.getEdges().filter(function (item) {
+      lines: getEdgeDatas(this.getDataModel()).filter(function (item) {
+        return !!item.id;
+      }),
+      customLines: getEdgeDatas(this.getDataModel()).filter(function (item) {
         return !item.id;
       })
     };
-  };
-
-  _proto.getGroups = function getGroups() {
-    return getGroupDatas(this.getDataModel());
-  };
-
-  _proto.getNodes = function getNodes() {
-    var nodes = _getNodes(this.getDataModel()).filter(function (node) {
-      return !!node.getTag();
-    });
-
-    return nodes.map(getNodeData);
-  };
+  }
+  /**
+   * @deprecated 待移除。uicbb有使用
+   * @returns 
+   */
+  ;
 
   _proto.getLines = function getLines() {
-    return this.getEdges().filter(function (item) {
-      return !!item.id;
-    });
-  };
-
-  _proto.getEdges = function getEdges() {
-    return getEdgeDatas(this.getDataModel());
+    return this.getData().lines;
   }
   /**
    * 全量更新数据
@@ -278,18 +269,19 @@ var Topo = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _addElements = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(elements) {
-      var data;
+      var prevData, data;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            prevData = this.getData();
             data = {
-              groups: [].concat(this.getGroups(), elements.groups || []),
-              nodes: [].concat(this.getNodes(), elements.nodes || []),
-              lines: [].concat(this.getLines(), elements.lines || [])
+              groups: [].concat(prevData.groups, elements.groups || []),
+              nodes: [].concat(prevData.nodes, elements.nodes || []),
+              lines: [].concat(prevData.lines, elements.lines || [])
             };
             this.updateElements(data); // TODO 更新store，触发属性、指标模型加载，更新指标
 
-          case 2:
+          case 3:
           case "end":
             return _context5.stop();
         }

package/es/utils/htElementUtils.js

@@ -133,6 +133,12 @@ export function isEdgeGroup(edge) {
 export function isEdgeGroupAgent(edge) {
   return isEdgeGroup(edge) && isEdgeVisible(edge);
 }
+/**
+ * TODO
+ * @param {*} edge 
+ * @returns 
+ */
+
 export function isEdgeGroupExpanded(edge) {
   return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
 }
@@ -218,7 +224,9 @@ export function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }
 export function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).map(function (element) {
+  return getEdges(dataModel).filter(function (edge) {
+    return !isEdgeGroup(edge);
+  }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return _extends({}, element.getAttrObject(), {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.1.0-dev.3" === 'string' ? "12.1.0-dev.3" : null;
+var version = typeof "12.1.0-dev.4" === 'string' ? "12.1.0-dev.4" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -218,37 +218,29 @@ var Topo = /*#__PURE__*/function () {
 
   _proto.getData = function getData() {
     return {
-      groups: this.getGroups(),
-      nodes: this.getNodes(),
-      lines: this.getLines(),
+      groups: (0, _htElementUtils.getGroupDatas)(this.getDataModel()),
+      nodes: (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
+        return !!node.getTag();
+      }).map(_htElementUtils.getNodeData),
       customNodes: (0, _htElementUtils.getNodeDatas)(this.getDataModel()).filter(function (item) {
         return !item.id;
       }),
-      customLines: this.getEdges().filter(function (item) {
+      lines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
+        return !!item.id;
+      }),
+      customLines: (0, _htElementUtils.getEdgeDatas)(this.getDataModel()).filter(function (item) {
         return !item.id;
       })
     };
-  };
-
-  _proto.getGroups = function getGroups() {
-    return (0, _htElementUtils.getGroupDatas)(this.getDataModel());
-  };
-
-  _proto.getNodes = function getNodes() {
-    var nodes = (0, _htElementUtils.getNodes)(this.getDataModel()).filter(function (node) {
-      return !!node.getTag();
-    });
-    return nodes.map(_htElementUtils.getNodeData);
-  };
+  }
+  /**
+   * @deprecated 待移除。uicbb有使用
+   * @returns 
+   */
+  ;
 
   _proto.getLines = function getLines() {
-    return this.getEdges().filter(function (item) {
-      return !!item.id;
-    });
-  };
-
-  _proto.getEdges = function getEdges() {
-    return (0, _htElementUtils.getEdgeDatas)(this.getDataModel());
+    return this.getData().lines;
   }
   /**
    * 全量更新数据
@@ -307,18 +299,19 @@ var Topo = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _addElements = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(elements) {
-      var data;
+      var prevData, data;
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            prevData = this.getData();
             data = {
-              groups: [].concat(this.getGroups(), elements.groups || []),
-              nodes: [].concat(this.getNodes(), elements.nodes || []),
-              lines: [].concat(this.getLines(), elements.lines || [])
+              groups: [].concat(prevData.groups, elements.groups || []),
+              nodes: [].concat(prevData.nodes, elements.nodes || []),
+              lines: [].concat(prevData.lines, elements.lines || [])
             };
             this.updateElements(data); // TODO 更新store，触发属性、指标模型加载，更新指标
 
-          case 2:
+          case 3:
           case "end":
             return _context5.stop();
         }

package/lib/utils/htElementUtils.js

@@ -194,6 +194,12 @@ function isEdgeGroup(edge) {
 function isEdgeGroupAgent(edge) {
   return isEdgeGroup(edge) && isEdgeVisible(edge);
 }
+/**
+ * TODO
+ * @param {*} edge 
+ * @returns 
+ */
+
 
 function isEdgeGroupExpanded(edge) {
   return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
@@ -287,7 +293,9 @@ function getEdgeGroupAgents(dataModel) {
 }
 
 function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).map(function (element) {
+  return getEdges(dataModel).filter(function (edge) {
+    return !isEdgeGroup(edge);
+  }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return (0, _extends3["default"])({}, element.getAttrObject(), {

package/package.json

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