@riil-frontend/component-topology 2.1.5-dev.3 → 2.1.9

package/es/core/models/TopoApp.js

@@ -10,7 +10,7 @@ import TopoGraphView from './TopoGraphView';
 import createStore from '../store/createStore';
 import buildProvider from '../components/buildProvider';
 import { formatTreeDataSelect } from '../../utils/format';
-import { getNodes as _getNodes, getEdges as _getEdges } from '../../utils/htElementUtils';
+import { getNodes as _getNodes, getEdges as _getEdges, getGroups as _getGroups } from '../../utils/htElementUtils';
 import Test from '../test/Test';
 import { formatGroups } from "../../utils/topoData";
 import { updateAttrsAndMetrics } from "./attrAndMetric";
@@ -165,6 +165,37 @@ var TopoApp = /*#__PURE__*/function () {
 
     return clear;
   }()
+  /**
+   * 获取数据
+   * @return {{nodes: [], lines: [], customNodes: [], customLines: []}}
+   */
+  ;
+
+  _proto.getData = function getData() {
+    return {
+      groups: this.getGroups(),
+      nodes: this.getNodes(),
+      lines: this.getLines(),
+      customNodes: [],
+      customLines: []
+    };
+  };
+
+  _proto.getGroups = function getGroups() {
+    return _getGroups(this.getDataModel());
+  };
+
+  _proto.getNodes = function getNodes() {
+    return _getNodes(this.getDataModel());
+  };
+
+  _proto.getLines = function getLines() {
+    return this.getEdges();
+  };
+
+  _proto.getEdges = function getEdges() {
+    return _getEdges(this.getDataModel());
+  }
   /**
    * 全量更新数据
    *
@@ -172,10 +203,10 @@ var TopoApp = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.updateData =
+  _proto.updateElements =
   /*#__PURE__*/
   function () {
-    var _updateData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+    var _updateElements = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
       var _data$groups2, groups, _data$nodes2, nodes, links, lines;
 
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -185,9 +216,19 @@ var TopoApp = /*#__PURE__*/function () {
               _data$groups2 = data.groups, groups = _data$groups2 === void 0 ? [] : _data$groups2, _data$nodes2 = data.nodes, nodes = _data$nodes2 === void 0 ? [] : _data$nodes2, links = data.links, lines = data.lines;
               this.view.topoClient.updateElements({
                 groups: formatGroups(groups),
-                nodes: nodes,
-                links: links || lines || []
-              });
+                nodes: nodes.map(function (node) {
+                  return _extends({}, node, {
+                    type: 'node',
+                    dtype: 'device'
+                  });
+                }),
+                links: (links || lines || []).map(function (link) {
+                  return _extends({}, link, {
+                    type: 'link',
+                    dtype: 'link'
+                  });
+                })
+              }); // TODO 更新store，触发属性、指标模型加载，更新指标
 
             case 2:
             case "end":
@@ -197,45 +238,93 @@ var TopoApp = /*#__PURE__*/function () {
       }, _callee4, this);
     }));
 
-    function updateData(_x3) {
+    function updateElements(_x3) {
+      return _updateElements.apply(this, arguments);
+    }
+
+    return updateElements;
+  }()
+  /**
+   * 全量更新数据
+   *
+   * @param data {{groups: [], nodes: [], lines: []}}
+   * @deprecated 使用 updateElements 替换
+   */
+  ;
+
+  _proto.updateData =
+  /*#__PURE__*/
+  function () {
+    var _updateData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              this.updateElements(data);
+
+            case 1:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5, this);
+    }));
+
+    function updateData(_x4) {
       return _updateData.apply(this, arguments);
     }
 
     return updateData;
-  }()
+  }();
+
+  _proto.replaceNode = function replaceNode(id, newNode) {
+    this.view.replaceNode(id, newNode); // TODO 更新store，触发属性、指标模型加载，更新指标
+  }
   /**
-   * 获取数据
-   * @return {{nodes: [], lines: [], customNodes: [], customLines: []}}
+   * 追加元素
+   *
+   * @param elements
    */
+  // addElements({nodes: [], lines: []})
   ;
 
-  _proto.getData = function getData() {
-    return {
-      nodes: this.getNodes(),
-      lines: this.getLines(),
-      customNodes: [],
-      customLines: []
-    };
-  };
+  _proto.addElements =
+  /*#__PURE__*/
+  function () {
+    var _addElements = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(elements) {
+      var data;
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              data = {
+                groups: [].concat(this.getGroups(), elements.groups || []),
+                nodes: [].concat(this.getNodes(), elements.nodes || []),
+                lines: [].concat(this.getLines(), elements.lines || [])
+              };
+              this.updateElements(data); // TODO 更新store，触发属性、指标模型加载，更新指标
 
-  _proto.getNodes = function getNodes() {
-    return _getNodes(this.getDataModel());
-  };
+            case 2:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6, this);
+    }));
 
-  _proto.getLines = function getLines() {
-    return this.getEdges();
-  };
+    function addElements(_x5) {
+      return _addElements.apply(this, arguments);
+    }
 
