@riil-frontend/component-topology 2.15.43 → 2.15.46

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.43" === 'string' ? "2.15.43" : null;
+var version = typeof "2.15.46" === 'string' ? "2.15.46" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -103,6 +103,10 @@ var Topo = /*#__PURE__*/function () {
 
     this.test = new _Test["default"](this);
     this.uid = _topoFactory["default"].add(options.name, this);
+  };
+
+  _proto.destroy = function destroy() {
+    _topoFactory["default"].remove(this.uid);
   }
   /**
    * TODO 移除
@@ -123,7 +127,7 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              _topoFactory["default"].remove(this.uid);
+              this.destroy();
 
             case 4:
             case "end":
@@ -572,7 +576,7 @@ var Topo = /*#__PURE__*/function () {
 
             case 7:
               (0, _edgeUtil.updateEdgeExpanded)(this);
-              editDispatchers = this.store.getModelDispatchers('topoCreateMod');
+              editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
@@ -580,7 +584,7 @@ var Topo = /*#__PURE__*/function () {
               } // 加载自定义上传的图标
 
 
-              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
+              iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
             case 13:
@@ -609,7 +613,7 @@ var Topo = /*#__PURE__*/function () {
               return this.view.switchToViewMode();
 
             case 2:
-              editDispatchers = this.store.getModelDispatchers('topoCreateMod');
+              editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToViewMode(this.id);
 
               if (this.options.onSwitchToViewMode) {

package/lib/core/services/background.js

@@ -117,6 +117,31 @@ var _default = {
   /**
    * 背景图导出
    */
-  EXPORT_BG_ZIP: EXPORT_BG_ZIP
+  EXPORT_BG_ZIP: EXPORT_BG_ZIP,
+
+  /**
+   * 校验背景图是否被占用
+   * @param {*} params id
+   */
+  canDeleteBackground: function canDeleteBackground(id) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return (0, _request.getRequest)()("/topo/v1/api/background/" + id);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }))();
+  }
 };
 exports["default"] = _default;

package/lib/core/store/coreModels.js

@@ -5,51 +5,60 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _topoMod = _interopRequireDefault(require("./models/topoMod"));
+var _topoMod = _interopRequireDefault(require("../../models/topoMod"));
 
-var _iconManage = _interopRequireDefault(require("./models/iconManage"));
+var _customIcon = _interopRequireDefault(require("../../models/customIcon"));
 
-var _ciModel = _interopRequireDefault(require("./models/ciModel"));
+var _ciModel = _interopRequireDefault(require("../../models/ciModel"));
 
-var _functionAuth = _interopRequireDefault(require("./models/functionAuth"));
+var _selection = _interopRequireDefault(require("../../models/selection"));
 
-var _linkDynamicStyle = _interopRequireDefault(require("./models/linkDynamicStyle"));
+var _topoBizMod = _interopRequireDefault(require("../../models/topoBizMod"));
 
-var _linkDynamicStyleConfig = _interopRequireDefault(require("./models/linkDynamicStyleConfig"));
+var _topoConfig = _interopRequireDefault(require("../../models/topoConfig"));
 
-var _permissionSetting = _interopRequireDefault(require("./models/permissionSetting"));
+var _topoEdit = _interopRequireDefault(require("../../models/topoEdit"));
 
-var _resourceWebControllUrlSetting = _interopRequireDefault(require("./models/resourceWebControllUrlSetting"));
+var _topoView = _interopRequireDefault(require("../../models/topoView"));
 
-var _topoBizMod = _interopRequireDefault(require("./models/topoBizMod"));
+var _topoAlarm = _interopRequireDefault(require("../../models/topoAlarm"));
 
-var _topoCenter = _interopRequireDefault(require("./models/topoCenter"));
+var _topoGraphView = _interopRequireDefault(require("../../models/topoGraphView"));
 
-var _topoCreate = _interopRequireDefault(require("./models/topoCreate"));
+var _background = _interopRequireDefault(require("../../models/background"));
 
-var _topoCreateMod = _interopRequireDefault(require("./models/topoCreateMod"));
+var _displayConfig = _interopRequireDefault(require("../../models/displayConfig"));
 
