@riil-frontend/component-topology 12.0.0-dev.16 → 12.0.0-dev.18

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -97,7 +97,7 @@ function SubListItem(props) {
   var subNode = topo.getData().nodes.find(function (node) {
     return node.ciId === alarmInfo.mainCiId;
   });
-  var plarm = alarmInfo.cmpCode ? "\u3010" + subNode.sourceName + "\u3011" : "【本级平台】";
+  var plarm = alarmInfo.cmpCode ? "\u3010" + (subNode === null || subNode === void 0 ? void 0 : subNode.sourceName) + "\u3011" : "【本级平台】";
   return /*#__PURE__*/React.createElement(_List.Item, {
     className: styles.AlarmListItem,
     media: /*#__PURE__*/React.createElement(_Icon, {

package/es/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -24,6 +24,11 @@ function Layout(props) {
       selection = _topo$store$useModelS.selection;
 
   var setDisabled = function setDisabled(data) {
+    if (topoShowType !== 'layers' && selection.length === 1) {
+      //中心节点布局，选中一个节点非分层情况下，需要星型和树形布局亮起来
+      return data == 'rectangle' || data == 'hierarchical';
+    }
+
     if (topoShowType == 'layers' && selection.length == 1 && !isGroup(selection[0])) {
       return data != 'rectangle';
     } else {
@@ -41,7 +46,11 @@ function Layout(props) {
 
 
     if (topoShowType != 'layers' && selection.length == 1) {
-      topo.getHtTopo().layoutInContainer(layouType);
+      if (layouType == 'hierarchical') {
+        topo.getHtTopo().layoutInContainer(layouType);
+      } else {
+        topo.getHtTopo().layoutTopoBySelectNode(layouType, selectionElements[0]);
+      }
     } // eslint-disable-next-line eqeqeq
 
 
@@ -56,7 +65,7 @@ function Layout(props) {
     topo.historyManager.beginTransaction();
     setLayout(v); // eslint-disable-next-line eqeqeq
 
-    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1) {
+    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1 || topoShowType !== 'layers' && selection.length === 1) {
       globalLayout(v);
     }
 
@@ -135,6 +144,11 @@ function isLayoutEnabled(props) {
 
   if (topoShowType !== 'layers' && !selection.length) {
     return true;
+  } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
+
+
+  if (topoShowType !== 'layers' && selection.length === 1) {
+    return true;
   }
 
   return false;

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -2,8 +2,14 @@ import { useEffect } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { getElements } from "../../utils/htElementUtils";
 import { removeManageStatus, showManageStatus } from "../utils/showGraphManageStatusUtil";
+/**
+ * 获取ci的最高告警级别
+ * @param {Array} alarmList 
+ * @param {*} risks 
+ * @returns 
+ */
 
-function getCiAlarmLevels(alarmList, risks) {
+function getCiAlarmLevelMap(alarmList, risks) {
   var ciIdLevelMap = {};
   [].concat(alarmList, risks.map(function (item) {
     var _item$resourceId;
@@ -21,13 +27,53 @@ function getCiAlarmLevels(alarmList, risks) {
 
     ciIdLevelMap[item.id] = level;
   });
+  return ciIdLevelMap;
+}
+
+function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
       level: ciIdLevelMap[id]
     };
+  }).filter(function (alarm) {
+    var resource = resources.find(function (item) {
+      return item.id === alarm.id;
+    });
+    return !!resource;
   });
 }
+/**
+ * 获得关联拓扑节点告警级别
+ * @param {*} topo 
+ * @param {*} relateTopoAlarm 
+ * @returns 
+ */
+
+
+function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
+  return Object.keys(relateTopoAlarm).map(function (topoId) {
+    var level = relateTopoAlarm[topoId];
+    var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
+      return "" + node.a('bindTopo') === "" + topoId;
+    });
+
+    if (!level || !relateTopoNode) {
+      return null;
+    }
+
+    return {
+      elementId: relateTopoNode.getId(),
+      level: level
+    };
+  }).filter(function (item) {
+    return !!item;
+  });
+} // 获取拓扑图元素最高告警级别。包含资源、链路、关联拓扑节点
+
+
+function getGraphElementAlarmLevels(resources) {}
 /**
  * 告警显示到ht拓扑
  * 
@@ -38,7 +84,6 @@ function getCiAlarmLevels(alarmList, risks) {
 export default function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
-  var store = topo.store;
   var topoState = topo.store.useModelState('topoMod');
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
@@ -52,17 +97,7 @@ export default function useGraphAlarmDisplay(options) {
   var resources = topo.dataModel.useCis();
 
   function getCisEventLevel() {
-    return getCiAlarmLevels(alarmList || [], risks).filter(function (alarm) {
-      var resource = resources.find(function (item) {
-        return item.id === alarm.id;
-      });
-
-      if (!resource) {
-        return false;
-      }
-
-      return true;
-    });
+    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
   }
 
   useEffect(function () {
@@ -72,8 +107,8 @@ export default function useGraphAlarmDisplay(options) {
       resources: resources,
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
-      // 有告警且未监控时，此时开启告警静默，应当显示未监控图标
-      cisEventLevel: alarmSwitch === false ? [] : getCisEventLevel()
+      alarmSwitch: alarmSwitch,
+      cisEventLevel: getCisEventLevel()
     });
 
     function showAlarm() {
@@ -87,41 +122,28 @@ export default function useGraphAlarmDisplay(options) {
         return;
       }
 
-      var finalAlarms = getCisEventLevel(); // 将告警级别放入ht元素，便于测试
+      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
+
+      var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
+      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       getElements(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
       }).forEach(function (element) {
-        var _finalAlarms$find;
+        var _elementsAlarmLevels$;
 
-        var alarmLevel = (_finalAlarms$find = finalAlarms.find(function (item) {
-          return item.id === element.getTag();
-        })) === null || _finalAlarms$find === void 0 ? void 0 : _finalAlarms$find.level;
+        var alarmLevel = (_elementsAlarmLevels$ = elementsAlarmLevels.find(function (item) {
+          return item.id === element.getTag() || item.elementId === element.getId();
+        })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
         element.a('alarmLevel', alarmLevel);
       });
-      var relateTopoAlarms = Object.keys(relateTopoAlarm).map(function (topoId) {
-        var level = relateTopoAlarm[topoId];
-        var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
-          return "" + node.a('bindTopo') === "" + topoId;
-        });
-
-        if (!level || !relateTopoNode) {
-          return null;
-        }
-
-        return {
-          elementId: relateTopoNode.getId(),
-          level: level
-        };
-      }).filter(function (item) {
-        return !!item;
-      });
-      rlog.debug('关联拓扑告警：推送ht', {
-        all: relateTopoAlarm,
+      rlog.debug('推送告警 => ht', {
+        alarms: elementsAlarmLevels,
+        relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
-      topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));
+      topo.view.loadAlarm(elementsAlarmLevels);
     }
 
     return function () {

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.0.0-dev.16" === 'string' ? "12.0.0-dev.16" : null;
+var version = typeof "12.0.0-dev.18" === 'string' ? "12.0.0-dev.18" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

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

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

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

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/utils/ciRefAttributeTranslateUtil.d.ts

@@ -1,12 +1,16 @@
+interface Options {
+    refreshCiCache: boolean;
+}
 /**
  * 翻译ci列表引用属性名称
  * @param ciDatas
  * @returns
  */
-export declare function translateCisRefAttributeName(ciDatas: Array<any>): Promise<Array<any>>;
+export declare function translateCisRefAttributeName(ciDatas: Array<any>, options?: Options): Promise<Array<any>>;
 /**
  * 翻译ci引用属性名称
  * @param ciData
  * @returns
  */
-export declare function translateCiRefAttributeName(ciData: any): Promise<any>;
+export declare function translateCiRefAttributeName(ciData: any, options?: Options): Promise<any>;
+export {};

package/es/utils/ciRefAttributeTranslateUtil.js

@@ -77,14 +77,13 @@ function addRefCiNameToCiDatas(ciDatas, ciRefAttributesMap, refCiMap) {
     });
   });
 }
+
 /**
  * 翻译ci列表引用属性名称
  * @param ciDatas 
  * @returns 
  */
-
-
-export function translateCisRefAttributeName(_x) {
+export function translateCisRefAttributeName(_x, _x2) {
   return _translateCisRefAttributeName.apply(this, arguments);
 }
 /**
@@ -94,7 +93,7 @@ export function translateCisRefAttributeName(_x) {
  */
 
 function _translateCisRefAttributeName() {
-  _translateCisRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ciDatas) {
+  _translateCisRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ciDatas, options) {
     var ciTypeMap, ciRefAttributesMap, refIds, refCiMap;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -118,7 +117,7 @@ function _translateCisRefAttributeName() {
 
         case 7:
           _context.next = 9;
-          return ciCache.load(refIds);
+          return ciCache.load(refIds, options === null || options === void 0 ? void 0 : options.refreshCiCache);
 
         case 9:
           refCiMap = _context.sent;
@@ -133,17 +132,17 @@ function _translateCisRefAttributeName() {
   return _translateCisRefAttributeName.apply(this, arguments);
 }
 
-export function translateCiRefAttributeName(_x2) {
+export function translateCiRefAttributeName(_x3, _x4) {
   return _translateCiRefAttributeName.apply(this, arguments);
 }
 
 function _translateCiRefAttributeName() {
-  _translateCiRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ciData) {
+  _translateCiRefAttributeName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ciData, options) {
     var result;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          result = translateCisRefAttributeName([]);
+          result = translateCisRefAttributeName([ciData], options);
           return _context2.abrupt("return", result[0]);
 
         case 2:

package/lib/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -115,7 +115,7 @@ function SubListItem(props) {
   var subNode = topo.getData().nodes.find(function (node) {
     return node.ciId === alarmInfo.mainCiId;
   });
-  var plarm = alarmInfo.cmpCode ? "\u3010" + subNode.sourceName + "\u3011" : "【本级平台】";
+  var plarm = alarmInfo.cmpCode ? "\u3010" + (subNode === null || subNode === void 0 ? void 0 : subNode.sourceName) + "\u3011" : "【本级平台】";
   return /*#__PURE__*/_react["default"].createElement(_list["default"].Item, {
     className: _indexModule["default"].AlarmListItem,
     media: /*#__PURE__*/_react["default"].createElement(_icon["default"], {

package/lib/core/editor/components/Toolbar/widgets/Layout/index.js

@@ -40,6 +40,11 @@ function Layout(props) {
       selection = _topo$store$useModelS.selection;
 
   var setDisabled = function setDisabled(data) {
+    if (topoShowType !== 'layers' && selection.length === 1) {
+      //中心节点布局，选中一个节点非分层情况下，需要星型和树形布局亮起来
+      return data == 'rectangle' || data == 'hierarchical';
+    }
+
     if (topoShowType == 'layers' && selection.length == 1 && !(0, _htElementDataUtil.isGroup)(selection[0])) {
       return data != 'rectangle';
     } else {
@@ -57,7 +62,11 @@ function Layout(props) {
 
 
     if (topoShowType != 'layers' && selection.length == 1) {
-      topo.getHtTopo().layoutInContainer(layouType);
+      if (layouType == 'hierarchical') {
+        topo.getHtTopo().layoutInContainer(layouType);
+      } else {
+        topo.getHtTopo().layoutTopoBySelectNode(layouType, selectionElements[0]);
+      }
     } // eslint-disable-next-line eqeqeq
 
 
@@ -72,7 +81,7 @@ function Layout(props) {
     topo.historyManager.beginTransaction();
     setLayout(v); // eslint-disable-next-line eqeqeq
 
-    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1) {
+    if (topoShowType != 'layers' && ((_selection$ = selection[0]) === null || _selection$ === void 0 ? void 0 : _selection$.className) != 'ht.Node' || topoShowType == 'partition' && selection.length == 1 || topoShowType == 'layers' && selection.length == 1 || topoShowType !== 'layers' && selection.length === 1) {
       globalLayout(v);
     }
 
@@ -150,6 +159,11 @@ function isLayoutEnabled(props) {
 
   if (topoShowType !== 'layers' && !selection.length) {
     return true;
+  } //中心节点布局,选中一个节点不是分层的情况下，按钮亮起
+
+
+  if (topoShowType !== 'layers' && selection.length === 1) {
+    return true;
   }
 
   return false;

package/lib/core/hooks/useGraphAlarmDisplay.js

@@ -13,7 +13,13 @@ var _htElementUtils = require("../../utils/htElementUtils");
 
 var _showGraphManageStatusUtil = require("../utils/showGraphManageStatusUtil");
 
-function getCiAlarmLevels(alarmList, risks) {
+/**
+ * 获取ci的最高告警级别
+ * @param {Array} alarmList 
+ * @param {*} risks 
+ * @returns 
+ */
+function getCiAlarmLevelMap(alarmList, risks) {
   var ciIdLevelMap = {};
   [].concat(alarmList, risks.map(function (item) {
     var _item$resourceId;
@@ -31,13 +37,53 @@ function getCiAlarmLevels(alarmList, risks) {
 
     ciIdLevelMap[item.id] = level;
   });
+  return ciIdLevelMap;
+}
+
+function getGraphCiElementAlarmLevels(resources, alarmList, risks) {
+  var ciIdLevelMap = getCiAlarmLevelMap(alarmList, risks);
   return Object.keys(ciIdLevelMap).map(function (id) {
     return {
       id: id,
       level: ciIdLevelMap[id]
     };
+  }).filter(function (alarm) {
+    var resource = resources.find(function (item) {
+      return item.id === alarm.id;
+    });
+    return !!resource;
   });
 }
+/**
+ * 获得关联拓扑节点告警级别
+ * @param {*} topo 
+ * @param {*} relateTopoAlarm 
+ * @returns 
+ */
+
+
+function getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm) {
+  return Object.keys(relateTopoAlarm).map(function (topoId) {
+    var level = relateTopoAlarm[topoId];
+    var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
+      return "" + node.a('bindTopo') === "" + topoId;
+    });
+
+    if (!level || !relateTopoNode) {
+      return null;
+    }
+
+    return {
+      elementId: relateTopoNode.getId(),
+      level: level
+    };
+  }).filter(function (item) {
+    return !!item;
+  });
+} // 获取拓扑图元素最高告警级别。包含资源、链路、关联拓扑节点
+
+
+function getGraphElementAlarmLevels(resources) {}
 /**
  * 告警显示到ht拓扑
  * 
@@ -48,7 +94,6 @@ function getCiAlarmLevels(alarmList, risks) {
 function useGraphAlarmDisplay(options) {
   var topo = options.topo,
       alarmSwitch = options.alarmSwitch;
-  var store = topo.store;
   var topoState = topo.store.useModelState('topoMod');
   var graphLoaded = topoState.graphLoaded,
       viewState = topoState.viewState;
@@ -62,17 +107,7 @@ function useGraphAlarmDisplay(options) {
   var resources = topo.dataModel.useCis();
 
   function getCisEventLevel() {
-    return getCiAlarmLevels(alarmList || [], risks).filter(function (alarm) {
-      var resource = resources.find(function (item) {
-        return item.id === alarm.id;
-      });
-
-      if (!resource) {
-        return false;
-      }
-
-      return true;
-    });
+    return getGraphCiElementAlarmLevels(resources, alarmList || [], risks);
   }
 
   (0, _react.useEffect)(function () {
@@ -82,8 +117,8 @@ function useGraphAlarmDisplay(options) {
       resources: resources,
       isEditMode: isEditMode,
       graphLoaded: graphLoaded,
-      // 有告警且未监控时，此时开启告警静默，应当显示未监控图标
-      cisEventLevel: alarmSwitch === false ? [] : getCisEventLevel()
+      alarmSwitch: alarmSwitch,
+      cisEventLevel: getCisEventLevel()
     });
 
     function showAlarm() {
@@ -97,43 +132,30 @@ function useGraphAlarmDisplay(options) {
         return;
       }
 
-      var finalAlarms = getCisEventLevel(); // 将告警级别放入ht元素，便于测试
+      var finalAlarms = getCisEventLevel(); // 关联拓扑告警
+
+      var relateTopoAlarms = getRelateTopoNodeAlarmLevels(topo, relateTopoAlarm);
+      var elementsAlarmLevels = [].concat(finalAlarms, relateTopoAlarms); // 将告警级别放入ht元素，便于测试
 
       (0, _htElementUtils.getElements)(topo.getDataModel()).filter(function (item) {
         return !!item.getTag();
       }).forEach(function (element) {
-        var _finalAlarms$find;
+        var _elementsAlarmLevels$;
 
-        var alarmLevel = (_finalAlarms$find = finalAlarms.find(function (item) {
-          return item.id === element.getTag();
-        })) === null || _finalAlarms$find === void 0 ? void 0 : _finalAlarms$find.level;
+        var alarmLevel = (_elementsAlarmLevels$ = elementsAlarmLevels.find(function (item) {
+          return item.id === element.getTag() || item.elementId === element.getId();
+        })) === null || _elementsAlarmLevels$ === void 0 ? void 0 : _elementsAlarmLevels$.level;
         element.a('alarmLevel', alarmLevel);
       });
-      var relateTopoAlarms = Object.keys(relateTopoAlarm).map(function (topoId) {
-        var level = relateTopoAlarm[topoId];
-        var relateTopoNode = topo.getDataModel().getDatas().toArray().find(function (node) {
-          return "" + node.a('bindTopo') === "" + topoId;
-        });
-
-        if (!level || !relateTopoNode) {
-          return null;
-        }
-
-        return {
-          elementId: relateTopoNode.getId(),
-          level: level
-        };
-      }).filter(function (item) {
-        return !!item;
-      });
 
-      _rlog["default"].debug('关联拓扑告警：推送ht', {
-        all: relateTopoAlarm,
+      _rlog["default"].debug('推送告警 => ht', {
+        alarms: elementsAlarmLevels,
+        relateTopoAlarmMap: relateTopoAlarm,
         relateTopoAlarms: relateTopoAlarms
       }); // 更新到ht拓扑
 
 
-      topo.view.loadAlarm([].concat(finalAlarms, relateTopoAlarms));
+      topo.view.loadAlarm(elementsAlarmLevels);
     }
 
     return function () {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.16" === 'string' ? "12.0.0-dev.16" : null;
+var version = typeof "12.0.0-dev.18" === 'string' ? "12.0.0-dev.18" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

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

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

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

package/lib/core/utils/showGraphManageStatusUtil.js

@@ -14,6 +14,7 @@ function showManageStatus(options) {
   var topo = options.topo,
       resources = options.resources,
       graphLoaded = options.graphLoaded,
+      alarmSwitch = options.alarmSwitch,
       cisEventLevel = options.cisEventLevel;
 
   var hasAlarm = function hasAlarm(id) {
@@ -30,9 +31,9 @@ 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/lib/utils/ciRefAttributeTranslateUtil.d.ts

@@ -1,12 +1,16 @@
+interface Options {
+    refreshCiCache: boolean;
+}
 /**
  * 翻译ci列表引用属性名称
  * @param ciDatas
  * @returns
  */
-export declare function translateCisRefAttributeName(ciDatas: Array<any>): Promise<Array<any>>;
+export declare function translateCisRefAttributeName(ciDatas: Array<any>, options?: Options): Promise<Array<any>>;
 /**
  * 翻译ci引用属性名称
  * @param ciData
  * @returns
  */
-export declare function translateCiRefAttributeName(ciData: any): Promise<any>;
+export declare function translateCiRefAttributeName(ciData: any, options?: Options): Promise<any>;
+export {};