@riil-frontend/component-topology 2.12.3 → 2.12.4

package/es/core/models/TopoApp.js

@@ -478,42 +478,54 @@ var TopoApp = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _enterEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      var topoDispatchers, editDispatchers, ciSetDoc, linkDynamicStyleDispatcher, iconManageDispatchers, topoTreeData;
+      var topoDispatchers, editDispatchers, iconManageDispatchers, ciSetDoc, linkDynamicStyleDispatcher;
       return _regeneratorRuntime.wrap(function _callee11$(_context11) {
         while (1) {
           switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
-              return this.view.switchToEditMode();
-
-            case 2:
               topoDispatchers = this.store.getModelDispatchers('topoMod');
               topoDispatchers.update({
                 viewState: 'edit'
               });
+
+              if (!this.options.beforeSwitchToEditMode) {
+                _context11.next = 5;
+                break;
+              }
+
+              _context11.next = 5;
+              return this.options.beforeSwitchToEditMode();
+
+            case 5:
+              _context11.next = 7;
+              return this.view.switchToEditMode();
+
+            case 7:
               editDispatchers = this.store.getModelDispatchers('topoCreateMod');
               editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
                 this.options.onSwitchToEditMode();
-              } // 每个节点的属性指标显示配置 TODO 每个节点都传了属性指标列表，待优化
+              } // 加载自定义图标
 
 
+              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
+              iconManageDispatchers.loadIcons(); // 每个节点的属性指标显示配置 TODO 每个节点都传了属性指标列表，待优化
+
               ciSetDoc = this.store.getModelState('topoBizMod').ciSetDoc;
               this.view.topoClient.saveMarkSetting({
                 tagAndTipSet: ciSetDoc
               }); // 刷新链路动态样式
 
               linkDynamicStyleDispatcher = this.store.getModelDispatchers('linkDynamicStyle');
-              linkDynamicStyleDispatcher.execute(); // 加载自定义图标
-
-              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
-              iconManageDispatchers.loadIcons(); // 加载关联拓扑图数据 FIXME 关联拓扑图时动态获取
-
-              topoTreeData = formatTreeDataSelect(this.store.getModelState('topoTreeMod').treeData, this.id);
-              this.view.topoClient.setTopoTreeData(topoTreeData);
-
-            case 15:
+              linkDynamicStyleDispatcher.execute(); // 加载关联拓扑图数据 FIXME 关联拓扑图时动态获取
+              // const topoTreeData = formatTreeDataSelect(
+              //   this.store.getModelState('topoTreeMod').treeData,
+              //   this.id
+              // );
+              // this.view.topoClient.setTopoTreeData(topoTreeData);
+
+            case 16:
             case "end":
               return _context11.stop();
           }

package/es/topoCenter/models/TopoCenter.js

@@ -17,6 +17,34 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
       loadData: getTopoData
     }, options, {
       usePermission: true,
+      beforeSwitchToEditMode: function () {
+        var _beforeSwitchToEditMode = _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('topoMod');
+                  topoDispatchers.update({
+                    topoData: null
+                  });
+                  _context.next = 4;
+                  return topoDispatchers.refreshTopo();
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function beforeSwitchToEditMode() {
+          return _beforeSwitchToEditMode.apply(this, arguments);
+        }
+
+        return beforeSwitchToEditMode;
+      }(),
       onSwitchToEditMode: function onSwitchToEditMode() {
         var editDispatchers = _this.store.getModelDispatchers('topoCreateMod');
 
@@ -49,22 +77,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
+    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(params) {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context.next = 3;
+              _context2.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
 
     function initData(_x) {
@@ -86,22 +114,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context2.next = 3;
+              _context3.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
 
     function exit() {

package/lib/core/models/TopoApp.js

@@ -505,42 +505,54 @@ var TopoApp = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _enterEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-      var topoDispatchers, editDispatchers, ciSetDoc, linkDynamicStyleDispatcher, iconManageDispatchers, topoTreeData;
+      var topoDispatchers, editDispatchers, iconManageDispatchers, ciSetDoc, linkDynamicStyleDispatcher;
       return _regenerator["default"].wrap(function _callee11$(_context11) {
         while (1) {
           switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
-              return this.view.switchToEditMode();
-
-            case 2:
               topoDispatchers = this.store.getModelDispatchers('topoMod');
               topoDispatchers.update({
                 viewState: 'edit'
               });
+
+              if (!this.options.beforeSwitchToEditMode) {
+                _context11.next = 5;
+                break;
+              }
+
+              _context11.next = 5;
+              return this.options.beforeSwitchToEditMode();
+
+            case 5:
+              _context11.next = 7;
+              return this.view.switchToEditMode();
+
+            case 7:
               editDispatchers = this.store.getModelDispatchers('topoCreateMod');
               editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
                 this.options.onSwitchToEditMode();
-              } // 每个节点的属性指标显示配置 TODO 每个节点都传了属性指标列表，待优化
+              } // 加载自定义图标
 
 
+              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
+              iconManageDispatchers.loadIcons(); // 每个节点的属性指标显示配置 TODO 每个节点都传了属性指标列表，待优化
+
               ciSetDoc = this.store.getModelState('topoBizMod').ciSetDoc;
               this.view.topoClient.saveMarkSetting({
                 tagAndTipSet: ciSetDoc
               }); // 刷新链路动态样式
 
               linkDynamicStyleDispatcher = this.store.getModelDispatchers('linkDynamicStyle');
-              linkDynamicStyleDispatcher.execute(); // 加载自定义图标
-
-              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
-              iconManageDispatchers.loadIcons(); // 加载关联拓扑图数据 FIXME 关联拓扑图时动态获取
-
-              topoTreeData = (0, _format.formatTreeDataSelect)(this.store.getModelState('topoTreeMod').treeData, this.id);
-              this.view.topoClient.setTopoTreeData(topoTreeData);
-
-            case 15:
+              linkDynamicStyleDispatcher.execute(); // 加载关联拓扑图数据 FIXME 关联拓扑图时动态获取
+              // const topoTreeData = formatTreeDataSelect(
+              //   this.store.getModelState('topoTreeMod').treeData,
+              //   this.id
+              // );
+              // this.view.topoClient.setTopoTreeData(topoTreeData);
+
+            case 16:
             case "end":
               return _context11.stop();
           }

package/lib/topoCenter/models/TopoCenter.js

@@ -31,6 +31,34 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
       loadData: _getTopoData["default"]
     }, options, {
       usePermission: true,
+      beforeSwitchToEditMode: function () {
+        var _beforeSwitchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var topoDispatchers;
+          return _regenerator["default"].wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  topoDispatchers = _this.store.getModelDispatchers('topoMod');
+                  topoDispatchers.update({
+                    topoData: null
+                  });
+                  _context.next = 4;
+                  return topoDispatchers.refreshTopo();
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function beforeSwitchToEditMode() {
+          return _beforeSwitchToEditMode.apply(this, arguments);
+        }
+
+        return beforeSwitchToEditMode;
+      }(),
       onSwitchToEditMode: function onSwitchToEditMode() {
         var editDispatchers = _this.store.getModelDispatchers('topoCreateMod');
 
@@ -63,22 +91,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(params) {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context.next = 3;
+              _context2.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
 
     function initData(_x) {
@@ -100,22 +128,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context2.next = 3;
+              _context3.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
 
     function exit() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.12.3",
+  "version": "2.12.4",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -105,6 +105,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.12.3/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.12.4/build/index.html",
   "gitHead": "e53aaebbab89c4155be21b26a1cbac09542ad400"
 }