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

package/es/core/utils/showGraphManageStatusUtil.js

@@ -4,6 +4,7 @@ export function showManageStatus(options) {
   var topo = options.topo,
       resources = options.resources,
       graphLoaded = options.graphLoaded,
+      alarmSwitch = options.alarmSwitch,
       cisEventLevel = options.cisEventLevel;
 
   var hasAlarm = function hasAlarm(id) {
@@ -20,9 +21,9 @@ export function showManageStatus(options) {
           manageStatus = resource.manageStatus,
           permission = resource.permission;
       var isNotMonite = manageStatus === 0;
-      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 没有告警且有查看权限，才显示未监控状态
+      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 未监控 && 有查看权限 && (告警静默 || 没有告警)，才显示未监控状态
 
-      var showUnMoniteStatus = !hasAlarm(id) && isNotMonite && readable;
+      var showUnMoniteStatus = isNotMonite && readable && (alarmSwitch === false || !hasAlarm(id));
       var element = topo.getDataModel().getDataByTag(id);
       if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
 

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js

@@ -23,8 +23,8 @@ export default function LinkTopoCard(props) {
       openFlow = _useState[0],
       setOpenFlow = _useState[1];
 
-  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + data.attributes.name + "&num=0";
-  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + data.attributes.name + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
+  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + encodeURIComponent(data.attributes.display_name) + "&num=0";
+  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + encodeURIComponent(data.attributes.display_name) + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
 
   var isOpenFlows = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {

package/es/core/viewer/components/plugins/ViewerPlugin.js

@@ -8,8 +8,10 @@ export default function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
+  var alarmInfoDoc = viewerProps.alarmInfoDoc;
   useAlarm({
-    topo: topo
+    topo: topo,
+    alarmInfoDoc: alarmInfoDoc
   });
   useManageStatus({
     topo: topo

package/es/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -5,11 +5,7 @@ import useEventData from "../../../../hooks/useEventData";
 
 function AlarmButton(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
+  var alarmState = topo.store.useModelState("topoAlarm");
   var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
   var alarmData = useEventData({
     topo: topo

package/es/networkTopo/components/TopoView.js

@@ -2,7 +2,7 @@ import _Loading from "@alifd/next/es/loading";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
-import React, { useState, useEffect, useRef, useCallback } from "react";
+import React from "react";
 import NodataPage from "@riil-frontend/component-topology-common/es/components/NoDataPage/index";
 import BasicTopoView from "../../core/components/TopoView";
 import topoPermissonUtil from "../../utils/topoPermissionUtil";
@@ -11,8 +11,8 @@ import TopoNoPermission from "./TopoNoPermission";
 import styles from "../../components/index.module.scss";
 import useLinkDynamicStyle from "../hooks/useLinkDynamicStyle";
 import useRelateTopo from "../hooks/viewer/useRelateTopo";
-import useEdgeFlow from "../hooks/viewer/useEdgeFlow";
-import useEdgeExpand from "../hooks/useEdgeExpand";
+import useEdgeFlow from "../hooks/viewer/useEdgeFlow"; // import useEdgeExpand from "../hooks/useEdgeExpand";
+
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
@@ -36,10 +36,8 @@ function NetworkTopologyCore(props) {
   });
   useEdgeFlow({
     topo: topo
-  });
-  useEdgeExpand({
-    topo: topo
-  });
+  }); // useEdgeExpand({ topo })
+
   var relateTopo = useRelateTopo({
     topo: topo
   });
@@ -68,10 +66,7 @@ function NetworkTopologyCore(props) {
       });
     } else if (!topoId) {
       return null;
-    } // if (loading) {
-    //   return null;
-    // }
-
+    }
 
     if (!loading) {
       // 加载完成后

package/es/networkTopo/hooks/useEdgeExpand.js

@@ -15,9 +15,8 @@ export default function useEdgeExpand(props) {
           data = e.data;
 
       if (data instanceof ht.Group && property === 'expanded') {
-        updateEdgeExpanded(topo);
-        setTimeout(function () {
-          updateEdgeExpanded(topo);
+        // updateEdgeExpanded(topo)
+        setTimeout(function () {// updateEdgeExpanded(topo)
         }, 100);
       }
     }

package/es/networkTopo/services/topo/basic.js

@@ -1,7 +1,7 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["groups", "resources", "exportLinkIdList"];
+var _excluded = ["groups", "resources"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { rlog } from '@riil-frontend/component-topology-utils';
@@ -463,11 +463,11 @@ export default _extends({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
+      var groups, resources, otherConfig, newGroups, obj;
       return _regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
+            groups = config.groups, resources = config.resources, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {

package/es/networkTopo/store/topoCenter.js

@@ -8,243 +8,280 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  *
  */
 import { rlog } from '@riil-frontend/component-topology-utils';
-export default {
-  // 定义 model 的初始 state
-  state: {
-    loading: true,
-    id: undefined,
-    viewState: 'view' // view, create, 2种模式
-
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      /**
-       * 初始化。
-       */
-      initData: function initData(params, rootState) {
-        var _this = this;
-
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var topoModState, viewType, id, topoTreeModState;
-          return _regeneratorRuntime.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;
+import { parseTopoData } from "../../utils/topoData";
+export default function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: {
+      loading: true,
+      id: undefined,
+      viewState: 'view' // view, create, 2种模式
+
+    },
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return _extends({}, prevState, payload);
+      }
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        /**
+         * 初始化。
+         */
+        initData: function initData(params, rootState) {
+          var _this = this;
+
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            var topoModState, viewType, id, topoTreeModState;
+            return _regeneratorRuntime.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(_extends({}, params, {
+                    type: params.type,
+                    id: id
+                  }));
 
-              case 27:
-                _context.next = 29;
-                return dispatch.topoMod.initData(_extends({}, 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+            return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+            return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+            var id, viewState;
+            return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-          return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-          var id, viewState;
-          return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-          return _regeneratorRuntime.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);
-        }))();
-      }
-    };
-  }
-};
+
+                case 8:
+                  _context4.next = 10;
+                  return dispatch.topoMod.clearData();
+
+                case 10:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _callee4);
+          }))();
+        },
+        refreshTopoTree: function refreshTopoTree() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+            return _regeneratorRuntime.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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+            var result, extraConfig;
+            return _regeneratorRuntime.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 = parseTopoData(result);
+                  extraConfig = result.global.extraConfig;
+                  _context6.next = 9;
+                  return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
+                    alarmSwitch: result.global.alarmSwitch,
+                    alarmListDefaultOpen: result.global.alarmListDefaultOpen
+                  }));
+
+                case 9:
+                case "end":
+                  return _context6.stop();
+              }
+            }, _callee6);
+          }))();
+        }
+      };
+    }
+  };
+}

package/es/style.js

@@ -2,8 +2,8 @@ import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
 import '@riil-frontend/component-topology-utils/es/style';
 import '@alifd/next/es/message/style';
-import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@riil-frontend/utils/es/style';
+import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@alifd/next/es/menu-button/style';
 import '@alifd/next/es/search/style';
 import '@alifd/next/es/drawer/style';