@riil-frontend/component-topology 0.2.2 → 0.2.3

package/lib/core/utils/showMessage.js

@@ -5,9 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = showMessage;
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/utils/rlog"));
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
-var _next = require("@alifd/next");
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/utils/rlog"));
 
 var MSG_TYPES = {
   info: 'notice',
@@ -24,7 +24,7 @@ function showMessage(type, title, content) {
     msgType = MSG_TYPES.info;
   }
 
-  _next.Message.show({
+  _message["default"].show({
     type: msgType,
     title: title,
     content: content

package/lib/createTopo.js

@@ -6,48 +6,17 @@ exports.__esModule = true;
 exports.createTopo = createTopo;
 exports["default"] = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
-
 var _createTopoApp = require("./core/models/createTopoApp");
 
 var _createMenuCommands = _interopRequireDefault(require("./contextmenu/createMenuCommands"));
 
+var _getTopoData = _interopRequireDefault(require("./topoCenter/getTopoData"));
+
 function createTopo(options) {
   var topoApp = (0, _createTopoApp.createTopoApp)((0, _extends2["default"])({
-    loadData: function () {
-      var _loadData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
-        var data;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return _topo["default"].getTopoData(id);
-
-              case 2:
-                data = _context.sent;
-                return _context.abrupt("return", data);
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function loadData(_x) {
-        return _loadData.apply(this, arguments);
-      }
-
-      return loadData;
-    }()
+    loadData: _getTopoData["default"]
   }, options));
   var menuCommands = (0, _createMenuCommands["default"])(topoApp);
   topoApp.view.contextMenu.registerCommands(menuCommands);

package/lib/hooks/usePolling.js

@@ -23,13 +23,14 @@ var _utils = require("@riil-frontend/utils");
 
 var _topoData = require("../utils/topoData");
 
+var _DictCache = _interopRequireDefault(require("../core/models/cache/DictCache"));
+
 /**
  * 轮询获取指标hooks
  * @param {*} props
  */
 var usePolling = function usePolling(props) {
-  var topoApp = props.topoApp,
-      dictObj = props.dictObj;
+  var topoApp = props.topoApp;
   var store = topoApp.store;
 
   var _store$useModel = store.useModel('topoBizMod'),
@@ -87,12 +88,16 @@ var usePolling = function usePolling(props) {
 
             case 2:
               _context.next = 4;
-              return bizDispatchers.getMetricsByIds();
+              return _DictCache["default"].init();
 
             case 4:
+              _context.next = 6;
+              return bizDispatchers.getMetricsByIds();
+
+            case 6:
               return _context.abrupt("return", _context.sent);
 
-            case 5:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -199,7 +204,7 @@ var usePolling = function usePolling(props) {
       var result = (0, _utils.metricValueFormat)({
         value: item.val,
         dataType: metricInfo.dataType,
-        dict: dictObj,
+        dict: _DictCache["default"].getDictObject(),
         unit: metricInfo.unit,
         code: metricInfo.code
       });

package/lib/hooks/useTopoEdit.js

@@ -9,14 +9,16 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _react = require("react");
 
 var _ahooks = require("ahooks");
 
-var _next = require("@alifd/next");
-
 var _utils = require("@riil-frontend/utils");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/utils/rlog"));
@@ -290,7 +292,7 @@ var useTopoEdit = function useTopoEdit(params) {
   };
 
   var deleteLink = function deleteLink(data) {
-    _next.Dialog.confirm({
+    _dialog["default"].confirm({
       title: '确定要删除链路？',
       content: '若执行相关操作，此链路将会从数据库删除，建议您谨慎操作。',
       okProps: {
@@ -314,11 +316,11 @@ var useTopoEdit = function useTopoEdit(params) {
                   success = result === 0;
 
                   if (success) {
-                    _next.Message.success('删除成功');
+                    _message["default"].success('删除成功');
 
                     emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, data);
                   } else {
-                    _next.Message.error('删除失败');
+                    _message["default"].error('删除失败');
                   }
 
                 case 5:
@@ -464,7 +466,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
     if (selected && exist) {
       // 资源已被选
-      _next.Message.warning('所选资源在图上已存在，请重新选择一个。');
+      _message["default"].warning('所选资源在图上已存在，请重新选择一个。');
 
       return false;
     } else {
@@ -519,7 +521,7 @@ var useTopoEdit = function useTopoEdit(params) {
               return _context4.abrupt("return", true);
 
             case 5:
-              _next.Dialog.alert({
+              _dialog["default"].alert({
                 title: '没有权限进行此操作',
                 content: '您的权限发生了变化，请联系相关管理员。',
                 okProps: {
@@ -597,7 +599,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 saving: false
               });
 
-              _next.Message.success('保存成功！');
+              _message["default"].success('保存成功！');
 
             case 16:
             case "end":
@@ -644,7 +646,7 @@ var useTopoEdit = function useTopoEdit(params) {
   var onTopoRelatedImage = function onTopoRelatedImage(eventData) {
     setFocusedGroup(eventData.data);
 
-    _next.Dialog.confirm({
+    _dialog["default"].confirm({
       title: '确定要关联拓扑图？',
       content: '关联拓扑图后，容器中关联的资源会被清除。确定要继续吗？',
       onClose: function onClose() {

package/lib/models/iconManage.js

@@ -7,6 +7,10 @@ exports["default"] = _default;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -15,8 +19,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 图标管理 Model
  */
@@ -141,7 +143,7 @@ function _default(engine) {
         deleteIcon: function deleteIcon(id, rootState) {
           _rlog["default"].debug("\u5220\u9664\u56FE\u6807: " + id);
 
-          _next.Dialog.confirm({
+          _dialog["default"].confirm({
             title: '确定要删除图标？',
             okProps: {
               children: '确定'
@@ -165,11 +167,11 @@ function _default(engine) {
                         success = _context3.sent;
 
                         if (success) {
-                          _next.Message.success('删除成功');
+                          _message["default"].success('删除成功');
 
                           engine.view.topoClient.emitEvent('topo_shape_delete_finish', id);
                         } else {
-                          _next.Message.error('删除失败');
+                          _message["default"].error('删除失败');
                         }
 
                         _context3.next = 10;
@@ -224,7 +226,7 @@ function _default(engine) {
                     return _topo["default"].icon.rename(payload);
 
                   case 2:
-                    _next.Message.success('重命名成功');
+                    _message["default"].success('重命名成功');
 
                     engine.view.topoClient.emitEvent('topo_shape_rename_finish', payload);
 

package/lib/models/linkDynamicStyleConfig.js

@@ -7,12 +7,12 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _next = require("@alifd/next");
-
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var ruleKey = 0;
@@ -172,7 +172,7 @@ var _default = {
                     break;
                   }
 
-                  _next.Message.show({
+                  _message["default"].show({
                     type: 'error',
                     title: error
                   });

package/lib/models/linkManager.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 链路新增、编辑 Model
  */

package/lib/models/resourceWebControllUrlSetting.js

@@ -11,8 +11,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 资源web控制台url配置 Model
  */

package/lib/models/topoAlarm.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 告警
  */

package/lib/models/topoBizMod.js

@@ -68,7 +68,7 @@ function _default(engine) {
           var _this = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            var ciTypes, ciTypesDoc, ciDoc, bindingCiSet, allMetrics, allAttrs, allCiSet, metrics, attrs;
+            var ciTypes, ciTypesDoc, ciDoc, bindingCiSet, allMetrics, allAttrs, newCiDoc, allCiSet, metrics, attrs;
             return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -79,6 +79,7 @@ function _default(engine) {
                     });
 
                     ciTypes = conditions.ciTypes, ciTypesDoc = conditions.ciTypesDoc, ciDoc = conditions.ciDoc, bindingCiSet = conditions.bindingCiSet, allMetrics = conditions.allMetrics, allAttrs = conditions.allAttrs;
+                    newCiDoc = (0, _extends2["default"])({}, ciDoc);
                     allCiSet = {}; // const metrics = await topoServer.getBatchCiMetric({ ciTypes });
 
                     metrics = allMetrics; // const attrs = await topoServer.getBatchCi({ ciTypes });
@@ -141,11 +142,13 @@ function _default(engine) {
 
                       ciTypesDoc[item].map(function (ciItem) {
                         // rlog.debug('ciDoc-before', item, ciItem);
-                        ciDoc[ciItem.ciId].list = allArray.map(function (codeItem) {
-                          return (0, _extends2["default"])({}, codeItem, {
-                            tag: (0, _topoData.findItemIndex)(ciDoc[ciItem.ciId].tag, 'code', codeItem.code) >= 0,
-                            tip: (0, _topoData.findItemIndex)(ciDoc[ciItem.ciId].tip, 'code', codeItem.code) >= 0
-                          });
+                        newCiDoc[ciItem.ciId] = (0, _extends2["default"])({}, newCiDoc[ciItem.ciId], {
+                          list: allArray.map(function (codeItem) {
+                            return (0, _extends2["default"])({}, codeItem, {
+                              tag: (0, _topoData.findItemIndex)(newCiDoc[ciItem.ciId].tag, 'code', codeItem.code) >= 0,
+                              tip: (0, _topoData.findItemIndex)(newCiDoc[ciItem.ciId].tip, 'code', codeItem.code) >= 0
+                            });
+                          })
                         });
                         return '';
                       });
@@ -155,13 +158,13 @@ function _default(engine) {
 
                     _this.update({
                       allCiSet: allCiSet,
-                      ciSetDoc: ciDoc,
+                      ciSetDoc: newCiDoc,
                       pollingSwitch: true
                     });
 
                     return _context.abrupt("return", {});
 
-                  case 10:
+                  case 11:
                   case "end":
                     return _context.stop();
                 }

package/lib/models/topoEdit.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 拓扑编辑 Model
  */

package/lib/models/topoGraphView.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 拓扑图 Model
  */

package/lib/models/topoMod.js

@@ -149,36 +149,38 @@ function _default(topoApp) {
           var _this2 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var id, viewState, linkTo;
+            var id, data, viewState, linkTo, topoId;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    id = playload.id, viewState = playload.viewState, linkTo = playload.linkTo;
-                    _context2.next = 3;
-                    return topoApp.open(id);
+                    id = playload.id, data = playload.data, viewState = playload.viewState, linkTo = playload.linkTo;
+                    topoId = id || data.config.id;
+                    _context2.next = 4;
+                    return topoApp.open(topoId);
 
-                  case 3:
+                  case 4:
                     _this2.update({
                       viewState: viewState || 'view',
                       currentTopo: playload,
-                      topoId: id,
+                      topoId: topoId,
                       topoPermission: undefined
                     });
 
-                    _context2.next = 6;
+                    _context2.next = 7;
                     return _this2.initTopoData({
-                      topoId: id,
+                      topoId: topoId,
+                      data: data,
                       linkTo: linkTo
                     });
 
-                  case 6:
+                  case 7:
                     if (viewState === 'edit') {
                       // TODO 待优化进入编辑模式方式
                       _this2.enterEditMode();
                     }
 
-                  case 7:
+                  case 8:
                   case "end":
                     return _context2.stop();
                 }
@@ -293,14 +295,14 @@ function _default(topoApp) {
           var _this5 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-            var startTime, topoId, linkToData, refresh, linkTo, permission, result, _yield$Promise$all, ciTypeMap, links, icons, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, linkTo, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, icons, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
                 switch (_context6.prev = _context6.next) {
                   case 0:
                     startTime = (0, _moment["default"])();
-                    topoId = props.topoId, linkToData = props.linkTo, refresh = props.refresh; // 关联拓扑图
+                    topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh; // 关联拓扑图
 
                     if (refresh !== true) {
                       linkTo = linkToData || null;
@@ -323,18 +325,25 @@ function _default(topoApp) {
                       topoLoadError: false
                     });
 
-                    topoApp.options.onLoadStart(); // 查询权限
+                    topoApp.options.onLoadStart(); // 待移走
 
-                    _context6.next = 8;
+                    permission = 'write';
+
+                    if (!topoApp.options.usePermission) {
+                      _context6.next = 15;
+                      break;
+                    }
+
+                    _context6.next = 10;
                     return _this5.getTopoPermission({
                       id: topoId
                     });
 
-                  case 8:
+                  case 10:
                     permission = _context6.sent;
 
                     if (_topoPermissonUtil["default"].isReadable(permission)) {
-                      _context6.next = 13;
+                      _context6.next = 15;
                       break;
                     }
 
@@ -347,15 +356,33 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 13:
-                    _context6.next = 15;
+                  case 15:
+                    if (!data) {
+                      _context6.next = 22;
+                      break;
+                    }
+
+                    _context6.next = 18;
                     return topoApp.options.loadData(topoId);
 
-                  case 15:
+                  case 18:
+                    topoConfig = _context6.sent;
+                    result = (0, _extends2["default"])({}, data, {
+                      serialize: topoConfig.serialize
+                    });
+                    _context6.next = 25;
+                    break;
+
+                  case 22:
+                    _context6.next = 24;
+                    return topoApp.options.loadData(topoId);
+
+                  case 24:
                     result = _context6.sent;
 
+                  case 25:
                     if (result) {
-                      _context6.next = 20;
+                      _context6.next = 29;
                       break;
                     }
 
@@ -367,25 +394,22 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 20:
+                  case 29:
                     _rlog["default"].debug('topoMod.initTopoData 获取拓扑数据', topoId, linkTo, result);
 
-                    _context6.next = 23;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), (0, _linkUtils.getLinksDetail)(result.links), dispatch.iconManage.getIcons()]);
+                    _context6.next = 32;
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.iconManage.getIcons()]);
 
-                  case 23:
+                  case 32:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
-                    links = _yield$Promise$all[1];
-                    icons = _yield$Promise$all[2];
+                    icons = _yield$Promise$all[1];
 
                     _rlog["default"].debug('topoMod.initTopoData Ci属性指标元数据', ciTypeMap);
 
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
-                      data: (0, _extends2["default"])({}, result, {
-                        links: links
-                      }),
+                      data: result,
                       linkTo: linkTo,
                       globalSetting: null,
                       ciTypeMap: ciTypeMap,
@@ -413,7 +437,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 37:
+                  case 45:
                   case "end":
                     return _context6.stop();
                 }

package/lib/models/topoView.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 拓扑图 Model
  */

package/lib/models/topocenter/functionAuth.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 var _authorization = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/authorization"));
 
 /**

package/lib/models/topocenter/topoCenter.js

@@ -15,8 +15,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/services/topo"));
 
-var _next = require("@alifd/next");
-
 /**
  * 拓扑中心 Model
  *

package/lib/style.js

@@ -1,17 +1,41 @@
 require('@riil-frontend/component-topology-graph/lib/style');
+require('@alifd/next/lib/message/style');
+require('@alifd/next/lib/dialog/style');
 require('@riil-frontend/utils/lib/style');
-
 require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/drawer/style');
+require('@alifd/next/lib/button/style');
+require('@alifd/next/lib/table/style');
+require('@alifd/next/lib/search/style');
 require('@riil-frontend/component-pager/lib/style');
 require('@riil-frontend/component-more-buttons-menu/lib/style');
 require('@riil-frontend/component-table-filter-tags/lib/style');
 require('@riil-frontend/component-table-layout/lib/style');
 require('@riil-frontend/component-res-advanced-search/lib/style');
+require('@alifd/next/lib/card/style');
+require('@alifd/next/lib/checkbox/style');
+require('@alifd/next/lib/loading/style');
+require('@alifd/next/lib/upload/style');
+require('@alifd/next/lib/icon/style');
+require('@alifd/next/lib/input/style');
+require('@alifd/next/lib/field/style');
+require('@alifd/next/lib/form/style');
+require('@alifd/next/lib/number-picker/style');
+require('@alifd/next/lib/select/style');
 require('@riil-frontend/component-riil-rule-tree/lib/style');
+require('@alifd/next/lib/balloon/style');
+require('@alifd/next/lib/grid/style');
 require('@riil-frontend/component-action-tree/lib/style');
 require('@riil-frontend/hooks/lib/style');
 require('@riil-frontend/component-extra-title/lib/style');
 require('@riil-frontend/next-collapse/lib/style');
+require('@alifd/next/lib/box/style');
+require('@alifd/next/lib/menu-button/style');
+require('@alifd/next/lib/tab/style');
+require('@alifd/next/lib/radio/style');
+require('@alifd/next/lib/collapse/style');
+require('@alifd/next/lib/avatar/style');
+require('@alifd/next/lib/cascader-select/style');
 require('@riil-frontend/component-no-data-page/lib/style');
 require('@riil-frontend/component-topology-utils/lib/style');
 require('./index.scss');