-  _proto.getEdges = function getEdges() {
-    return _getEdges(this.getDataModel());
-  };
+    return addElements;
+  }();
 
   _proto.open = /*#__PURE__*/function () {
-    var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id, mode) {
+    var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id, mode) {
       var lastId;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               rlog.info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
 
@@ -249,13 +338,13 @@ var TopoApp = /*#__PURE__*/function () {
 
             case 4:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee7, this);
     }));
 
-    function open(_x4, _x5) {
+    function open(_x6, _x7) {
       return _open.apply(this, arguments);
     }
 
@@ -263,19 +352,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.close = /*#__PURE__*/function () {
-    var _close = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+    var _close = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               rlog.info('关闭拓扑图', this.id);
 
               if (this.id) {
-                _context6.next = 3;
+                _context8.next = 3;
                 break;
               }
 
-              return _context6.abrupt("return");
+              return _context8.abrupt("return");
 
             case 3:
               this.alarm.close();
@@ -283,10 +372,10 @@ var TopoApp = /*#__PURE__*/function () {
 
             case 5:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
         }
-      }, _callee6, this);
+      }, _callee8, this);
     }));
 
     function close() {
@@ -297,16 +386,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.refresh = /*#__PURE__*/function () {
-    var _refresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+    var _refresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
         }
-      }, _callee7);
+      }, _callee9);
     }));
 
     function refresh() {
@@ -338,19 +427,19 @@ var TopoApp = /*#__PURE__*/function () {
   };
 
   _proto.openViewMode = /*#__PURE__*/function () {
-    var _openViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(id) {
-      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+    var _openViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(id) {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
         }
-      }, _callee8);
+      }, _callee10);
     }));
 