-var _topoEdit = _interopRequireDefault(require("./models/topoEdit"));
+var _resourceWebControllUrlSetting = _interopRequireDefault(require("../../models/resourceWebControllUrlSetting"));
 
-var _topoTreeMod = _interopRequireDefault(require("./models/topoTreeMod"));
+var _topoBaseInfoOverview = _interopRequireDefault(require("../../models/topoBaseInfoOverview"));
 
-var _topoView = _interopRequireDefault(require("./models/topoView"));
+var _topoCenter = _interopRequireDefault(require("../../topoCenter/store/topoCenter"));
+
+var _functionAuth = _interopRequireDefault(require("../../topoCenter/store/functionAuth"));
+
+var _topoLinkMod = _interopRequireDefault(require("../../topoCenter/store/topoLinkMod"));
+
+var _topoTreeMod = _interopRequireDefault(require("../../topoCenter/store/topoTreeMod"));
 
 var _default = {
   topoMod: _topoMod["default"],
-  iconManage: _iconManage["default"],
-  ciModel: _ciModel["default"],
-  functionAuth: _functionAuth["default"],
-  linkDynamicStyle: _linkDynamicStyle["default"],
-  linkDynamicStyleConfig: _linkDynamicStyleConfig["default"],
-  permissionSetting: _permissionSetting["default"],
+  customIcon: _customIcon["default"],
+  selection: _selection["default"],
   resourceWebControllUrlSetting: _resourceWebControllUrlSetting["default"],
   topoBizMod: _topoBizMod["default"],
-  topoCenter: _topoCenter["default"],
-  topoCreate: _topoCreate["default"],
-  topoCreateMod: _topoCreateMod["default"],
+  topoConfig: _topoConfig["default"],
+  topoLinkMod: _topoLinkMod["default"],
+  topoView: _topoView["default"],
+  background: _background["default"],
+  topoGraphView: _topoGraphView["default"],
+  topoAlarm: _topoAlarm["default"],
+  displayConfig: _displayConfig["default"],
+  topoBaseInfoOverview: _topoBaseInfoOverview["default"],
+  ciModel: _ciModel["default"],
+  functionAuth: _functionAuth["default"],
   topoEdit: _topoEdit["default"],
-  topoTreeMod: _topoTreeMod["default"],
-  topoView: _topoView["default"]
+  topoCenter: _topoCenter["default"],
+  topoTreeMod: _topoTreeMod["default"]
 };
 exports["default"] = _default;

package/lib/core/store/createStore.js

@@ -9,14 +9,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _store = require("@ice/store");
 
