inl-ui 0.1.171 → 0.1.173

package/dist/components/index.cjs

@@ -88,20 +88,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -6661,6 +6661,24 @@ function getOpenUrl(url) {
   return res;
 }
 
+async function canCloseTab(tab, beforeTabClose) {
+  if (typeof beforeTabClose !== "function") return true;
+  try {
+    const result = await beforeTabClose(tab);
+    return result !== false;
+  } catch {
+    return false;
+  }
+}
+async function canCloseTabs(tabs, beforeTabClose) {
+  for (const tab of tabs) {
+    if (!(await canCloseTab(tab, beforeTabClose))) {
+      return false;
+    }
+  }
+  return true;
+}
+
 const closeTabMagicKey = "control_shift_q";
 const TabList = vue.defineComponent({
   emits: ["update:activeKey", "update:list", "tabSelect", "closeExtraPage", "closeIframePage", "fullscreen", "refreshIframe", "refreshExtraPage", "mouseLeave"],
@@ -6672,7 +6690,10 @@ const TabList = vue.defineComponent({
     activeKey: {
       type: String
     },
-    containerRef: Object
+    containerRef: Object,
+    beforeTabClose: {
+      type: Function
+    }
   },
   setup(props, {
     emit,
@@ -6704,37 +6725,54 @@ const TabList = vue.defineComponent({
         scrollLeft(e.deltaY < 0 ? -300 : 300);
       }
     };
-    const handleRemove = async (tab, index) => {
-      if (getTabUniqueKey(tab) === activeTabKey.value) {
-        const next = tabList.value[index + 1];
-        const prev = tabList.value[index - 1];
-        if (next) {
-          activeTabKey.value = getTabUniqueKey(next);
-          emit("tabSelect", next);
-        } else if (prev) {
-          activeTabKey.value = getTabUniqueKey(prev);
-          emit("tabSelect", prev);
-        } else {
-          return;
+    const getBeforeTabClose = () => props.beforeTabClose ?? qiankunState.value?.beforeTabClose;
+    const selectTab = tab => {
+      activeTabKey.value = getTabUniqueKey(tab);
+      emit("tabSelect", tab);
+    };
+    const removeTabs = async (tabs, fallbackTab) => {
+      const closeKeys = new Set(tabs.map(item => getTabUniqueKey(item)));
+      const currentTabs = tabList.value.filter(item => closeKeys.has(getTabUniqueKey(item)));
+      if (!currentTabs.length || currentTabs.length >= tabList.value.length) {
+        return false;
+      }
+      if (!(await canCloseTabs(currentTabs, getBeforeTabClose()))) {
+        return false;
+      }
+      const remainingTabs = tabList.value.filter(item => !closeKeys.has(getTabUniqueKey(item)));
+      if (!remainingTabs.length) {
+        return false;
+      }
+      if (activeTabKey.value && closeKeys.has(activeTabKey.value)) {
+        const nextActiveTab = fallbackTab && remainingTabs.some(item => getTabUniqueKey(item) === getTabUniqueKey(fallbackTab)) ? fallbackTab : remainingTabs[0];
+        if (nextActiveTab) {
+          selectTab(nextActiveTab);
         }
       }
-      tabList.value.splice(index, 1);
+      tabList.value = remainingTabs;
+      return true;
     };
-    const closeToRight = index => tabList.value = tabList.value.filter((_2, i) => i <= index);
-    const closeToLeft = index => tabList.value = tabList.value.filter((_2, i) => i >= index);
-    const closeOther = index => {
-      activeTabKey.value = tabList.value[index].key;
-      tabList.value = tabList.value.filter((_2, i) => i === index);
+    const handleRemove = async (tab, index) => {
+      const target = tabList.value[index];
+      if (!target || getTabUniqueKey(target) !== getTabUniqueKey(tab)) {
+        return closeTab(tab);
+      }
+      const fallbackTab = tabList.value[index + 1] ?? tabList.value[index - 1];
+      return removeTabs([target], fallbackTab);
     };
-    const closeTab = tab => {
+    const closeToRight = index => removeTabs(tabList.value.filter((_2, i) => i > index), tabList.value[index]);
+    const closeToLeft = index => removeTabs(tabList.value.filter((_2, i) => i < index), tabList.value[index]);
+    const closeOther = index => removeTabs(tabList.value.filter((_2, i) => i !== index), tabList.value[index]);
+    const closeTab = async tab => {
       const idx = tabList.value.findIndex(item => getTabUniqueKey(item) === getTabUniqueKey(tab));
       if (idx !== -1) {
-        handleRemove(tab, idx);
+        return handleRemove(tabList.value[idx], idx);
       }
+      return false;
     };
     const magicKeys = core.useMagicKeys();
     core.whenever(magicKeys[closeTabMagicKey], () => {
-      if (tabList.value.length > 1) {
+      if (tabList.value.length > 1 && activeTabIndex.value !== -1) {
         handleRemove(tabList.value[activeTabIndex.value], activeTabIndex.value);
       }
     });
@@ -7020,6 +7058,9 @@ const Props$1 = {
   pageContainerRef: {
     type: Object,
     required: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const PageContent = vue.defineComponent({
@@ -7256,6 +7297,35 @@ const PageContent = vue.defineComponent({
         data
       } = 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
+          });
+          return;
+        }
         handleMenuChange({
           ...data,
           mode: 2,
@@ -7337,7 +7407,8 @@ const PageContent = vue.defineComponent({
         "onFullscreen": handleFullscreen,
         "onRefreshIframe": handleRefreshIframe,
         "onRefreshExtraPage": handleRefreshExtraPage,
-        "onMouseLeave": () => isTabsShow.value = false
+        "onMouseLeave": () => isTabsShow.value = false,
+        "beforeTabClose": props.beforeTabClose
       }, null), [[vue.vShow, !isFullscreen.value || isTabsShow.value]]);
       const containerCns = {
         padding: isPadding.value,
@@ -7498,6 +7569,9 @@ const Props = {
   showNotice: {
     type: Boolean,
     default: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const Layout = vue.defineComponent({
@@ -7550,13 +7624,22 @@ const Layout = vue.defineComponent({
       currMenu.value = menu;
       vue.nextTick(() => currMenu.value = void 0);
     };
+    vue.watch(() => props.beforeTabClose, beforeTabClose => {
+      qiankunState.value = {
+        ...(qiankunState.value ?? {}),
+        beforeTabClose
+      };
+    }, {
+      immediate: true
+    });
     vue.onBeforeUnmount(() => {
       qiankunState.value = {
         ...qiankunState.value,
         extraTabs: [],
         removeMenuTabs: [],
         activeTabKey: "",
-        refreshTabKey: ""
+        refreshTabKey: "",
+        beforeTabClose: void 0
       };
     });
     const pageContainerRef = vue.ref();
@@ -7613,7 +7696,8 @@ const Layout = vue.defineComponent({
         "menu": props.userMenu,
         "extraPages": props.extraPages,
         "appList": props.appList,
-        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage
+        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage,
+        "beforeTabClose": props.beforeTabClose
       }, null);
       return vue.createVNode("div", {
         "class": `${config.prefix}-layout`
@@ -8776,6 +8860,9 @@ const getDetailContainer = () => vue.defineComponent({
     const detailList = vue.ref([]);
     const extraPages = vue.computed(() => qiankunState.value.extraTabs);
     const handleClose = async tab => {
+      if (!(await canCloseTab(tab, qiankunState.value?.beforeTabClose))) {
+        return;
+      }
       const copyPages = [...extraPages.value];
       const idx = copyPages.findIndex(item => item.name === tab.name && tab.uniqueKey === item.uniqueKey);
       if (idx !== -1) {
@@ -8808,6 +8895,7 @@ const getDetailContainer = () => vue.defineComponent({
         uniqueKey: dataId.value,
         icon: props.icon,
         isExtraTab: true,
+        type: "extraTab",
         params: ___default["default"].omit(route.query, "name")
       };
       const detail = detailList.value.find(item => item.key + item.uniqueKey === tab.key + tab.uniqueKey);

package/dist/components/index.d.ts

@@ -19,6 +19,9 @@ declare const _default$k: vue.DefineComponent<{
 
 declare const _default$j: vue.FunctionalComponent<_ant_design_icons_vue_lib_components_IconFont.IconFontProps, {}, any>;
 
+type BeforeTabCloseResult = boolean | void;
+type BeforeTabClose<T = any> = (tab: T) => BeforeTabCloseResult | Promise<BeforeTabCloseResult>;
+
 interface IMenuItem {
     id: string;
     code: string;
@@ -73,6 +76,9 @@ declare const _default$i: vue.DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    beforeTabClose: {
+        type: PropType<BeforeTabClose>;
+    };
 }, () => vue_jsx_runtime.JSX.Element, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, ("globalSearch" | "personalCenter" | "logout" | "extraPage")[], "globalSearch" | "personalCenter" | "logout" | "extraPage", vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{
     userMenu: {
         type: PropType<MenuList>;
@@ -115,6 +121,9 @@ declare const _default$i: vue.DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    beforeTabClose: {
+        type: PropType<BeforeTabClose>;
+    };
 }>> & {
     onGlobalSearch?: ((...args: any[]) => any) | undefined;
     onPersonalCenter?: ((...args: any[]) => any) | undefined;

package/dist/components/index.js

@@ -59,20 +59,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -6632,6 +6632,24 @@ function getOpenUrl(url) {
   return res;
 }
 
+async function canCloseTab(tab, beforeTabClose) {
+  if (typeof beforeTabClose !== "function") return true;
+  try {
+    const result = await beforeTabClose(tab);
+    return result !== false;
+  } catch {
+    return false;
+  }
+}
+async function canCloseTabs(tabs, beforeTabClose) {
+  for (const tab of tabs) {
+    if (!(await canCloseTab(tab, beforeTabClose))) {
+      return false;
+    }
+  }
+  return true;
+}
+
 const closeTabMagicKey = "control_shift_q";
 const TabList = defineComponent({
   emits: ["update:activeKey", "update:list", "tabSelect", "closeExtraPage", "closeIframePage", "fullscreen", "refreshIframe", "refreshExtraPage", "mouseLeave"],
@@ -6643,7 +6661,10 @@ const TabList = defineComponent({
     activeKey: {
       type: String
     },
-    containerRef: Object
+    containerRef: Object,
+    beforeTabClose: {
+      type: Function
+    }
   },
   setup(props, {
     emit,
@@ -6675,37 +6696,54 @@ const TabList = defineComponent({
         scrollLeft(e.deltaY < 0 ? -300 : 300);
       }
     };
-    const handleRemove = async (tab, index) => {
-      if (getTabUniqueKey(tab) === activeTabKey.value) {
-        const next = tabList.value[index + 1];
-        const prev = tabList.value[index - 1];
-        if (next) {
-          activeTabKey.value = getTabUniqueKey(next);
-          emit("tabSelect", next);
-        } else if (prev) {
-          activeTabKey.value = getTabUniqueKey(prev);
-          emit("tabSelect", prev);
-        } else {
-          return;
+    const getBeforeTabClose = () => props.beforeTabClose ?? qiankunState.value?.beforeTabClose;
+    const selectTab = tab => {
+      activeTabKey.value = getTabUniqueKey(tab);
+      emit("tabSelect", tab);
+    };
+    const removeTabs = async (tabs, fallbackTab) => {
+      const closeKeys = new Set(tabs.map(item => getTabUniqueKey(item)));
+      const currentTabs = tabList.value.filter(item => closeKeys.has(getTabUniqueKey(item)));
+      if (!currentTabs.length || currentTabs.length >= tabList.value.length) {
+        return false;
+      }
+      if (!(await canCloseTabs(currentTabs, getBeforeTabClose()))) {
+        return false;
+      }
+      const remainingTabs = tabList.value.filter(item => !closeKeys.has(getTabUniqueKey(item)));
+      if (!remainingTabs.length) {
+        return false;
+      }
+      if (activeTabKey.value && closeKeys.has(activeTabKey.value)) {
+        const nextActiveTab = fallbackTab && remainingTabs.some(item => getTabUniqueKey(item) === getTabUniqueKey(fallbackTab)) ? fallbackTab : remainingTabs[0];
+        if (nextActiveTab) {
+          selectTab(nextActiveTab);
         }
       }
-      tabList.value.splice(index, 1);
+      tabList.value = remainingTabs;
+      return true;
     };
-    const closeToRight = index => tabList.value = tabList.value.filter((_2, i) => i <= index);
-    const closeToLeft = index => tabList.value = tabList.value.filter((_2, i) => i >= index);
-    const closeOther = index => {
-      activeTabKey.value = tabList.value[index].key;
-      tabList.value = tabList.value.filter((_2, i) => i === index);
+    const handleRemove = async (tab, index) => {
+      const target = tabList.value[index];
+      if (!target || getTabUniqueKey(target) !== getTabUniqueKey(tab)) {
+        return closeTab(tab);
+      }
+      const fallbackTab = tabList.value[index + 1] ?? tabList.value[index - 1];
+      return removeTabs([target], fallbackTab);
     };
-    const closeTab = tab => {
+    const closeToRight = index => removeTabs(tabList.value.filter((_2, i) => i > index), tabList.value[index]);
+    const closeToLeft = index => removeTabs(tabList.value.filter((_2, i) => i < index), tabList.value[index]);
+    const closeOther = index => removeTabs(tabList.value.filter((_2, i) => i !== index), tabList.value[index]);
+    const closeTab = async tab => {
       const idx = tabList.value.findIndex(item => getTabUniqueKey(item) === getTabUniqueKey(tab));
       if (idx !== -1) {
-        handleRemove(tab, idx);
+        return handleRemove(tabList.value[idx], idx);
       }
+      return false;
     };
     const magicKeys = useMagicKeys();
     whenever(magicKeys[closeTabMagicKey], () => {
-      if (tabList.value.length > 1) {
+      if (tabList.value.length > 1 && activeTabIndex.value !== -1) {
         handleRemove(tabList.value[activeTabIndex.value], activeTabIndex.value);
       }
     });
@@ -6991,6 +7029,9 @@ const Props$1 = {
   pageContainerRef: {
     type: Object,
     required: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const PageContent = defineComponent({
@@ -7227,6 +7268,35 @@ const PageContent = defineComponent({
         data
       } = 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
+          });
+          return;
+        }
         handleMenuChange({
           ...data,
           mode: 2,
@@ -7308,7 +7378,8 @@ const PageContent = defineComponent({
         "onFullscreen": handleFullscreen,
         "onRefreshIframe": handleRefreshIframe,
         "onRefreshExtraPage": handleRefreshExtraPage,
-        "onMouseLeave": () => isTabsShow.value = false
+        "onMouseLeave": () => isTabsShow.value = false,
+        "beforeTabClose": props.beforeTabClose
       }, null), [[vShow, !isFullscreen.value || isTabsShow.value]]);
       const containerCns = {
         padding: isPadding.value,
@@ -7469,6 +7540,9 @@ const Props = {
   showNotice: {
     type: Boolean,
     default: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const Layout = defineComponent({
@@ -7521,13 +7595,22 @@ const Layout = defineComponent({
       currMenu.value = menu;
       nextTick(() => currMenu.value = void 0);
     };
+    watch(() => props.beforeTabClose, beforeTabClose => {
+      qiankunState.value = {
+        ...(qiankunState.value ?? {}),
+        beforeTabClose
+      };
+    }, {
+      immediate: true
+    });
     onBeforeUnmount(() => {
       qiankunState.value = {
         ...qiankunState.value,
         extraTabs: [],
         removeMenuTabs: [],
         activeTabKey: "",
-        refreshTabKey: ""
+        refreshTabKey: "",
+        beforeTabClose: void 0
       };
     });
     const pageContainerRef = ref();
@@ -7584,7 +7667,8 @@ const Layout = defineComponent({
         "menu": props.userMenu,
         "extraPages": props.extraPages,
         "appList": props.appList,
-        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage
+        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage,
+        "beforeTabClose": props.beforeTabClose
       }, null);
       return createVNode("div", {
         "class": `${config.prefix}-layout`
@@ -8747,6 +8831,9 @@ const getDetailContainer = () => defineComponent({
     const detailList = ref([]);
     const extraPages = computed(() => qiankunState.value.extraTabs);
     const handleClose = async tab => {
+      if (!(await canCloseTab(tab, qiankunState.value?.beforeTabClose))) {
+        return;
+      }
       const copyPages = [...extraPages.value];
       const idx = copyPages.findIndex(item => item.name === tab.name && tab.uniqueKey === item.uniqueKey);
       if (idx !== -1) {
@@ -8779,6 +8866,7 @@ const getDetailContainer = () => defineComponent({
         uniqueKey: dataId.value,
         icon: props.icon,
         isExtraTab: true,
+        type: "extraTab",
         params: _.omit(route.query, "name")
       };
       const detail = detailList.value.find(item => item.key + item.uniqueKey === tab.key + tab.uniqueKey);

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.164";
+var version = "0.1.172";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -227,20 +227,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -7816,6 +7816,24 @@ function getOpenUrl(url) {
   return res;
 }
 
+async function canCloseTab(tab, beforeTabClose) {
+  if (typeof beforeTabClose !== "function") return true;
+  try {
+    const result = await beforeTabClose(tab);
+    return result !== false;
+  } catch {
+    return false;
+  }
+}
+async function canCloseTabs(tabs, beforeTabClose) {
+  for (const tab of tabs) {
+    if (!(await canCloseTab(tab, beforeTabClose))) {
+      return false;
+    }
+  }
+  return true;
+}
+
 const closeTabMagicKey = "control_shift_q";
 const TabList = vue.defineComponent({
   emits: ["update:activeKey", "update:list", "tabSelect", "closeExtraPage", "closeIframePage", "fullscreen", "refreshIframe", "refreshExtraPage", "mouseLeave"],
@@ -7827,7 +7845,10 @@ const TabList = vue.defineComponent({
     activeKey: {
       type: String
     },
-    containerRef: Object
+    containerRef: Object,
+    beforeTabClose: {
+      type: Function
+    }
   },
   setup(props, {
     emit,
@@ -7859,37 +7880,54 @@ const TabList = vue.defineComponent({
         scrollLeft(e.deltaY < 0 ? -300 : 300);
       }
     };
-    const handleRemove = async (tab, index) => {
-      if (getTabUniqueKey(tab) === activeTabKey.value) {
-        const next = tabList.value[index + 1];
-        const prev = tabList.value[index - 1];
-        if (next) {
-          activeTabKey.value = getTabUniqueKey(next);
-          emit("tabSelect", next);
-        } else if (prev) {
-          activeTabKey.value = getTabUniqueKey(prev);
-          emit("tabSelect", prev);
-        } else {
-          return;
+    const getBeforeTabClose = () => props.beforeTabClose ?? qiankunState.value?.beforeTabClose;
+    const selectTab = tab => {
+      activeTabKey.value = getTabUniqueKey(tab);
+      emit("tabSelect", tab);
+    };
+    const removeTabs = async (tabs, fallbackTab) => {
+      const closeKeys = new Set(tabs.map(item => getTabUniqueKey(item)));
+      const currentTabs = tabList.value.filter(item => closeKeys.has(getTabUniqueKey(item)));
+      if (!currentTabs.length || currentTabs.length >= tabList.value.length) {
+        return false;
+      }
+      if (!(await canCloseTabs(currentTabs, getBeforeTabClose()))) {
+        return false;
+      }
+      const remainingTabs = tabList.value.filter(item => !closeKeys.has(getTabUniqueKey(item)));
+      if (!remainingTabs.length) {
+        return false;
+      }
+      if (activeTabKey.value && closeKeys.has(activeTabKey.value)) {
+        const nextActiveTab = fallbackTab && remainingTabs.some(item => getTabUniqueKey(item) === getTabUniqueKey(fallbackTab)) ? fallbackTab : remainingTabs[0];
+        if (nextActiveTab) {
+          selectTab(nextActiveTab);
         }
       }
-      tabList.value.splice(index, 1);
+      tabList.value = remainingTabs;
+      return true;
     };
-    const closeToRight = index => tabList.value = tabList.value.filter((_2, i) => i <= index);
-    const closeToLeft = index => tabList.value = tabList.value.filter((_2, i) => i >= index);
-    const closeOther = index => {
-      activeTabKey.value = tabList.value[index].key;
-      tabList.value = tabList.value.filter((_2, i) => i === index);
+    const handleRemove = async (tab, index) => {
+      const target = tabList.value[index];
+      if (!target || getTabUniqueKey(target) !== getTabUniqueKey(tab)) {
+        return closeTab(tab);
+      }
+      const fallbackTab = tabList.value[index + 1] ?? tabList.value[index - 1];
+      return removeTabs([target], fallbackTab);
     };
-    const closeTab = tab => {
+    const closeToRight = index => removeTabs(tabList.value.filter((_2, i) => i > index), tabList.value[index]);
+    const closeToLeft = index => removeTabs(tabList.value.filter((_2, i) => i < index), tabList.value[index]);
+    const closeOther = index => removeTabs(tabList.value.filter((_2, i) => i !== index), tabList.value[index]);
+    const closeTab = async tab => {
       const idx = tabList.value.findIndex(item => getTabUniqueKey(item) === getTabUniqueKey(tab));
       if (idx !== -1) {
-        handleRemove(tab, idx);
+        return handleRemove(tabList.value[idx], idx);
       }
+      return false;
     };
     const magicKeys = core.useMagicKeys();
     core.whenever(magicKeys[closeTabMagicKey], () => {
-      if (tabList.value.length > 1) {
+      if (tabList.value.length > 1 && activeTabIndex.value !== -1) {
         handleRemove(tabList.value[activeTabIndex.value], activeTabIndex.value);
       }
     });
@@ -8167,6 +8205,9 @@ const Props$1 = {
   pageContainerRef: {
     type: Object,
     required: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const PageContent = vue.defineComponent({
@@ -8403,6 +8444,35 @@ const PageContent = vue.defineComponent({
         data
       } = 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
+          });
+          return;
+        }
         handleMenuChange({
           ...data,
           mode: 2,
@@ -8484,7 +8554,8 @@ const PageContent = vue.defineComponent({
         "onFullscreen": handleFullscreen,
         "onRefreshIframe": handleRefreshIframe,
         "onRefreshExtraPage": handleRefreshExtraPage,
-        "onMouseLeave": () => isTabsShow.value = false
+        "onMouseLeave": () => isTabsShow.value = false,
+        "beforeTabClose": props.beforeTabClose
       }, null), [[vue.vShow, !isFullscreen.value || isTabsShow.value]]);
       const containerCns = {
         padding: isPadding.value,
@@ -8645,6 +8716,9 @@ const Props = {
   showNotice: {
     type: Boolean,
     default: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const Layout = vue.defineComponent({
@@ -8697,13 +8771,22 @@ const Layout = vue.defineComponent({
       currMenu.value = menu;
       vue.nextTick(() => currMenu.value = void 0);
     };
+    vue.watch(() => props.beforeTabClose, beforeTabClose => {
+      qiankunState.value = {
+        ...(qiankunState.value ?? {}),
+        beforeTabClose
+      };
+    }, {
+      immediate: true
+    });
     vue.onBeforeUnmount(() => {
       qiankunState.value = {
         ...qiankunState.value,
         extraTabs: [],
         removeMenuTabs: [],
         activeTabKey: "",
-        refreshTabKey: ""
+        refreshTabKey: "",
+        beforeTabClose: void 0
       };
     });
     const pageContainerRef = vue.ref();
@@ -8760,7 +8843,8 @@ const Layout = vue.defineComponent({
         "menu": props.userMenu,
         "extraPages": props.extraPages,
         "appList": props.appList,
-        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage
+        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage,
+        "beforeTabClose": props.beforeTabClose
       }, null);
       return vue.createVNode("div", {
         "class": `${config.prefix}-layout`
@@ -9762,6 +9846,9 @@ const getDetailContainer = () => vue.defineComponent({
     const detailList = vue.ref([]);
     const extraPages = vue.computed(() => qiankunState.value.extraTabs);
     const handleClose = async tab => {
+      if (!(await canCloseTab(tab, qiankunState.value?.beforeTabClose))) {
+        return;
+      }
       const copyPages = [...extraPages.value];
       const idx = copyPages.findIndex(item => item.name === tab.name && tab.uniqueKey === item.uniqueKey);
       if (idx !== -1) {
@@ -9794,6 +9881,7 @@ const getDetailContainer = () => vue.defineComponent({
         uniqueKey: dataId.value,
         icon: props.icon,
         isExtraTab: true,
+        type: "extraTab",
         params: ___default["default"].omit(route.query, "name")
       };
       const detail = detailList.value.find(item => item.key + item.uniqueKey === tab.key + tab.uniqueKey);

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.164";
+var version = "0.1.172";
 
 declare const _default$p: {
     set(theme: string): void;
@@ -78,13 +78,8 @@ interface IApiInstanceConfig extends AxiosRequestConfig {
  *    keepProperty: boolean; 保留多余的属性，如createUser
  */
 declare const getCommonHeaders: () => {
-    userName: any;
-    userId: any;
-    employeeName: string;
-    employeeId: any;
     token: string;
     appId: any;
-    corpId: any;
     Authorization: string;
     "Content-Type": string;
 };
@@ -787,6 +782,9 @@ declare const _default$l: vue.DefineComponent<{
 
 declare const _default$k: vue.FunctionalComponent<_ant_design_icons_vue_lib_components_IconFont.IconFontProps, {}, any>;
 
+type BeforeTabCloseResult = boolean | void;
+type BeforeTabClose<T = any> = (tab: T) => BeforeTabCloseResult | Promise<BeforeTabCloseResult>;
+
 interface IMenuItem {
     id: string;
     code: string;
@@ -841,6 +839,9 @@ declare const _default$j: vue.DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    beforeTabClose: {
+        type: PropType<BeforeTabClose>;
+    };
 }, () => vue_jsx_runtime.JSX.Element, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, ("globalSearch" | "personalCenter" | "logout" | "extraPage")[], "globalSearch" | "personalCenter" | "logout" | "extraPage", vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{
     userMenu: {
         type: PropType<MenuList>;
@@ -883,6 +884,9 @@ declare const _default$j: vue.DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    beforeTabClose: {
+        type: PropType<BeforeTabClose>;
+    };
 }>> & {
     onGlobalSearch?: ((...args: any[]) => any) | undefined;
     onPersonalCenter?: ((...args: any[]) => any) | undefined;

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.164";
+var version = "0.1.172";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -196,20 +196,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -7785,6 +7785,24 @@ function getOpenUrl(url) {
   return res;
 }
 
+async function canCloseTab(tab, beforeTabClose) {
+  if (typeof beforeTabClose !== "function") return true;
+  try {
+    const result = await beforeTabClose(tab);
+    return result !== false;
+  } catch {
+    return false;
+  }
+}
+async function canCloseTabs(tabs, beforeTabClose) {
+  for (const tab of tabs) {
+    if (!(await canCloseTab(tab, beforeTabClose))) {
+      return false;
+    }
+  }
+  return true;
+}
+
 const closeTabMagicKey = "control_shift_q";
 const TabList = defineComponent({
   emits: ["update:activeKey", "update:list", "tabSelect", "closeExtraPage", "closeIframePage", "fullscreen", "refreshIframe", "refreshExtraPage", "mouseLeave"],
@@ -7796,7 +7814,10 @@ const TabList = defineComponent({
     activeKey: {
       type: String
     },
-    containerRef: Object
+    containerRef: Object,
+    beforeTabClose: {
+      type: Function
+    }
   },
   setup(props, {
     emit,
@@ -7828,37 +7849,54 @@ const TabList = defineComponent({
         scrollLeft(e.deltaY < 0 ? -300 : 300);
       }
     };
-    const handleRemove = async (tab, index) => {
-      if (getTabUniqueKey(tab) === activeTabKey.value) {
-        const next = tabList.value[index + 1];
-        const prev = tabList.value[index - 1];
-        if (next) {
-          activeTabKey.value = getTabUniqueKey(next);
-          emit("tabSelect", next);
-        } else if (prev) {
-          activeTabKey.value = getTabUniqueKey(prev);
-          emit("tabSelect", prev);
-        } else {
-          return;
+    const getBeforeTabClose = () => props.beforeTabClose ?? qiankunState.value?.beforeTabClose;
+    const selectTab = tab => {
+      activeTabKey.value = getTabUniqueKey(tab);
+      emit("tabSelect", tab);
+    };
+    const removeTabs = async (tabs, fallbackTab) => {
+      const closeKeys = new Set(tabs.map(item => getTabUniqueKey(item)));
+      const currentTabs = tabList.value.filter(item => closeKeys.has(getTabUniqueKey(item)));
+      if (!currentTabs.length || currentTabs.length >= tabList.value.length) {
+        return false;
+      }
+      if (!(await canCloseTabs(currentTabs, getBeforeTabClose()))) {
+        return false;
+      }
+      const remainingTabs = tabList.value.filter(item => !closeKeys.has(getTabUniqueKey(item)));
+      if (!remainingTabs.length) {
+        return false;
+      }
+      if (activeTabKey.value && closeKeys.has(activeTabKey.value)) {
+        const nextActiveTab = fallbackTab && remainingTabs.some(item => getTabUniqueKey(item) === getTabUniqueKey(fallbackTab)) ? fallbackTab : remainingTabs[0];
+        if (nextActiveTab) {
+          selectTab(nextActiveTab);
         }
       }
-      tabList.value.splice(index, 1);
+      tabList.value = remainingTabs;
+      return true;
     };
-    const closeToRight = index => tabList.value = tabList.value.filter((_2, i) => i <= index);
-    const closeToLeft = index => tabList.value = tabList.value.filter((_2, i) => i >= index);
-    const closeOther = index => {
-      activeTabKey.value = tabList.value[index].key;
-      tabList.value = tabList.value.filter((_2, i) => i === index);
+    const handleRemove = async (tab, index) => {
+      const target = tabList.value[index];
+      if (!target || getTabUniqueKey(target) !== getTabUniqueKey(tab)) {
+        return closeTab(tab);
+      }
+      const fallbackTab = tabList.value[index + 1] ?? tabList.value[index - 1];
+      return removeTabs([target], fallbackTab);
     };
-    const closeTab = tab => {
+    const closeToRight = index => removeTabs(tabList.value.filter((_2, i) => i > index), tabList.value[index]);
+    const closeToLeft = index => removeTabs(tabList.value.filter((_2, i) => i < index), tabList.value[index]);
+    const closeOther = index => removeTabs(tabList.value.filter((_2, i) => i !== index), tabList.value[index]);
+    const closeTab = async tab => {
       const idx = tabList.value.findIndex(item => getTabUniqueKey(item) === getTabUniqueKey(tab));
       if (idx !== -1) {
-        handleRemove(tab, idx);
+        return handleRemove(tabList.value[idx], idx);
       }
+      return false;
     };
     const magicKeys = useMagicKeys();
     whenever(magicKeys[closeTabMagicKey], () => {
-      if (tabList.value.length > 1) {
+      if (tabList.value.length > 1 && activeTabIndex.value !== -1) {
         handleRemove(tabList.value[activeTabIndex.value], activeTabIndex.value);
       }
     });
@@ -8136,6 +8174,9 @@ const Props$1 = {
   pageContainerRef: {
     type: Object,
     required: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const PageContent = defineComponent({
@@ -8372,6 +8413,35 @@ const PageContent = defineComponent({
         data
       } = 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
+          });
+          return;
+        }
         handleMenuChange({
           ...data,
           mode: 2,
@@ -8453,7 +8523,8 @@ const PageContent = defineComponent({
         "onFullscreen": handleFullscreen,
         "onRefreshIframe": handleRefreshIframe,
         "onRefreshExtraPage": handleRefreshExtraPage,
-        "onMouseLeave": () => isTabsShow.value = false
+        "onMouseLeave": () => isTabsShow.value = false,
+        "beforeTabClose": props.beforeTabClose
       }, null), [[vShow, !isFullscreen.value || isTabsShow.value]]);
       const containerCns = {
         padding: isPadding.value,
@@ -8614,6 +8685,9 @@ const Props = {
   showNotice: {
     type: Boolean,
     default: true
+  },
+  beforeTabClose: {
+    type: Function
   }
 };
 const Layout = defineComponent({
@@ -8666,13 +8740,22 @@ const Layout = defineComponent({
       currMenu.value = menu;
       nextTick(() => currMenu.value = void 0);
     };
+    watch(() => props.beforeTabClose, beforeTabClose => {
+      qiankunState.value = {
+        ...(qiankunState.value ?? {}),
+        beforeTabClose
+      };
+    }, {
+      immediate: true
+    });
     onBeforeUnmount(() => {
       qiankunState.value = {
         ...qiankunState.value,
         extraTabs: [],
         removeMenuTabs: [],
         activeTabKey: "",
-        refreshTabKey: ""
+        refreshTabKey: "",
+        beforeTabClose: void 0
       };
     });
     const pageContainerRef = ref();
@@ -8729,7 +8812,8 @@ const Layout = defineComponent({
         "menu": props.userMenu,
         "extraPages": props.extraPages,
         "appList": props.appList,
-        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage
+        "showTabList": (props.withMenu || showSideMenu.value) && !isOnlyPage,
+        "beforeTabClose": props.beforeTabClose
       }, null);
       return createVNode("div", {
         "class": `${config.prefix}-layout`
@@ -9731,6 +9815,9 @@ const getDetailContainer = () => defineComponent({
     const detailList = ref([]);
     const extraPages = computed(() => qiankunState.value.extraTabs);
     const handleClose = async tab => {
+      if (!(await canCloseTab(tab, qiankunState.value?.beforeTabClose))) {
+        return;
+      }
       const copyPages = [...extraPages.value];
       const idx = copyPages.findIndex(item => item.name === tab.name && tab.uniqueKey === item.uniqueKey);
       if (idx !== -1) {
@@ -9763,6 +9850,7 @@ const getDetailContainer = () => defineComponent({
         uniqueKey: dataId.value,
         icon: props.icon,
         isExtraTab: true,
+        type: "extraTab",
         params: _.omit(route.query, "name")
       };
       const detail = detailList.value.find(item => item.key + item.uniqueKey === tab.key + tab.uniqueKey);

package/dist/utils/index.cjs

@@ -213,20 +213,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };

package/dist/utils/index.d.ts

@@ -69,13 +69,8 @@ interface IApiInstanceConfig extends AxiosRequestConfig {
  *    keepProperty: boolean; 保留多余的属性，如createUser
  */
 declare const getCommonHeaders: () => {
-    userName: any;
-    userId: any;
-    employeeName: string;
-    employeeId: any;
     token: string;
     appId: any;
-    corpId: any;
     Authorization: string;
     "Content-Type": string;
 };

package/dist/utils/index.js

@@ -185,20 +185,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };

package/package.json

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