@blueking/monitor-alarm-center 0.0.2 → 0.0.3

package/index.js

@@ -193209,6 +193209,7 @@ var Popup$2 = withInstall$2(/* @__PURE__ */ defineComponent({
     var popper2;
     var showTimeout;
     var hideTimeout;
+    var _showTs = 0;
     var triggerEl = /* @__PURE__ */ ref(null);
     var overlayEl = /* @__PURE__ */ ref(null);
     var popperEl = /* @__PURE__ */ ref(null);
@@ -193371,7 +193372,7 @@ var Popup$2 = withInstall$2(/* @__PURE__ */ defineComponent({
           if (!(parent22 !== document.body || rect2.width === 0 && rect2.height === 0)) {
             popper2.state.elements.reference = triggerEl.value;
             popper2.update();
-          } else setVisible(false, { trigger: getTriggerType({ type: "mouseenter" }) });
+          } else if (props2.trigger !== "click") setVisible(false, { trigger: getTriggerType({ type: "mouseenter" }) });
         }
         if (props2.showArrow) arrowStyle.value = getArrowStyle();
         return;
@@ -193396,6 +193397,7 @@ var Popup$2 = withInstall$2(/* @__PURE__ */ defineComponent({
       }
     }
     function show(ev) {
+      _showTs = Date.now();
       clearAllTimeout();
       showTimeout = setTimeout(function() {
         setVisible(true, { trigger: getTriggerType(ev) });
@@ -193436,6 +193438,8 @@ var Popup$2 = withInstall$2(/* @__PURE__ */ defineComponent({
       }
     }
     function onDocumentMouseDown(ev) {
+      if (Date.now() - _showTs < 200) return;
+      if (ev.target.closest && ev.target.closest('[data-td-popup="' + id + '"]')) return;
       var _popperEl$value, _triggerEl$value;
       if ((_popperEl$value = popperEl.value) !== null && _popperEl$value !== void 0 && _popperEl$value.contains(ev.target)) return;
       if ((_triggerEl$value = triggerEl.value) !== null && _triggerEl$value !== void 0 && _triggerEl$value.contains(ev.target)) return;
@@ -193494,7 +193498,22 @@ var Popup$2 = withInstall$2(/* @__PURE__ */ defineComponent({
           getOverlayStyle(),
           hidePopup && { visibility: "hidden" }
         ],
-        "onClick": onOverlayClick,
+        "onClick": function(e3) {
+          e3.stopPropagation();
+          onOverlayClick(e3);
+        },
+        "onMousedown": function(e3) {
+          e3.stopPropagation();
+        },
+        "onMouseup": function(e3) {
+          e3.stopPropagation();
+        },
+        "onPointerdown": function(e3) {
+          e3.stopPropagation();
+        },
+        "onPointerup": function(e3) {
+          e3.stopPropagation();
+        },
         "onMouseenter": onMouseenter,
         "onMouseleave": onMouseLeave
       }), [createVNode("div", {
@@ -249339,9 +249358,11 @@ const TypeEnum = {
   SEVERITY_UP: "SEVERITY_UP",
   ACTION: "ACTION",
   ALERT_QOS: "ALERT_QOS",
-  EVENT_DROP: "EVENT_DROP"
+  EVENT_DROP: "EVENT_DROP",
+  USER_ACTION: "USER_ACTION"
 };
 const OperateMap = {
+  [TypeEnum.USER_ACTION]: `【${window.i18n.t("用户操作")}】`,
   [TypeEnum.CREATE]: `【${window.i18n.t("告警产生")}】`,
   [TypeEnum.CONVERGE]: `【${window.i18n.t("告警收敛")}】`,
   [TypeEnum.RECOVER]: `【${window.i18n.t("告警恢复")}】`,
@@ -249358,6 +249379,7 @@ const OperateMap = {
   [TypeEnum.EVENT_DROP]: `【${window.i18n.t("事件忽略")}】`
 };
 const iconMap = {
+  [TypeEnum.USER_ACTION]: "👤",
   [TypeEnum.CREATE]: "🚨",
   [TypeEnum.CONVERGE]: "🎯",
   [TypeEnum.RECOVER]: "✅",
@@ -249425,61 +249447,65 @@ const AlarmRecords = /* @__PURE__ */ defineComponent({
     } = useI18n$1();
     const loadingRef = useTemplateRef("scrollRef");
     const circulationFilter = /* @__PURE__ */ shallowRef([{
-      id: "CREATE",
+      id: TypeEnum.USER_ACTION,
+      name: t3("用户操作"),
+      icon: iconMap[TypeEnum.USER_ACTION]
+    }, {
+      id: TypeEnum.CREATE,
       name: t3("告警产生"),
-      icon: "🚨"
+      icon: iconMap[TypeEnum.CREATE]
     }, {
-      id: "CONVERGE",
+      id: TypeEnum.CONVERGE,
       name: t3("告警收敛"),
-      icon: "🎯"
+      icon: iconMap[TypeEnum.CONVERGE]
     }, {
-      id: "RECOVER",
+      id: TypeEnum.RECOVER,
       name: t3("告警恢复"),
-      icon: "✅"
+      icon: iconMap[TypeEnum.RECOVER]
     }, {
-      id: "RECOVERING",
+      id: TypeEnum.RECOVERING,
       name: t3("告警恢复中"),
-      icon: "🔄"
+      icon: iconMap[TypeEnum.RECOVERING]
     }, {
-      id: "CLOSE",
+      id: TypeEnum.CLOSE,
       name: t3("告警关闭"),
-      icon: "❌"
+      icon: iconMap[TypeEnum.CLOSE]
     }, {
-      id: "DELAY_RECOVER",
+      id: TypeEnum.DELAY_RECOVER,
       name: t3("延迟恢复"),
-      icon: "⏰"
+      icon: iconMap[TypeEnum.DELAY_RECOVER]
     }, {
-      id: "ABORT_RECOVER",
+      id: TypeEnum.ABORT_RECOVER,
       name: t3("中断恢复"),
-      icon: "🔌"
+      icon: iconMap[TypeEnum.ABORT_RECOVER]
     }, {
-      id: "SYSTEM_RECOVER",
+      id: TypeEnum.SYSTEM_RECOVER,
       name: t3("系统恢复"),
-      icon: "✅"
+      icon: iconMap[TypeEnum.SYSTEM_RECOVER]
     }, {
-      id: "SYSTEM_CLOSE",
+      id: TypeEnum.SYSTEM_CLOSE,
       name: t3("系统关闭"),
-      icon: "❌"
+      icon: iconMap[TypeEnum.SYSTEM_CLOSE]
     }, {
-      id: "ACK",
+      id: TypeEnum.ACK,
       name: t3("告警确认"),
-      icon: "✔︎"
+      icon: iconMap[TypeEnum.ACK]
     }, {
-      id: "SEVERITY_UP",
+      id: TypeEnum.SEVERITY_UP,
       name: t3("告警级别调整"),
-      icon: "📉📈"
+      icon: iconMap[TypeEnum.SEVERITY_UP]
     }, {
-      id: "ACTION",
+      id: TypeEnum.ACTION,
       name: t3("处理动作"),
-      icon: "🔧"
+      icon: iconMap[TypeEnum.ACTION]
     }, {
-      id: "ALERT_QOS",
+      id: TypeEnum.ALERT_QOS,
       name: t3("告警流控"),
-      icon: "🚦"
+      icon: iconMap[TypeEnum.ALERT_QOS]
     }, {
-      id: "EVENT_DROP",
+      id: TypeEnum.EVENT_DROP,
       name: t3("事件忽略"),
-      icon: "🚫"
+      icon: iconMap[TypeEnum.EVENT_DROP]
     }]);
     const checked = /* @__PURE__ */ shallowRef(circulationFilter.value.map((item2) => item2.id));
     const oldChecked = /* @__PURE__ */ shallowRef(circulationFilter.value.map((item2) => item2.id));
@@ -249673,7 +249699,7 @@ const AlarmRecords = /* @__PURE__ */ defineComponent({
       let dom = null;
       const convergeDom = () => {
         return item2.contents.map((content, i2) => {
-          const showTip = i2 === item2.index && item2.source_time && (item2.operate === "CREATE" || item2.operate === "CONVERGE" || item2.operate === "EVENT_DROP");
+          const showTip = i2 === item2.index && item2.source_time && (item2.operate === TypeEnum.CREATE || item2.operate === TypeEnum.CONVERGE || item2.operate === TypeEnum.EVENT_DROP);
           return withDirectives(createVNode("span", {
             "key": i2,
             "class": {
@@ -249697,7 +249723,7 @@ const AlarmRecords = /* @__PURE__ */ defineComponent({
         }
         dom = createVNode("span", null, [withDirectives(createVNode("span", {
           "class": {
-            "tip-dashed": item2.operate === "CREATE" || item2.operate === "CONVERGE"
+            "tip-dashed": item2.operate === TypeEnum.CREATE || item2.operate === TypeEnum.CONVERGE
           },
           "onClick": () => item2.is_multiple && this.beforeCollapseChange(item2)
         }, [item2.count > 1 ? `${this.$t("当前事件流水过多，收敛{count}条。", {
@@ -249708,7 +249734,7 @@ const AlarmRecords = /* @__PURE__ */ defineComponent({
           disabled: !item2.source_time,
           allowHTML: false
         }]]), child]);
-        if (item2.operate === "ACTION") {
+        if (item2.operate === TypeEnum.ACTION) {
           const textList = item2.contents[0].split("$");
           let link2 = null;
           if (item2.action_plugin_type === "notice") {
@@ -249730,15 +249756,15 @@ const AlarmRecords = /* @__PURE__ */ defineComponent({
           ];
         }
       } else if (item2.operate === "ANOMALY_NOTICE") ;
-      else if (item2.operate === "ACK") {
+      else if (item2.operate === TypeEnum.ACK || item2.operate === TypeEnum.USER_ACTION) {
         dom = [item2.contents[0], createVNode("span", {
           "key": "alarm-ack",
           "class": "alarm-ack"
         }, [item2.contents[1]])];
-      } else if (item2.contents.length > 1 && (item2.operate === "CREATE" || item2.operate === "CONVERGE" || item2.operate === "EVENT_DROP")) {
+      } else if (item2.contents.length > 1 && (item2.operate === TypeEnum.CREATE || item2.operate === TypeEnum.CONVERGE || item2.operate === TypeEnum.EVENT_DROP)) {
         dom = convergeDom();
       }
-      if (item2.operate === "EVENT_DROP") {
+      if (item2.operate === TypeEnum.EVENT_DROP) {
         if (item2.count > 1) {
           dom = createVNode("span", null, [withDirectives(createVNode("span", {
             "class": "tip-dashed"
@@ -273783,7 +273809,6 @@ class AlertService extends AlarmService {
     } else {
       paramsClone.query_string = window.APM_QUERY_STRING || "";
     }
-    console.log("getFilterTableList = ", paramsClone);
     const data3 = await searchAlert(
       {
         ...paramsClone,
@@ -316557,6 +316582,15 @@ const AlarmCenter = /* @__PURE__ */ defineComponent({
       defaultFavoriteId.value = null;
       currentFavorite.value = null;
     });
+    watch(bridgeProps, () => {
+      console.log("bridgeProps change === ", bridgeProps);
+      alarmStore.refreshImmediate = bridgeProps.refreshImmediate;
+      alarmStore.refreshInterval = Number(bridgeProps.refreshInterval);
+      alarmStore.timeRange = bridgeProps.timeRange;
+    }, {
+      immediate: true,
+      deep: true
+    });
     const updateIsCollapsed = (v2) => {
       isCollapsed.value = v2;
     };
@@ -316762,12 +316796,16 @@ const AlarmCenter = /* @__PURE__ */ defineComponent({
     const handlePreviousDetail = () => {
       let index2 = data3.value.findIndex((item2) => item2.id === alarmId.value);
       index2 = index2 === -1 ? 0 : index2;
-      alarmId.value = data3.value[index2 === 0 ? data3.value.length - 1 : index2 - 1].id;
+      const target2 = data3.value[index2 === 0 ? data3.value.length - 1 : index2 - 1];
+      alarmId.value = target2.id;
+      alarmBizId.value = target2.bk_biz_id;
     };
     const handleNextDetail = () => {
       let index2 = data3.value.findIndex((item2) => item2.id === alarmId.value);
       index2 = index2 === -1 ? 0 : index2;
-      alarmId.value = data3.value[index2 === data3.value.length - 1 ? 0 : index2 + 1].id;
+      const target2 = data3.value[index2 === data3.value.length - 1 ? 0 : index2 + 1];
+      alarmId.value = target2.id;
+      alarmBizId.value = target2.bk_biz_id;
     };
     const autoShowAlertDialog = () => {
       const alertAction = route?.query?.autoShowAlertAction;
@@ -316926,6 +316964,9 @@ const AlarmCenter = /* @__PURE__ */ defineComponent({
       getUrlParams();
       setUrlParams();
     });
+    onBeforeUnmount(() => {
+      window.APM_QUERY_STRING = "";
+    });
     return {
       isFirstInit,
       quickFilterList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/monitor-alarm-center",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "蓝鲸监控告警中心抽取出来的独立库，主要提供给APM等宿主使用",
   "scripts": {},
   "files": [