inl-ui 0.1.173 → 0.1.175

package/dist/components/index.cjs

@@ -7210,62 +7210,138 @@ const PageContent = vue.defineComponent({
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
     let interval = null;
+    const minute = 60 * 1e3;
+    const retryDelay = 5 * 1e3;
+    const getRecordKey = item => {
+      if (!item) return "";
+      if (item.isExtra || item.isExtraTab) {
+        return `extra:${item.key ?? item.id ?? ""}:${item.uniqueKey ?? ""}`;
+      }
+      return `menu:${item.id ?? item.key ?? item.url ?? ""}`;
+    };
+    const sendRecord = async (obj, fun) => {
+      let userInfo = {};
+      try {
+        userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      } catch {}
+      const payload = {
+        ...obj,
+        userId: userInfo.userId,
+        userName: userInfo.userName,
+        menuName: obj.name,
+        type: 1
+      };
+      try {
+        await axios__default["default"].post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", payload, {
+          headers: {
+            token: sessionStorage.getItem("token") || ""
+          }
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    };
+    const buildRecordPayload = (entry, sendTime = entry.sendTime) => ({
+      ...entry.menu,
+      uuid: entry.uuid,
+      inUse: entry.inUse,
+      sendTime,
+      leaveTime: entry.leaveTime
+    });
+    const ensureInserted = entry => {
+      if (entry.inserted) return Promise.resolve(true);
+      if (entry.insertPromise) return entry.insertPromise;
+      entry.insertPromise = sendRecord(buildRecordPayload(entry, entry.sendTime), "insert").then(success => {
+        if (success) {
+          entry.inserted = true;
+          entry.insertPromise = void 0;
+        } else {
+          entry.insertPromise = void 0;
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      });
+      return entry.insertPromise;
+    };
+    const queueUpdate = (entry, force = false) => {
+      if (entry.updateQueued) return;
+      if (!force && entry.sendTime <= 0) return;
+      if (entry.retryAt > Date.now()) return;
+      entry.updateQueued = true;
+      entry.requestChain = entry.requestChain.catch(() => false).then(async () => {
+        if (!(await ensureInserted(entry))) return false;
+        const sendTime = entry.sendTime;
+        if (!force && sendTime <= 0) return true;
+        const success = await sendRecord(buildRecordPayload(entry, sendTime), "update");
+        if (success && sendTime > 0) {
+          entry.sendTime = Math.max(0, entry.sendTime - sendTime);
+        } else if (!success) {
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      }).finally(() => {
+        entry.updateQueued = false;
+      });
+    };
     vue.onMounted(() => {
       interval = setInterval(() => {
-        historyArr.forEach(item => {
-          if (item.inUse) {
-            item.sendTime += 1e3;
-            if (item.sendTime >= 60 * 1e3) {
-              sendRecord(item, "update");
-              item.sendTime = 0;
+        historyArr.forEach(entry => {
+          if (entry.inUse) {
+            entry.sendTime += 1e3;
+            if (entry.sendTime >= minute) {
+              queueUpdate(entry);
             }
           }
-          if (item.leaveTime > 0) {
-            item.leaveTime += 1e3;
+          if (entry.leaveTime > 0) {
+            entry.leaveTime += 1e3;
+            if (entry.sendTime > 0) {
+              queueUpdate(entry);
+            }
           }
         });
-        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+        historyArr = historyArr.filter(entry => entry.leaveTime <= minute || entry.sendTime > 0 || entry.updateQueued || !!entry.insertPromise);
       }, 1e3);
     });
     let historyArr = [];
-    const sendRecord = async (obj, fun) => {
-      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
-      obj.userId = userInfo.userId;
-      obj.userName = userInfo.userName;
-      obj.menuName = obj.name;
-      obj.type = 1;
-      await axios__default["default"].post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
-        headers: {
-          token: sessionStorage.getItem("token") || ""
-        }
-      });
-    };
     vue.watch(activeMenu, (val, oldVal) => {
+      const oldRecordKey = getRecordKey(oldVal);
+      const recordKey = getRecordKey(val);
       if (oldVal) {
-        const historyItem = historyArr.find(item => item.id === oldVal.id);
-        if (historyItem) {
-          historyItem.inUse = false;
-          historyItem.sendTime = 0;
-          historyItem.leaveTime = 1e3;
+        const historyEntry = historyArr.find(entry => entry.recordKey === oldRecordKey);
+        if (historyEntry && oldRecordKey !== recordKey) {
+          historyEntry.inUse = false;
+          historyEntry.leaveTime = 1e3;
+          queueUpdate(historyEntry);
         }
       }
       if (val) {
-        const historyItem = historyArr.find(item => item.id === val.id);
-        if (historyItem) {
-          historyItem.leaveTime = 0;
-          historyItem.sendTime = 0;
-          historyItem.inUse = true;
-          sendRecord({
-            ...val,
-            uuid: historyItem.uuid
-          }, "update");
+        const historyEntry = historyArr.find(entry => entry.recordKey === recordKey);
+        if (historyEntry) {
+          historyEntry.menu = {
+            ...historyEntry.menu,
+            ...val
+          };
+          historyEntry.leaveTime = 0;
+          historyEntry.inUse = true;
+          queueUpdate(historyEntry, oldRecordKey !== recordKey);
         } else {
-          val.leaveTime = 0;
-          val.sendTime = 0;
-          val.inUse = true;
-          val.uuid = UUID();
-          historyArr.push(val);
-          sendRecord(val, "insert");
+          const entry = {
+            recordKey,
+            menu: {
+              ...val
+            },
+            uuid: UUID(),
+            leaveTime: 0,
+            sendTime: 0,
+            inUse: true,
+            inserted: false,
+            requestChain: Promise.resolve(true),
+            updateQueued: false,
+            retryAt: 0
+          };
+          historyArr.push(entry);
+          ensureInserted(entry);
         }
       }
       handleMenuChange(val);
@@ -7298,31 +7374,9 @@ const PageContent = vue.defineComponent({
       } = event;
       if (type === "addTab") {
         if (data.mode === "microApp") {
-          const uniqueKey = data.uniqueKey || data.key;
-          const tab = {
-            ...data,
-            uniqueKey,
-            isExtraTab: true,
-            params: data.params ?? {}
-          };
-          const extraTabs = Array.isArray(qiankunState.value.extraTabs) ? [...qiankunState.value.extraTabs] : [];
-          const tabIndex = extraTabs.findIndex(item => item.key === tab.key && item.uniqueKey === tab.uniqueKey);
-          if (tabIndex === -1) {
-            extraTabs.push(tab);
-          } else {
-            extraTabs[tabIndex] = {
-              ...extraTabs[tabIndex],
-              ...tab
-            };
-          }
-          qiankunState.value = {
-            ...qiankunState.value,
-            extraTabs,
-            activeTabKey: `${tab.key}${tab.uniqueKey}`
-          };
           router.push({
-            path: tab.url,
-            query: tab.params
+            path: data.url,
+            query: data.params ?? {}
           });
           return;
         }
@@ -7389,6 +7443,11 @@ const PageContent = vue.defineComponent({
     };
     vue.onBeforeUnmount(() => {
       clearInterval(interval);
+      historyArr.forEach(entry => {
+        entry.inUse = false;
+        entry.leaveTime = minute + 1;
+        queueUpdate(entry);
+      });
       for (const app of loadAppList.value) {
         app.app.unmount();
       }

package/dist/components/index.js

@@ -7181,62 +7181,138 @@ const PageContent = defineComponent({
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
     let interval = null;
+    const minute = 60 * 1e3;
+    const retryDelay = 5 * 1e3;
+    const getRecordKey = item => {
+      if (!item) return "";
+      if (item.isExtra || item.isExtraTab) {
+        return `extra:${item.key ?? item.id ?? ""}:${item.uniqueKey ?? ""}`;
+      }
+      return `menu:${item.id ?? item.key ?? item.url ?? ""}`;
+    };
+    const sendRecord = async (obj, fun) => {
+      let userInfo = {};
+      try {
+        userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      } catch {}
+      const payload = {
+        ...obj,
+        userId: userInfo.userId,
+        userName: userInfo.userName,
+        menuName: obj.name,
+        type: 1
+      };
+      try {
+        await axios$3.post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", payload, {
+          headers: {
+            token: sessionStorage.getItem("token") || ""
+          }
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    };
+    const buildRecordPayload = (entry, sendTime = entry.sendTime) => ({
+      ...entry.menu,
+      uuid: entry.uuid,
+      inUse: entry.inUse,
+      sendTime,
+      leaveTime: entry.leaveTime
+    });
+    const ensureInserted = entry => {
+      if (entry.inserted) return Promise.resolve(true);
+      if (entry.insertPromise) return entry.insertPromise;
+      entry.insertPromise = sendRecord(buildRecordPayload(entry, entry.sendTime), "insert").then(success => {
+        if (success) {
+          entry.inserted = true;
+          entry.insertPromise = void 0;
+        } else {
+          entry.insertPromise = void 0;
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      });
+      return entry.insertPromise;
+    };
+    const queueUpdate = (entry, force = false) => {
+      if (entry.updateQueued) return;
+      if (!force && entry.sendTime <= 0) return;
+      if (entry.retryAt > Date.now()) return;
+      entry.updateQueued = true;
+      entry.requestChain = entry.requestChain.catch(() => false).then(async () => {
+        if (!(await ensureInserted(entry))) return false;
+        const sendTime = entry.sendTime;
+        if (!force && sendTime <= 0) return true;
+        const success = await sendRecord(buildRecordPayload(entry, sendTime), "update");
+        if (success && sendTime > 0) {
+          entry.sendTime = Math.max(0, entry.sendTime - sendTime);
+        } else if (!success) {
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      }).finally(() => {
+        entry.updateQueued = false;
+      });
+    };
     onMounted(() => {
       interval = setInterval(() => {
-        historyArr.forEach(item => {
-          if (item.inUse) {
-            item.sendTime += 1e3;
-            if (item.sendTime >= 60 * 1e3) {
-              sendRecord(item, "update");
-              item.sendTime = 0;
+        historyArr.forEach(entry => {
+          if (entry.inUse) {
+            entry.sendTime += 1e3;
+            if (entry.sendTime >= minute) {
+              queueUpdate(entry);
             }
           }
-          if (item.leaveTime > 0) {
-            item.leaveTime += 1e3;
+          if (entry.leaveTime > 0) {
+            entry.leaveTime += 1e3;
+            if (entry.sendTime > 0) {
+              queueUpdate(entry);
+            }
           }
         });
-        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+        historyArr = historyArr.filter(entry => entry.leaveTime <= minute || entry.sendTime > 0 || entry.updateQueued || !!entry.insertPromise);
       }, 1e3);
     });
     let historyArr = [];
-    const sendRecord = async (obj, fun) => {
-      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
-      obj.userId = userInfo.userId;
-      obj.userName = userInfo.userName;
-      obj.menuName = obj.name;
-      obj.type = 1;
-      await axios$3.post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
-        headers: {
-          token: sessionStorage.getItem("token") || ""
-        }
-      });
-    };
     watch(activeMenu, (val, oldVal) => {
+      const oldRecordKey = getRecordKey(oldVal);
+      const recordKey = getRecordKey(val);
       if (oldVal) {
-        const historyItem = historyArr.find(item => item.id === oldVal.id);
-        if (historyItem) {
-          historyItem.inUse = false;
-          historyItem.sendTime = 0;
-          historyItem.leaveTime = 1e3;
+        const historyEntry = historyArr.find(entry => entry.recordKey === oldRecordKey);
+        if (historyEntry && oldRecordKey !== recordKey) {
+          historyEntry.inUse = false;
+          historyEntry.leaveTime = 1e3;
+          queueUpdate(historyEntry);
         }
       }
       if (val) {
-        const historyItem = historyArr.find(item => item.id === val.id);
-        if (historyItem) {
-          historyItem.leaveTime = 0;
-          historyItem.sendTime = 0;
-          historyItem.inUse = true;
-          sendRecord({
-            ...val,
-            uuid: historyItem.uuid
-          }, "update");
+        const historyEntry = historyArr.find(entry => entry.recordKey === recordKey);
+        if (historyEntry) {
+          historyEntry.menu = {
+            ...historyEntry.menu,
+            ...val
+          };
+          historyEntry.leaveTime = 0;
+          historyEntry.inUse = true;
+          queueUpdate(historyEntry, oldRecordKey !== recordKey);
         } else {
-          val.leaveTime = 0;
-          val.sendTime = 0;
-          val.inUse = true;
-          val.uuid = UUID();
-          historyArr.push(val);
-          sendRecord(val, "insert");
+          const entry = {
+            recordKey,
+            menu: {
+              ...val
+            },
+            uuid: UUID(),
+            leaveTime: 0,
+            sendTime: 0,
+            inUse: true,
+            inserted: false,
+            requestChain: Promise.resolve(true),
+            updateQueued: false,
+            retryAt: 0
+          };
+          historyArr.push(entry);
+          ensureInserted(entry);
         }
       }
       handleMenuChange(val);
@@ -7269,31 +7345,9 @@ const PageContent = defineComponent({
       } = event;
       if (type === "addTab") {
         if (data.mode === "microApp") {
-          const uniqueKey = data.uniqueKey || data.key;
-          const tab = {
-            ...data,
-            uniqueKey,
-            isExtraTab: true,
-            params: data.params ?? {}
-          };
-          const extraTabs = Array.isArray(qiankunState.value.extraTabs) ? [...qiankunState.value.extraTabs] : [];
-          const tabIndex = extraTabs.findIndex(item => item.key === tab.key && item.uniqueKey === tab.uniqueKey);
-          if (tabIndex === -1) {
-            extraTabs.push(tab);
-          } else {
-            extraTabs[tabIndex] = {
-              ...extraTabs[tabIndex],
-              ...tab
-            };
-          }
-          qiankunState.value = {
-            ...qiankunState.value,
-            extraTabs,
-            activeTabKey: `${tab.key}${tab.uniqueKey}`
-          };
           router.push({
-            path: tab.url,
-            query: tab.params
+            path: data.url,
+            query: data.params ?? {}
           });
           return;
         }
@@ -7360,6 +7414,11 @@ const PageContent = defineComponent({
     };
     onBeforeUnmount(() => {
       clearInterval(interval);
+      historyArr.forEach(entry => {
+        entry.inUse = false;
+        entry.leaveTime = minute + 1;
+        queueUpdate(entry);
+      });
       for (const app of loadAppList.value) {
         app.app.unmount();
       }

package/dist/index.cjs

@@ -45,7 +45,7 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var mqtt__default = /*#__PURE__*/_interopDefaultLegacy(mqtt);
 
-var version = "0.1.172";
+var version = "0.1.174";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -8357,62 +8357,138 @@ const PageContent = vue.defineComponent({
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
     let interval = null;
+    const minute = 60 * 1e3;
+    const retryDelay = 5 * 1e3;
+    const getRecordKey = item => {
+      if (!item) return "";
+      if (item.isExtra || item.isExtraTab) {
+        return `extra:${item.key ?? item.id ?? ""}:${item.uniqueKey ?? ""}`;
+      }
+      return `menu:${item.id ?? item.key ?? item.url ?? ""}`;
+    };
+    const sendRecord = async (obj, fun) => {
+      let userInfo = {};
+      try {
+        userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      } catch {}
+      const payload = {
+        ...obj,
+        userId: userInfo.userId,
+        userName: userInfo.userName,
+        menuName: obj.name,
+        type: 1
+      };
+      try {
+        await axios__default["default"].post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", payload, {
+          headers: {
+            token: sessionStorage.getItem("token") || ""
+          }
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    };
+    const buildRecordPayload = (entry, sendTime = entry.sendTime) => ({
+      ...entry.menu,
+      uuid: entry.uuid,
+      inUse: entry.inUse,
+      sendTime,
+      leaveTime: entry.leaveTime
+    });
+    const ensureInserted = entry => {
+      if (entry.inserted) return Promise.resolve(true);
+      if (entry.insertPromise) return entry.insertPromise;
+      entry.insertPromise = sendRecord(buildRecordPayload(entry, entry.sendTime), "insert").then(success => {
+        if (success) {
+          entry.inserted = true;
+          entry.insertPromise = void 0;
+        } else {
+          entry.insertPromise = void 0;
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      });
+      return entry.insertPromise;
+    };
+    const queueUpdate = (entry, force = false) => {
+      if (entry.updateQueued) return;
+      if (!force && entry.sendTime <= 0) return;
+      if (entry.retryAt > Date.now()) return;
+      entry.updateQueued = true;
+      entry.requestChain = entry.requestChain.catch(() => false).then(async () => {
+        if (!(await ensureInserted(entry))) return false;
+        const sendTime = entry.sendTime;
+        if (!force && sendTime <= 0) return true;
+        const success = await sendRecord(buildRecordPayload(entry, sendTime), "update");
+        if (success && sendTime > 0) {
+          entry.sendTime = Math.max(0, entry.sendTime - sendTime);
+        } else if (!success) {
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      }).finally(() => {
+        entry.updateQueued = false;
+      });
+    };
     vue.onMounted(() => {
       interval = setInterval(() => {
-        historyArr.forEach(item => {
-          if (item.inUse) {
-            item.sendTime += 1e3;
-            if (item.sendTime >= 60 * 1e3) {
-              sendRecord(item, "update");
-              item.sendTime = 0;
+        historyArr.forEach(entry => {
+          if (entry.inUse) {
+            entry.sendTime += 1e3;
+            if (entry.sendTime >= minute) {
+              queueUpdate(entry);
             }
           }
-          if (item.leaveTime > 0) {
-            item.leaveTime += 1e3;
+          if (entry.leaveTime > 0) {
+            entry.leaveTime += 1e3;
+            if (entry.sendTime > 0) {
+              queueUpdate(entry);
+            }
           }
         });
-        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+        historyArr = historyArr.filter(entry => entry.leaveTime <= minute || entry.sendTime > 0 || entry.updateQueued || !!entry.insertPromise);
       }, 1e3);
     });
     let historyArr = [];
-    const sendRecord = async (obj, fun) => {
-      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
-      obj.userId = userInfo.userId;
-      obj.userName = userInfo.userName;
-      obj.menuName = obj.name;
-      obj.type = 1;
-      await axios__default["default"].post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
-        headers: {
-          token: sessionStorage.getItem("token") || ""
-        }
-      });
-    };
     vue.watch(activeMenu, (val, oldVal) => {
+      const oldRecordKey = getRecordKey(oldVal);
+      const recordKey = getRecordKey(val);
       if (oldVal) {
-        const historyItem = historyArr.find(item => item.id === oldVal.id);
-        if (historyItem) {
-          historyItem.inUse = false;
-          historyItem.sendTime = 0;
-          historyItem.leaveTime = 1e3;
+        const historyEntry = historyArr.find(entry => entry.recordKey === oldRecordKey);
+        if (historyEntry && oldRecordKey !== recordKey) {
+          historyEntry.inUse = false;
+          historyEntry.leaveTime = 1e3;
+          queueUpdate(historyEntry);
         }
       }
       if (val) {
-        const historyItem = historyArr.find(item => item.id === val.id);
-        if (historyItem) {
-          historyItem.leaveTime = 0;
-          historyItem.sendTime = 0;
-          historyItem.inUse = true;
-          sendRecord({
-            ...val,
-            uuid: historyItem.uuid
-          }, "update");
+        const historyEntry = historyArr.find(entry => entry.recordKey === recordKey);
+        if (historyEntry) {
+          historyEntry.menu = {
+            ...historyEntry.menu,
+            ...val
+          };
+          historyEntry.leaveTime = 0;
+          historyEntry.inUse = true;
+          queueUpdate(historyEntry, oldRecordKey !== recordKey);
         } else {
-          val.leaveTime = 0;
-          val.sendTime = 0;
-          val.inUse = true;
-          val.uuid = UUID();
-          historyArr.push(val);
-          sendRecord(val, "insert");
+          const entry = {
+            recordKey,
+            menu: {
+              ...val
+            },
+            uuid: UUID(),
+            leaveTime: 0,
+            sendTime: 0,
+            inUse: true,
+            inserted: false,
+            requestChain: Promise.resolve(true),
+            updateQueued: false,
+            retryAt: 0
+          };
+          historyArr.push(entry);
+          ensureInserted(entry);
         }
       }
       handleMenuChange(val);
@@ -8445,31 +8521,9 @@ const PageContent = vue.defineComponent({
       } = event;
       if (type === "addTab") {
         if (data.mode === "microApp") {
-          const uniqueKey = data.uniqueKey || data.key;
-          const tab = {
-            ...data,
-            uniqueKey,
-            isExtraTab: true,
-            params: data.params ?? {}
-          };
-          const extraTabs = Array.isArray(qiankunState.value.extraTabs) ? [...qiankunState.value.extraTabs] : [];
-          const tabIndex = extraTabs.findIndex(item => item.key === tab.key && item.uniqueKey === tab.uniqueKey);
-          if (tabIndex === -1) {
-            extraTabs.push(tab);
-          } else {
-            extraTabs[tabIndex] = {
-              ...extraTabs[tabIndex],
-              ...tab
-            };
-          }
-          qiankunState.value = {
-            ...qiankunState.value,
-            extraTabs,
-            activeTabKey: `${tab.key}${tab.uniqueKey}`
-          };
           router.push({
-            path: tab.url,
-            query: tab.params
+            path: data.url,
+            query: data.params ?? {}
           });
           return;
         }
@@ -8536,6 +8590,11 @@ const PageContent = vue.defineComponent({
     };
     vue.onBeforeUnmount(() => {
       clearInterval(interval);
+      historyArr.forEach(entry => {
+        entry.inUse = false;
+        entry.leaveTime = minute + 1;
+        queueUpdate(entry);
+      });
       for (const app of loadAppList.value) {
         app.app.unmount();
       }

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { Key } from 'ant-design-vue/lib/table/interface';
 import * as vue_jsx_runtime from 'vue/jsx-runtime';
 import * as _ant_design_icons_vue_lib_components_IconFont from '@ant-design/icons-vue/lib/components/IconFont';
 
-var version = "0.1.172";
+var version = "0.1.174";
 
 declare const _default$p: {
     set(theme: string): void;

package/dist/index.js

@@ -14,7 +14,7 @@ import { XPopup, CommentBlock, setAxiosOption } from '@sszj-temp/mobile';
 import { marked } from 'marked';
 import '@sszj-temp/mobile/style.css';
 
-var version = "0.1.172";
+var version = "0.1.174";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -8326,62 +8326,138 @@ const PageContent = defineComponent({
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
     let interval = null;
+    const minute = 60 * 1e3;
+    const retryDelay = 5 * 1e3;
+    const getRecordKey = item => {
+      if (!item) return "";
+      if (item.isExtra || item.isExtraTab) {
+        return `extra:${item.key ?? item.id ?? ""}:${item.uniqueKey ?? ""}`;
+      }
+      return `menu:${item.id ?? item.key ?? item.url ?? ""}`;
+    };
+    const sendRecord = async (obj, fun) => {
+      let userInfo = {};
+      try {
+        userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      } catch {}
+      const payload = {
+        ...obj,
+        userId: userInfo.userId,
+        userName: userInfo.userName,
+        menuName: obj.name,
+        type: 1
+      };
+      try {
+        await axios$3.post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", payload, {
+          headers: {
+            token: sessionStorage.getItem("token") || ""
+          }
+        });
+        return true;
+      } catch {
+        return false;
+      }
+    };
+    const buildRecordPayload = (entry, sendTime = entry.sendTime) => ({
+      ...entry.menu,
+      uuid: entry.uuid,
+      inUse: entry.inUse,
+      sendTime,
+      leaveTime: entry.leaveTime
+    });
+    const ensureInserted = entry => {
+      if (entry.inserted) return Promise.resolve(true);
+      if (entry.insertPromise) return entry.insertPromise;
+      entry.insertPromise = sendRecord(buildRecordPayload(entry, entry.sendTime), "insert").then(success => {
+        if (success) {
+          entry.inserted = true;
+          entry.insertPromise = void 0;
+        } else {
+          entry.insertPromise = void 0;
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      });
+      return entry.insertPromise;
+    };
+    const queueUpdate = (entry, force = false) => {
+      if (entry.updateQueued) return;
+      if (!force && entry.sendTime <= 0) return;
+      if (entry.retryAt > Date.now()) return;
+      entry.updateQueued = true;
+      entry.requestChain = entry.requestChain.catch(() => false).then(async () => {
+        if (!(await ensureInserted(entry))) return false;
+        const sendTime = entry.sendTime;
+        if (!force && sendTime <= 0) return true;
+        const success = await sendRecord(buildRecordPayload(entry, sendTime), "update");
+        if (success && sendTime > 0) {
+          entry.sendTime = Math.max(0, entry.sendTime - sendTime);
+        } else if (!success) {
+          entry.retryAt = Date.now() + retryDelay;
+        }
+        return success;
+      }).finally(() => {
+        entry.updateQueued = false;
+      });
+    };
     onMounted(() => {
       interval = setInterval(() => {
-        historyArr.forEach(item => {
-          if (item.inUse) {
-            item.sendTime += 1e3;
-            if (item.sendTime >= 60 * 1e3) {
-              sendRecord(item, "update");
-              item.sendTime = 0;
+        historyArr.forEach(entry => {
+          if (entry.inUse) {
+            entry.sendTime += 1e3;
+            if (entry.sendTime >= minute) {
+              queueUpdate(entry);
             }
           }
-          if (item.leaveTime > 0) {
-            item.leaveTime += 1e3;
+          if (entry.leaveTime > 0) {
+            entry.leaveTime += 1e3;
+            if (entry.sendTime > 0) {
+              queueUpdate(entry);
+            }
           }
         });
-        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+        historyArr = historyArr.filter(entry => entry.leaveTime <= minute || entry.sendTime > 0 || entry.updateQueued || !!entry.insertPromise);
       }, 1e3);
     });
     let historyArr = [];
-    const sendRecord = async (obj, fun) => {
-      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
-      obj.userId = userInfo.userId;
-      obj.userName = userInfo.userName;
-      obj.menuName = obj.name;
-      obj.type = 1;
-      await axios$3.post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
-        headers: {
-          token: sessionStorage.getItem("token") || ""
-        }
-      });
-    };
     watch(activeMenu, (val, oldVal) => {
+      const oldRecordKey = getRecordKey(oldVal);
+      const recordKey = getRecordKey(val);
       if (oldVal) {
-        const historyItem = historyArr.find(item => item.id === oldVal.id);
-        if (historyItem) {
-          historyItem.inUse = false;
-          historyItem.sendTime = 0;
-          historyItem.leaveTime = 1e3;
+        const historyEntry = historyArr.find(entry => entry.recordKey === oldRecordKey);
+        if (historyEntry && oldRecordKey !== recordKey) {
+          historyEntry.inUse = false;
+          historyEntry.leaveTime = 1e3;
+          queueUpdate(historyEntry);
         }
       }
       if (val) {
-        const historyItem = historyArr.find(item => item.id === val.id);
-        if (historyItem) {
-          historyItem.leaveTime = 0;
-          historyItem.sendTime = 0;
-          historyItem.inUse = true;
-          sendRecord({
-            ...val,
-            uuid: historyItem.uuid
-          }, "update");
+        const historyEntry = historyArr.find(entry => entry.recordKey === recordKey);
+        if (historyEntry) {
+          historyEntry.menu = {
+            ...historyEntry.menu,
+            ...val
+          };
+          historyEntry.leaveTime = 0;
+          historyEntry.inUse = true;
+          queueUpdate(historyEntry, oldRecordKey !== recordKey);
         } else {
-          val.leaveTime = 0;
-          val.sendTime = 0;
-          val.inUse = true;
-          val.uuid = UUID();
-          historyArr.push(val);
-          sendRecord(val, "insert");
+          const entry = {
+            recordKey,
+            menu: {
+              ...val
+            },
+            uuid: UUID(),
+            leaveTime: 0,
+            sendTime: 0,
+            inUse: true,
+            inserted: false,
+            requestChain: Promise.resolve(true),
+            updateQueued: false,
+            retryAt: 0
+          };
+          historyArr.push(entry);
+          ensureInserted(entry);
         }
       }
       handleMenuChange(val);
@@ -8414,31 +8490,9 @@ const PageContent = defineComponent({
       } = event;
       if (type === "addTab") {
         if (data.mode === "microApp") {
-          const uniqueKey = data.uniqueKey || data.key;
-          const tab = {
-            ...data,
-            uniqueKey,
-            isExtraTab: true,
-            params: data.params ?? {}
-          };
-          const extraTabs = Array.isArray(qiankunState.value.extraTabs) ? [...qiankunState.value.extraTabs] : [];
-          const tabIndex = extraTabs.findIndex(item => item.key === tab.key && item.uniqueKey === tab.uniqueKey);
-          if (tabIndex === -1) {
-            extraTabs.push(tab);
-          } else {
-            extraTabs[tabIndex] = {
-              ...extraTabs[tabIndex],
-              ...tab
-            };
-          }
-          qiankunState.value = {
-            ...qiankunState.value,
-            extraTabs,
-            activeTabKey: `${tab.key}${tab.uniqueKey}`
-          };
           router.push({
-            path: tab.url,
-            query: tab.params
+            path: data.url,
+            query: data.params ?? {}
           });
           return;
         }
@@ -8505,6 +8559,11 @@ const PageContent = defineComponent({
     };
     onBeforeUnmount(() => {
       clearInterval(interval);
+      historyArr.forEach(entry => {
+        entry.inUse = false;
+        entry.leaveTime = minute + 1;
+        queueUpdate(entry);
+      });
       for (const app of loadAppList.value) {
         app.app.unmount();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inl-ui",
-  "version": "0.1.173",
+  "version": "0.1.175",
   "description": "工业 pc ui库",
   "main": "dist/index.cjs",
   "module": "dist/index.js",