@chewel611/naive-ui-plus 0.0.40 → 0.0.42

package/es/layout/sider/PMenus.vue.js

@@ -1,23 +1,23 @@
-import { defineComponent as B, ref as d, watch as y, onMounted as S, openBlock as C, createBlock as L, unref as g } from "vue";
+import { defineComponent as k, ref as d, watch as S, onMounted as y, openBlock as C, createBlock as L, unref as g } from "vue";
 import { NMenu as O } from "naive-ui";
 import { useRoute as P, useRouter as U } from "vue-router";
 import { useLayoutStore as b } from "../store.js";
-const j = /* @__PURE__ */ B({
+const j = /* @__PURE__ */ k({
   __name: "PMenus",
   setup(z) {
-    const a = P(), m = U(), M = b(), p = d(a.name), r = d(
+    const m = d([]), a = P(), p = U(), M = b(), h = d(a.name), l = d(
       a.matched && a.matched.length ? a.matched.map((e) => e.name) : []
-    ), h = d([]), _ = (e) => {
-      /http(s)?:/.test(e) ? window.open(e) : m.push({ name: e });
+    ), _ = (e) => {
+      a.name !== e && (/http(s)?:/.test(e) ? window.open(e) : p.push({ name: e }));
     }, w = (e) => {
       if (!e) return;
-      const n = e.find((s) => r.value.indexOf(s) === -1);
-      r.value = n ? [n] : [];
+      const n = e.find((s) => l.value.indexOf(s) === -1);
+      l.value = n ? [n] : [];
     }, f = () => {
       const e = a.matched;
-      r.value = e.map((s) => s.name);
+      l.value = e.map((s) => s.name);
       const n = a.meta?.activeMenu || "";
-      p.value = n || a.name;
+      h.value = n || a.name;
     }, i = (e, n = [], s = !1) => {
       const u = [], R = [
         "/:path(.*)*",
@@ -28,18 +28,18 @@ const j = /* @__PURE__ */ B({
       ];
       if (!e || e.length === 0)
         return u;
-      e = e.sort((o, l) => {
-        let c = (l.children?.length ? 1 : 0) - (o.children?.length ? 1 : 0);
-        return c === 0 && (c = (o.meta?.sort ?? 0) - (l.meta?.sort ?? 0)), c;
+      e = e.sort((o, r) => {
+        let c = (r.children?.length ? 1 : 0) - (o.children?.length ? 1 : 0);
+        return c === 0 && (c = (o.meta?.sort ?? 0) - (r.meta?.sort ?? 0)), c;
       });
       for (const o of e) {
         if (s || o.meta?.hidden || R.includes(o.path.toLowerCase())) {
           n.push(o.name), i(o.children || [], n, !0);
           continue;
         }
-        const l = o.children?.filter(
-          (k) => !k.meta?.hidden
-        ) || [], c = o.meta?.alwaysShow != !0 && l.length === 1, t = c ? l[0] : o, v = {
+        const r = o.children?.filter(
+          (B) => !B.meta?.hidden
+        ) || [], c = o.meta?.alwaysShow != !0 && r.length === 1, t = c ? r[0] : o, v = {
           key: t.name,
           label: t.meta?.title,
           affix: t.meta?.affix,
@@ -55,27 +55,27 @@ const j = /* @__PURE__ */ B({
       }
       return u;
     }, x = () => {
-      const e = m.getRoutes();
-      h.value = i(e);
+      const e = p.getRoutes();
+      m.value = i(e);
     };
-    return y(
+    return S(
       () => a.fullPath,
       () => {
         f();
       }
-    ), S(() => {
+    ), y(() => {
       x(), f();
     }), (e, n) => (C(), L(g(O), {
       class: "h-full",
       inverted: "",
       mode: "vertical",
-      options: h.value,
+      options: m.value,
       collapsed: g(M).state.collapsed,
       "collapsed-width": 64,
       "collapsed-icon-size": 20,
       indent: 24,
-      "expanded-keys": r.value,
-      value: p.value,
+      "expanded-keys": l.value,
+      value: h.value,
       "onUpdate:value": _,
       "onUpdate:expandedKeys": w
     }, null, 8, ["options", "collapsed", "expanded-keys", "value"]));

package/es/layout/store.d.ts

@@ -8,7 +8,7 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
         avatar: string;
         collapsed: boolean;
         tabs: {
-            name: string;
+            name?: import('vue-router').RouteRecordNameGeneric;
             matched?: {
                 path: import('vue-router')._RouteRecordBase["path"];
                 redirect: string | ((to: import('vue-router').RouteLocation, from: import('vue-router').RouteLocationNormalizedLoaded) => import('vue-router').RouteLocationRaw) | {
@@ -3480,9 +3480,9 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 instances: Record<string, import('vue').ComponentPublicInstance | undefined | null>;
                 aliasOf: any | undefined;
             }[] | undefined;
-            fullPath: string;
-            query: import('vue-router').LocationQuery & object;
-            hash: string;
+            fullPath?: string | undefined;
+            query?: import('vue-router').LocationQuery | undefined;
+            hash?: string | undefined;
             redirectedFrom?: {
                 matched: {
                     path: import('vue-router')._RouteRecordBase["path"];
@@ -6968,8 +6968,8 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 state?: import('vue-router').HistoryState | undefined;
             } | undefined;
             meta: import('vue-router').RouteMeta & object;
-            path: string;
-            params: import('vue-router').RouteParamsGeneric & object;
+            path?: string | undefined;
+            params?: import('vue-router').RouteParamsGeneric | undefined;
         }[];
         cacheTabs: boolean;
         settingPages?: {
@@ -7005,7 +7005,7 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
         avatar: string;
         collapsed: boolean;
         tabs: {
-            name: string;
+            name?: import('vue-router').RouteRecordNameGeneric;
             matched?: {
                 path: import('vue-router')._RouteRecordBase["path"];
                 redirect: string | ((to: import('vue-router').RouteLocation, from: import('vue-router').RouteLocationNormalizedLoaded) => import('vue-router').RouteLocationRaw) | {
@@ -10477,9 +10477,9 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 instances: Record<string, import('vue').ComponentPublicInstance | undefined | null>;
                 aliasOf: any | undefined;
             }[] | undefined;
-            fullPath: string;
-            query: import('vue-router').LocationQuery & object;
-            hash: string;
+            fullPath?: string | undefined;
+            query?: import('vue-router').LocationQuery | undefined;
+            hash?: string | undefined;
             redirectedFrom?: {
                 matched: {
                     path: import('vue-router')._RouteRecordBase["path"];
@@ -13965,8 +13965,8 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 state?: import('vue-router').HistoryState | undefined;
             } | undefined;
             meta: import('vue-router').RouteMeta & object;
-            path: string;
-            params: import('vue-router').RouteParamsGeneric & object;
+            path?: string | undefined;
+            params?: import('vue-router').RouteParamsGeneric | undefined;
         }[];
         cacheTabs: boolean;
         settingPages?: {
@@ -14002,7 +14002,7 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
         avatar: string;
         collapsed: boolean;
         tabs: {
-            name: string;
+            name?: import('vue-router').RouteRecordNameGeneric;
             matched?: {
                 path: import('vue-router')._RouteRecordBase["path"];
                 redirect: string | ((to: import('vue-router').RouteLocation, from: import('vue-router').RouteLocationNormalizedLoaded) => import('vue-router').RouteLocationRaw) | {
@@ -17474,9 +17474,9 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 instances: Record<string, import('vue').ComponentPublicInstance | undefined | null>;
                 aliasOf: any | undefined;
             }[] | undefined;
-            fullPath: string;
-            query: import('vue-router').LocationQuery & object;
-            hash: string;
+            fullPath?: string | undefined;
+            query?: import('vue-router').LocationQuery | undefined;
+            hash?: string | undefined;
             redirectedFrom?: {
                 matched: {
                     path: import('vue-router')._RouteRecordBase["path"];
@@ -20962,8 +20962,8 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 state?: import('vue-router').HistoryState | undefined;
             } | undefined;
             meta: import('vue-router').RouteMeta & object;
-            path: string;
-            params: import('vue-router').RouteParamsGeneric & object;
+            path?: string | undefined;
+            params?: import('vue-router').RouteParamsGeneric | undefined;
         }[];
         cacheTabs: boolean;
         settingPages?: {

package/es/layout/store.js

@@ -1,7 +1,7 @@
 import { defineStore as o } from "pinia";
 import { reactive as n } from "vue";
 const i = ["Redirect", "RedirectSon", "login"], I = o("p-layout", () => {
-  const s = n({
+  const e = n({
     collapsed: !1,
     title: "输入项目名称",
     logo: "https://picsum.photos/id/1/100/100",
@@ -13,63 +13,63 @@ const i = ["Redirect", "RedirectSon", "login"], I = o("p-layout", () => {
     enableLanguage: !1
   });
   return {
-    state: s,
+    state: e,
     initTabs: (t) => {
-      t.sort((e, a) => (a.meta.affix ? 1 : 0) - (e.meta.affix ? 1 : 0)), s.tabs = t;
+      t.sort((s, a) => s.meta.affix && !a.meta.affix ? -1 : !s.meta.affix && a.meta.affix ? 1 : Number(a.meta.sort ?? 0) - Number(s.meta.sort ?? 0)), e.tabs = t;
     },
-    addTab: (t) => i.includes(t.name) ? !1 : (s.tabs?.some(
+    addTab: (t) => i.includes(t.name) ? !1 : (e.tabs?.some(
       (a) => a.fullPath == t.fullPath
-    ) || s.tabs?.push(t), !0),
+    ) || e.tabs?.push(t), !0),
     closeCurrentTab: (t) => {
-      const e = s.tabs.findIndex(
+      const s = e.tabs.findIndex(
         (a) => a.fullPath == t.fullPath
       );
-      s.tabs.splice(e, 1);
+      e.tabs.splice(s, 1);
     },
     closeAllTabs: () => {
-      s.tabs = s.tabs.filter((t) => t?.meta?.affix ?? !1);
+      e.tabs = e.tabs.filter((t) => t?.meta?.affix ?? !1);
     },
     closeOtherTabs: (t) => {
-      s.tabs = s.tabs.filter(
-        (e) => e.fullPath == t.fullPath || (e?.meta?.affix ?? !1)
+      e.tabs = e.tabs.filter(
+        (s) => s.fullPath == t.fullPath || (s?.meta?.affix ?? !1)
       );
     },
     closeLeftTabs: (t) => {
-      const e = s.tabs.findIndex(
+      const s = e.tabs.findIndex(
         (a) => a.fullPath == t.fullPath
       );
-      s.tabs = s.tabs.filter(
-        (a, l) => l >= e || (a?.meta?.affix ?? !1)
+      e.tabs = e.tabs.filter(
+        (a, l) => l >= s || (a?.meta?.affix ?? !1)
       );
     },
     closeRightTabs: (t) => {
-      const e = s.tabs.findIndex(
+      const s = e.tabs.findIndex(
         (a) => a.fullPath == t.fullPath
       );
-      s.tabs = s.tabs.filter(
-        (a, l) => l <= e || (a?.meta?.affix ?? !1)
+      e.tabs = e.tabs.filter(
+        (a, l) => l <= s || (a?.meta?.affix ?? !1)
       );
     },
     collapse: () => {
-      s.collapsed = !s.collapsed;
+      e.collapsed = !e.collapsed;
     },
     setTitle: (t) => {
-      s.title = t;
+      e.title = t;
     },
     setLogo: (t) => {
-      s.logo = t;
+      e.logo = t;
     },
-    setUser: (t, e) => {
-      s.uid = t, s.uname = e;
+    setUser: (t, s) => {
+      e.uid = t, e.uname = s;
     },
     setSettingPages: (t) => {
-      s.settingPages = t;
+      e.settingPages = t;
     },
     setLogout: (t) => {
-      s.logout = t;
+      e.logout = t;
     },
     enableLanguage: (t) => {
-      s.enableLanguage = t;
+      e.enableLanguage = t;
     }
   };
 });

package/es/layout/typing.d.ts

@@ -1,12 +1,6 @@
 import { RouteLocationNormalized } from 'vue-router';
 export type RouteItem = Partial<RouteLocationNormalized> & {
-    fullPath: string;
-    path: string;
-    name: string;
-    hash: string;
     meta: object;
-    params: object;
-    query: object;
 };
 export type LayoutState = {
     title: string;

package/es/table/PTable.vue.js

@@ -114,7 +114,7 @@ const we = { class: "text-lg font-medium" }, be = { id: "data-content" }, Ce = {
         k.value = !0;
         try {
           if (l.onLoad) {
-            var { data: e, total: t } = await l.onLoad(
+            var { items: e, totalCount: t } = await l.onLoad(
               u.value.page,
               u.value.pageSize
             );

package/es/table/typing.d.ts

@@ -19,8 +19,8 @@ export type DataTableProps = {
     idField?: string;
     columns: DataTableColumnDefine[];
     onLoad: (page: number, pageSize: number) => Promise<{
-        data: any[];
-        total: number;
+        items: any[];
+        totalCount: number;
     }>;
     onDelete?: (rows: any[]) => Promise<boolean>;
     onAdd?: () => Promise<void>;

package/lib/layout/content/PTabs.css

@@ -1 +1 @@
-.tabs-view[data-v-e37d2460]{width:100%;padding:6px 0;display:flex;transition:all .2s ease-in-out}.tabs-view-main[data-v-e37d2460]{height:32px;display:flex;max-width:100%;min-width:100%}.tabs-view-main .tabs-card[data-v-e37d2460]{-webkit-box-flex:1;flex-grow:1;flex-shrink:1;overflow:hidden;position:relative}.tabs-view-main .tabs-card .tabs-card-prev[data-v-e37d2460],.tabs-view-main .tabs-card .tabs-card-next[data-v-e37d2460]{width:32px;text-align:center;position:absolute;line-height:32px;cursor:pointer}.tabs-view-main .tabs-card .tabs-card-prev .n-icon[data-v-e37d2460],.tabs-view-main .tabs-card .tabs-card-next .n-icon[data-v-e37d2460]{display:flex;align-items:center;justify-content:center;height:32px;width:32px}.tabs-view-main .tabs-card .tabs-card-prev[data-v-e37d2460]{left:0}.tabs-view-main .tabs-card .tabs-card-next[data-v-e37d2460]{right:0}.tabs-view-main .tabs-card .tabs-card-next-hide[data-v-e37d2460],.tabs-view-main .tabs-card .tabs-card-prev-hide[data-v-e37d2460]{display:none}.tabs-view-main .tabs-card-scroll[data-v-e37d2460]{white-space:nowrap;overflow:hidden}.tabs-view-main .tabs-card-scroll-item[data-v-e37d2460]{background:var(--v4a1a98ea);color:var(--v271d846e);height:32px;padding:6px 16px 4px;border-radius:3px;margin-right:6px;cursor:pointer;display:inline-block;position:relative;flex:0 0 auto}.tabs-view-main .tabs-card-scroll-item span[data-v-e37d2460]{float:left;vertical-align:middle}.tabs-view-main .tabs-card-scroll-item[data-v-e37d2460]:hover{color:#515a6e}.tabs-view-main .tabs-card-scroll-item .n-icon[data-v-e37d2460]{height:22px;width:21px;margin-right:-6px;position:relative;vertical-align:middle;text-align:center;color:#808695}.tabs-view-main .tabs-card-scroll-item .n-icon[data-v-e37d2460]:hover{color:#515a6e!important}.tabs-view-main .tabs-card-scroll-item .n-icon svg[data-v-e37d2460]{height:21px;display:inline-block}.tabs-view-main .tabs-card-scroll .active-item[data-v-e37d2460]{color:#2d8cf0}.tabs-view-main .tabs-card-scrollable[data-v-e37d2460]{padding:0 32px;overflow:hidden}.tabs-view .tabs-close[data-v-e37d2460]{min-width:32px;width:32px;height:32px;line-height:32px;text-align:center;background:var(--color);border-radius:2px;cursor:pointer}.tabs-view .tabs-close-btn[data-v-e37d2460]{color:var(--color);height:100%;display:flex;align-items:center;justify-content:center}.tabs-view-default-background[data-v-e37d2460]{background:#f5f7f9}.tabs-view-dark-background[data-v-e37d2460]{background:#101014}.tabs-view-fix[data-v-e37d2460]{position:fixed;z-index:5;padding:6px 10px;left:200px}.tabs-view-fixed-header[data-v-e37d2460]{top:0}
+.tabs-view[data-v-428fe23d]{width:100%;padding:6px 0;display:flex;transition:all .2s ease-in-out}.tabs-view-main[data-v-428fe23d]{height:32px;display:flex;max-width:100%;min-width:100%}.tabs-view-main .tabs-card[data-v-428fe23d]{-webkit-box-flex:1;flex-grow:1;flex-shrink:1;overflow:hidden;position:relative}.tabs-view-main .tabs-card .tabs-card-prev[data-v-428fe23d],.tabs-view-main .tabs-card .tabs-card-next[data-v-428fe23d]{width:32px;text-align:center;position:absolute;line-height:32px;cursor:pointer}.tabs-view-main .tabs-card .tabs-card-prev .n-icon[data-v-428fe23d],.tabs-view-main .tabs-card .tabs-card-next .n-icon[data-v-428fe23d]{display:flex;align-items:center;justify-content:center;height:32px;width:32px}.tabs-view-main .tabs-card .tabs-card-prev[data-v-428fe23d]{left:0}.tabs-view-main .tabs-card .tabs-card-next[data-v-428fe23d]{right:0}.tabs-view-main .tabs-card .tabs-card-next-hide[data-v-428fe23d],.tabs-view-main .tabs-card .tabs-card-prev-hide[data-v-428fe23d]{display:none}.tabs-view-main .tabs-card-scroll[data-v-428fe23d]{white-space:nowrap;overflow:hidden}.tabs-view-main .tabs-card-scroll-item[data-v-428fe23d]{background:var(--d48fbd46);color:var(--v380ec63c);height:32px;padding:6px 16px 4px;border-radius:3px;margin-right:6px;cursor:pointer;display:inline-block;position:relative;flex:0 0 auto}.tabs-view-main .tabs-card-scroll-item span[data-v-428fe23d]{float:left;vertical-align:middle}.tabs-view-main .tabs-card-scroll-item[data-v-428fe23d]:hover{color:#515a6e}.tabs-view-main .tabs-card-scroll-item .n-icon[data-v-428fe23d]{height:22px;width:21px;margin-right:-6px;position:relative;vertical-align:middle;text-align:center;color:#808695}.tabs-view-main .tabs-card-scroll-item .n-icon[data-v-428fe23d]:hover{color:#515a6e!important}.tabs-view-main .tabs-card-scroll-item .n-icon svg[data-v-428fe23d]{height:21px;display:inline-block}.tabs-view-main .tabs-card-scroll .active-item[data-v-428fe23d]{color:#2d8cf0}.tabs-view-main .tabs-card-scrollable[data-v-428fe23d]{padding:0 32px;overflow:hidden}.tabs-view .tabs-close[data-v-428fe23d]{min-width:32px;width:32px;height:32px;line-height:32px;text-align:center;background:var(--color);border-radius:2px;cursor:pointer}.tabs-view .tabs-close-btn[data-v-428fe23d]{color:var(--color);height:100%;display:flex;align-items:center;justify-content:center}.tabs-view-default-background[data-v-428fe23d]{background:#f5f7f9}.tabs-view-dark-background[data-v-428fe23d]{background:#101014}.tabs-view-fix[data-v-428fe23d]{position:fixed;z-index:5;padding:6px 10px;left:200px}.tabs-view-fixed-header[data-v-428fe23d]{top:0}

package/lib/layout/content/PTabs.vue.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("./PTabs.vue2.cjs");;/* empty css             */const t=require("../../_virtual/_plugin-vue_export-helper.cjs"),u=t.default(e.default,[["__scopeId","data-v-e37d2460"]]);exports.default=u;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("./PTabs.vue2.cjs");;/* empty css             */const t=require("../../_virtual/_plugin-vue_export-helper.cjs"),u=t.default(e.default,[["__scopeId","data-v-428fe23d"]]);exports.default=u;

package/lib/layout/content/PTabs.vue2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),F=require("element-resize-detector"),U=require("vuedraggable"),u=require("@vicons/antd"),y=require("vue-router"),r=require("naive-ui"),X=require("../store.cjs"),H={class:"tabs-view-main"},J=["id","onClick","onContextmenu"],G={class:"tabs-close"},Q={class:"tabs-close-btn"},Z=e.defineComponent({__name:"PTabs",setup(ee){e.useCssVars(t=>({v4a1a98ea:x.value,v271d846e:T.value}));const p=r.useThemeVars(),x=e.computed(()=>p.value.cardColor),T=e.computed(()=>p.value.textColor1),k=r.useMessage(),c=y.useRoute(),m=y.useRouter(),s=e.ref(null),b=e.ref(null),w=e.ref(!1),i=X.useLayoutStore(),d=e.computed(()=>i.state.tabs),n=e.reactive({activeKey:c.fullPath,scrollable:!0,dropdownX:0,dropdownY:0,showDropdown:!1,isMultiHeaderFixed:!0,multiTabsSetting:!0}),_=["Login","Redirect","ErrorPage"],g=t=>{const{fullPath:o,hash:l,meta:a,name:f,params:B,path:j,query:Y}=t;return{fullPath:o,hash:l,meta:a,name:f,params:B,path:j,query:Y}},V=e.computed(()=>{const l=i.state.collapsed?"64px":"272px";return{left:l,width:`calc(100% - ${l})`}}),C=e.computed(()=>{const t=d.value.length<=1;return[{label:"刷新当前",key:"1",icon:()=>e.h(r.NIcon,null,{default:()=>e.h(u.ReloadOutlined)})},{label:"关闭当前",key:"2",disabled:w.value||t,icon:()=>e.h(r.NIcon,null,{default:()=>e.h(u.CloseOutlined)})},{label:"关闭其他",key:"3",disabled:t,icon:()=>e.h(r.NIcon,null,{default:()=>e.h(u.ColumnWidthOutlined)})},{label:"关闭全部",key:"4",disabled:t,icon:()=>e.h(r.NIcon,null,{default:()=>e.h(u.MinusOutlined)})}]}),P=()=>{let t=[];const o=g(c);try{if(i.state.cacheTabs){const l=localStorage.getItem("TABS_ROUTES");t=l?JSON.parse(l):[o]}else t=[o]}catch{t=[o]}finally{return t}},E=t=>{const o=m.getRoutes();t.forEach(l=>{const a=o.find(f=>f.path===l.path);a&&(l.meta=a.meta||l.meta,l.name=a.name||l.name)}),i.state.cacheTabs&&localStorage.setItem("TABS_ROUTES",JSON.stringify(t))},O=()=>{const t=P();E(t),i.initTabs(t)},h=async t=>{if(await e.nextTick(),!s.value)return;const o=s.value.offsetWidth,l=s.value.scrollWidth;o<l?(n.scrollable=!0,t&&[...s.value.querySelectorAll(".tabs-card-scroll-item")||[]].forEach(f=>{f.id===`tag${n.activeKey.split("/").join("/")}`&&f.scrollIntoView&&f.scrollIntoView()})):n.scrollable=!1},W=t=>!(t.draggedContext.element.meta.affix||t.relatedContext.element.meta.affix),M=()=>{let t;t=F(),t.listenTo(b.value,()=>h(!0))},I=t=>{const{fullPath:o}=t;if(o===c.fullPath||(n.activeKey=o,!t))return;const{replace:l}=m;toString.call(t),l(t).catch(console.error)},R=(t,o)=>{t.preventDefault(),w.value=o.path==="/home",n.showDropdown=!1,e.nextTick().then(()=>{n.showDropdown=!0,n.dropdownX=t.clientX,n.dropdownY=t.clientY})},D=()=>{if(c.meta.keepAlive){var t=m.currentRoute.value.matched.find(o=>o.name==c.name);t&&t.components?.default?.name}},N=t=>{if(d.value.length===1)return k.warning("这已经是最后一页，不能再关闭了！");if(D(),i.closeCurrentTab(t),n.activeKey===t.fullPath){const o=d.value[Math.max(0,d.value.length-1)];n.activeKey=o.fullPath,m.push(o)}h()},L=t=>{const{fullPath:o}=t,l=d.value.find(a=>a.fullPath==o);N(l)},z=t=>{i.closeOtherTabs(t),n.activeKey=t.fullPath,m.replace(t.fullPath),h()},q=()=>{i.closeAllTabs(),h()},A=e.inject("reloadPage"),S=t=>{switch(t){case"1":A();break;case"2":N(c);break;case"3":z(c);break;case"4":q();break}h(),n.showDropdown=!1},v=(t,o)=>{const l=s.value.scrollLeft,a=o>0&&l+o>=t||o<0&&l+o<=t?t:l+o;if(s.value&&s.value.scrollTo(a,0),a!==t)return window.requestAnimationFrame(()=>v(t,o))},K=()=>{const t=s.value.offsetWidth,o=s.value.scrollLeft;if(!o)return;const l=o>t?o-t:0;v(l,(l-o)/20)},$=()=>{const t=s.value.offsetWidth,o=s.value.scrollWidth,l=s.value.scrollLeft;if(o-l<=t)return;const a=o-l>t*2?l+t:o-t;v(a,(a-l)/20)};return window.addEventListener("beforeunload",()=>{localStorage.setItem("TABS_ROUTES",JSON.stringify(d.value))}),window.addEventListener("scroll",t=>{let o=t.target.scrollTop||document.documentElement.scrollTop||window.pageYOffset||document.body.scrollTop;n.isMultiHeaderFixed=o>=64},!0),e.watch(()=>c.fullPath,t=>{_.includes(c.name)||(n.activeKey=t,i.addTab(g(c)),h(!0))},{immediate:!0}),O(),e.onMounted(()=>M()),(t,o)=>(e.openBlock(),e.createElementBlock("div",{class:"box-border tabs-view tabs-view-fix tabs-view-default-background",style:e.normalizeStyle(V.value)},[e.createElementVNode("div",H,[e.createElementVNode("div",{ref_key:"navWrap",ref:b,class:e.normalizeClass(["tabs-card",{"tabs-card-scrollable":n.scrollable}])},[e.createElementVNode("span",{class:e.normalizeClass(["tabs-card-prev",{"tabs-card-prev-hide":!n.scrollable}]),onClick:K},[e.createVNode(e.unref(r.NIcon),{size:"16",color:"#515a6e"},{default:e.withCtx(()=>[e.createVNode(e.unref(u.LeftOutlined))]),_:1})],2),e.createElementVNode("span",{class:e.normalizeClass(["tabs-card-next",{"tabs-card-next-hide":!n.scrollable}]),onClick:$},[e.createVNode(e.unref(r.NIcon),{size:"16",color:"#515a6e"},{default:e.withCtx(()=>[e.createVNode(e.unref(u.RightOutlined))]),_:1})],2),e.createElementVNode("div",{ref_key:"navScroll",ref:s,class:"tabs-card-scroll"},[e.createVNode(e.unref(U),{list:d.value,animation:"300","item-key":"fullPath",class:"flex",move:W},{item:e.withCtx(({element:l})=>[e.createElementVNode("div",{id:`tag${l.fullPath.split("/").join("/")}`,class:e.normalizeClass(["tabs-card-scroll-item",{"active-item":n.activeKey===l.fullPath}]),onClick:e.withModifiers(a=>I(l),["stop"]),onContextmenu:a=>R(a,l)},[e.createElementVNode("span",null,e.toDisplayString(l.meta.title),1),l.meta.affix?e.createCommentVNode("",!0):(e.openBlock(),e.createBlock(e.unref(r.NIcon),{key:0,size:"14",onClick:e.withModifiers(a=>L(l),["stop"])},{default:e.withCtx(()=>[e.createVNode(e.unref(u.CloseOutlined))]),_:1},8,["onClick"]))],42,J)]),_:1},8,["list"])],512)],2),e.createElementVNode("div",G,[e.createVNode(e.unref(r.NDropdown),{trigger:"hover",onSelect:S,placement:"bottom-end",options:C.value},{default:e.withCtx(()=>[e.createElementVNode("div",Q,[e.createVNode(e.unref(r.NIcon),{size:"16",color:"#515a6e"},{default:e.withCtx(()=>[e.createVNode(e.unref(u.DownOutlined))]),_:1})])]),_:1},8,["options"])]),e.createVNode(e.unref(r.NDropdown),{show:n.showDropdown,x:n.dropdownX,y:n.dropdownY,onClickoutside:o[0]||(o[0]=l=>n.showDropdown=!1),placement:"bottom-start",onSelect:S,options:C.value},null,8,["show","x","y","options"])])],4))}});exports.default=Z;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),B=require("element-resize-detector"),j=require("vuedraggable"),u=require("@vicons/antd"),S=require("vue-router"),r=require("naive-ui"),Y=require("../store.cjs"),F={class:"tabs-view-main"},U=["id","onClick","onContextmenu"],X={class:"tabs-close"},H={class:"tabs-close-btn"},J=t.defineComponent({__name:"PTabs",setup(G){t.useCssVars(e=>({d48fbd46:x.value,v380ec63c:T.value}));const b=r.useThemeVars(),x=t.computed(()=>b.value.cardColor),T=t.computed(()=>b.value.textColor1),k=r.useMessage(),c=S.useRoute(),f=S.useRouter(),s=t.ref(null),w=t.ref(null),g=t.ref(!1),i=Y.useLayoutStore(),d=t.computed(()=>i.state.tabs),a=t.reactive({activeKey:c.fullPath,scrollable:!0,dropdownX:0,dropdownY:0,showDropdown:!1,isMultiHeaderFixed:!0,multiTabsSetting:!0}),_=["Login","Redirect","ErrorPage"],v=e=>({meta:e.meta,name:e.name,fullPath:e.fullPath??e.path,path:e.path,hash:e.hash??"",query:e.query??{},params:e.params??{}}),V=t.computed(()=>{const l=i.state.collapsed?"64px":"272px";return{left:l,width:`calc(100% - ${l})`}}),C=t.computed(()=>{const e=d.value.length<=1;return[{label:"刷新当前",key:"1",icon:()=>t.h(r.NIcon,null,{default:()=>t.h(u.ReloadOutlined)})},{label:"关闭当前",key:"2",disabled:g.value||e,icon:()=>t.h(r.NIcon,null,{default:()=>t.h(u.CloseOutlined)})},{label:"关闭其他",key:"3",disabled:e,icon:()=>t.h(r.NIcon,null,{default:()=>t.h(u.ColumnWidthOutlined)})},{label:"关闭全部",key:"4",disabled:e,icon:()=>t.h(r.NIcon,null,{default:()=>t.h(u.MinusOutlined)})}]}),P=()=>{let e=[v(c)];f.getRoutes().filter(o=>o.meta.affix).forEach(o=>{const l=v(o);e.every(n=>n.name!==l.name)&&e.push(l)});try{if(i.state.cacheTabs){const o=localStorage.getItem("TABS_ROUTES");e=o?JSON.parse(o):e}}finally{return e}},E=e=>{const o=f.getRoutes();e.forEach(l=>{const n=o.find(m=>m.path===l.path);n&&(l.meta=n.meta||l.meta,l.name=n.name||l.name)}),i.state.cacheTabs&&localStorage.setItem("TABS_ROUTES",JSON.stringify(e))},O=()=>{const e=P();E(e),i.initTabs(e)},h=async e=>{if(await t.nextTick(),!s.value)return;const o=s.value.offsetWidth,l=s.value.scrollWidth;o<l?(a.scrollable=!0,e&&[...s.value.querySelectorAll(".tabs-card-scroll-item")||[]].forEach(m=>{m.id===`tag${a.activeKey.split("/").join("/")}`&&m.scrollIntoView&&m.scrollIntoView()})):a.scrollable=!1},W=e=>!(e.draggedContext.element.meta.affix||e.relatedContext.element.meta.affix),M=()=>{let e;e=B(),e.listenTo(w.value,()=>h(!0))},R=e=>{if(!e||e.fullPath===c.fullPath)return;if(a.activeKey=e.fullPath,toString.call(e)==="[object String]"){f.replace(e).catch(console.error);return}const o=e;f.replace(o).catch(console.error)},D=(e,o)=>{e.preventDefault(),g.value=o.path==="/home",a.showDropdown=!1,t.nextTick().then(()=>{a.showDropdown=!0,a.dropdownX=e.clientX,a.dropdownY=e.clientY})},I=()=>{if(c.meta.keepAlive){var e=f.currentRoute.value.matched.find(o=>o.name==c.name);e&&e.components?.default?.name}},N=e=>{if(d.value.length===1)return k.warning("这已经是最后一页，不能再关闭了！");if(I(),i.closeCurrentTab(e),a.activeKey===e.fullPath){const o=d.value[Math.max(0,d.value.length-1)];a.activeKey=o.fullPath,f.push(o)}h()},L=e=>{const o=d.value.find(l=>l.fullPath==e.fullPath);o&&N(o)},q=e=>{i.closeOtherTabs(e),a.activeKey=e.fullPath,h()},z=()=>{i.closeAllTabs(),h()},A=t.inject("reloadPage"),y=e=>{switch(e){case"1":A();break;case"2":N(c);break;case"3":q(c);break;case"4":z();break}h(),a.showDropdown=!1},p=(e,o)=>{const l=s.value.scrollLeft,n=o>0&&l+o>=e||o<0&&l+o<=e?e:l+o;if(s.value&&s.value.scrollTo(n,0),n!==e)return window.requestAnimationFrame(()=>p(e,o))},K=()=>{const e=s.value.offsetWidth,o=s.value.scrollLeft;if(!o)return;const l=o>e?o-e:0;p(l,(l-o)/20)},$=()=>{const e=s.value.offsetWidth,o=s.value.scrollWidth,l=s.value.scrollLeft;if(o-l<=e)return;const n=o-l>e*2?l+e:o-e;p(n,(n-l)/20)};return window.addEventListener("beforeunload",()=>{i.state.cacheTabs&&localStorage.setItem("TABS_ROUTES",JSON.stringify(d.value))}),window.addEventListener("scroll",e=>{let o=e.target.scrollTop||document.documentElement.scrollTop||window.pageYOffset||document.body.scrollTop;a.isMultiHeaderFixed=o>=64},!0),t.watch(()=>c.fullPath,e=>{_.includes(c.name)||(a.activeKey=e,i.addTab(v(c)),h(!0))},{immediate:!0}),O(),t.onMounted(()=>M()),(e,o)=>(t.openBlock(),t.createElementBlock("div",{class:"box-border tabs-view tabs-view-fix tabs-view-default-background",style:t.normalizeStyle(V.value)},[t.createElementVNode("div",F,[t.createElementVNode("div",{ref_key:"navWrap",ref:w,class:t.normalizeClass(["tabs-card",{"tabs-card-scrollable":a.scrollable}])},[t.createElementVNode("span",{class:t.normalizeClass(["tabs-card-prev",{"tabs-card-prev-hide":!a.scrollable}]),onClick:K},[t.createVNode(t.unref(r.NIcon),{size:"16",color:"#515a6e"},{default:t.withCtx(()=>[t.createVNode(t.unref(u.LeftOutlined))]),_:1})],2),t.createElementVNode("span",{class:t.normalizeClass(["tabs-card-next",{"tabs-card-next-hide":!a.scrollable}]),onClick:$},[t.createVNode(t.unref(r.NIcon),{size:"16",color:"#515a6e"},{default:t.withCtx(()=>[t.createVNode(t.unref(u.RightOutlined))]),_:1})],2),t.createElementVNode("div",{ref_key:"navScroll",ref:s,class:"tabs-card-scroll"},[t.createVNode(t.unref(j),{animation:"300","item-key":"fullPath",class:"flex",list:d.value,move:W},{item:t.withCtx(({element:l})=>[t.createElementVNode("div",{class:t.normalizeClass(["tabs-card-scroll-item",{"active-item":a.activeKey===l.fullPath}]),id:`tag${l.fullPath.split("/").join("/")}`,onClick:t.withModifiers(n=>R(l),["stop"]),onContextmenu:n=>D(n,l)},[t.createElementVNode("span",null,t.toDisplayString(l.meta.title),1),l.meta.affix?t.createCommentVNode("",!0):(t.openBlock(),t.createBlock(t.unref(r.NIcon),{key:0,size:"14",onClick:t.withModifiers(n=>L(l),["stop"])},{default:t.withCtx(()=>[t.createVNode(t.unref(u.CloseOutlined))]),_:1},8,["onClick"]))],42,U)]),_:1},8,["list"])],512)],2),t.createElementVNode("div",X,[t.createVNode(t.unref(r.NDropdown),{trigger:"hover",placement:"bottom-end",options:C.value,onSelect:y},{default:t.withCtx(()=>[t.createElementVNode("div",H,[t.createVNode(t.unref(r.NIcon),{size:"16",color:"#515a6e"},{default:t.withCtx(()=>[t.createVNode(t.unref(u.DownOutlined))]),_:1})])]),_:1},8,["options"])]),t.createVNode(t.unref(r.NDropdown),{placement:"bottom-start",show:a.showDropdown,x:a.dropdownX,y:a.dropdownY,options:C.value,onClickoutside:o[0]||(o[0]=l=>a.showDropdown=!1),onSelect:y},null,8,["show","x","y","options"])])],4))}});exports.default=J;

package/lib/layout/sider/PMenus.vue.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("vue"),k=require("naive-ui"),g=require("vue-router"),q=require("../store.cjs"),y=a.defineComponent({__name:"PMenus",setup(B){const c=g.useRoute(),m=g.useRouter(),M=q.useLayoutStore(),h=a.ref(c.name),u=a.ref(c.matched&&c.matched.length?c.matched.map(e=>e.name):[]),p=a.ref([]),_=e=>{/http(s)?:/.test(e)?window.open(e):m.push({name:e})},w=e=>{if(!e)return;const n=e.find(r=>u.value.indexOf(r)===-1);u.value=n?[n]:[]},f=()=>{const e=c.matched;u.value=e.map(r=>r.name);const n=c.meta?.activeMenu||"";h.value=n||c.name},i=(e,n=[],r=!1)=>{const d=[],x=["/:path(.*)*","/redirect","/redirect/:path(.*)","/login","/oidc-callback"];if(!e||e.length===0)return d;e=e.sort((o,l)=>{let s=(l.children?.length?1:0)-(o.children?.length?1:0);return s===0&&(s=(o.meta?.sort??0)-(l.meta?.sort??0)),s});for(const o of e){if(r||o.meta?.hidden||x.includes(o.path.toLowerCase())){n.push(o.name),i(o.children||[],n,!0);continue}const l=o.children?.filter(S=>!S.meta?.hidden)||[],s=o.meta?.alwaysShow!=!0&&l.length===1,t=s?l[0]:o,v={key:t.name,label:t.meta?.title,affix:t.meta?.affix,sort:s?o.meta?.sort??0:t.meta?.sort??0,path:t.path,redirect:t.redirect,icon:s?o.meta?.icon:t.meta?.icon,permissions:t.meta?.permissions,meta:t.meta,children:void 0};n.includes(t.name)||(d.push(v),n.push(t.name)),t.children?.length>0&&(v.children=i(t.children,n,r))}return d},R=()=>{const e=m.getRoutes();p.value=i(e)};return a.watch(()=>c.fullPath,()=>{f()}),a.onMounted(()=>{R(),f()}),(e,n)=>(a.openBlock(),a.createBlock(a.unref(k.NMenu),{class:"h-full",inverted:"",mode:"vertical",options:p.value,collapsed:a.unref(M).state.collapsed,"collapsed-width":64,"collapsed-icon-size":20,indent:24,"expanded-keys":u.value,value:h.value,"onUpdate:value":_,"onUpdate:expandedKeys":w},null,8,["options","collapsed","expanded-keys","value"]))}});exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("vue"),q=require("naive-ui"),g=require("vue-router"),B=require("../store.cjs"),b=a.defineComponent({__name:"PMenus",setup(k){const m=a.ref([]),c=g.useRoute(),h=g.useRouter(),M=B.useLayoutStore(),p=a.ref(c.name),u=a.ref(c.matched&&c.matched.length?c.matched.map(e=>e.name):[]),_=e=>{c.name!==e&&(/http(s)?:/.test(e)?window.open(e):h.push({name:e}))},w=e=>{if(!e)return;const n=e.find(r=>u.value.indexOf(r)===-1);u.value=n?[n]:[]},f=()=>{const e=c.matched;u.value=e.map(r=>r.name);const n=c.meta?.activeMenu||"";p.value=n||c.name},i=(e,n=[],r=!1)=>{const d=[],x=["/:path(.*)*","/redirect","/redirect/:path(.*)","/login","/oidc-callback"];if(!e||e.length===0)return d;e=e.sort((o,l)=>{let s=(l.children?.length?1:0)-(o.children?.length?1:0);return s===0&&(s=(o.meta?.sort??0)-(l.meta?.sort??0)),s});for(const o of e){if(r||o.meta?.hidden||x.includes(o.path.toLowerCase())){n.push(o.name),i(o.children||[],n,!0);continue}const l=o.children?.filter(S=>!S.meta?.hidden)||[],s=o.meta?.alwaysShow!=!0&&l.length===1,t=s?l[0]:o,v={key:t.name,label:t.meta?.title,affix:t.meta?.affix,sort:s?o.meta?.sort??0:t.meta?.sort??0,path:t.path,redirect:t.redirect,icon:s?o.meta?.icon:t.meta?.icon,permissions:t.meta?.permissions,meta:t.meta,children:void 0};n.includes(t.name)||(d.push(v),n.push(t.name)),t.children?.length>0&&(v.children=i(t.children,n,r))}return d},R=()=>{const e=h.getRoutes();m.value=i(e)};return a.watch(()=>c.fullPath,()=>{f()}),a.onMounted(()=>{R(),f()}),(e,n)=>(a.openBlock(),a.createBlock(a.unref(q.NMenu),{class:"h-full",inverted:"",mode:"vertical",options:m.value,collapsed:a.unref(M).state.collapsed,"collapsed-width":64,"collapsed-icon-size":20,indent:24,"expanded-keys":u.value,value:p.value,"onUpdate:value":_,"onUpdate:expandedKeys":w},null,8,["options","collapsed","expanded-keys","value"]))}});exports.default=b;

package/lib/layout/store.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("pinia"),n=require("vue"),i=["Redirect","RedirectSon","login"],c=o.defineStore("p-layout",()=>{const e=n.reactive({collapsed:!1,title:"输入项目名称",logo:"https://picsum.photos/id/1/100/100",avatar:"",uid:"",uname:"",tabs:[],cacheTabs:!1,enableLanguage:!1});return{state:e,initTabs:t=>{t.sort((s,a)=>(a.meta.affix?1:0)-(s.meta.affix?1:0)),e.tabs=t},addTab:t=>i.includes(t.name)?!1:(e.tabs?.some(a=>a.fullPath==t.fullPath)||e.tabs?.push(t),!0),closeCurrentTab:t=>{const s=e.tabs.findIndex(a=>a.fullPath==t.fullPath);e.tabs.splice(s,1)},closeAllTabs:()=>{e.tabs=e.tabs.filter(t=>t?.meta?.affix??!1)},closeOtherTabs:t=>{e.tabs=e.tabs.filter(s=>s.fullPath==t.fullPath||(s?.meta?.affix??!1))},closeLeftTabs:t=>{const s=e.tabs.findIndex(a=>a.fullPath==t.fullPath);e.tabs=e.tabs.filter((a,l)=>l>=s||(a?.meta?.affix??!1))},closeRightTabs:t=>{const s=e.tabs.findIndex(a=>a.fullPath==t.fullPath);e.tabs=e.tabs.filter((a,l)=>l<=s||(a?.meta?.affix??!1))},collapse:()=>{e.collapsed=!e.collapsed},setTitle:t=>{e.title=t},setLogo:t=>{e.logo=t},setUser:(t,s)=>{e.uid=t,e.uname=s},setSettingPages:t=>{e.settingPages=t},setLogout:t=>{e.logout=t},enableLanguage:t=>{e.enableLanguage=t}}});exports.useLayoutStore=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("pinia"),n=require("vue"),i=["Redirect","RedirectSon","login"],f=o.defineStore("p-layout",()=>{const e=n.reactive({collapsed:!1,title:"输入项目名称",logo:"https://picsum.photos/id/1/100/100",avatar:"",uid:"",uname:"",tabs:[],cacheTabs:!1,enableLanguage:!1});return{state:e,initTabs:t=>{t.sort((s,a)=>s.meta.affix&&!a.meta.affix?-1:!s.meta.affix&&a.meta.affix?1:Number(a.meta.sort??0)-Number(s.meta.sort??0)),e.tabs=t},addTab:t=>i.includes(t.name)?!1:(e.tabs?.some(a=>a.fullPath==t.fullPath)||e.tabs?.push(t),!0),closeCurrentTab:t=>{const s=e.tabs.findIndex(a=>a.fullPath==t.fullPath);e.tabs.splice(s,1)},closeAllTabs:()=>{e.tabs=e.tabs.filter(t=>t?.meta?.affix??!1)},closeOtherTabs:t=>{e.tabs=e.tabs.filter(s=>s.fullPath==t.fullPath||(s?.meta?.affix??!1))},closeLeftTabs:t=>{const s=e.tabs.findIndex(a=>a.fullPath==t.fullPath);e.tabs=e.tabs.filter((a,l)=>l>=s||(a?.meta?.affix??!1))},closeRightTabs:t=>{const s=e.tabs.findIndex(a=>a.fullPath==t.fullPath);e.tabs=e.tabs.filter((a,l)=>l<=s||(a?.meta?.affix??!1))},collapse:()=>{e.collapsed=!e.collapsed},setTitle:t=>{e.title=t},setLogo:t=>{e.logo=t},setUser:(t,s)=>{e.uid=t,e.uname=s},setSettingPages:t=>{e.settingPages=t},setLogout:t=>{e.logout=t},enableLanguage:t=>{e.enableLanguage=t}}});exports.useLayoutStore=f;

package/lib/layout/store.d.ts

@@ -8,7 +8,7 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
         avatar: string;
         collapsed: boolean;
         tabs: {
-            name: string;
+            name?: import('vue-router').RouteRecordNameGeneric;
             matched?: {
                 path: import('vue-router')._RouteRecordBase["path"];
                 redirect: string | ((to: import('vue-router').RouteLocation, from: import('vue-router').RouteLocationNormalizedLoaded) => import('vue-router').RouteLocationRaw) | {
@@ -3480,9 +3480,9 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 instances: Record<string, import('vue').ComponentPublicInstance | undefined | null>;
                 aliasOf: any | undefined;
             }[] | undefined;
-            fullPath: string;
-            query: import('vue-router').LocationQuery & object;
-            hash: string;
+            fullPath?: string | undefined;
+            query?: import('vue-router').LocationQuery | undefined;
+            hash?: string | undefined;
             redirectedFrom?: {
                 matched: {
                     path: import('vue-router')._RouteRecordBase["path"];
@@ -6968,8 +6968,8 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 state?: import('vue-router').HistoryState | undefined;
             } | undefined;
             meta: import('vue-router').RouteMeta & object;
-            path: string;
-            params: import('vue-router').RouteParamsGeneric & object;
+            path?: string | undefined;
+            params?: import('vue-router').RouteParamsGeneric | undefined;
         }[];
         cacheTabs: boolean;
         settingPages?: {
@@ -7005,7 +7005,7 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
         avatar: string;
         collapsed: boolean;
         tabs: {
-            name: string;
+            name?: import('vue-router').RouteRecordNameGeneric;
             matched?: {
                 path: import('vue-router')._RouteRecordBase["path"];
                 redirect: string | ((to: import('vue-router').RouteLocation, from: import('vue-router').RouteLocationNormalizedLoaded) => import('vue-router').RouteLocationRaw) | {
@@ -10477,9 +10477,9 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 instances: Record<string, import('vue').ComponentPublicInstance | undefined | null>;
                 aliasOf: any | undefined;
             }[] | undefined;
-            fullPath: string;
-            query: import('vue-router').LocationQuery & object;
-            hash: string;
+            fullPath?: string | undefined;
+            query?: import('vue-router').LocationQuery | undefined;
+            hash?: string | undefined;
             redirectedFrom?: {
                 matched: {
                     path: import('vue-router')._RouteRecordBase["path"];
@@ -13965,8 +13965,8 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 state?: import('vue-router').HistoryState | undefined;
             } | undefined;
             meta: import('vue-router').RouteMeta & object;
-            path: string;
-            params: import('vue-router').RouteParamsGeneric & object;
+            path?: string | undefined;
+            params?: import('vue-router').RouteParamsGeneric | undefined;
         }[];
         cacheTabs: boolean;
         settingPages?: {
@@ -14002,7 +14002,7 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
         avatar: string;
         collapsed: boolean;
         tabs: {
-            name: string;
+            name?: import('vue-router').RouteRecordNameGeneric;
             matched?: {
                 path: import('vue-router')._RouteRecordBase["path"];
                 redirect: string | ((to: import('vue-router').RouteLocation, from: import('vue-router').RouteLocationNormalizedLoaded) => import('vue-router').RouteLocationRaw) | {
@@ -17474,9 +17474,9 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 instances: Record<string, import('vue').ComponentPublicInstance | undefined | null>;
                 aliasOf: any | undefined;
             }[] | undefined;
-            fullPath: string;
-            query: import('vue-router').LocationQuery & object;
-            hash: string;
+            fullPath?: string | undefined;
+            query?: import('vue-router').LocationQuery | undefined;
+            hash?: string | undefined;
             redirectedFrom?: {
                 matched: {
                     path: import('vue-router')._RouteRecordBase["path"];
@@ -20962,8 +20962,8 @@ export declare const useLayoutStore: import('pinia').StoreDefinition<"p-layout",
                 state?: import('vue-router').HistoryState | undefined;
             } | undefined;
             meta: import('vue-router').RouteMeta & object;
-            path: string;
-            params: import('vue-router').RouteParamsGeneric & object;
+            path?: string | undefined;
+            params?: import('vue-router').RouteParamsGeneric | undefined;
         }[];
         cacheTabs: boolean;
         settingPages?: {

package/lib/layout/typing.d.ts

@@ -1,12 +1,6 @@
 import { RouteLocationNormalized } from 'vue-router';
 export type RouteItem = Partial<RouteLocationNormalized> & {
-    fullPath: string;
-    path: string;
-    name: string;
-    hash: string;
     meta: object;
-    params: object;
-    query: object;
 };
 export type LayoutState = {
     title: string;

package/lib/table/PTable.vue.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("naive-ui"),e=require("vue"),u=require("@vicons/antd"),K={class:"text-lg font-medium"},X={id:"data-content"},Y={key:0,class:"rounded-lg bg-gray-50 flex flex-row gap-2 items-center justify-end p-4 mb-4"},G=e.defineComponent({__name:"PTable",props:{title:{},idField:{default:"id"},columns:{},onLoad:{},onDelete:{},onAdd:{},onEdit:{}},setup(y,{expose:S}){const N=e.ref(null),D=a.useDialog(),g=a.useMessage(),p=e.ref(!1),h=e.ref([]),m=e.ref([]),c=e.ref({page:1,itemCount:0,pageSize:10,pageSizes:[10,20,30,50],showSizePicker:!0,onChange:async t=>{c.value.page=t,await d()},onUpdatePageSize:async t=>{c.value.pageSize=t,await d()}}),i=y,B=t=>{const o=n=>{const l=[];return t&&t.forEach(r=>{r.key!=="edit"&&r.key!=="delete"&&l.push({label:r.name,key:r.key,icon:r.icon&&(()=>e.h(a.NIcon,null,{default:()=>e.h(r.icon)})),props:{onClick:()=>r.action(n)}})}),l};return{title:"操作",key:"actions",width:100,fixed:"right",render:n=>{let l=[];if(i.onEdit&&l.push({label:"编辑",key:"edit",icon:()=>e.h(a.NIcon,null,{default:()=>e.h(u.EditOutlined)}),props:{onClick:async()=>await i.onEdit(n)}}),i.onDelete&&l.push({label:"删除",key:"delete",icon:()=>e.h(a.NIcon,null,{default:()=>e.h(u.DeleteOutlined)}),props:{onClick:()=>R(n)}}),l=[...l,...o(n)],!(l.length<=0))return e.h(a.NDropdown,{options:l,placement:"bottom-start"},{default:()=>e.h(a.NButton,{size:"small",type:"primary"},{default:()=>["操作",e.h(a.NIcon,()=>e.h(u.MoreOutlined))]})})}}},O=e.computed(()=>{const t=i.columns.filter(n=>n.key!="action").map(n=>({title:n.title,key:n.key,width:n.width,fixed:n.fixed??!1,render:n.render,ellipsis:n.ellipsis?{tooltip:!0}:!1})),o=i.columns.reduce((n,l)=>l.key==="action"?l:n,void 0)?.action;return o&&o?.length>0||i.onEdit||i.onDelete?[{type:"selection",fixed:"left"},...t,B(o)]:[{type:"selection",fixed:"left"},...t]}),T=async()=>await d(),R=t=>x([t]),I=()=>{const t=k();x(t)},x=t=>{t&&t.length>0&&D.warning({title:"警告",content:"删除数据不可恢复, 确认删除吗?",positiveText:"确定",negativeText:"取消",onPositiveClick:async()=>{if(i.onDelete)try{await i.onDelete(t)?(d(),g.success("删除成功")):g.error("删除失败")}catch(o){g.error(o.message)}}})},k=()=>h.value?m.value.filter(o=>h.value.includes(o.id)).map(o=>e.toRaw(o)):[],z=()=>k()[0],L=()=>e.toRaw(m.value),d=async()=>{if(!p.value){p.value=!0;try{if(i.onLoad){var{data:t,total:o}=await i.onLoad(c.value.page,c.value.pageSize);m.value=t,c.value.itemCount=o}}catch(n){g.error(n.message)}finally{p.value=!1}}},H=e.computed(()=>{const t=e.unref(N);if(!t)return;const o=t?.$el,n=o.querySelector(".n-data-table-thead "),{bottomIncludeBody:l}=$(n),r=48;let s=12,w=25;const f=o.querySelector(".n-data-table__pagination");if(f){const v=f.offsetHeight;s+=v||0}else s+=28;return l-(r+s+w)}),P=t=>!t||!t.getBoundingClientRect?0:t.getBoundingClientRect(),$=t=>{const o=document.documentElement,n=o.scrollLeft,l=o.scrollTop,r=o.clientLeft,s=o.clientTop,w=window.pageXOffset,f=window.pageYOffset,_=P(t),{left:v,top:q,width:M,height:A}=_,j=(w||n)-(r||0),U=(f||l)-(s||0),W=v+w,F=q+f,C=W-j,b=F-U,V=window.document.documentElement.clientWidth,E=window.document.documentElement.clientHeight;return{left:C,top:b,right:V-M-C,bottom:E-A-b,rightIncludeBody:V-C,bottomIncludeBody:E-b}};return e.onMounted(async()=>await d()),S({getData:L,getSelectedRow:z,getSelectedRows:k,refreshData:d,resetPage:()=>{c.value.page=1}}),(t,o)=>{const n=a.NTooltip,l=a.NSpace,r=a.NDataTable;return e.openBlock(),e.createBlock(e.unref(a.NCard),{bordered:!1},{header:e.withCtx(()=>[e.createVNode(l,{justify:"space-between",align:"center",class:"w-full"},{default:e.withCtx(()=>[e.createElementVNode("span",K,e.toDisplayString(y.title),1),e.createVNode(l,null,{default:e.withCtx(()=>[i.onAdd?(e.openBlock(),e.createBlock(n,{key:0,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(a.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:i.onAdd},{default:e.withCtx(()=>[e.createVNode(e.unref(u.PlusSquareOutlined))]),_:1},8,["onClick"])]),default:e.withCtx(()=>[o[1]||(o[1]=e.createElementVNode("span",null,"新增",-1))]),_:1})):e.createCommentVNode("",!0),i.onDelete?(e.openBlock(),e.createBlock(n,{key:1,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(a.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:I},{default:e.withCtx(()=>[e.createVNode(e.unref(u.DeleteOutlined))]),_:1})]),default:e.withCtx(()=>[o[2]||(o[2]=e.createElementVNode("span",null,"删除",-1))]),_:1})):e.createCommentVNode("",!0),e.createVNode(n,{trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(a.NIcon),{size:"18",class:"cursor-pointer hover:text-blue-600",onClick:T},{default:e.withCtx(()=>[e.createVNode(e.unref(u.ReloadOutlined))]),_:1})]),default:e.withCtx(()=>[o[3]||(o[3]=e.createElementVNode("span",null,"刷新",-1))]),_:1})]),_:1})]),_:1})]),default:e.withCtx(()=>[e.createElementVNode("div",X,[t.$slots.toolbar?(e.openBlock(),e.createElementBlock("div",Y,[e.renderSlot(t.$slots,"toolbar")])):e.createCommentVNode("",!0),e.createVNode(r,{remote:"",ref_key:"$table",ref:N,"checked-row-keys":h.value,"onUpdate:checkedRowKeys":o[0]||(o[0]=s=>h.value=s),"max-height":H.value,loading:p.value,bordered:!1,"single-line":!1,columns:O.value,data:m.value,pagination:c.value,"row-key":s=>s[y.idField]},null,8,["checked-row-keys","max-height","loading","columns","data","pagination","row-key"])])]),_:3})}}});exports.default=G;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("naive-ui"),e=require("vue"),u=require("@vicons/antd"),K={class:"text-lg font-medium"},X={id:"data-content"},Y={key:0,class:"rounded-lg bg-gray-50 flex flex-row gap-2 items-center justify-end p-4 mb-4"},G=e.defineComponent({__name:"PTable",props:{title:{},idField:{default:"id"},columns:{},onLoad:{},onDelete:{},onAdd:{},onEdit:{}},setup(y,{expose:S}){const N=e.ref(null),D=a.useDialog(),g=a.useMessage(),p=e.ref(!1),h=e.ref([]),m=e.ref([]),c=e.ref({page:1,itemCount:0,pageSize:10,pageSizes:[10,20,30,50],showSizePicker:!0,onChange:async t=>{c.value.page=t,await d()},onUpdatePageSize:async t=>{c.value.pageSize=t,await d()}}),i=y,B=t=>{const o=n=>{const l=[];return t&&t.forEach(r=>{r.key!=="edit"&&r.key!=="delete"&&l.push({label:r.name,key:r.key,icon:r.icon&&(()=>e.h(a.NIcon,null,{default:()=>e.h(r.icon)})),props:{onClick:()=>r.action(n)}})}),l};return{title:"操作",key:"actions",width:100,fixed:"right",render:n=>{let l=[];if(i.onEdit&&l.push({label:"编辑",key:"edit",icon:()=>e.h(a.NIcon,null,{default:()=>e.h(u.EditOutlined)}),props:{onClick:async()=>await i.onEdit(n)}}),i.onDelete&&l.push({label:"删除",key:"delete",icon:()=>e.h(a.NIcon,null,{default:()=>e.h(u.DeleteOutlined)}),props:{onClick:()=>R(n)}}),l=[...l,...o(n)],!(l.length<=0))return e.h(a.NDropdown,{options:l,placement:"bottom-start"},{default:()=>e.h(a.NButton,{size:"small",type:"primary"},{default:()=>["操作",e.h(a.NIcon,()=>e.h(u.MoreOutlined))]})})}}},O=e.computed(()=>{const t=i.columns.filter(n=>n.key!="action").map(n=>({title:n.title,key:n.key,width:n.width,fixed:n.fixed??!1,render:n.render,ellipsis:n.ellipsis?{tooltip:!0}:!1})),o=i.columns.reduce((n,l)=>l.key==="action"?l:n,void 0)?.action;return o&&o?.length>0||i.onEdit||i.onDelete?[{type:"selection",fixed:"left"},...t,B(o)]:[{type:"selection",fixed:"left"},...t]}),T=async()=>await d(),R=t=>x([t]),I=()=>{const t=k();x(t)},x=t=>{t&&t.length>0&&D.warning({title:"警告",content:"删除数据不可恢复, 确认删除吗?",positiveText:"确定",negativeText:"取消",onPositiveClick:async()=>{if(i.onDelete)try{await i.onDelete(t)?(d(),g.success("删除成功")):g.error("删除失败")}catch(o){g.error(o.message)}}})},k=()=>h.value?m.value.filter(o=>h.value.includes(o.id)).map(o=>e.toRaw(o)):[],z=()=>k()[0],L=()=>e.toRaw(m.value),d=async()=>{if(!p.value){p.value=!0;try{if(i.onLoad){var{items:t,totalCount:o}=await i.onLoad(c.value.page,c.value.pageSize);m.value=t,c.value.itemCount=o}}catch(n){g.error(n.message)}finally{p.value=!1}}},H=e.computed(()=>{const t=e.unref(N);if(!t)return;const o=t?.$el,n=o.querySelector(".n-data-table-thead "),{bottomIncludeBody:l}=$(n),r=48;let s=12,w=25;const f=o.querySelector(".n-data-table__pagination");if(f){const v=f.offsetHeight;s+=v||0}else s+=28;return l-(r+s+w)}),P=t=>!t||!t.getBoundingClientRect?0:t.getBoundingClientRect(),$=t=>{const o=document.documentElement,n=o.scrollLeft,l=o.scrollTop,r=o.clientLeft,s=o.clientTop,w=window.pageXOffset,f=window.pageYOffset,_=P(t),{left:v,top:q,width:M,height:A}=_,j=(w||n)-(r||0),U=(f||l)-(s||0),W=v+w,F=q+f,C=W-j,b=F-U,V=window.document.documentElement.clientWidth,E=window.document.documentElement.clientHeight;return{left:C,top:b,right:V-M-C,bottom:E-A-b,rightIncludeBody:V-C,bottomIncludeBody:E-b}};return e.onMounted(async()=>await d()),S({getData:L,getSelectedRow:z,getSelectedRows:k,refreshData:d,resetPage:()=>{c.value.page=1}}),(t,o)=>{const n=a.NTooltip,l=a.NSpace,r=a.NDataTable;return e.openBlock(),e.createBlock(e.unref(a.NCard),{bordered:!1},{header:e.withCtx(()=>[e.createVNode(l,{justify:"space-between",align:"center",class:"w-full"},{default:e.withCtx(()=>[e.createElementVNode("span",K,e.toDisplayString(y.title),1),e.createVNode(l,null,{default:e.withCtx(()=>[i.onAdd?(e.openBlock(),e.createBlock(n,{key:0,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(a.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:i.onAdd},{default:e.withCtx(()=>[e.createVNode(e.unref(u.PlusSquareOutlined))]),_:1},8,["onClick"])]),default:e.withCtx(()=>[o[1]||(o[1]=e.createElementVNode("span",null,"新增",-1))]),_:1})):e.createCommentVNode("",!0),i.onDelete?(e.openBlock(),e.createBlock(n,{key:1,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(a.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:I},{default:e.withCtx(()=>[e.createVNode(e.unref(u.DeleteOutlined))]),_:1})]),default:e.withCtx(()=>[o[2]||(o[2]=e.createElementVNode("span",null,"删除",-1))]),_:1})):e.createCommentVNode("",!0),e.createVNode(n,{trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(a.NIcon),{size:"18",class:"cursor-pointer hover:text-blue-600",onClick:T},{default:e.withCtx(()=>[e.createVNode(e.unref(u.ReloadOutlined))]),_:1})]),default:e.withCtx(()=>[o[3]||(o[3]=e.createElementVNode("span",null,"刷新",-1))]),_:1})]),_:1})]),_:1})]),default:e.withCtx(()=>[e.createElementVNode("div",X,[t.$slots.toolbar?(e.openBlock(),e.createElementBlock("div",Y,[e.renderSlot(t.$slots,"toolbar")])):e.createCommentVNode("",!0),e.createVNode(r,{remote:"",ref_key:"$table",ref:N,"checked-row-keys":h.value,"onUpdate:checkedRowKeys":o[0]||(o[0]=s=>h.value=s),"max-height":H.value,loading:p.value,bordered:!1,"single-line":!1,columns:O.value,data:m.value,pagination:c.value,"row-key":s=>s[y.idField]},null,8,["checked-row-keys","max-height","loading","columns","data","pagination","row-key"])])]),_:3})}}});exports.default=G;

package/lib/table/typing.d.ts

@@ -19,8 +19,8 @@ export type DataTableProps = {
     idField?: string;
     columns: DataTableColumnDefine[];
     onLoad: (page: number, pageSize: number) => Promise<{
-        data: any[];
-        total: number;
+        items: any[];
+        totalCount: number;
     }>;
     onDelete?: (rows: any[]) => Promise<boolean>;
     onAdd?: () => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chewel611/naive-ui-plus",
   "private": false,
-  "version": "0.0.40",
+  "version": "0.0.42",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -48,10 +48,11 @@
     "@tailwindcss/vite": "^4.1.18",
     "@types/element-resize-detector": "^1.1.6",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^24.1.0",
+    "@types/node": "^24.12.0",
     "@vicons/antd": "^0.13.0",
     "@vitejs/plugin-vue": "^6.0.4",
     "@vue/tsconfig": "^0.8.1",
+    "alova": "^3.5.1",
     "less": "^4.4.0",
     "less-loader": "^12.3.0",
     "minimist": "^1.2.8",