@riil-frontend/component-topology 11.0.35 → 12.0.0-dev.1

package/lib/core/models/graph/Background.js

@@ -14,11 +14,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
  */
 var Background = /*#__PURE__*/function () {
   function Background(view) {
-    var _this = this,
-        _ref2;
+    var _this = this;
 
-    this.setSize = function (_x) {
-      return (_ref2 = _ref2 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
+    this.setSize = /*#__PURE__*/function () {
+      var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
         var width, height, backgroundNode, backgroundDispatchers;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -39,8 +38,12 @@ var Background = /*#__PURE__*/function () {
               return _context.stop();
           }
         }, _callee);
-      }))).apply(this, arguments);
-    };
+      }));
+
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }();
 
     this.view = view;
   }

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

@@ -16,8 +16,6 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 function _default(topo) {
-  var _onTopoDataLoaded, _initData, _saveResourceWebUrl;
-
   var resourceUrlMap = {};
   var currentId = null;
   init();
@@ -35,7 +33,11 @@ function _default(topo) {
   }
 
   function onTopoDataLoaded(_x) {
-    return (_onTopoDataLoaded = _onTopoDataLoaded || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
+    return _onTopoDataLoaded.apply(this, arguments);
+  }
+
+  function _onTopoDataLoaded() {
+    _onTopoDataLoaded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -46,11 +48,16 @@ function _default(topo) {
             return _context.stop();
         }
       }, _callee);
-    }))).apply(this, arguments);
+    }));
+    return _onTopoDataLoaded.apply(this, arguments);
   }
 
   function initData(_x2) {
-    return (_initData = _initData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(nodes) {
+    return _initData.apply(this, arguments);
+  }
+
+  function _initData() {
+    _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(nodes) {
       var ids, list;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -90,7 +97,8 @@ function _default(topo) {
             return _context2.stop();
         }
       }, _callee2, null, [[3, 10]]);
-    }))).apply(this, arguments);
+    }));
+    return _initData.apply(this, arguments);
   }
 
   function getModelDispatchers() {
@@ -129,7 +137,11 @@ function _default(topo) {
   }
 
   function saveResourceWebUrl(_x3, _x4) {
-    return (_saveResourceWebUrl = _saveResourceWebUrl || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, url) {
+    return _saveResourceWebUrl.apply(this, arguments);
+  }
+
+  function _saveResourceWebUrl() {
+    _saveResourceWebUrl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, url) {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -174,7 +186,8 @@ function _default(topo) {
             return _context3.stop();
         }
       }, _callee3, null, [[5, 13]]);
-    }))).apply(this, arguments);
+    }));
+    return _saveResourceWebUrl.apply(this, arguments);
   }
 
   var resourceWebUrl = {

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

@@ -23,8 +23,6 @@ var _tagtip = require("../../services/topo/tagtip");
  * 标注、悬浮框字段模型
  */
 var ElementTagTipConfig = /*#__PURE__*/function () {
-  var _init, _initNetworkLinkModel;
-
   function ElementTagTipConfig(topo) {
     this.topoData = void 0;
     this.modelMap = {};
@@ -36,8 +34,8 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   var _proto = ElementTagTipConfig.prototype;
 
-  _proto.init = function init(_x) {
-    return (_init = _init || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
+  _proto.init = /*#__PURE__*/function () {
+    var _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topoData) {
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -53,11 +51,17 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
             return _context.stop();
         }
       }, _callee, this);
-    }))).apply(this, arguments);
-  };
+    }));
+
+    function init(_x) {
+      return _init.apply(this, arguments);
+    }
+
+    return init;
+  }();
 
-  _proto.initNetworkLinkModel = function initNetworkLinkModel() {
-    return (_initNetworkLinkModel = _initNetworkLinkModel || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  _proto.initNetworkLinkModel = /*#__PURE__*/function () {
+    var _initNetworkLinkModel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var mtCodes;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -91,8 +95,14 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
             return _context2.stop();
         }
       }, _callee2, this, [[0, 8]]);
