@riil-frontend/component-topology 0.2.2 → 0.2.3

package/es/core/models/TopoApp.js

@@ -37,12 +37,12 @@ var TopoApp = /*#__PURE__*/function () {
       setRequest(options.request);
     }
 
-    this.init(options);
+    this.initialize(options);
   }
 
   var _proto = TopoApp.prototype;
 
-  _proto.init = function init(options) {
+  _proto.initialize = function initialize(options) {
     // 初始化store ============================
     this.initStore(); // 初始化核心 ============================
 
@@ -56,23 +56,21 @@ var TopoApp = /*#__PURE__*/function () {
   }
   /**
    * TODO 移除
-   * @param params
-   * @return {Promise<void>}
    */
   ;
 
-  _proto.initData =
+  _proto.exit =
   /*#__PURE__*/
   function () {
-    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
+    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var topoDispatchers;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoCenter');
+              topoDispatchers = this.store.getModelDispatchers('topoMod');
               _context.next = 3;
-              return topoDispatchers.initData(params);
+              return topoDispatchers.exit();
 
             case 3:
             case "end":
@@ -82,38 +80,6 @@ var TopoApp = /*#__PURE__*/function () {
       }, _callee, this);
     }));
 
-    function initData(_x) {
-      return _initData.apply(this, arguments);
-    }
-
-    return initData;
-  }()
-  /**
-   * TODO 移除
-   */
-  ;
-
-  _proto.exit =
-  /*#__PURE__*/
-  function () {
-    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              topoDispatchers = this.store.getModelDispatchers('topoMod');
-              _context2.next = 3;
-              return topoDispatchers.exit();
-
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2, this);
-    }));
-
     function exit() {
       return _exit.apply(this, arguments);
     }
@@ -122,27 +88,27 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.load = /*#__PURE__*/function () {
-    var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
+    var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoMod');
-              _context3.next = 3;
+              _context2.next = 3;
               return topoDispatchers.openTopoPage({
-                id: id
+                data: data
               });
 
             case 3:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee2, this);
     }));
 
-    function load(_x2) {
+    function load(_x) {
       return _load.apply(this, arguments);
     }
 
@@ -150,16 +116,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.clear = /*#__PURE__*/function () {
-    var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+    var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
         }
-      }, _callee4);
+      }, _callee3);
     }));
 
     function clear() {
@@ -170,11 +136,11 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.open = /*#__PURE__*/function () {
-    var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id, mode) {
+    var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, mode) {
       var lastId;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               rlog.info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
 
@@ -188,13 +154,13 @@ var TopoApp = /*#__PURE__*/function () {
 
             case 4:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee4, this);
     }));
 
-    function open(_x3, _x4) {
+    function open(_x2, _x3) {
       return _open.apply(this, arguments);
     }
 
@@ -202,19 +168,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 _callee5() {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               rlog.info('关闭拓扑图', this.id);
 
               if (this.id) {
-                _context6.next = 3;
+                _context5.next = 3;
                 break;
               }
 
-              return _context6.abrupt("return");
+              return _context5.abrupt("return");
 
             case 3:
               this.alarm.close();
@@ -222,10 +188,10 @@ var TopoApp = /*#__PURE__*/function () {
 
             case 5:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
         }
-      }, _callee6, this);
+      }, _callee5, this);
     }));
 
     function close() {
@@ -236,16 +202,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 _callee6() {
+      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
         }
-      }, _callee7);
+      }, _callee6);
     }));
 
     function refresh() {
@@ -277,19 +243,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 _callee7(id) {
+      return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
         }
-      }, _callee8);
+      }, _callee7);
     }));
 
-    function openViewMode(_x5) {
+    function openViewMode(_x4) {
       return _openViewMode.apply(this, arguments);
     }
 
@@ -303,11 +269,11 @@ var TopoApp = /*#__PURE__*/function () {
   _proto.enterEditMode =
   /*#__PURE__*/
   function () {
-    var _enterEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+    var _enterEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
       var editDispatchers, ciSetDoc, linkDynamicStyleDispatcher, iconManageDispatchers, topoTreeData;
-      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               this.view.topoClient.enterEditMode();
               editDispatchers = this.store.getModelDispatchers('topoCreateMod');
@@ -329,10 +295,10 @@ var TopoApp = /*#__PURE__*/function () {
 
             case 11:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
         }
-      }, _callee9, this);
+      }, _callee8, this);
     }));
 
     function enterEditMode() {
@@ -343,19 +309,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.exitEditMode = /*#__PURE__*/function () {
-    var _exitEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+    var _exitEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               this.view.topoClient.exitEditMode();
 
             case 1:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
         }
-      }, _callee10, this);
+      }, _callee9, this);
     }));
 
     function exitEditMode() {
@@ -366,19 +332,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.save = /*#__PURE__*/function () {
-    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context11.prev = _context11.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
               this.view.topoClient.saveExternal();
 
             case 1:
             case "end":
-              return _context11.stop();
+              return _context10.stop();
           }
         }
