@blueking/monitor-apm-log 2.3.15 → 2.3.17

package/main.js

@@ -51988,6 +51988,75 @@ function throttle(func, wait, options) {
 
 /* harmony default export */ const lodash_es_throttle = (throttle);
 
+;// ./src/utils/decode.ts
+/*
+ * Tencent is pleased to support the open source community by making
+ * 蓝鲸智云PaaS平台 (BlueKing PaaS) available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License.
+ *
+ * License for 蓝鲸智云PaaS平台 (BlueKing PaaS):
+ *
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+// base64转规则列表
+function base64ToRuleList(str) {
+  if (!str) {
+    return [];
+  }
+  try {
+    const ruleList = JSON.parse(base64Decode(str));
+    const ruleNewList = ruleList.reduce((pre, cur, index) => {
+      const itemObj = {};
+      const matchVal = cur.match(/:(.*)/);
+      const key = cur.substring(0, matchVal.index);
+      itemObj[key] = matchVal[1];
+      itemObj.__Index__ = index;
+      pre.push(itemObj);
+      return pre;
+    }, []);
+    return ruleNewList;
+  } catch {
+    return [];
+  }
+}
+;// ./src/utils/url.ts
+/** 读取当前 URL 中的全部 query（兼容 hash 路由与 location.search） */
+const getLocationQueryParams = () => {
+  const query = {};
+  const merge = source => {
+    if (!source) {
+      return;
+    }
+    const search = source.startsWith('?') ? source : `?${source}`;
+    new URLSearchParams(search).forEach((value, key) => {
+      query[key] = value;
+    });
+  };
+  merge(window.location.search);
+  const hashQuery = window.location.hash.includes('?') ? window.location.hash.split('?').slice(1).join('?') : '';
+  merge(hashQuery);
+  return query;
+};
+;// ./src/utils/index.ts
+
+
 ;// ./src/global/utils/path.ts
 // 实现 path.join 功能, 组合为一个合法路径, 并且去掉重复的 /
 // 例如： a/, /b/ -> a/b
@@ -54292,6 +54361,7 @@ var RouteQueryTab;
 
 
 
+
 var STORAGE_KEY;
 (function (STORAGE_KEY) {
   // eslint-disable-next-line no-unused-vars
@@ -54411,7 +54481,21 @@ class RetrieveHelper extends base {
     let fireEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     // 监控下的关联日志需要再浏览器本地记住最近一次使用的索引集
     if (window.__IS_MONITOR_COMPONENT__) {
-      localStorage.setItem('MONITOR_LOG_RECENT_INDEX_SET_ID', JSON.stringify(idList));
+      const query = getLocationQueryParams();
+      const bizAppKey = `${query.bizId} ${query['filter-app_name']}`;
+      let memoryObj = {};
+      const storageStr = localStorage.getItem('MONITOR_LOG_RECENT_INDEX_SET_ID');
+      if (storageStr) {
+        // 兼容旧的代码，后期可以去除
+        const parseValue = JSON.parse(storageStr);
+        if (!Array.isArray(parseValue)) {
+          memoryObj = parseValue;
+        }
+      }
+      Object.assign(memoryObj, {
+        [bizAppKey]: idList
+      });
+      localStorage.setItem('MONITOR_LOG_RECENT_INDEX_SET_ID', JSON.stringify(memoryObj));
     }
     this.indexSetIdList = idList;
     this.indexSetType = type;
@@ -213885,56 +213969,6 @@ const getRuleMessage = rule => {
     }, [t('取消')])])])]);
   }
 }));
-;// ./src/utils/decode.ts
-/*
- * Tencent is pleased to support the open source community by making
- * 蓝鲸智云PaaS平台 (BlueKing PaaS) available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * 蓝鲸智云PaaS平台 (BlueKing PaaS) is licensed under the MIT License.
- *
- * License for 蓝鲸智云PaaS平台 (BlueKing PaaS):
- *
- * ---------------------------------------------------
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
- * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
- * the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
- * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-// base64转规则列表
-function base64ToRuleList(str) {
-  if (!str) {
-    return [];
-  }
-  try {
-    const ruleList = JSON.parse(base64Decode(str));
-    const ruleNewList = ruleList.reduce((pre, cur, index) => {
-      const itemObj = {};
-      const matchVal = cur.match(/:(.*)/);
-      const key = cur.substring(0, matchVal.index);
-      itemObj[key] = matchVal[1];
-      itemObj.__Index__ = index;
-      pre.push(itemObj);
-      return pre;
-    }, []);
-    return ruleNewList;
-  } catch {
-    return [];
-  }
-}
-;// ./src/utils/index.ts
-
 ;// ./src/views/retrieve-v3/search-result/log-clustering/log-table/content-table/cluster-popover/regex-match/index.tsx
 /*
  * Tencent is pleased to support the open source community by making
@@ -221892,6 +221926,7 @@ var sub_bar_component = normalizeComponent(
 
 
 
+
 /* harmony default export */ const use_monitor_app_init = (indexSetApi => {
   const store = use_store();
   const router = useRouter();
@@ -222013,18 +222048,33 @@ var sub_bar_component = normalizeComponent(
       // 本地如果没有 MONITOR_LOG_RECENT_INDEX_SET_IDS，则默认取第一个有数据的索引集
       // 同时，更新索引信息到store中
       if (!indexSetIdList.value.length) {
-        const memoryIdStr = localStorage.getItem('MONITOR_LOG_RECENT_INDEX_SET_ID');
+        const query = getLocationQueryParams();
+        const bizAppKey = `${query.bizId} ${query['filter-app_name']}`;
+        const memoryStr = localStorage.getItem('MONITOR_LOG_RECENT_INDEX_SET_ID');
         let defaultId = '';
-        if (memoryIdStr) {
-          const memoryId = JSON.parse(memoryIdStr)[0];
-          const defaultValidItem = resp.find(item => item.index_set_id === memoryId);
-          if (defaultValidItem) {
-            defaultId = memoryId;
+        if (memoryStr) {
+          const parseValue = JSON.parse(memoryStr);
+          // 兼容旧的代码，后期可以去除
+          if (!Array.isArray(parseValue)) {
+            const memoryObj = parseValue;
+            const memoryIds = memoryObj[bizAppKey];
+            if (memoryIds) {
+              const memoryId = memoryIds[0];
+              const defaultValidItem = resp.find(item => item.index_set_id === memoryId && item.tags.every(tag => tag.tag_id !== 4));
+              if (defaultValidItem) {
+                defaultId = memoryId;
+              }
+            }
           }
         }
         if (!defaultId) {
           const dataValidItem = resp.find(item => item.tags.every(tag => tag.tag_id !== 4));
-          defaultId = `${dataValidItem.index_set_id}`;
+          if (dataValidItem) {
+            defaultId = `${dataValidItem.index_set_id}`;
+          } else {
+            // 也可能存在只有无数据的采集项，这种情况取第一个即可
+            defaultId = `${resp[0].index_set_id}`;
+          }
         }
         store.commit('updateIndexItem', {
           ids: [defaultId],

package/package.json

@@ -1 +1 @@
-{"name":"@blueking/monitor-apm-log","version":"2.3.15","description":"","main":"main.js","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"author":"","license":"MIT"}
+{"name":"@blueking/monitor-apm-log","version":"2.3.17","description":"","main":"main.js","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"author":"","license":"MIT"}