-    }))).apply(this, arguments);
-  };
+    }));
+
+    function initNetworkLinkModel() {
+      return _initNetworkLinkModel.apply(this, arguments);
+    }
+
+    return initNetworkLinkModel;
+  }();
 
   _proto.getModelTypes = function getModelTypes(cis) {
     var _this = this;

package/lib/core/models/topoData.js

@@ -17,8 +17,6 @@ var _topo = require("@riil-frontend/component-topology-common/es/services/topo")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _saveTopo;
-
 function getLayoutId(layout) {
   if (!layout) {
     return layout;
@@ -54,7 +52,11 @@ function resToConditions(resources, persist) {
 }
 
 function saveTopo(_x) {
-  return (_saveTopo = _saveTopo || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
+  return _saveTopo.apply(this, arguments);
+}
+
+function _saveTopo() {
+  _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
     var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -140,5 +142,6 @@ function saveTopo(_x) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _saveTopo.apply(this, arguments);
 }

package/lib/core/models/utils/linkUtils.js

@@ -30,8 +30,7 @@ var _CiTypeCache = _interopRequireDefault(require("../cache/CiTypeCache"));
 
 var _CiCache = _interopRequireDefault(require("../cache/CiCache"));
 
-var _getLinksDetail;
-
+// 查询所有连线
 // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
@@ -99,7 +98,11 @@ function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
 }
 
 function getLinksDetail(_x, _x2) {
-  return (_getLinksDetail = _getLinksDetail || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
+  return _getLinksDetail.apply(this, arguments);
+}
+
+function _getLinksDetail() {
+  _getLinksDetail = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCiMap, interfaceDoc;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -145,7 +148,8 @@ function getLinksDetail(_x, _x2) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _getLinksDetail.apply(this, arguments);
 }
 
 function buildTopoLinkData() {}

package/lib/core/services/cmdb/metric.js

@@ -11,10 +11,12 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _queryLatestMetrics;
-
 function queryLatestMetrics(_x, _x2) {
-  return (_queryLatestMetrics = _queryLatestMetrics || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, codes) {
+  return _queryLatestMetrics.apply(this, arguments);
+}
+
+function _queryLatestMetrics() {
+  _queryLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, codes) {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -28,5 +30,6 @@ function queryLatestMetrics(_x, _x2) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _queryLatestMetrics.apply(this, arguments);
 }

package/lib/core/services/cmdb.js

@@ -13,10 +13,12 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _commonQueryCiDataByIds;
-
 function commonQueryCiDataByIds(_x, _x2) {
-  return (_commonQueryCiDataByIds = _commonQueryCiDataByIds || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, options) {
+  return _commonQueryCiDataByIds.apply(this, arguments);
+}
+
+function _commonQueryCiDataByIds() {
+  _commonQueryCiDataByIds = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids, options) {
     var result;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -28,6 +30,8 @@ function commonQueryCiDataByIds(_x, _x2) {
               name: 'display_name',
               type: 'asc'
             }],
+            level: null,
+            // 本级+下级
             pageIndex: 1,
             pageSize: 20
           }, options));
@@ -41,5 +45,6 @@ function commonQueryCiDataByIds(_x, _x2) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _commonQueryCiDataByIds.apply(this, arguments);
 }

package/lib/core/services/index.js

@@ -15,10 +15,12 @@ var _componentTopologyUtils = require("@riil-frontend/component-topology-utils")
 
 var _cmdb = require("./cmdb");
 
-var _queryCisByIds, _queryModelAsset, _commonQueryCiData;
-
 function queryCisByIds(_x) {
-  return (_queryCisByIds = _queryCisByIds || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
+  return _queryCisByIds.apply(this, arguments);
+}
+
+function _queryCisByIds() {
+  _queryCisByIds = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(ids) {
     var result;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -39,11 +41,16 @@ function queryCisByIds(_x) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _queryCisByIds.apply(this, arguments);
 }
 
 function queryModelAsset(_x2) {
-  return (_queryModelAsset = _queryModelAsset || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(code) {
+  return _queryModelAsset.apply(this, arguments);
+}
+
+function _queryModelAsset() {
+  _queryModelAsset = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(code) {
     var result;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -60,11 +67,16 @@ function queryModelAsset(_x2) {
           return _context2.stop();
       }
     }, _callee2);
-  }))).apply(this, arguments);
+  }));
+  return _queryModelAsset.apply(this, arguments);
 }
 
 function commonQueryCiData(_x3) {
-  return (_commonQueryCiData = _commonQueryCiData || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+  return _commonQueryCiData.apply(this, arguments);
+}
+
+function _commonQueryCiData() {
+  _commonQueryCiData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
     var result;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -86,5 +98,6 @@ function commonQueryCiData(_x3) {
           return _context3.stop();
       }
     }, _callee3);
-  }))).apply(this, arguments);
+  }));
+  return _commonQueryCiData.apply(this, arguments);
 }

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