-      }, _callee11, this);
+      }, _callee10, this);
     }));
 
     function save() {
@@ -389,19 +355,19 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.exportImage = /*#__PURE__*/function () {
-    var _exportImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+    var _exportImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+      return _regeneratorRuntime.wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
               this.view.topoClient.exportImage();
 
             case 1:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
         }
-      }, _callee12, this);
+      }, _callee11, this);
     }));
 
     function exportImage() {
@@ -412,16 +378,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.switchToViewMode = /*#__PURE__*/function () {
-    var _switchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+    var _switchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+      return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
-          switch (_context13.prev = _context13.next) {
+          switch (_context12.prev = _context12.next) {
             case 0:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
         }
-      }, _callee13);
+      }, _callee12);
     }));
 
     function switchToViewMode() {
@@ -432,16 +398,16 @@ var TopoApp = /*#__PURE__*/function () {
   }();
 
   _proto.switchToEditMode = /*#__PURE__*/function () {
-    var _switchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+    var _switchToEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+      return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context14.prev = _context14.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
         }
-      }, _callee14);
+      }, _callee13);
     }));
 
     function switchToEditMode() {

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

@@ -0,0 +1,79 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { dictFormat } from '@riil-frontend/utils';
+import * as modelService from '@riil-frontend/component-topology-utils/es/services/model';
+/**
+ * 数据字典缓存
+ */
+
+var DictCache = /*#__PURE__*/function () {
+  function DictCache() {
+    this.dists = void 0;
+    this.dictObject = void 0;
+  }
+
+  var _proto = DictCache.prototype;
+
+  _proto.init = /*#__PURE__*/function () {
+    var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var distsStr, dicts;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!this.dists) {
+                _context.next = 2;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 2:
+              distsStr = sessionStorage.getItem('dists');
+
+              if (!distsStr) {
+                _context.next = 7;
+                break;
+              }
+
+              dicts = JSON.parse(distsStr);
+              _context.next = 10;
+              break;
+
+            case 7:
+              _context.next = 9;
+              return modelService.queryDicts()["catch"](function (e) {
+                console.error('初始化数据字典异常', e);
+                return [];
+              });
+
+            case 9:
+              dicts = _context.sent;
+
+            case 10:
+              this.dists = dicts;
+              this.dictObject = dictFormat(dicts);
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function init() {
+      return _init.apply(this, arguments);
+    }
+
+    return init;
+  }();
+
+  _proto.getDictObject = function getDictObject() {
+    return this.dictObject;
+  };
+
+  return DictCache;
+}();
+
+export default new DictCache();

package/es/core/models/plugins/resourceWebControllUrl.js

@@ -1,7 +1,7 @@
+import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { Message } from '@alifd/next';
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 export default function (topo) {
   var resourceUrlMap = {};
@@ -142,7 +142,8 @@ export default function (topo) {
                 break;
               }
 
-              Message.success('链接设置成功');
+              _Message.success('链接设置成功');
+
               closeSettingDialog();
               return _context3.abrupt("return");
 
@@ -155,7 +156,8 @@ export default function (topo) {
               return topoService.resourceWebUrl.save(id, url || null);
 
             case 8:
-              Message.success('链接设置成功');
+              _Message.success('链接设置成功');
+
               resourceUrlMap[id] = url;
               closeSettingDialog();
               _context3.next = 17;
@@ -164,7 +166,9 @@ export default function (topo) {
             case 13:
               _context3.prev = 13;
               _context3.t0 = _context3["catch"](5);
-              Message.error('链接设置失败');
+
+              _Message.error('链接设置失败');
+
               updateStore({
                 saving: false
               });

package/es/core/utils/showMessage.js

@@ -1,5 +1,5 @@
+import _Message from "@alifd/next/es/message";
 import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
-import { Message } from '@alifd/next';
 var MSG_TYPES = {
   info: 'notice',
   success: 'success',
@@ -13,7 +13,7 @@ export default function showMessage(type, title, content) {
     msgType = MSG_TYPES.info;
   }
 
-  Message.show({
+  _Message.show({
     type: msgType,
     title: title,
     content: content

package/es/createTopo.js

@@ -1,39 +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-utils/es/services/topo';
 import { createTopoApp } from './core/models/createTopoApp';
 import createMenuCommands from './contextmenu/createMenuCommands';
+import getTopoData from "./topoCenter/getTopoData";
 export function createTopo(options) {
   var topoApp = createTopoApp(_extends({
-    loadData: function () {
-      var _loadData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
-        var data;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return topoService.getTopoData(id);
-
-              case 2:
-                data = _context.sent;
-                return _context.abrupt("return", data);
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function loadData(_x) {
-        return _loadData.apply(this, arguments);
-      }
-
-      return loadData;
-    }()
+    loadData: getTopoData
   }, options));
   var menuCommands = createMenuCommands(topoApp);
   topoApp.view.contextMenu.registerCommands(menuCommands);

package/es/hooks/usePolling.js

@@ -7,14 +7,14 @@ import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import { metricValueFormat } from '@riil-frontend/utils';
 import { findItem } from '../utils/topoData';
+import DictCache from "../core/models/cache/DictCache";
 /**
  * 轮询获取指标hooks
  * @param {*} props
  */
 
 var usePolling = function usePolling(props) {
-  var topoApp = props.topoApp,
-      dictObj = props.dictObj;
+  var topoApp = props.topoApp;
   var store = topoApp.store;
 
   var _store$useModel = store.useModel('topoBizMod'),
@@ -71,12 +71,16 @@ var usePolling = function usePolling(props) {
 
             case 2:
               _context.next = 4;
-              return bizDispatchers.getMetricsByIds();
+              return DictCache.init();
 
             case 4:
+              _context.next = 6;
+              return bizDispatchers.getMetricsByIds();
+
+            case 6:
               return _context.abrupt("return", _context.sent);
 
-            case 5:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -179,7 +183,7 @@ var usePolling = function usePolling(props) {
       var result = metricValueFormat({
         value: item.val,
         dataType: metricInfo.dataType,
-        dict: dictObj,
+        dict: DictCache.getDictObject(),
         unit: metricInfo.unit,
         code: metricInfo.code
       });