-var _getStoreModels = _interopRequireDefault(require("./getStoreModels"));
+var _coreModels = _interopRequireDefault(require("./coreModels"));
 
 function _default(engine, extModels) {
   if (extModels === void 0) {
     extModels = {};
   }
 
-  var models = (0, _extends2["default"])({}, _getStoreModels["default"], extModels);
+  var models = (0, _extends2["default"])({}, _coreModels["default"], extModels);
   Object.keys(models).forEach(function (name) {
     var model = models[name];
 

package/lib/core/test/Test.js

@@ -13,9 +13,11 @@ var Test = /*#__PURE__*/function () {
   var _proto = Test.prototype;
 
   _proto.init = function init() {
+    var _this = this;
+
     this.iconManage = {
       openUpload: function openUpload(type) {
-        topo.store.getModelDispatchers('iconManage').open({
+        _this.topo.store.getModelDispatchers('customIcon').open({
           type: type || 'node'
         });
       }

package/lib/core/viewer/contextmenu/buildNodeContextmenu.js

@@ -11,70 +11,71 @@ function buildNodeContextmenu(topoApp) {
   return {
     enable: true,
     items: [// {
-    //   label: '概览',
-    //   id: 'Resource.detail',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
-    //   visible: (data) => {
-    //     return isResource(data) && !!data.operation;
-    //   }
-    // },
-    {
-      label: 'Web控制台',
-      icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
-      visible: function visible(data) {
-        return isResource(data) && !!data.operation;
-      },
-      items: [{
-        label: '访问',
-        id: 'Resource.WebConsole.open',
-        disable: function disable(data) {
-          var resourceWebControllUrl = topoApp.pluginManager.pluginMap.resourceWebControllUrl;
-          return !resourceWebControllUrl.getResourceUrl(data.id);
-        }
-      }, {
-        label: '设置',
-        id: 'Resource.WebConsole.setting'
-      }]
-    } // {
-    //   label: '资源操作',
-    //   id: 'Resource.Operate',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_operands.svg',
-    //   visible: (data) => {
-    //     if (!isResource(data)) {
-    //       return false;
-    //     }
-    //     const {ciType} = data;
-    //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
-    //     if (!ciMeta) {
-    //       return false;
-    //     }
-    //     const {domain} = ciMeta;
-    //     // 是否有该页签，与资源详情保持一致
-    //     const hasTab = domain === 'network' || domain === 'server';
-    //     return !!data.operation && hasTab;
-    //   }
-    // },
-    // {
-    //   label: 'Syslog',
-    //   id: 'Resource.Syslog',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_syslog.svg',
-    //   visible: (data) => {
-    //     if (!isResource(data)) {
-    //       return false;
-    //     }
-    //     const {ciType} = data;
-    //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
-    //     if (!ciMeta) {
-    //       return false;
-    //     }
-    //     const {domain} = ciMeta;
-    //     // 是否有该页签，与资源详情保持一致
-    //     const hasTab = domain === 'network' || domain === 'server';
-    //     return !!data.operation && hasTab;
-    //   }
-    // },
-    // { label: '打开属性设置', id: 'openSet' },
-    // { label: '打开全局属性设置', id: 'openAllSet' },
+      //   label: '概览',
+      //   id: 'Resource.detail',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
+      //   visible: (data) => {
+      //     return isResource(data) && !!data.operation;
+      //   }
+      // },
+      // {
+      //   label: 'Web控制台',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
+      //   visible: (data) => {
+      //     return isResource(data) && !!data.operation;
+      //   },
+      //   items: [
+      //     {
+      //       label: '访问',
+      //       id: 'Resource.WebConsole.open',
+      //       disable: (data) => {
+      //         const {resourceWebControllUrl} = topoApp.pluginManager.pluginMap;
+      //         return !resourceWebControllUrl.getResourceUrl(data.id)
+      //       },
+      //     },
+      //     { label: '设置', id: 'Resource.WebConsole.setting' },
+      //   ]
+      // },
+      // {
+      //   label: '资源操作',
+      //   id: 'Resource.Operate',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_operands.svg',
+      //   visible: (data) => {
+      //     if (!isResource(data)) {
+      //       return false;
+      //     }
+      //     const {ciType} = data;
+      //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
+      //     if (!ciMeta) {
+      //       return false;
+      //     }
+      //     const {domain} = ciMeta;
+      //     // 是否有该页签，与资源详情保持一致
+      //     const hasTab = domain === 'network' || domain === 'server';
+      //     return !!data.operation && hasTab;
+      //   }
+      // },
+      // {
+      //   label: 'Syslog',
+      //   id: 'Resource.Syslog',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_syslog.svg',
+      //   visible: (data) => {
+      //     if (!isResource(data)) {
+      //       return false;
+      //     }
+      //     const {ciType} = data;
+      //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
+      //     if (!ciMeta) {
+      //       return false;
+      //     }
+      //     const {domain} = ciMeta;
+      //     // 是否有该页签，与资源详情保持一致
+      //     const hasTab = domain === 'network' || domain === 'server';
+      //     return !!data.operation && hasTab;
+      //   }
+      // },
+      // { label: '打开属性设置', id: 'openSet' },
+      // { label: '打开全局属性设置', id: 'openAllSet' },
     ]
   };
 }

package/lib/createTopo.js

@@ -8,7 +8,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _createTopoApp = require("./core/models/createTopoApp");
+var _createTopoApp = require("./core/createTopoApp");
 
 var _createMenuCommands = _interopRequireDefault(require("./contextmenu/createMenuCommands"));
 

package/lib/hooks/useAlarm.js

@@ -39,9 +39,7 @@ function useAlarm(options) {
 
   var _store$useModel2 = store.useModel("topoBizMod"),
       bizState = _store$useModel2[0],
-      bizDispatchers = _store$useModel2[1];
-
-  var linkDynamicStyleDispatcher = store.getModel("linkDynamicStyle")[1]; // rlog.debug(
+      bizDispatchers = _store$useModel2[1]; // rlog.debug(
   //   "useAlarm.useEffect 获取初始化告警----------init",
   //   topo,
   //   allData,
@@ -76,6 +74,7 @@ function useAlarm(options) {
   //   };
   // }, [alarmIsOpened]);
 
+
   function getAlarmByEE(_x) {
     return _getAlarmByEE.apply(this, arguments);
   }
@@ -127,9 +126,7 @@ function useAlarm(options) {
               _rlog["default"].debug("useAlarm.getAlarmByEE 推送告警到ht", alarmList, bizState);
 
               if (alarmIsOpened) {
-                topo.loadAlarm(alarmList); // 告警变化后，刷新链路动态样式
-
-                linkDynamicStyleDispatcher.execute();
+                topo.loadAlarm(alarmList);
               }
 
             case 12:

package/lib/hooks/useResourceConfig.js

@@ -24,7 +24,7 @@ var _htElementUtils = require("../utils/htElementUtils");
 function _default(props) {
   var topo = props.topo;
   var store = topo.store;
-  var editDispatchers = store.useModelDispatchers('topoCreateMod');
+  var editDispatchers = store.useModelDispatchers('topoConfig');
 
   var loadConfig = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {

package/lib/hooks/useTopoEdit.js

@@ -59,7 +59,7 @@ var useTopoEdit = function useTopoEdit(params) {
       topoEditState = _store$useModel[0],
       topoEditDispatchers = _store$useModel[1];
 
-  var _store$useModel2 = store.useModel('topoCreateMod'),
+  var _store$useModel2 = store.useModel('topoConfig'),
       editState = _store$useModel2[0],
       editDispatchers = _store$useModel2[1];
 
@@ -128,9 +128,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
     if (!isLayerTopo && config.layers.length) {
-      topoDispatchers.update({
-        type: _template.TPL_TREE
-      });
+      topoDispatchers.setTopoType(_template.TPL_TREE);
     } // 更新配置
 
 
@@ -150,9 +148,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
     if (!config.layers.length) {
-      topoDispatchers.update({
-        type: _template.TPL_BLANK
-      });
+      topoDispatchers.setTopoType(_template.TPL_BLANK);
     } // 更新配置
 
 
@@ -957,7 +953,7 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
-  var effectsState = store.useModelEffectsState('topoCreateMod');
+  var effectsState = store.useModelEffectsState('topoConfig');
   var topoLoading = effectsState.getTopoByConditions.isLoading;
   return {
     resourceConfig: resourceConfig,

package/lib/models/{iconManage.js → customIcon.js}

@@ -177,7 +177,7 @@ function _default(engine) {
                     _this3.update({
                       visible: false,
                       icons: {
-                        node: [].concat(rootState.iconManage.icons.node, data.map(addIconUrlData)),
+                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
                         container: []
                       }
                     });

package/lib/models/topoBizMod.js

@@ -83,105 +83,75 @@ function _default(engine) {
             }, _callee);
           }))();
         },
-        getCiInfo: function getCiInfo(conditions, state) {
-          var _this2 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var result;
-            return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
-                    return (0, _model.getCiMeta)(conditions);
-
-                  case 2:
-                    result = _context2.sent;
-
-                    // rlog.debug('getCiInfo', result);
-                    _this2.update({
-                      // alarmList: result.datas,
-                      currentCiInfo: result // drawerAlarmPageInfo,
-
-                    });
-
-                  case 4:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }))();
-        },
         // 根据ci的id获取属性的值
         getCiArrByIds: function getCiArrByIds(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var resIdsList, result;
-            return _regenerator["default"].wrap(function _callee3$(_context3) {
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     resIdsList = state.topoBizMod.resAndMetrics.resIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList);
                     // const ciIds = encodeURIComponent(resIdsList);
 
-                    _context3.prev = 1;
-                    _context3.next = 4;
+                    _context2.prev = 1;
+                    _context2.next = 4;
                     return _topo["default"].getBatchCiArr({
                       ids: resIdsList
                     });
 
                   case 4:
-                    result = _context3.sent;
-                    return _context3.abrupt("return", result.content);
+                    result = _context2.sent;
+                    return _context2.abrupt("return", result.content);
 
                   case 8:
-                    _context3.prev = 8;
-                    _context3.t0 = _context3["catch"](1);
-                    return _context3.abrupt("return", null);
+                    _context2.prev = 8;
+                    _context2.t0 = _context2["catch"](1);
+                    return _context2.abrupt("return", null);
 
                   case 11:
                   case "end":
-                    return _context3.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee3, null, [[1, 8]]);
+            }, _callee2, null, [[1, 8]]);
           }))();
         },
         // 初始化，统一获取指标和属性
         getCiBizByIds: function getCiBizByIds(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var _conditions$ciIds, _conditions$codes;
 
             var _state$topoBizMod$res, resIdsList, metrics, ciIds, codes, metricResult, arrResult;
 
-            return _regenerator["default"].wrap(function _callee4$(_context4) {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
                     _state$topoBizMod$res = state.topoBizMod.resAndMetrics, resIdsList = _state$topoBizMod$res.resIdsList, metrics = _state$topoBizMod$res.metrics;
                     ciIds = encodeURIComponent((_conditions$ciIds = conditions === null || conditions === void 0 ? void 0 : conditions.ciIds) !== null && _conditions$ciIds !== void 0 ? _conditions$ciIds : resIdsList);
                     codes = encodeURIComponent((_conditions$codes = conditions === null || conditions === void 0 ? void 0 : conditions.codes) !== null && _conditions$codes !== void 0 ? _conditions$codes : metrics);
-                    _context4.next = 5;
+                    _context3.next = 5;
                     return (0, _metric.getLatestMetrics)(ciIds, codes);
 
                   case 5:
-                    metricResult = _context4.sent;
-                    _context4.next = 8;
+                    metricResult = _context3.sent;
+                    _context3.next = 8;
                     return _topo["default"].getBatchCiArr(ciIds);
 
                   case 8:
-                    arrResult = _context4.sent;
-                    return _context4.abrupt("return", {
+                    arrResult = _context3.sent;
+                    return _context3.abrupt("return", {
                       metricResult: metricResult,
                       arrResult: arrResult
                     });
 
                   case 10:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
 

package/lib/models/{topoCreateMod.js → topoConfig.js}

@@ -33,6 +33,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+/**
+ * 拓扑配置
+ */
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
     group = _template.DEFAULT_GROUP;
@@ -266,7 +269,7 @@ function _default(topoApp) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    editState = rootState.topoCreateMod;
+                    editState = rootState.topoConfig;
                     resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                     query = {
                       id: rootState.topoMod.topoId,
@@ -355,7 +358,7 @@ function _default(topoApp) {
                     _rlog["default"].debug("getTopoByConditions--------", data, groupInfo);
 
                     _context4.next = 13;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.iconManage.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 13:
                     _yield$Promise$all = _context4.sent;
@@ -423,7 +426,7 @@ function _default(topoApp) {
           var _this5 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-            var _state$topoCreateMod$;
+            var _state$topoConfig$vie;
 
             var currentBackground;
             return _regenerator["default"].wrap(function _callee6$(_context6) {
@@ -433,7 +436,7 @@ function _default(topoApp) {
                     currentBackground = topoApp.store.getModelState('background').current;
                     _context6.next = 3;
                     return (0, _topoData2.saveTopo)((0, _extends2["default"])({}, data, {
-                      viewGroupId: (_state$topoCreateMod$ = state.topoCreateMod.viewGroup) === null || _state$topoCreateMod$ === void 0 ? void 0 : _state$topoCreateMod$.id,
+                      viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图
                       backgroundId: currentBackground ? currentBackground.id : null