@riil-frontend/component-topology 2.15.44 → 2.15.47

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -255,9 +255,9 @@ function ResourceOverview(props) {
 
   function _init() {
     _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var _topo$options$resourc, _attributeMap$source_, _attributeMap$destina;
+      var _topo$options$resourc, _modelAttributeMap$ow, _modelAttributeMap$, _modelAttributeMap$2, _modelAttributeMap$3, _modelAttributeMap$di, _modelAttributeMap$ip, _modelAttributeMap$as, _modelAttributeMap$5, _modelAttributeMap$6, _modelAttributeMap$so, _attributeMap$source_, _modelAttributeMap$de, _attributeMap$destina;
 
-      var ciTypeMeta, link, linkConnectType, _ciTypeMeta, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics, isAppTopoFlag, _findItem, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$;
+      var ciTypeMeta, link, linkConnectType, _ciTypeMeta, modelMetrics, ciName, modelAttributeMap, domain, topModelMetrics, isAppTopoFlag, _findItem, attributeMap, metrics, res_address, _attributeMap$, rated_bandwidth, _modelAttributeMap$4;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -296,11 +296,12 @@ function ResourceOverview(props) {
               // 拓扑（默认） ---------------------------
               // 基本信息
               _findItem = (0, _topoData.findItem)(attrsAndMetrics, 'id', id), attributeMap = _findItem.attributeMap, metrics = _findItem.metrics;
-              console.log('基本信息', attributeMap, attrsAndMetrics); // 位置
+              console.log('基本信息', attributeMap, attrsAndMetrics, modelAttributeMap); // userVisible
+              // 位置
 
               res_address = false;
 
-              if (!modelAttributeMap['owned_computer_room']) {
+              if (!((_modelAttributeMap$ow = modelAttributeMap['owned_computer_room']) !== null && _modelAttributeMap$ow !== void 0 && _modelAttributeMap$ow.userVisible)) {
                 _context.next = 19;
                 break;
               }
@@ -314,7 +315,7 @@ function ResourceOverview(props) {
               break;
 
             case 19:
-              if (modelAttributeMap[ciType + ".computer_room"] || modelAttributeMap[ciType + ".area"]) {
+              if ((_modelAttributeMap$ = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$ !== void 0 && _modelAttributeMap$.userVisible || (_modelAttributeMap$2 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$2 !== void 0 && _modelAttributeMap$2.userVisible) {
                 res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$ = attributeMap[ciType + ".area_object"]) === null || _attributeMap$ === void 0 ? void 0 : _attributeMap$.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
               }
 
@@ -322,30 +323,30 @@ function ResourceOverview(props) {
               // 链路带宽(取实际带宽)
               rated_bandwidth = false;
 
-              if (modelAttributeMap[ciType + ".actual_bandwidth"]) {
-                rated_bandwidth = attributeMap[ciType + ".actual_bandwidth"] ? attributeMap[ciType + ".actual_bandwidth"] + " " + ((_modelAttributeMap$ = modelAttributeMap[ciType + ".actual_bandwidth"]) === null || _modelAttributeMap$ === void 0 ? void 0 : _modelAttributeMap$.unit) : '';
+              if ((_modelAttributeMap$3 = modelAttributeMap[ciType + ".actual_bandwidth"]) !== null && _modelAttributeMap$3 !== void 0 && _modelAttributeMap$3.userVisible) {
+                rated_bandwidth = attributeMap[ciType + ".actual_bandwidth"] ? attributeMap[ciType + ".actual_bandwidth"] + " " + ((_modelAttributeMap$4 = modelAttributeMap[ciType + ".actual_bandwidth"]) === null || _modelAttributeMap$4 === void 0 ? void 0 : _modelAttributeMap$4.unit) : '';
               }
 
               setBaseInfo({
                 // 资源
                 //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
-                resource: modelAttributeMap['display_name'] ? {
+                resource: (_modelAttributeMap$di = modelAttributeMap['display_name']) !== null && _modelAttributeMap$di !== void 0 && _modelAttributeMap$di.userVisible ? {
                   display_name: attributeMap.display_name,
                   // 资源名称/显示名称
                   link: "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
 
                 } : false,
-                ipv4_address: modelAttributeMap['ipv4_address'] ? attributeMap.ipv4_address : false,
-                asset_number: modelAttributeMap['asset_number'] ? attributeMap.asset_number : false,
+                ipv4_address: (_modelAttributeMap$ip = modelAttributeMap['ipv4_address']) !== null && _modelAttributeMap$ip !== void 0 && _modelAttributeMap$ip.userVisible ? attributeMap.ipv4_address : false,
+                asset_number: (_modelAttributeMap$as = modelAttributeMap['asset_number']) !== null && _modelAttributeMap$as !== void 0 && _modelAttributeMap$as.userVisible ? attributeMap.asset_number : false,
                 ciName: ciName,
                 res_address: res_address,
                 // principal: modelAttributeMap[`${ciType}.principal`] ? attributeMap[`${ciType}.principal`] : false,
                 // 链路
                 rated_bandwidth: rated_bandwidth,
-                source_ipv4: modelAttributeMap[ciType + ".source_ipv4"] ? attributeMap[ciType + ".source_ipv4"] : false,
-                destination_ipv4: modelAttributeMap[ciType + ".destination_ipv4"] ? attributeMap[ciType + ".destination_ipv4"] : false,
-                source_Interface: modelAttributeMap['source_id'] ? (_attributeMap$source_ = attributeMap.source_id_object) === null || _attributeMap$source_ === void 0 ? void 0 : _attributeMap$source_.displayName : false,
-                destination_Interface: modelAttributeMap['destination_id'] ? (_attributeMap$destina = attributeMap.destination_id_object) === null || _attributeMap$destina === void 0 ? void 0 : _attributeMap$destina.displayName : false
+                source_ipv4: (_modelAttributeMap$5 = modelAttributeMap[ciType + ".source_ipv4"]) !== null && _modelAttributeMap$5 !== void 0 && _modelAttributeMap$5.userVisible ? attributeMap[ciType + ".source_ipv4"] : false,
+                destination_ipv4: (_modelAttributeMap$6 = modelAttributeMap[ciType + ".destination_ipv4"]) !== null && _modelAttributeMap$6 !== void 0 && _modelAttributeMap$6.userVisible ? attributeMap[ciType + ".destination_ipv4"] : false,
+                source_Interface: (_modelAttributeMap$so = modelAttributeMap['source_id']) !== null && _modelAttributeMap$so !== void 0 && _modelAttributeMap$so.userVisible ? (_attributeMap$source_ = attributeMap.source_id_object) === null || _attributeMap$source_ === void 0 ? void 0 : _attributeMap$source_.displayName : false,
+                destination_Interface: (_modelAttributeMap$de = modelAttributeMap['destination_id']) !== null && _modelAttributeMap$de !== void 0 && _modelAttributeMap$de.userVisible ? (_attributeMap$destina = attributeMap.destination_id_object) === null || _attributeMap$destina === void 0 ? void 0 : _attributeMap$destina.displayName : false
               }); // 资源/链路-关键指标 数据 metrics，模型 topo.ciTyeCache.getCiType(ciType)
 
               setIndicator(topModelMetrics.map(function (item) {
@@ -375,7 +376,7 @@ function ResourceOverview(props) {
 
   function _initAppTopo() {
     _initAppTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(topModelMetrics, modelAttributeMap, ciName, domain) {
-      var _topo$options$resourc2, _alarmList;
+      var _topo$options$resourc2, _modelAttributeMap$ow2, _modelAttributeMap$7, _modelAttributeMap$8, _modelAttributeMap$di2, _modelAttributeMap$ip2, _modelAttributeMap$as2, _alarmList;
 
       var _yield$topo$options$r, metrics, alarmList, attributeMap, res_address, _attributeMap$2;
 
@@ -407,7 +408,7 @@ function ResourceOverview(props) {
               // 位置
               res_address = false;
 
-              if (!modelAttributeMap['owned_computer_room']) {
+              if (!((_modelAttributeMap$ow2 = modelAttributeMap['owned_computer_room']) !== null && _modelAttributeMap$ow2 !== void 0 && _modelAttributeMap$ow2.userVisible)) {
                 _context2.next = 17;
                 break;
               }
@@ -421,7 +422,7 @@ function ResourceOverview(props) {
               break;
 
             case 17:
-              if (modelAttributeMap[ciType + ".computer_room"] || modelAttributeMap[ciType + ".area"]) {
+              if ((_modelAttributeMap$7 = modelAttributeMap[ciType + ".computer_room"]) !== null && _modelAttributeMap$7 !== void 0 && _modelAttributeMap$7.userVisible || (_modelAttributeMap$8 = modelAttributeMap[ciType + ".area"]) !== null && _modelAttributeMap$8 !== void 0 && _modelAttributeMap$8.userVisible) {
                 res_address = attributeMap[ciType + ".computer_room "] || attributeMap[ciType + ".area"] ? " " + (((_attributeMap$2 = attributeMap[ciType + ".area_object"]) === null || _attributeMap$2 === void 0 ? void 0 : _attributeMap$2.displayName) || '') + " " + (attributeMap[ciType + ".computer_room"] || '') : false;
               }
 
@@ -429,14 +430,14 @@ function ResourceOverview(props) {
               setBaseInfo({
                 // 资源
                 //display_name: modelAttributeMap['display_name'] ? attributeMap.display_name : false,
-                resource: modelAttributeMap['display_name'] ? {
+                resource: (_modelAttributeMap$di2 = modelAttributeMap['display_name']) !== null && _modelAttributeMap$di2 !== void 0 && _modelAttributeMap$di2.userVisible ? {
                   display_name: attributeMap.display_name,
                   // 资源名称/显示名称
                   link: "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType // 资源跳转链接
 
                 } : false,
-                ipv4_address: modelAttributeMap['ipv4_address'] ? attributeMap.ipv4_address : false,
-                asset_number: modelAttributeMap['asset_number'] ? attributeMap.asset_number : false,
+                ipv4_address: (_modelAttributeMap$ip2 = modelAttributeMap['ipv4_address']) !== null && _modelAttributeMap$ip2 !== void 0 && _modelAttributeMap$ip2.userVisible ? attributeMap.ipv4_address : false,
+                asset_number: (_modelAttributeMap$as2 = modelAttributeMap['asset_number']) !== null && _modelAttributeMap$as2 !== void 0 && _modelAttributeMap$as2.userVisible ? attributeMap.asset_number : false,
                 ciName: ciName,
                 res_address: res_address // principal: modelAttributeMap[`${ciType}.principal`] ? attributeMap[`${ciType}.principal`] : false,
 
@@ -594,7 +595,7 @@ function ResourceOverview(props) {
                 pageNum: 1,
                 pageSize: 999,
                 sortField: "alertLevel",
-                sortOrder: "asc"
+                sortOrder: "desc"
               });
 
             case 2:

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