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

package/lib/networkTopo/store/topoCenter.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = _default;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -11,251 +11,288 @@ 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 _topoData = require("../../utils/topoData");
 
 /**
  * 拓扑中心 Model
  *
  *
  */
-var _default = {
-  // 定义 model 的初始 state
-  state: {
-    loading: true,
-    id: undefined,
-    viewState: 'view' // view, create, 2种模式
-
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return (0, _extends2["default"])({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      /**
-       * 初始化。
-       */
-      initData: function initData(params, rootState) {
-        var _this = this;
-
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-          var topoModState, viewType, id, topoTreeModState;
-          return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                if (params === void 0) {
-                  params = {};
-                }
-
-                topoModState = rootState.topoMod;
-                viewType = params.type || 'view';
-                id = params.id || topoModState.topoId || '';
-
-                _this.update({
-                  loading: true,
-                  viewState: viewType
-                }); // 加载功能操作权限
-
-
-                _context.next = 7;
-                return dispatch.functionAuth.init();
-
-              case 7:
-                // 加载拓扑树数据
-                topoTreeModState = rootState.topoTreeMod;
-
-                if (topoTreeModState.loaded) {
-                  _context.next = 16;
+function _default(topo) {
+  return {
+    // 定义 model 的初始 state
+    state: {
+      loading: true,
+      id: undefined,
+      viewState: 'view' // view, create, 2种模式
+
+    },
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return (0, _extends2["default"])({}, prevState, payload);
+      }
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        /**
+         * 初始化。
+         */
+        initData: function initData(params, rootState) {
+          var _this = this;
+
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+            var topoModState, viewType, id, topoTreeModState;
+            return _regenerator["default"].wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (params === void 0) {
+                    params = {};
+                  }
+
+                  topoModState = rootState.topoMod;
+                  viewType = params.type || 'view';
+                  id = params.id || topoModState.topoId || '';
+
+                  _this.update({
+                    loading: true,
+                    viewState: viewType
+                  }); // 加载功能操作权限
+
+
+                  _context.next = 7;
+                  return dispatch.functionAuth.init();
+
+                case 7:
+                  // 加载拓扑树数据
+                  topoTreeModState = rootState.topoTreeMod;
+
+                  if (topoTreeModState.loaded) {
+                    _context.next = 16;
+                    break;
+                  }
+
+                  _context.next = 11;
+                  return dispatch.topoTreeMod.fetchTopoTree({
+                    id: id
+                  });
+
+                case 11:
+                  _context.next = 13;
+                  return dispatch.topoTreeMod.getSelectedTopoId();
+
+                case 13:
+                  id = _context.sent;
+                  _context.next = 18;
                   break;
-                }
 
-                _context.next = 11;
-                return dispatch.topoTreeMod.fetchTopoTree({
-                  id: id
-                });
+                case 16:
+                  _context.next = 18;
+                  return _this.refreshTopoTree();
 
-              case 11:
-                _context.next = 13;
-                return dispatch.topoTreeMod.getSelectedTopoId();
+                case 18:
+                  if (id) {
+                    // 左侧树切换选中
+                    dispatch.topoTreeMod.selectNode(id);
+                  }
 
-              case 13:
-                id = _context.sent;
-                _context.next = 18;
-                break;
+                  if (!(viewType === 'create')) {
+                    _context.next = 24;
+                    break;
+                  }
 
-              case 16:
-                _context.next = 18;
-                return _this.refreshTopoTree();
-
-              case 18:
-                if (id) {
-                  // 左侧树切换选中
-                  dispatch.topoTreeMod.selectNode(id);
-                }
+                  _context.next = 22;
+                  return _this.openCreateTopoPage({
+                    id: id
+                  });
 
-                if (!(viewType === 'create')) {
-                  _context.next = 24;
+                case 22:
+                  _context.next = 29;
                   break;
-                }
 
-                _context.next = 22;
-                return _this.openCreateTopoPage({
-                  id: id
-                });
+                case 24:
+                  if (!params.selectedElementTag) {
+                    _context.next = 27;
+                    break;
+                  }
 
-              case 22:
-                _context.next = 29;
-                break;
-
-              case 24:
-                if (!params.selectedElementTag) {
                   _context.next = 27;
-                  break;
-                }
+                  return dispatch.selection.update({
+                    initSelectionId: params.selectedElementTag
+                  });
 
-                _context.next = 27;
-                return dispatch.selection.update({
-                  initSelectionId: params.selectedElementTag
-                });
+                case 27:
+                  _context.next = 29;
+                  return dispatch.topoMod.initData((0, _extends2["default"])({}, params, {
+                    type: params.type,
+                    id: id
+                  }));
 
-              case 27:
-                _context.next = 29;
-                return dispatch.topoMod.initData((0, _extends2["default"])({}, params, {
-                  type: params.type,
-                  id: id
-                }));
+                case 29:
+                  _this.update({
+                    loading: false
+                  }); // 是否打开概览
 
-              case 29:
-                _this.update({
-                  loading: false
-                }); // 是否打开概览
 
+                  if (!params.openResourceOverview) {
+                    _context.next = 33;
+                    break;
+                  }
 
-                if (!params.openResourceOverview) {
                   _context.next = 33;
+                  return dispatch.resourceDetail.update({
+                    visible: true,
+                    id: params.openResourceOverview
+                  });
+
+                case 33:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }))();
+        },
+
+        /**
+         * 退出。
+         */
+        exit: function exit(playload, rootState) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return dispatch.topoMod.exit(playload);
+
+                case 2:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2);
+          }))();
+        },
+        openCreateTopoPage: function openCreateTopoPage(playload, state) {
+          var _this2 = this;
+
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  if (playload === void 0) {
+                    playload = {};
+                  }
+
+                  _this2.update({
+                    viewState: 'create',
+                    id: playload.id
+                  });
+
+                  dispatch.topoCreate.init(playload); // history.replace(`/default/topoCenter?type=create&id=${playload.id}`);
+
+                case 3:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _callee3);
+          }))();
+        },
+
+        /**
+         *
+         * @param playload {{id: string, linkTo:?object}}
+         */
+        openTopoPage: function openTopoPage(playload, rootState) {
+          var _this3 = this;
+
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+            var id, viewState;
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  id = playload.id, viewState = playload.viewState; // 左侧树切换选中
+
+                  dispatch.topoTreeMod.selectNode(id);
+
+                  _this3.update({
+                    viewState: viewState || 'view'
+                  });
+
+                  if (!id) {
+                    _context4.next = 8;
+                    break;
+                  }
+
+                  _context4.next = 6;
+                  return dispatch.topoMod.openTopoPage(playload);
+
+                case 6:
+                  _context4.next = 10;
                   break;
-                }
-
-                _context.next = 33;
-                return dispatch.resourceDetail.update({
-                  visible: true,
-                  id: params.openResourceOverview
-                });
-
-              case 33:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }))();
-      },
-
-      /**
-       * 退出。
-       */
-      exit: function exit(playload, rootState) {
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-          return _regenerator["default"].wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return dispatch.topoMod.exit(playload);
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }, _callee2);
-        }))();
-      },
-      openCreateTopoPage: function openCreateTopoPage(playload, state) {
-        var _this2 = this;
-
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-          return _regenerator["default"].wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
-              case 0:
-                if (playload === void 0) {
-                  playload = {};
-                }
-
-                _this2.update({
-                  viewState: 'create',
-                  id: playload.id
-                });
-
-                dispatch.topoCreate.init(playload); // history.replace(`/default/topoCenter?type=create&id=${playload.id}`);
-
-              case 3:
-              case "end":
-                return _context3.stop();
-            }
-          }, _callee3);
-        }))();
-      },
-
-      /**
-       *
-       * @param playload {{id: string, linkTo:?object}}
-       */
-      openTopoPage: function openTopoPage(playload, rootState) {
-        var _this3 = this;
-
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-          var id, viewState;
-          return _regenerator["default"].wrap(function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
-              case 0:
-                id = playload.id, viewState = playload.viewState; // 左侧树切换选中
-
-                dispatch.topoTreeMod.selectNode(id);
-
-                _this3.update({
-                  viewState: viewState || 'view'
-                });
-
-                if (!id) {
-                  _context4.next = 8;
-                  break;
-                }
-
-                _context4.next = 6;
-                return dispatch.topoMod.openTopoPage(playload);
-
-              case 6:
-                _context4.next = 10;
-                break;
-
-              case 8:
-                _context4.next = 10;
-                return dispatch.topoMod.clearData();
-
-              case 10:
-              case "end":
-                return _context4.stop();
-            }
-          }, _callee4);
-        }))();
-      },
-      refreshTopoTree: function refreshTopoTree() {
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-          return _regenerator["default"].wrap(function _callee5$(_context5) {
-            while (1) switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return dispatch.topoTreeMod.refreshTree();
-
-              case 2:
-              case "end":
-                return _context5.stop();
-            }
-          }, _callee5);
-        }))();
-      }
-    };
-  }
-};
-exports["default"] = _default;
+
+                case 8:
+                  _context4.next = 10;
+                  return dispatch.topoMod.clearData();
+
+                case 10:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _callee4);
+          }))();
+        },
+        refreshTopoTree: function refreshTopoTree() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+            return _regenerator["default"].wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
+                case 0:
+                  _context5.next = 2;
+                  return dispatch.topoTreeMod.refreshTree();
+
+                case 2:
+                case "end":
+                  return _context5.stop();
+              }
+            }, _callee5);
+          }))();
+        },
+        refreshGlobalConfig: function refreshGlobalConfig() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+            var result, extraConfig;
+            return _regenerator["default"].wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
+                case 0:
+                  if (topo.id) {
+                    _context6.next = 2;
+                    break;
+                  }
+
+                  return _context6.abrupt("return");
+
+                case 2:
+                  _context6.next = 4;
+                  return topo.options.loadData(topo.id, topo.serverApi);
+
+                case 4:
+                  result = _context6.sent;
+                  result = (0, _topoData.parseTopoData)(result);
+                  extraConfig = result.global.extraConfig;
+                  _context6.next = 9;
+                  return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
+                    alarmSwitch: result.global.alarmSwitch,
+                    alarmListDefaultOpen: result.global.alarmListDefaultOpen
+                  }));
+
+                case 9:
+                case "end":
+                  return _context6.stop();
+              }
+            }, _callee6);
+          }))();
+        }
+      };
+    }
+  };
+}