-    function openViewMode(_x6) {
+    function openViewMode(_x8) {
       return _openViewMode.apply(this, arguments);
     }
 
@@ -364,13 +453,16 @@ var TopoApp = /*#__PURE__*/function () {
   _proto.enterEditMode =
   /*#__PURE__*/
   function () {
-    var _enterEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+    var _enterEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
       var topoDispatchers, editDispatchers, ciSetDoc, linkDynamicStyleDispatcher, iconManageDispatchers, topoTreeData;
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
-              this.view.topoClient.enterEditMode();
+              _context11.next = 2;
+              return this.view.switchToEditMode();
+
+            case 2:
               topoDispatchers = this.store.getModelDispatchers('topoMod');
               topoDispatchers.update({
                 viewState: 'edit'
@@ -397,12 +489,12 @@ var TopoApp = /*#__PURE__*/function () {
               topoTreeData = formatTreeDataSelect(this.store.getModelState('topoTreeMod').treeData, this.id);
               this.view.topoClient.setTopoTreeData(topoTreeData);
 
-            case 14:
+            case 15:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
         }
-      }, _callee9, this);
+      }, _callee11, this);
     }));
 
     function enterEditMode() {
@@ -413,13 +505,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.exitEditMode = /*#__PURE__*/function () {
-    var _exitEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+    var _exitEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
       var editDispatchers;
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
-              this.view.topoClient.exitEditMode();
+              _context12.next = 2;
+              return this.view.switchToViewMode();
+
+            case 2:
               editDispatchers = this.store.getModelDispatchers('topoCreateMod');
               editDispatchers.switchToViewMode(this.id);
 
@@ -427,12 +522,12 @@ var TopoApp = /*#__PURE__*/function () {
                 this.options.onSwitchToViewMode();
               }
 
-            case 4:
+            case 5:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
         }
-      }, _callee10, this);
+      }, _callee12, this);
     }));
 
     function exitEditMode() {
@@ -443,19 +538,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.triggerSaveEvent = /*#__PURE__*/function () {
-    var _triggerSaveEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+    var _triggerSaveEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
               this.view.topoClient.saveExternal();
 
             case 1:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
         }
-      }, _callee11, this);
+      }, _callee13, this);
     }));
 
     function triggerSaveEvent() {
@@ -466,19 +561,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.save = /*#__PURE__*/function () {
-    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
+      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
               this.triggerSaveEvent();
 
             case 1:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
         }
-      }, _callee12, this);
+      }, _callee14, this);
     }));
 
     function save() {
@@ -489,19 +584,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.exportImage = /*#__PURE__*/function () {
-    var _exportImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+    var _exportImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) {
-          switch (_context13.prev = _context13.next) {
+          switch (_context15.prev = _context15.next) {
             case 0:
               this.view.topoClient.exportImage();
 
             case 1:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
         }
-      }, _callee13, this);
+      }, _callee15, this);
     }));
 
     function exportImage() {
@@ -513,16 +608,16 @@ var TopoApp = /*#__PURE__*/function () {
 
   _proto.loadAlarm = function loadAlarm(alarmList) {
     this.alarms = alarmList;
-    this.view.topoClient.loadAlarm(alarmList);
+    this.view.loadAlarm(alarmList);
   };
 
   _proto.loadAttrsAndMetrics = /*#__PURE__*/function () {
-    var _loadAttrsAndMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(data) {
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+    var _loadAttrsAndMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(data) {
+      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
         while (1) {
-          switch (_context14.prev = _context14.next) {
+          switch (_context16.prev = _context16.next) {
             case 0:
-              _context14.next = 2;
+              _context16.next = 2;
               return DictCache.init();
 
             case 2:
@@ -533,13 +628,13 @@ var TopoApp = /*#__PURE__*/function () {
 
             case 3:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
         }
-      }, _callee14, this);
+      }, _callee16, this);
     }));
 
-    function loadAttrsAndMetrics(_x7) {
+    function loadAttrsAndMetrics(_x9) {
       return _loadAttrsAndMetrics.apply(this, arguments);
     }
 
@@ -547,16 +642,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.switchToViewMode = /*#__PURE__*/function () {
-    var _switchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
-      return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+    var _switchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17() {
+      return _regeneratorRuntime.wrap(function _callee17$(_context17) {
         while (1) {
-          switch (_context15.prev = _context15.next) {
+          switch (_context17.prev = _context17.next) {
             case 0:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
         }
-      }, _callee15);
+      }, _callee17);
     }));
 
     function switchToViewMode() {
@@ -567,16 +662,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.switchToEditMode = /*#__PURE__*/function () {
-    var _switchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
-      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+    var _switchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
+      return _regeneratorRuntime.wrap(function _callee18$(_context18) {
         while (1) {
-          switch (_context16.prev = _context16.next) {
+          switch (_context18.prev = _context18.next) {
             case 0:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
         }
-      }, _callee16);
+      }, _callee18);
     }));
 
     function switchToEditMode() {

package/es/core/models/TopoGraphView.js

@@ -34,11 +34,14 @@ var TopoGraphView = /*#__PURE__*/function () {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              this.topoClient.exitEditMode();
+
+            case 1:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee);
+      }, _callee, this);
     }));
 
     function switchToViewMode() {
@@ -54,11 +57,14 @@ var TopoGraphView = /*#__PURE__*/function () {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              this.topoClient.enterEditMode();
+
+            case 1:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2);
+      }, _callee2, this);
     }));
 
     function switchToEditMode() {
@@ -111,12 +117,11 @@ var TopoGraphView = /*#__PURE__*/function () {
     this.topoClient.loadAlarm(alarms);
   };
 
-  _proto.setElementAlarm = function setElementAlarm(id, alarmLevel) {
-    this.loadAlarm([{
+  _proto.replaceNode = function replaceNode(id, newNode) {
+    this.topoClient.emitEvent('topo_replace_node', {
       id: id,
-      level: alarmLevel // 0为恢复
-
-    }]);
+      data: newNode
+    });
   };
 
   return TopoGraphView;

package/es/core/models/cache/CiTyeCache.js

@@ -19,13 +19,15 @@ var CiTyeCache = /*#__PURE__*/function () {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return this.load(ciTypeIds);
+              try {// await this.load(ciTypeIds);
+                // TODO 等待接口通
+              } catch (e) {
+                console.error('查询Ci模型异常');
+              }
 
-            case 2:
               return _context.abrupt("return", this.cache);
 
-            case 3:
+            case 2:
             case "end":
               return _context.stop();
           }

package/es/models/topoBizMod.js

@@ -50,7 +50,7 @@ export default function (engine) {
           var _this = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-            var ciTypes, ciTypesDoc, ciDoc, bindingCiSet, allMetrics, allAttrs, newCiDoc, allCiSet, metrics, attrs;
+            var ciTypes, ciTypesDoc, ciDoc, bindingCiSet, ciTypeMap, allMetrics, allAttrs, newCiDoc, allCiSet, metrics, attrs;
             return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -60,7 +60,7 @@ export default function (engine) {
                       resAndMetrics: conditions
                     });
 
-                    ciTypes = conditions.ciTypes, ciTypesDoc = conditions.ciTypesDoc, ciDoc = conditions.ciDoc, bindingCiSet = conditions.bindingCiSet, allMetrics = conditions.allMetrics, allAttrs = conditions.allAttrs;
+                    ciTypes = conditions.ciTypes, ciTypesDoc = conditions.ciTypesDoc, ciDoc = conditions.ciDoc, bindingCiSet = conditions.bindingCiSet, ciTypeMap = conditions.ciTypeMap, allMetrics = conditions.allMetrics, allAttrs = conditions.allAttrs;
                     newCiDoc = _extends({}, ciDoc);
                     allCiSet = {}; // const metrics = await topoServer.getBatchCiMetric({ ciTypes });
 
@@ -69,6 +69,10 @@ export default function (engine) {
                     attrs = allAttrs;
                     rlog.debug('topoBizMod.combBatchCiInfo getBatchCiInfo', conditions, metrics, attrs);
                     ciTypes.forEach(function (item, index) {
+                      if (!ciTypeMap[item]) {
+                        return;
+                      }
+
                       var attrObj = findItem(attrs, 'code', item);
                       var metricObj = findItem(metrics, 'code', item); // rlog.debug('getBatchCiInfo-result', attrObj, metricObj);