@@ -11,10 +11,12 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _getMetricsByMonitorTemplateCodes;
-
 function getMetricsByMonitorTemplateCodes(_x) {
-  return (_getMetricsByMonitorTemplateCodes = _getMetricsByMonitorTemplateCodes || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(mtCodes) {
+  return _getMetricsByMonitorTemplateCodes.apply(this, arguments);
+}
+
+function _getMetricsByMonitorTemplateCodes() {
+  _getMetricsByMonitorTemplateCodes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(mtCodes) {
     var result;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -31,5 +33,6 @@ function getMetricsByMonitorTemplateCodes(_x) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _getMetricsByMonitorTemplateCodes.apply(this, arguments);
 }

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

@@ -198,8 +198,7 @@ function _default(engine) {
           }))();
         },
         deleteIcon: function deleteIcon(htIconId, rootState) {
-          var _this4 = this,
-              _onOk;
+          var _this4 = this;
 
           var id = (0, _icon.getCustomIconIdFromHtId)(htIconId);
 
@@ -214,8 +213,8 @@ function _default(engine) {
               type: 'warning'
             },
             content: '若执行相关操作，此图片将会从图片库删除，确定删除吗？',
-            onOk: function onOk() {
-              return (_onOk = _onOk || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+            onOk: function () {
+              var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
                 var success;
                 return _regenerator["default"].wrap(function _callee5$(_context5) {
                   while (1) switch (_context5.prev = _context5.next) {
@@ -254,8 +253,14 @@ function _default(engine) {
                       return _context5.stop();
                   }
                 }, _callee5, null, [[0, 9]]);
-              }))).apply(this, arguments);
-            }
+              }));
+
+              function onOk() {
+                return _onOk.apply(this, arguments);
+              }
+
+              return onOk;
+            }()
           });
         },
         openRenameDialog: function openRenameDialog(icon, rootState) {

package/lib/core/utils/imageUtil.js

@@ -9,14 +9,16 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _getImageSize;
-
 /**
  * 获取图片大小
  * @param {*} url 
  */
 function getImageSize(_x) {
-  return (_getImageSize = _getImageSize || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url) {
+  return _getImageSize.apply(this, arguments);
+}
+
+function _getImageSize() {
+  _getImageSize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(url) {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -42,5 +44,6 @@ function getImageSize(_x) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _getImageSize.apply(this, arguments);
 }

package/lib/core/utils/metricUtil.js

@@ -16,10 +16,15 @@ var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
  * @returns
  */
 function formatMetric(val, metricModel) {
+  if (val === undefined) {
+    return '-';
+  }
+
   if (metricModel) {
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
+      changeValue: metricModel.changeValue,
       dict: _DictCache["default"].getDictObject(),
       unit: metricModel.unit,
       code: metricModel.code

package/lib/core/utils/saveSerialize.js

@@ -9,15 +9,17 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _saveSerialize;
-
 /**
  * 增加保存拓扑序列化数据方法，以便于拓扑中心和业务拓扑使用
  * 
  * @param {*} topo 
  */
 function saveSerialize(_x) {
-  return (_saveSerialize = _saveSerialize || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
+  return _saveSerialize.apply(this, arguments);
+}
+
+function _saveSerialize() {
+  _saveSerialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
     var topoId, serialize;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -32,5 +34,6 @@ function saveSerialize(_x) {
           return _context.stop();
       }
     }, _callee);
-  }))).apply(this, arguments);
+  }));
+  return _saveSerialize.apply(this, arguments);
 }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js

@@ -104,8 +104,6 @@ function ClusterMemberTable(props) {
 }
 
 function ClusterMemberTableContainer(props) {
-  var _ref;
-
   var data = props.data,
       topo = props.topo;
   var datas = topo.dataModel.useDatas();
@@ -115,8 +113,8 @@ function ClusterMemberTableContainer(props) {
     return item.id;
   });
 
-  var getTableData = function getTableData(_x) {
-    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+  var getTableData = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
       var _params$current, current, _params$pageSize, pageSize, _params$sortBy, sortBy, _params$sortOrder, sortOrder, _yield$Promise$all, ciDataResult, memberRoleMetrics, ciTypeMap;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
@@ -180,8 +178,12 @@ function ClusterMemberTableContainer(props) {
             return _context.stop();
         }
       }, _callee);
-    }))).apply(this, arguments);
-  };
+    }));
+
+    return function getTableData(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   var plugins = [(0, _useSortablePlugin["default"])({
     resetWhenQuery: false,

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -7,10 +7,10 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
-
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
+var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
@@ -32,8 +32,6 @@ function formatUrl(url) {
 }
 
 function EventsCard(props) {
-  var _alarmRiskOperation;
-
   var alarmRiskList = props.alarmRiskList,
       closeDetailDrawer = props.closeDetailDrawer,
       onHandleAlarm = props.onHandleAlarm; // 告警table列配置
@@ -96,7 +94,11 @@ function EventsCard(props) {
   ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x, _x2) {
-    return (_alarmRiskOperation = _alarmRiskOperation || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(type, params) {
+    return _alarmRiskOperation.apply(this, arguments);
+  }
+
+  function _alarmRiskOperation() {
+    _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(type, params) {
       var res;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -121,7 +123,8 @@ function EventsCard(props) {
             return _context.stop();
         }
       }, _callee);
-    }))).apply(this, arguments);
+    }));
+    return _alarmRiskOperation.apply(this, arguments);
   }
 
   return /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {