inl-ui 0.1.104 → 0.1.106

package/dist/components/index.cjs

@@ -602,7 +602,9 @@ function onAddExtraTabs(handler) {
       handler(added.map(item => ({
         ...item,
         type: "extraTab"
-      })));
+      })), "add");
+    } else {
+      handler(val, "update");
     }
   }, {
     deep: true,
@@ -6890,7 +6892,6 @@ const TabList = vue.defineComponent({
             "hide-border": activeTabIndex.value === index || activeTabIndex.value - 1 === index
           }],
           "onClick": () => {
-            console.log("111111111", item);
             emit("tabSelect", item);
           }
         }, [item.icon && vue.createVNode(vue.resolveComponent("icon-font"), {
@@ -6925,7 +6926,7 @@ const TabList = vue.defineComponent({
           "key": "right",
           "onClick": () => closeToRight(index)
         }, {
-          default: () => ["\u5173\u95ED\u53F3\u4FA71"]
+          default: () => ["\u5173\u95ED\u53F3\u4FA7"]
         }), vue.createVNode(antDesignVue.MenuItem, {
           "key": "left",
           "onClick": () => closeToLeft(index)
@@ -7104,7 +7105,6 @@ const PageContent = vue.defineComponent({
             openedTab.params = isFromMenu ? val.params : queryCombine;
             val.params = isFromMenu ? val.params : queryCombine;
           } else {
-            console.log("add2222222222", tab);
             tabList.value.push({
               ...tab,
               key: key ?? id,
@@ -7159,7 +7159,6 @@ const PageContent = vue.defineComponent({
       activeKey.value = id ? id : `${key}${uniqueKey}`;
     };
     const onTabSelect = tab => {
-      console.log("onTabSelect111111", tab);
       if (tab.isExtra) {
         router.push({
           path: "/",
@@ -7169,7 +7168,6 @@ const PageContent = vue.defineComponent({
         handleMenuChange(tab);
       } else {
         const resolveRes = router.resolve(tab.url);
-        console.log(resolveRes, 2222222222);
         router.push({
           path: resolveRes.path,
           query: Object.assign(resolveRes.query, tab.params)
@@ -7231,9 +7229,17 @@ const PageContent = vue.defineComponent({
         });
       }
     });
-    onAddExtraTabs(added => {
-      console.log("add1111111", added);
-      tabList.value.push(...added);
+    onAddExtraTabs((arr, operate) => {
+      if (operate === "add") {
+        tabList.value.push(...arr);
+      } else {
+        tabList.value.forEach(item => {
+          const exist = arr.find(ele => ele.uniqueKey === item.uniqueKey);
+          if (exist) {
+            item.url = exist.url;
+          }
+        });
+      }
     });
     const {
       isFullscreen,
@@ -8721,8 +8727,8 @@ const getDetailContainer = () => vue.defineComponent({
         };
       }
     };
-    const addTab = ___default["default"].debounce(newRroute => {
-      dataId.value = newRroute.params.id;
+    const addTab = ___default["default"].debounce(newRoute => {
+      dataId.value = newRoute.params.id;
       const {
         name
       } = route.query;
@@ -8730,21 +8736,18 @@ const getDetailContainer = () => vue.defineComponent({
         name,
         url: route.fullPath,
         key: props.name,
-        uniqueKey: newRroute.params.id,
+        uniqueKey: newRoute.params.id,
         icon: props.icon,
         isExtraTab: true,
         params: ___default["default"].omit(route.query, "name")
       };
-      console.log("tab4444444444444444", tab);
-      console.log("route4444444444444444", route);
       const detail = detailList.value.find(item => item.uniqueKey === tab.uniqueKey);
-      debugger;
       if (detail) {
-        detail.url = newRroute.fullPath;
+        detail.url = newRoute.fullPath;
         if (Array.isArray(qiankunState.value.extraTabs)) {
           const extraTabs = [...qiankunState.value.extraTabs];
           const ele = extraTabs.find(item => item.uniqueKey === tab.uniqueKey);
-          ele.url = newRroute.fullPath;
+          ele.url = newRoute.fullPath;
           qiankunState.value = {
             ...qiankunState.value,
             extraTabs
@@ -8754,8 +8757,9 @@ const getDetailContainer = () => vue.defineComponent({
         detailList.value.push({
           ...tab,
           refreshKey: Date.now(),
-          id: newRroute.params.id
+          id: newRoute.params.id
         });
+        console.log("detailList.value", detailList.value);
         setTimeout(() => {
           if (Array.isArray(qiankunState.value.extraTabs)) {
             const extraTabs = [...qiankunState.value.extraTabs, tab];
@@ -8776,7 +8780,6 @@ const getDetailContainer = () => vue.defineComponent({
       trailing: false
     });
     vue.watch(() => route, async val => {
-      debugger;
       if (!val || route.name.indexOf(props.name) === -1) return;
       addTab(val);
     }, {

package/dist/components/index.js

@@ -574,7 +574,9 @@ function onAddExtraTabs(handler) {
       handler(added.map(item => ({
         ...item,
         type: "extraTab"
-      })));
+      })), "add");
+    } else {
+      handler(val, "update");
     }
   }, {
     deep: true,
@@ -6862,7 +6864,6 @@ const TabList = defineComponent({
             "hide-border": activeTabIndex.value === index || activeTabIndex.value - 1 === index
           }],
           "onClick": () => {
-            console.log("111111111", item);
             emit("tabSelect", item);
           }
         }, [item.icon && createVNode(resolveComponent("icon-font"), {
@@ -6897,7 +6898,7 @@ const TabList = defineComponent({
           "key": "right",
           "onClick": () => closeToRight(index)
         }, {
-          default: () => ["\u5173\u95ED\u53F3\u4FA71"]
+          default: () => ["\u5173\u95ED\u53F3\u4FA7"]
         }), createVNode(MenuItem, {
           "key": "left",
           "onClick": () => closeToLeft(index)
@@ -7076,7 +7077,6 @@ const PageContent = defineComponent({
             openedTab.params = isFromMenu ? val.params : queryCombine;
             val.params = isFromMenu ? val.params : queryCombine;
           } else {
-            console.log("add2222222222", tab);
             tabList.value.push({
               ...tab,
               key: key ?? id,
@@ -7131,7 +7131,6 @@ const PageContent = defineComponent({
       activeKey.value = id ? id : `${key}${uniqueKey}`;
     };
     const onTabSelect = tab => {
-      console.log("onTabSelect111111", tab);
       if (tab.isExtra) {
         router.push({
           path: "/",
@@ -7141,7 +7140,6 @@ const PageContent = defineComponent({
         handleMenuChange(tab);
       } else {
         const resolveRes = router.resolve(tab.url);
-        console.log(resolveRes, 2222222222);
         router.push({
           path: resolveRes.path,
           query: Object.assign(resolveRes.query, tab.params)
@@ -7203,9 +7201,17 @@ const PageContent = defineComponent({
         });
       }
     });
-    onAddExtraTabs(added => {
-      console.log("add1111111", added);
-      tabList.value.push(...added);
+    onAddExtraTabs((arr, operate) => {
+      if (operate === "add") {
+        tabList.value.push(...arr);
+      } else {
+        tabList.value.forEach(item => {
+          const exist = arr.find(ele => ele.uniqueKey === item.uniqueKey);
+          if (exist) {
+            item.url = exist.url;
+          }
+        });
+      }
     });
     const {
       isFullscreen,
@@ -8693,8 +8699,8 @@ const getDetailContainer = () => defineComponent({
         };
       }
     };
-    const addTab = _.debounce(newRroute => {
-      dataId.value = newRroute.params.id;
+    const addTab = _.debounce(newRoute => {
+      dataId.value = newRoute.params.id;
       const {
         name
       } = route.query;
@@ -8702,21 +8708,18 @@ const getDetailContainer = () => defineComponent({
         name,
         url: route.fullPath,
         key: props.name,
-        uniqueKey: newRroute.params.id,
+        uniqueKey: newRoute.params.id,
         icon: props.icon,
         isExtraTab: true,
         params: _.omit(route.query, "name")
       };
-      console.log("tab4444444444444444", tab);
-      console.log("route4444444444444444", route);
       const detail = detailList.value.find(item => item.uniqueKey === tab.uniqueKey);
-      debugger;
       if (detail) {
-        detail.url = newRroute.fullPath;
+        detail.url = newRoute.fullPath;
         if (Array.isArray(qiankunState.value.extraTabs)) {
           const extraTabs = [...qiankunState.value.extraTabs];
           const ele = extraTabs.find(item => item.uniqueKey === tab.uniqueKey);
-          ele.url = newRroute.fullPath;
+          ele.url = newRoute.fullPath;
           qiankunState.value = {
             ...qiankunState.value,
             extraTabs
@@ -8726,8 +8729,9 @@ const getDetailContainer = () => defineComponent({
         detailList.value.push({
           ...tab,
           refreshKey: Date.now(),
-          id: newRroute.params.id
+          id: newRoute.params.id
         });
+        console.log("detailList.value", detailList.value);
         setTimeout(() => {
           if (Array.isArray(qiankunState.value.extraTabs)) {
             const extraTabs = [...qiankunState.value.extraTabs, tab];
@@ -8748,7 +8752,6 @@ const getDetailContainer = () => defineComponent({
       trailing: false
     });
     watch(() => route, async val => {
-      debugger;
       if (!val || route.name.indexOf(props.name) === -1) return;
       addTab(val);
     }, {

package/dist/index.cjs

@@ -43,7 +43,7 @@ var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios$2);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 
-var version = "0.1.103";
+var version = "0.1.106";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -7712,7 +7712,9 @@ function onAddExtraTabs(handler) {
       handler(added.map(item => ({
         ...item,
         type: "extraTab"
-      })));
+      })), "add");
+    } else {
+      handler(val, "update");
     }
   }, {
     deep: true,
@@ -8045,7 +8047,6 @@ const TabList = vue.defineComponent({
             "hide-border": activeTabIndex.value === index || activeTabIndex.value - 1 === index
           }],
           "onClick": () => {
-            console.log("111111111", item);
             emit("tabSelect", item);
           }
         }, [item.icon && vue.createVNode(vue.resolveComponent("icon-font"), {
@@ -8080,7 +8081,7 @@ const TabList = vue.defineComponent({
           "key": "right",
           "onClick": () => closeToRight(index)
         }, {
-          default: () => ["\u5173\u95ED\u53F3\u4FA71"]
+          default: () => ["\u5173\u95ED\u53F3\u4FA7"]
         }), vue.createVNode(antDesignVue.MenuItem, {
           "key": "left",
           "onClick": () => closeToLeft(index)
@@ -8259,7 +8260,6 @@ const PageContent = vue.defineComponent({
             openedTab.params = isFromMenu ? val.params : queryCombine;
             val.params = isFromMenu ? val.params : queryCombine;
           } else {
-            console.log("add2222222222", tab);
             tabList.value.push({
               ...tab,
               key: key ?? id,
@@ -8314,7 +8314,6 @@ const PageContent = vue.defineComponent({
       activeKey.value = id ? id : `${key}${uniqueKey}`;
     };
     const onTabSelect = tab => {
-      console.log("onTabSelect111111", tab);
       if (tab.isExtra) {
         router.push({
           path: "/",
@@ -8324,7 +8323,6 @@ const PageContent = vue.defineComponent({
         handleMenuChange(tab);
       } else {
         const resolveRes = router.resolve(tab.url);
-        console.log(resolveRes, 2222222222);
         router.push({
           path: resolveRes.path,
           query: Object.assign(resolveRes.query, tab.params)
@@ -8386,9 +8384,17 @@ const PageContent = vue.defineComponent({
         });
       }
     });
-    onAddExtraTabs(added => {
-      console.log("add1111111", added);
-      tabList.value.push(...added);
+    onAddExtraTabs((arr, operate) => {
+      if (operate === "add") {
+        tabList.value.push(...arr);
+      } else {
+        tabList.value.forEach(item => {
+          const exist = arr.find(ele => ele.uniqueKey === item.uniqueKey);
+          if (exist) {
+            item.url = exist.url;
+          }
+        });
+      }
     });
     const {
       isFullscreen,
@@ -9707,8 +9713,8 @@ const getDetailContainer = () => vue.defineComponent({
         };
       }
     };
-    const addTab = ___default["default"].debounce(newRroute => {
-      dataId.value = newRroute.params.id;
+    const addTab = ___default["default"].debounce(newRoute => {
+      dataId.value = newRoute.params.id;
       const {
         name
       } = route.query;
@@ -9716,21 +9722,18 @@ const getDetailContainer = () => vue.defineComponent({
         name,
         url: route.fullPath,
         key: props.name,
-        uniqueKey: newRroute.params.id,
+        uniqueKey: newRoute.params.id,
         icon: props.icon,
         isExtraTab: true,
         params: ___default["default"].omit(route.query, "name")
       };
-      console.log("tab4444444444444444", tab);
-      console.log("route4444444444444444", route);
       const detail = detailList.value.find(item => item.uniqueKey === tab.uniqueKey);
-      debugger;
       if (detail) {
-        detail.url = newRroute.fullPath;
+        detail.url = newRoute.fullPath;
         if (Array.isArray(qiankunState.value.extraTabs)) {
           const extraTabs = [...qiankunState.value.extraTabs];
           const ele = extraTabs.find(item => item.uniqueKey === tab.uniqueKey);
-          ele.url = newRroute.fullPath;
+          ele.url = newRoute.fullPath;
           qiankunState.value = {
             ...qiankunState.value,
             extraTabs
@@ -9740,8 +9743,9 @@ const getDetailContainer = () => vue.defineComponent({
         detailList.value.push({
           ...tab,
           refreshKey: Date.now(),
-          id: newRroute.params.id
+          id: newRoute.params.id
         });
+        console.log("detailList.value", detailList.value);
         setTimeout(() => {
           if (Array.isArray(qiankunState.value.extraTabs)) {
             const extraTabs = [...qiankunState.value.extraTabs, tab];
@@ -9762,7 +9766,6 @@ const getDetailContainer = () => vue.defineComponent({
       trailing: false
     });
     vue.watch(() => route, async val => {
-      debugger;
       if (!val || route.name.indexOf(props.name) === -1) return;
       addTab(val);
     }, {

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.103";
+var version = "0.1.106";
 
 declare const _default$p: {
     set(theme: string): void;

package/dist/index.js

@@ -13,7 +13,7 @@ import { XPopup, CommentBlock, setAxiosOption } from '@sszj-temp/mobile';
 import { marked } from 'marked';
 import '@sszj-temp/mobile/style.css';
 
-var version = "0.1.103";
+var version = "0.1.106";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -7682,7 +7682,9 @@ function onAddExtraTabs(handler) {
       handler(added.map(item => ({
         ...item,
         type: "extraTab"
-      })));
+      })), "add");
+    } else {
+      handler(val, "update");
     }
   }, {
     deep: true,
@@ -8015,7 +8017,6 @@ const TabList = defineComponent({
             "hide-border": activeTabIndex.value === index || activeTabIndex.value - 1 === index
           }],
           "onClick": () => {
-            console.log("111111111", item);
             emit("tabSelect", item);
           }
         }, [item.icon && createVNode(resolveComponent("icon-font"), {
@@ -8050,7 +8051,7 @@ const TabList = defineComponent({
           "key": "right",
           "onClick": () => closeToRight(index)
         }, {
-          default: () => ["\u5173\u95ED\u53F3\u4FA71"]
+          default: () => ["\u5173\u95ED\u53F3\u4FA7"]
         }), createVNode(MenuItem, {
           "key": "left",
           "onClick": () => closeToLeft(index)
@@ -8229,7 +8230,6 @@ const PageContent = defineComponent({
             openedTab.params = isFromMenu ? val.params : queryCombine;
             val.params = isFromMenu ? val.params : queryCombine;
           } else {
-            console.log("add2222222222", tab);
             tabList.value.push({
               ...tab,
               key: key ?? id,
@@ -8284,7 +8284,6 @@ const PageContent = defineComponent({
       activeKey.value = id ? id : `${key}${uniqueKey}`;
     };
     const onTabSelect = tab => {
-      console.log("onTabSelect111111", tab);
       if (tab.isExtra) {
         router.push({
           path: "/",
@@ -8294,7 +8293,6 @@ const PageContent = defineComponent({
         handleMenuChange(tab);
       } else {
         const resolveRes = router.resolve(tab.url);
-        console.log(resolveRes, 2222222222);
         router.push({
           path: resolveRes.path,
           query: Object.assign(resolveRes.query, tab.params)
@@ -8356,9 +8354,17 @@ const PageContent = defineComponent({
         });
       }
     });
-    onAddExtraTabs(added => {
-      console.log("add1111111", added);
-      tabList.value.push(...added);
+    onAddExtraTabs((arr, operate) => {
+      if (operate === "add") {
+        tabList.value.push(...arr);
+      } else {
+        tabList.value.forEach(item => {
+          const exist = arr.find(ele => ele.uniqueKey === item.uniqueKey);
+          if (exist) {
+            item.url = exist.url;
+          }
+        });
+      }
     });
     const {
       isFullscreen,
@@ -9677,8 +9683,8 @@ const getDetailContainer = () => defineComponent({
         };
       }
     };
-    const addTab = _.debounce(newRroute => {
-      dataId.value = newRroute.params.id;
+    const addTab = _.debounce(newRoute => {
+      dataId.value = newRoute.params.id;
       const {
         name
       } = route.query;
@@ -9686,21 +9692,18 @@ const getDetailContainer = () => defineComponent({
         name,
         url: route.fullPath,
         key: props.name,
-        uniqueKey: newRroute.params.id,
+        uniqueKey: newRoute.params.id,
         icon: props.icon,
         isExtraTab: true,
         params: _.omit(route.query, "name")
       };
-      console.log("tab4444444444444444", tab);
-      console.log("route4444444444444444", route);
       const detail = detailList.value.find(item => item.uniqueKey === tab.uniqueKey);
-      debugger;
       if (detail) {
-        detail.url = newRroute.fullPath;
+        detail.url = newRoute.fullPath;
         if (Array.isArray(qiankunState.value.extraTabs)) {
           const extraTabs = [...qiankunState.value.extraTabs];
           const ele = extraTabs.find(item => item.uniqueKey === tab.uniqueKey);
-          ele.url = newRroute.fullPath;
+          ele.url = newRoute.fullPath;
           qiankunState.value = {
             ...qiankunState.value,
             extraTabs
@@ -9710,8 +9713,9 @@ const getDetailContainer = () => defineComponent({
         detailList.value.push({
           ...tab,
           refreshKey: Date.now(),
-          id: newRroute.params.id
+          id: newRoute.params.id
         });
+        console.log("detailList.value", detailList.value);
         setTimeout(() => {
           if (Array.isArray(qiankunState.value.extraTabs)) {
             const extraTabs = [...qiankunState.value.extraTabs, tab];
@@ -9732,7 +9736,6 @@ const getDetailContainer = () => defineComponent({
       trailing: false
     });
     watch(() => route, async val => {
-      debugger;
       if (!val || route.name.indexOf(props.name) === -1) return;
       addTab(val);
     }, {

package/package.json

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