@riil-frontend/component-topology 12.0.0-dev.3 → 12.0.0-dev.30

package/lib/core/models/TopoApp.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _lodash = require("lodash");
 
 var _topo = _interopRequireDefault(require("../services/topo"));
@@ -56,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.3" === 'string' ? "12.0.0-dev.3" : null;
+var version = typeof "12.0.0-dev.30" === 'string' ? "12.0.0-dev.30" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -384,7 +382,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _rlog["default"].info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
+            _componentTopologyUtils.rlog.info('TopoApp.open 打开拓扑图', id); // 如果是切换拓扑图，注销原拓扑图
 
 
             lastId = this.id;
@@ -414,7 +412,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _rlog["default"].info('关闭拓扑图', this.id);
+            _componentTopologyUtils.rlog.info('关闭拓扑图', this.id);
 
             if (this.id) {
               _context8.next = 3;
@@ -547,7 +545,7 @@ var Topo = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _rlog["default"].info('TopoApp.enterEditMode');
+            _componentTopologyUtils.rlog.info('TopoApp.enterEditMode');
 
             if (!this.options.onSwitchToEditModeBegin) {
               _context12.next = 4;

package/lib/core/models/attributeFormatter/formatter/graphTransform.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports["default"] = graphTransform;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function graphTransform(options) {
   var item = options.item,
@@ -17,7 +15,7 @@ function graphTransform(options) {
     var node = topo.getDataModel().getDataByTag(ciData.id);
     value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
   } catch (error) {
-    _rlog["default"].error(error);
+    _componentTopologyUtils.rlog.error(error);
   }
 
   return {

package/lib/core/models/attributeFormatter/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _attributeTransform = _interopRequireDefault(require("./formatter/attributeTransform"));
 

package/lib/core/models/cache/CiCache.d.ts

@@ -11,7 +11,7 @@ declare class CiCache {
      * @param ids {string[]}
      * @returns {Promise<Object>}
      */
-    load(ids: string[]): Promise<Object>;
+    load(ids: string[], refreshCiCache?: boolean): Promise<Object>;
     getCi(id: string): Object;
 }
 declare const _default: CiCache;

package/lib/core/models/cache/CiCache.js

@@ -32,14 +32,14 @@ var CiCache = /*#__PURE__*/function () {
   _proto.load =
   /*#__PURE__*/
   function () {
-    var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
+    var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, refreshCiCache) {
       var _this = this;
 
       var unloadCiIds, cis, map;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            unloadCiIds = ids.filter(function (id) {
+            unloadCiIds = refreshCiCache === true ? ids : ids.filter(function (id) {
               return !_this.ciMap[id];
             });
 
@@ -71,7 +71,7 @@ var CiCache = /*#__PURE__*/function () {
       }, _callee, this);
     }));
 
-    function load(_x) {
+    function load(_x, _x2) {
       return _load.apply(this, arguments);
     }
 

package/lib/core/models/cache/CiTypeCache.js

@@ -15,7 +15,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
@@ -46,7 +46,7 @@ var CiTypeCache = /*#__PURE__*/function () {
             _context.prev = 5;
             _context.t0 = _context["catch"](0);
 
-            _rlog["default"].error('查询Ci模型异常', _context.t0);
+            _componentTopologyUtils.rlog.error('查询Ci模型异常', _context.t0);
 
           case 8:
             return _context.abrupt("return", this.ciTypeMap);
@@ -119,6 +119,10 @@ var CiTypeCache = /*#__PURE__*/function () {
     this.ciTypeMap = cache;
   };
 
+  _proto.getCiTypeMap = function getCiTypeMap() {
+    return this.ciTypeMap;
+  };
+
   _proto.getCiType = function getCiType(typeCode) {
     return this.ciTypeMap[typeCode];
   };

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

@@ -13,7 +13,7 @@ var _utils = require("@riil-frontend/utils");
 
 var modelService = _interopRequireWildcard(require("@riil-frontend/component-topology-common/es/services/model"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -58,7 +58,7 @@ var DictCache = /*#__PURE__*/function () {
           case 7:
             _context.next = 9;
             return modelService.queryDicts()["catch"](function (e) {
-              _rlog["default"].error('初始化数据字典异常', e);
+              _componentTopologyUtils.rlog.error('初始化数据字典异常', e);
 
               return [];
             });

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

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function _default(topo) {
   var resourceUrlMap = {};
@@ -90,7 +90,7 @@ function _default(topo) {
             _context2.prev = 10;
             _context2.t0 = _context2["catch"](3);
 
-            _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
+            _componentTopologyUtils.rlog.error('资源web控制台.加载数据异常', _context2.t0);
 
           case 13:
           case "end":

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _utils = require("./utils");
 
@@ -88,7 +88,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
             _context2.prev = 8;
             _context2.t0 = _context2["catch"](0);
 
-            _rlog["default"].error('查询监控模板指标失败', _context2.t0);
+            _componentTopologyUtils.rlog.error('查询监控模板指标失败', _context2.t0);
 
           case 11:
           case "end":

package/lib/core/models/topoData.js

@@ -124,7 +124,6 @@ function _saveTopo() {
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
             linkIps: linkIps,
-            // exportLinkIdList,
             relateTopoIdList: relateTopoIdList
           });
 

package/lib/core/services/alarm.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _default = {
   /**
@@ -36,7 +36,7 @@ var _default = {
           case 3:
             result = _context.sent;
 
-            _rlog["default"].debug('查询告警列表', ciIds, result);
+            _componentTopologyUtils.rlog.debug('查询告警列表', ciIds, result);
 
             return _context.abrupt("return", result);
 

package/lib/core/services/index.js

@@ -29,7 +29,7 @@ function _queryCisByIds() {
           return (0, _cmdb.commonQueryCiDataByIds)(ids, {
             orders: [],
             pageIndex: 1,
-            pageSize: 100000
+            pageSize: 10000
           });
 
         case 2:

package/lib/core/services/topo/basic.js

@@ -118,7 +118,7 @@ var _default = {
   * @param {Array} groups
   * @returns
   */
-  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var data, obj;
       return _regenerator["default"].wrap(function _callee$(_context) {
@@ -137,7 +137,7 @@ var _default = {
             obj = prepareGroupParams(data);
             _context.next = 5;
             return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
-              exportLinkIdList: exportLinkIdList
+              exportLinkIdList: []
             }));
 
           case 5:

package/lib/core/store/models/customIcon.js

@@ -15,7 +15,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
@@ -202,7 +202,7 @@ function _default(engine) {
 
           var id = (0, _icon.getCustomIconIdFromHtId)(htIconId);
 
-          _rlog["default"].debug("\u5220\u9664\u56FE\u6807: " + id);
+          _componentTopologyUtils.rlog.debug("\u5220\u9664\u56FE\u6807: " + id);
 
           _dialog["default"].confirm({
             title: '删除',
@@ -246,7 +246,7 @@ function _default(engine) {
                       _context5.prev = 9;
                       _context5.t0 = _context5["catch"](0);
 
-                      _rlog["default"].warn('删除图标失败', _context5.t0);
+                      _componentTopologyUtils.rlog.warn('删除图标失败', _context5.t0);
 
                     case 12:
                     case "end":

package/lib/core/store/models/displayConfig.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 动态设置链路样式 Model

package/lib/core/store/models/selection.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 /**
  * 拓扑图 Model

package/lib/core/store/models/topoBaseInfoOverview.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 

package/lib/core/store/models/topoBizMod.js

@@ -13,7 +13,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 function _default(engine) {
   return {

package/lib/core/store/models/topoConfig.js

@@ -53,7 +53,6 @@ var initialState = {
     "static": []
   },
   groups: [],
-  exportLinkIdList: [],
   // config: {
   //   view: null,
   //   groups: [],
@@ -260,18 +259,17 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var editState, resources, _editState$groups, groups, _editState$ipNodes, ipNodes, query, data;
+            var editState, resources, _editState$groups, groups, query, data;
 
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   editState = rootState.topoConfig;
-                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, _editState$ipNodes = editState.ipNodes, ipNodes = _editState$ipNodes === void 0 ? [] : _editState$ipNodes;
+                  resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                   query = {
                     id: rootState.topoMod.topoId,
                     resources: resources,
-                    groups: groups,
-                    ipNodes: ipNodes
+                    groups: groups
                   };
                   _context2.next = 5;
                   return _this2.getTopoByConditions(query);
@@ -322,14 +320,14 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, ipNodes, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   _rlog["default"].debug("getTopoByConditions--------", params);
 
-                  topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList, ipNodes = params.ipNodes;
+                  topoId = params.id, resources = params.resources, groups = params.groups;
                   viewConditions = (0, _topoData2.resToConditions)(resources);
                   groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
                     return (0, _extends2["default"])({}, group, {
@@ -341,7 +339,7 @@ function _default(topoApp) {
                   _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                   _context4.next = 7;
-                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList, ipNodes);
+                  return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
 
                 case 7:
                   data = _context4.sent;
@@ -484,8 +482,7 @@ function _default(topoApp) {
             return _regenerator["default"].wrap(function _callee8$(_context8) {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
-                  ids = data.ids, ip = data.ip; // console.log("queryAllLinkByIp", ids, ip);
-
+                  ids = data.ids, ip = data.ip;
                   _context8.next = 3;
                   return _networkLink["default"].queryLinksByIp(ids, ip);
 

package/lib/core/store/models/topoGraphView.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));