package/lib/networkTopo/store/topoTreeMod.js

@@ -13,7 +13,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 _tree = require("../../utils/tree");
 
@@ -165,7 +165,7 @@ function _default(topoApp) {
                     conditions = {};
                   }
 
-                  _rlog["default"].debug('editTopoOnTree', conditions);
+                  _componentTopologyUtils.rlog.debug('editTopoOnTree', conditions);
 
                   _context4.next = 4;
                   return topoApp.serverApi.editTopo({
@@ -236,7 +236,7 @@ function _default(topoApp) {
             return _regenerator["default"].wrap(function _callee5$(_context5) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
-                  _rlog["default"].debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
+                  _componentTopologyUtils.rlog.debug('deleteTopoOnTree', conditions, state, dispatch.topoMod);
 
                   currentTopoId = state.topoMod.topoId;
 
@@ -245,7 +245,7 @@ function _default(topoApp) {
                     break;
                   }
 
-                  _rlog["default"].debug('deleteTopo-currentTopo', conditions);
+                  _componentTopologyUtils.rlog.debug('deleteTopo-currentTopo', conditions);
 
                   _context5.next = 6;
                   return dispatch.topoMod.updateDelId("" + conditions);
@@ -304,7 +304,7 @@ function _default(topoApp) {
                     conditions = {};
                   }
 
-                  _rlog["default"].debug('setDefTopoOnTree', conditions);
+                  _componentTopologyUtils.rlog.debug('setDefTopoOnTree', conditions);
 
                   _context6.next = 4;
                   return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));

package/lib/networkTopo/utils/exportData.js

@@ -11,8 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
 var _clusterUtil = require("../../utils/clusterUtil");
 
 function _default(_x) {
@@ -57,7 +55,7 @@ function _ref() {
             })
           };
 
-          _rlog["default"].error('导出数据', params);
+          _componentTopologyUtils.rlog.error('导出数据', params);
 
           _context.next = 6;
           return _componentTopologyUtils.request.post('/topo/v1/api/structure/excel', params, {

package/lib/style.js

@@ -1,9 +1,9 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
-require('@alifd/next/lib/message/style');
 require('@riil-frontend/component-topology-utils/lib/style');
-require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/message/style');
 require('@riil-frontend/utils/lib/style');
+require('@riil-frontend/component-riil-event-emitter/lib/style');
 require('@alifd/next/lib/menu-button/style');
 require('@alifd/next/lib/search/style');
 require('@alifd/next/lib/drawer/style');

package/lib/utils/ResourceConfigUtil.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 _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
@@ -53,12 +53,6 @@ function getResourceConfigFromHt(topo) {
     layers: (0, _sortBy["default"])(layers, 'order'),
     groups: groups,
     resources: resources,
-    exportLinkIdList: getExportLinkIdList({
-      topo: topo,
-      htTopo: htTopo,
-      dataModel: dataModel
-    }),
-    // 出口链路id列表
     relateTopoIdList: getRelateTopoIdList(dataModel)
   };
 } // 查询关联拓扑id列表
@@ -75,35 +69,6 @@ function getRelateTopoIdList(dataModel) {
 
     return topoIds;
   }, []);
-} // 查询出口链路列表
-
-
-function getExportLinkIdList(_ref) {
-  var topo = _ref.topo,
-      htTopo = _ref.htTopo,
-      dataModel = _ref.dataModel;
-  var exportLinkIdList = [];
-  var edges = (0, _htElementUtils.getEdges)(dataModel);
-
-  _rlog["default"].debug(' 查询出口链路列表-edges', edges, dataModel);
-
-  edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
-
-    if (edgeData) {
-      // eslint-disable-next-line no-underscore-dangle
-      var id = edgeData._attrObject.id;
-
-      if (id) {
-        var linkData = topo.dataModel.getDataById(id);
-
-        if ((0, _linkUtils.isExitLink)(linkData) && !exportLinkIdList.includes(id)) {
-          exportLinkIdList.push(id);
-        }
-      }
-    }
-  });
-  return exportLinkIdList;
 }
 
 function getLayerDatas(dataModel) {
@@ -127,9 +92,9 @@ function getLayerDatas(dataModel) {
   return layers;
 }
 
-function getGroupDatas(_ref2) {
-  var groupElements = _ref2.groupElements,
-      layers = _ref2.layers;
+function getGroupDatas(_ref) {
+  var groupElements = _ref.groupElements,
+      layers = _ref.layers;
   // 获得视图上的区域配置
   var groups = groupElements.filter(function (node) {
     return !node.getParent();