@chewel611/naive-ui-plus 0.0.4 → 0.0.6

package/es/table/PTable.vue.js

@@ -1,14 +1,15 @@
-import { useDialog as he, useMessage as me, NCard as ve, NDataTable as ye, NModal as ke, NSpace as we, NButton as k, NTooltip as be, NIcon as D, NDropdown as _e } from "naive-ui";
-import { defineComponent as Ce, ref as c, computed as j, unref as r, onMounted as Se, createBlock as H, openBlock as h, withCtx as n, createElementVNode as E, createElementBlock as x, createCommentVNode as w, createVNode as s, renderSlot as P, normalizeStyle as q, createTextVNode as B, h as T, toRaw as G } from "vue";
-import { PlusSquareOutlined as Me, DeleteOutlined as Oe, ReloadOutlined as De, MoreOutlined as Ee } from "@vicons/antd";
-const Be = { id: "data-content" }, Te = {
+import { useDialog as he, useMessage as ve, NCard as ye, NDataTable as we, NModal as ke, NSpace as be, NButton as w, NTooltip as _e, NIcon as O, NDropdown as Ce } from "naive-ui";
+import { defineComponent as Se, ref as u, computed as G, unref as r, onMounted as Me, createBlock as H, openBlock as m, withCtx as n, createElementVNode as E, createElementBlock as x, createCommentVNode as k, createVNode as s, renderSlot as P, normalizeStyle as K, createTextVNode as B, h as T, toRaw as $ } from "vue";
+import { PlusSquareOutlined as De, DeleteOutlined as Oe, ReloadOutlined as Ee, MoreOutlined as Be } from "@vicons/antd";
+import { resetObject as Te } from "../utils/helper.js";
+const $e = { id: "data-content" }, Ne = {
   key: 0,
   class: "rounded-lg bg-gray-50 flex flex-row gap-2 items-center justify-end p-5 mb-5"
-}, $e = { key: 1 }, Ne = { key: 2 }, He = /* @__PURE__ */ Ce({
+}, Re = { key: 1 }, ze = { key: 2 }, We = /* @__PURE__ */ Se({
   __name: "PTable",
   props: {
     idField: { default: "id" },
-    item: {},
+    item: { default: {} },
     columns: {},
     modalWidth: { default: 800 },
     hiddenAdd: { type: Boolean, default: !1 },
@@ -21,8 +22,8 @@ const Be = { id: "data-content" }, Te = {
     onSave: {},
     onDelete: {}
   },
-  setup(K, { expose: X }) {
-    const W = c(null), Y = he(), m = me(), b = c(!1), _ = c([]), C = c([]), $ = c(null), p = c(!1), v = c(!1), S = c(!1), f = c({
+  setup(X, { expose: Y }) {
+    const W = u(null), J = he(), h = ve(), b = u(!1), _ = u([]), C = u([]), S = u(null), p = u(!1), v = u(!1), M = u(!1), f = u({
       page: 1,
       itemCount: 0,
       pageSize: 10,
@@ -34,14 +35,14 @@ const Be = { id: "data-content" }, Te = {
       onUpdatePageSize: async (e) => {
         f.value.pageSize = e, await g();
       }
-    }), o = K, J = (e) => {
-      const t = (l) => {
+    }), l = X, Q = (e) => {
+      const t = (o) => {
         const a = [];
         return e && e.forEach((i) => {
           i.key !== "edit" && i.key !== "delete" && a.push({
             label: i.name,
             key: i.key,
-            props: { onClick: () => i.action(l) }
+            props: { onClick: () => i.action(o) }
           });
         }), a;
       };
@@ -50,173 +51,176 @@ const Be = { id: "data-content" }, Te = {
         key: "actions",
         width: 100,
         fixed: "right",
-        render: (l) => {
+        render: (o) => {
           let a = [];
-          if (o.hiddenEdit || a.push({
+          if (l.hiddenEdit || a.push({
             label: "编辑",
             key: "edit",
-            props: { onClick: () => oe(l) }
-          }), o.hiddenDelete || a.push({
+            props: { onClick: () => le(o) }
+          }), l.hiddenDelete || a.push({
             label: "删除",
             key: "delete",
-            props: { onClick: () => Z(l) }
-          }), a = [...a, ...t(l)], !(a.length <= 0))
+            props: { onClick: () => ee(o) }
+          }), a = [...a, ...t(o)], !(a.length <= 0))
             return T(
-              _e,
+              Ce,
               {
                 options: a,
                 placement: "bottom-start"
               },
               {
                 default: () => T(
-                  k,
+                  w,
                   { size: "small", type: "primary" },
-                  { default: () => ["操作", T(D, () => T(Ee))] }
+                  { default: () => ["操作", T(O, () => T(Be))] }
                 )
               }
             );
         }
       };
-    }, Q = j(() => {
-      const e = o.columns.filter((l) => l.key != "action").map((l) => ({
-        title: l.title,
-        key: l.key,
-        width: l.width,
-        fixed: l.fixed ?? !1,
-        render: l.render,
-        ellipsis: l.ellipsis ? { tooltip: !0 } : !1
-      })), t = o.columns.reduce(
-        (l, a) => a.key === "action" ? a : l,
+    }, Z = G(() => {
+      const e = l.columns.filter((o) => o.key != "action").map((o) => ({
+        title: o.title,
+        key: o.key,
+        width: o.width,
+        fixed: o.fixed ?? !1,
+        render: o.render,
+        ellipsis: o.ellipsis ? { tooltip: !0 } : !1
+      })), t = l.columns.reduce(
+        (o, a) => a.key === "action" ? a : o,
         void 0
       )?.action;
-      return t && t?.length > 0 || !o.hiddenDelete || !o.hiddenEdit ? [
+      return t && t?.length > 0 || !l.hiddenDelete || !l.hiddenEdit ? [
         { type: "selection", fixed: "left" },
         ...e,
-        J(t)
+        Q(t)
       ] : [{ type: "selection", fixed: "left" }, ...e];
     }), A = async () => {
       await g();
-    }, Z = (e) => {
+    }, ee = (e) => {
       I([e]);
-    }, ee = () => {
+    }, te = () => {
       const e = N();
       I(e);
     }, I = (e) => {
-      e && e.length > 0 && Y.warning({
+      e && e.length > 0 && J.warning({
         title: "警告",
         content: "删除数据不可恢复, 确认删除吗?",
         positiveText: "确定",
         negativeText: "取消",
         onPositiveClick: async () => {
-          if (o.onDelete)
+          if (l.onDelete)
             try {
-              await o.onDelete(e) ? (g(), m.success("删除成功")) : m.error("删除失败");
+              await l.onDelete(e) ? (g(), h.success("删除成功")) : h.error("删除失败");
             } catch (t) {
-              m.error(t.message);
+              h.error(t.message);
             }
         }
       });
-    }, te = () => {
-      if (o.onOpenModal) {
-        o.onOpenModal();
-        return;
-      }
-      v.value = !1, p.value = !0;
-    }, oe = async (e) => {
-      if (o.onOpenModal) {
-        o.onOpenModal(e);
-        return;
-      }
-      o.onGet && (e = await o.onGet(e[o.idField])), $.value = e, Object.assign(o.item, e), p.value = !1, v.value = !0;
+    }, oe = () => {
+      S.value = null, F();
+    }, le = async (e) => {
+      S.value = e, F(e, async () => {
+        l.onGet && (e = await l.onGet(e[l.idField])), Object.assign(l.item, e);
+      });
     }, V = async () => {
-      if (o.onSave)
+      if (l.onSave)
         try {
-          S.value = !0, (p.value ? await o.onSave() : await o.onSave($.value[o.idField])) && (M(), await g());
+          M.value = !0, (p.value ? await l.onSave(void 0, $(l.item)) : await l.onSave(S.value[l.idField], $(l.item))) && (D(), await g());
         } catch (e) {
-          m.error(e.message);
+          h.error(e.message);
         } finally {
-          S.value = !1;
+          M.value = !1;
         }
-    }, M = () => {
-      o.onCloseModal && o.onCloseModal(), Object.keys(o.item).forEach((e) => o.item[e] = void 0), $.value = null, p.value = !1, v.value = !1;
-    }, N = () => _.value ? C.value.filter((t) => _.value.includes(t.id)).map((t) => G(t)) : [], le = () => N()[0], ne = () => G(C.value), g = async () => {
+    }, F = async (e, t) => {
+      if (Te(l.item), l.onOpenModal) {
+        l.onOpenModal(e);
+        return;
+      }
+      await t?.(), e ? (p.value = !1, v.value = !0) : (v.value = !1, p.value = !0);
+    }, D = () => {
+      if (S.value = null, l.onCloseModal) {
+        l.onCloseModal();
+        return;
+      }
+      p.value = !1, v.value = !1;
+    }, N = () => _.value ? C.value.filter((t) => _.value.includes(t.id)).map((t) => $(t)) : [], ne = () => N()[0], ae = () => $(C.value), g = async () => {
       if (!b.value) {
         b.value = !0;
         try {
-          if (o.onLoad) {
-            var { data: e, total: t } = await o.onLoad(
+          if (l.onLoad) {
+            var { data: e, total: t } = await l.onLoad(
               f.value.page,
               f.value.pageSize
             );
             C.value = e, f.value.itemCount = t;
           }
-        } catch (l) {
-          m.error(l.message);
+        } catch (o) {
+          h.error(o.message);
         } finally {
           b.value = !1;
         }
       }
-    }, ae = j(() => {
+    }, se = G(() => {
       const e = r(W);
       if (!e) return;
-      const t = e?.$el, l = t.querySelector(".n-data-table-thead "), { bottomIncludeBody: a } = ie(l), i = 64;
-      let u = 2, d = 24;
+      const t = e?.$el, o = t.querySelector(".n-data-table-thead "), { bottomIncludeBody: a } = de(o), i = 64;
+      let c = 2, d = 24;
       const y = t.querySelector(
         ".n-data-table__pagination"
       );
       if (y) {
         const R = y.offsetHeight;
-        u += R || 0;
+        c += R || 0;
       } else
-        u += 28;
-      let O = a - (i + u + d);
-      return console.log("height", O), O;
-    }), se = (e) => !e || !e.getBoundingClientRect ? 0 : e.getBoundingClientRect(), ie = (e) => {
-      const t = document.documentElement, l = t.scrollLeft, a = t.scrollTop, i = t.clientLeft, u = t.clientTop, d = window.pageXOffset, y = window.pageYOffset, O = se(e), {
+        c += 28;
+      return a - (i + c + d);
+    }), ie = (e) => !e || !e.getBoundingClientRect ? 0 : e.getBoundingClientRect(), de = (e) => {
+      const t = document.documentElement, o = t.scrollLeft, a = t.scrollTop, i = t.clientLeft, c = t.clientTop, d = window.pageXOffset, y = window.pageYOffset, U = ie(e), {
         left: R,
-        top: de,
-        width: re,
+        top: re,
+        width: ue,
         height: ce
-      } = O, ue = (d || l) - (i || 0), fe = (y || a) - (u || 0), pe = R + d, ge = de + y, z = pe - ue, L = ge - fe, F = window.document.documentElement.clientWidth, U = window.document.documentElement.clientHeight;
+      } = U, fe = (d || o) - (i || 0), pe = (y || a) - (c || 0), ge = R + d, me = re + y, z = ge - fe, L = me - pe, j = window.document.documentElement.clientWidth, q = window.document.documentElement.clientHeight;
       return {
         left: z,
         top: L,
-        right: F - re - z,
-        bottom: U - ce - L,
-        rightIncludeBody: F - z,
-        bottomIncludeBody: U - L
+        right: j - ue - z,
+        bottom: q - ce - L,
+        rightIncludeBody: j - z,
+        bottomIncludeBody: q - L
       };
     };
-    return Se(async () => await A()), X({
-      getData: ne,
-      getSelectedRow: le,
+    return Me(async () => await A()), Y({
+      getData: ae,
+      getSelectedRow: ne,
       getSelectedRows: N,
-      closeModal: M,
+      closeModal: D,
       refreshData: g,
       resetPage: () => {
         f.value.page = 1;
       }
     }), (e, t) => {
-      const l = be, a = ye, i = we, u = ke;
-      return h(), H(r(ve), {
+      const o = _e, a = we, i = be, c = ke;
+      return m(), H(r(ye), {
         title: " ",
         "header-class": "p-4",
         "content-class": "pl-4 pr-4",
         bordered: !1
       }, {
         "header-extra": n(() => [
-          e.hiddenAdd ? w("", !0) : (h(), H(l, {
+          e.hiddenAdd ? k("", !0) : (m(), H(o, {
             key: 0,
             trigger: "hover"
           }, {
             trigger: n(() => [
-              s(r(D), {
+              s(r(O), {
                 size: "18",
                 class: "mr-1 cursor-pointer hover:text-blue-600",
-                onClick: te
+                onClick: oe
               }, {
                 default: n(() => [
-                  s(r(Me))
+                  s(r(De))
                 ]),
                 _: 1
               })
@@ -227,15 +231,15 @@ const Be = { id: "data-content" }, Te = {
             _: 1,
             __: [3]
           })),
-          e.hiddenDelete ? w("", !0) : (h(), H(l, {
+          e.hiddenDelete ? k("", !0) : (m(), H(o, {
             key: 1,
             trigger: "hover"
           }, {
             trigger: n(() => [
-              s(r(D), {
+              s(r(O), {
                 size: "18",
                 class: "mr-1 cursor-pointer hover:text-blue-600",
-                onClick: ee
+                onClick: te
               }, {
                 default: n(() => [
                   s(r(Oe))
@@ -249,15 +253,15 @@ const Be = { id: "data-content" }, Te = {
             _: 1,
             __: [4]
           })),
-          s(l, { trigger: "hover" }, {
+          s(o, { trigger: "hover" }, {
             trigger: n(() => [
-              s(r(D), {
+              s(r(O), {
                 size: "18",
                 class: "cursor-pointer hover:text-blue-600",
                 onClick: A
               }, {
                 default: n(() => [
-                  s(r(De))
+                  s(r(Ee))
                 ]),
                 _: 1
               })
@@ -270,27 +274,27 @@ const Be = { id: "data-content" }, Te = {
           })
         ]),
         default: n(() => [
-          E("div", Be, [
-            e.$slots.toolbar ? (h(), x("div", Te, [
+          E("div", $e, [
+            e.$slots.toolbar ? (m(), x("div", Ne, [
               P(e.$slots, "toolbar")
-            ])) : w("", !0),
+            ])) : k("", !0),
             s(a, {
               remote: "",
               ref_key: "$table",
               ref: W,
               "checked-row-keys": _.value,
               "onUpdate:checkedRowKeys": t[0] || (t[0] = (d) => _.value = d),
-              "max-height": ae.value,
+              "max-height": se.value,
               loading: b.value,
               bordered: !1,
               "single-line": !1,
-              columns: Q.value,
+              columns: Z.value,
               data: C.value,
               pagination: f.value,
               "row-key": (d) => d[e.idField]
             }, null, 8, ["checked-row-keys", "max-height", "loading", "columns", "data", "pagination", "row-key"]),
-            e.$slots.addModal ? (h(), x("div", $e, [
-              s(u, {
+            e.$slots.addModal ? (m(), x("div", Re, [
+              s(c, {
                 title: "新增",
                 preset: "dialog",
                 show: p.value,
@@ -298,14 +302,14 @@ const Be = { id: "data-content" }, Te = {
                 closable: !1,
                 "close-on-esc": !1,
                 "mask-closable": !1,
-                style: q({ width: `${e.modalWidth}px` })
+                style: K({ width: `${e.modalWidth}px` })
               }, {
                 action: n(() => [
                   s(i, null, {
                     default: n(() => [
-                      s(r(k), {
+                      s(r(w), {
                         type: "primary",
-                        loading: S.value,
+                        loading: M.value,
                         onClick: V
                       }, {
                         default: n(() => t[6] || (t[6] = [
@@ -314,7 +318,7 @@ const Be = { id: "data-content" }, Te = {
                         _: 1,
                         __: [6]
                       }, 8, ["loading"]),
-                      s(r(k), { onClick: M }, {
+                      s(r(w), { onClick: D }, {
                         default: n(() => t[7] || (t[7] = [
                           B("取消", -1)
                         ])),
@@ -330,9 +334,9 @@ const Be = { id: "data-content" }, Te = {
                 ]),
                 _: 3
               }, 8, ["show", "style"])
-            ])) : w("", !0),
-            e.$slots.editModal ? (h(), x("div", Ne, [
-              s(u, {
+            ])) : k("", !0),
+            e.$slots.editModal ? (m(), x("div", ze, [
+              s(c, {
                 title: "编辑",
                 show: v.value,
                 "onUpdate:show": t[2] || (t[2] = (d) => v.value = d),
@@ -340,14 +344,14 @@ const Be = { id: "data-content" }, Te = {
                 closable: !1,
                 "close-on-esc": !1,
                 "mask-closable": !1,
-                style: q({ width: `${e.modalWidth}px` })
+                style: K({ width: `${e.modalWidth}px` })
               }, {
                 action: n(() => [
                   s(i, null, {
                     default: n(() => [
-                      s(r(k), {
+                      s(r(w), {
                         type: "primary",
-                        loading: S.value,
+                        loading: M.value,
                         onClick: V
                       }, {
                         default: n(() => t[8] || (t[8] = [
@@ -356,7 +360,7 @@ const Be = { id: "data-content" }, Te = {
                         _: 1,
                         __: [8]
                       }, 8, ["loading"]),
-                      s(r(k), { onClick: M }, {
+                      s(r(w), { onClick: D }, {
                         default: n(() => t[9] || (t[9] = [
                           B("取消", -1)
                         ])),
@@ -372,7 +376,7 @@ const Be = { id: "data-content" }, Te = {
                 ]),
                 _: 3
               }, 8, ["show", "style"])
-            ])) : w("", !0)
+            ])) : k("", !0)
           ])
         ]),
         _: 3
@@ -381,5 +385,5 @@ const Be = { id: "data-content" }, Te = {
   }
 });
 export {
-  He as default
+  We as default
 };

package/es/table/index.d.ts

@@ -8,6 +8,7 @@ declare const _default: {
         getSelectedRow: <T>() => T;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
         idField: string;
+        item: any;
         modalWidth: number;
         hiddenAdd: boolean;
         hiddenEdit: boolean;
@@ -30,6 +31,7 @@ declare const _default: {
         getSelectedRow: <T>() => T;
     }, {}, {}, {}, {
         idField: string;
+        item: any;
         modalWidth: number;
         hiddenAdd: boolean;
         hiddenEdit: boolean;
@@ -47,6 +49,7 @@ declare const _default: {
     getSelectedRow: <T>() => T;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
     idField: string;
+    item: any;
     modalWidth: number;
     hiddenAdd: boolean;
     hiddenEdit: boolean;

package/es/table/typing.d.ts

@@ -16,7 +16,7 @@ export interface DataTableColumnDefine {
 }
 export interface DataTableProps {
     idField?: string;
-    item: any;
+    item?: any;
     columns: DataTableColumnDefine[];
     modalWidth?: number;
     hiddenAdd?: boolean;
@@ -29,7 +29,7 @@ export interface DataTableProps {
     onGet?: (id: string | number) => Promise<any>;
     onOpenModal?: (item?: any) => void;
     onCloseModal?: (item?: any) => void;
-    onSave?: (id?: string | number) => Promise<boolean> | boolean;
+    onSave?: (id?: string | number, row?: any) => Promise<boolean> | boolean;
     onDelete?: (rows: any[]) => Promise<boolean> | boolean;
 }
 export interface DataTableMethods {

package/es/utils/helper.d.ts

@@ -0,0 +1 @@
+export declare const resetObject: (obj: Record<string, any>) => void;

package/es/utils/helper.js

@@ -0,0 +1,9 @@
+const s = (e) => {
+  Object.keys(e).forEach((r) => {
+    const t = e[r];
+    Array.isArray(t) ? e[r] = [] : t !== null && typeof t == "object" ? s(t) : e[r] = void 0;
+  });
+};
+export {
+  s as resetObject
+};

package/lib/modal/PModal.d.ts

@@ -3,7 +3,7 @@ declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: {
         default?(_: {}): any;
-        action?(_: {}): any;
+        'action-extra'?(_: {}): any;
     };
     refs: {
         $modal: import('vue').CreateComponentPublicInstanceWithMixins<Readonly<import('vue').ExtractPropTypes<{

package/lib/modal/PModal.vue.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("naive-ui"),e=require("vue"),w={class:"w-full cursor-move",id:"basic-modal-bar"},y=e.defineComponent({__name:"PModal",props:{saveBtnText:{default:"保 存"},closable:{type:Boolean,default:!1},preset:{default:"dialog"},title:{default:"操作"},width:{default:800},onSave:{},onClose:{}},setup(d,{expose:u}){const i=r.useMessage(),a=d,f=e.ref(null),o=e.ref(!1),s=e.ref(!1),p=async()=>{o.value=!0;try{a.onSave&&await a.onSave()&&l()}catch(t){i.error(t.message)}finally{o.value=!1}},l=()=>{s.value=!1,o.value=!1},v=async()=>{try{a.onClose?await a.onClose()&&l():l()}catch(t){i.error(t.message)}};return u({open:()=>{o.value=!1,s.value=!0},close:()=>{s.value=!1,o.value=!1}}),(t,n)=>{const c=r.NButton,m=r.NSpace;return e.openBlock(),e.createBlock(e.unref(r.NModal),e.mergeProps({ref_key:"$modal",ref:f,preset:"dialog",show:s.value,"onUpdate:show":n[0]||(n[0]=g=>s.value=g)},t.$attrs,{draggable:!0,closable:!1,"close-on-esc":!1,"mask-closable":!1,style:{width:`${a.width}px`},onClose:l}),e.createSlots({header:e.withCtx(()=>[e.createElementVNode("div",w,e.toDisplayString(t.title),1)]),default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:2},[t.$slots.action?{name:"action",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"action")]),key:"1"}:{name:"action",fn:e.withCtx(()=>[e.createVNode(m,null,{default:e.withCtx(()=>[e.createVNode(c,{type:"primary",loading:o.value,onClick:p},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(t.saveBtnText),1)]),_:1},8,["loading"]),e.createVNode(c,{onClick:v},{default:e.withCtx(()=>n[1]||(n[1]=[e.createTextVNode("取 消",-1)])),_:1,__:[1]})]),_:1})]),key:"0"}]),1040,["show","style"])}}});exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("naive-ui"),e=require("vue"),m={class:"w-full cursor-move",id:"basic-modal-bar"},w=e.defineComponent({__name:"PModal",props:{saveBtnText:{default:"保 存"},closable:{type:Boolean,default:!1},preset:{default:"dialog"},title:{default:"操作"},width:{default:800},onSave:{},onClose:{}},setup(d,{expose:u}){const i=r.useMessage(),a=d,o=e.ref(!1),s=e.ref(!1),f=async()=>{o.value=!0;try{a.onSave&&await a.onSave()&&l()}catch(t){i.error(t.message)}finally{o.value=!1}},l=()=>{s.value=!1,o.value=!1},p=async()=>{try{a.onClose?await a.onClose()&&l():l()}catch(t){i.error(t.message)}};return u({open:()=>{o.value=!1,s.value=!0},close:()=>{s.value=!1,o.value=!1}}),(t,n)=>{const c=r.NButton,v=r.NSpace;return e.openBlock(),e.createBlock(e.unref(r.NModal),e.mergeProps({ref:"$modal",preset:"dialog",show:s.value,"onUpdate:show":n[0]||(n[0]=g=>s.value=g)},t.$attrs,{draggable:!0,closable:!1,"close-on-esc":!1,"mask-closable":!1,style:{width:`${a.width}px`},onClose:l}),{header:e.withCtx(()=>[e.createElementVNode("div",m,e.toDisplayString(t.title),1)]),default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),action:e.withCtx(()=>[e.createVNode(v,null,{default:e.withCtx(()=>[e.createVNode(c,{type:"primary",loading:o.value,onClick:f},{default:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(t.saveBtnText),1)]),_:1},8,["loading"]),e.renderSlot(t.$slots,"action-extra"),e.createVNode(c,{onClick:p},{default:e.withCtx(()=>n[1]||(n[1]=[e.createTextVNode("取 消",-1)])),_:1,__:[1]})]),_:3})]),_:3},16,["show","style"])}}});exports.default=w;

package/lib/modal/index.d.ts

@@ -2113,7 +2113,7 @@ declare const _default: {
 }, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & (new () => {
     $slots: {
         default?(_: {}): any;
-        action?(_: {}): any;
+        'action-extra'?(_: {}): any;
     };
 }) & import('vue').Plugin;
 export default _default;

package/lib/table/PTable.d.ts

@@ -21,6 +21,7 @@ declare const __VLS_component: import('vue').DefineComponent<DataTableProps, {
     getSelectedRow: <T>() => T;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<DataTableProps> & Readonly<{}>, {
     idField: string;
+    item: any;
     modalWidth: number;
     hiddenAdd: boolean;
     hiddenEdit: boolean;

package/lib/table/PTable.vue.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("naive-ui"),e=require("vue"),N=require("@vicons/antd"),te={id:"data-content"},oe={key:0,class:"rounded-lg bg-gray-50 flex flex-row gap-2 items-center justify-end p-5 mb-5"},le={key:1},ne={key:2},ae=e.defineComponent({__name:"PTable",props:{idField:{default:"id"},item:{},columns:{},modalWidth:{default:800},hiddenAdd:{type:Boolean,default:!1},hiddenEdit:{type:Boolean,default:!1},hiddenDelete:{type:Boolean,default:!1},onLoad:{},onGet:{},onOpenModal:{},onCloseModal:{},onSave:{},onDelete:{}},setup(R,{expose:$}){const S=e.ref(null),z=i.useDialog(),p=i.useMessage(),m=e.ref(!1),v=e.ref([]),w=e.ref([]),b=e.ref(null),u=e.ref(!1),h=e.ref(!1),y=e.ref(!1),c=e.ref({page:1,itemCount:0,pageSize:10,pageSizes:[10,20,30,50],showSizePicker:!0,onChange:async t=>{c.value.page=t,await f()},onUpdatePageSize:async t=>{c.value.pageSize=t,await f()}}),l=R,L=t=>{const o=n=>{const a=[];return t&&t.forEach(s=>{s.key!=="edit"&&s.key!=="delete"&&a.push({label:s.name,key:s.key,props:{onClick:()=>s.action(n)}})}),a};return{title:"操作",key:"actions",width:100,fixed:"right",render:n=>{let a=[];if(l.hiddenEdit||a.push({label:"编辑",key:"edit",props:{onClick:()=>W(n)}}),l.hiddenDelete||a.push({label:"删除",key:"delete",props:{onClick:()=>I(n)}}),a=[...a,...o(n)],!(a.length<=0))return e.h(i.NDropdown,{options:a,placement:"bottom-start"},{default:()=>e.h(i.NButton,{size:"small",type:"primary"},{default:()=>["操作",e.h(i.NIcon,()=>e.h(N.MoreOutlined))]})})}}},H=e.computed(()=>{const t=l.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=l.columns.reduce((n,a)=>a.key==="action"?a:n,void 0)?.action;return o&&o?.length>0||!l.hiddenDelete||!l.hiddenEdit?[{type:"selection",fixed:"left"},...t,L(o)]:[{type:"selection",fixed:"left"},...t]}),M=async()=>{await f()},I=t=>{E([t])},P=()=>{const t=x();E(t)},E=t=>{t&&t.length>0&&z.warning({title:"警告",content:"删除数据不可恢复, 确认删除吗?",positiveText:"确定",negativeText:"取消",onPositiveClick:async()=>{if(l.onDelete)try{await l.onDelete(t)?(f(),p.success("删除成功")):p.error("删除失败")}catch(o){p.error(o.message)}}})},q=()=>{if(l.onOpenModal){l.onOpenModal();return}h.value=!1,u.value=!0},W=async t=>{if(l.onOpenModal){l.onOpenModal(t);return}l.onGet&&(t=await l.onGet(t[l.idField])),b.value=t,Object.assign(l.item,t),u.value=!1,h.value=!0},O=async()=>{if(l.onSave)try{y.value=!0,(u.value?await l.onSave():await l.onSave(b.value[l.idField]))&&(k(),await f())}catch(t){p.error(t.message)}finally{y.value=!1}},k=()=>{l.onCloseModal&&l.onCloseModal(),Object.keys(l.item).forEach(t=>l.item[t]=void 0),b.value=null,u.value=!1,h.value=!1},x=()=>v.value?w.value.filter(o=>v.value.includes(o.id)).map(o=>e.toRaw(o)):[],A=()=>x()[0],U=()=>e.toRaw(w.value),f=async()=>{if(!m.value){m.value=!0;try{if(l.onLoad){var{data:t,total:o}=await l.onLoad(c.value.page,c.value.pageSize);w.value=t,c.value.itemCount=o}}catch(n){p.error(n.message)}finally{m.value=!1}}},j=e.computed(()=>{const t=e.unref(S);if(!t)return;const o=t?.$el,n=o.querySelector(".n-data-table-thead "),{bottomIncludeBody:a}=G(n),s=64;let d=2,r=24;const g=o.querySelector(".n-data-table__pagination");if(g){const V=g.offsetHeight;d+=V||0}else d+=28;let C=a-(s+d+r);return console.log("height",C),C}),F=t=>!t||!t.getBoundingClientRect?0:t.getBoundingClientRect(),G=t=>{const o=document.documentElement,n=o.scrollLeft,a=o.scrollTop,s=o.clientLeft,d=o.clientTop,r=window.pageXOffset,g=window.pageYOffset,C=F(t),{left:V,top:K,width:X,height:Y}=C,J=(r||n)-(s||0),Q=(g||a)-(d||0),Z=V+r,ee=K+g,_=Z-J,B=ee-Q,T=window.document.documentElement.clientWidth,D=window.document.documentElement.clientHeight;return{left:_,top:B,right:T-X-_,bottom:D-Y-B,rightIncludeBody:T-_,bottomIncludeBody:D-B}};return e.onMounted(async()=>await M()),$({getData:U,getSelectedRow:A,getSelectedRows:x,closeModal:k,refreshData:f,resetPage:()=>{c.value.page=1}}),(t,o)=>{const n=i.NTooltip,a=i.NDataTable,s=i.NSpace,d=i.NModal;return e.openBlock(),e.createBlock(e.unref(i.NCard),{title:" ","header-class":"p-4","content-class":"pl-4 pr-4",bordered:!1},{"header-extra":e.withCtx(()=>[t.hiddenAdd?e.createCommentVNode("",!0):(e.openBlock(),e.createBlock(n,{key:0,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(i.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:q},{default:e.withCtx(()=>[e.createVNode(e.unref(N.PlusSquareOutlined))]),_:1})]),default:e.withCtx(()=>[o[3]||(o[3]=e.createElementVNode("span",null,"新增",-1))]),_:1,__:[3]})),t.hiddenDelete?e.createCommentVNode("",!0):(e.openBlock(),e.createBlock(n,{key:1,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(i.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:P},{default:e.withCtx(()=>[e.createVNode(e.unref(N.DeleteOutlined))]),_:1})]),default:e.withCtx(()=>[o[4]||(o[4]=e.createElementVNode("span",null,"删除",-1))]),_:1,__:[4]})),e.createVNode(n,{trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(i.NIcon),{size:"18",class:"cursor-pointer hover:text-blue-600",onClick:M},{default:e.withCtx(()=>[e.createVNode(e.unref(N.ReloadOutlined))]),_:1})]),default:e.withCtx(()=>[o[5]||(o[5]=e.createElementVNode("span",null,"刷新",-1))]),_:1,__:[5]})]),default:e.withCtx(()=>[e.createElementVNode("div",te,[t.$slots.toolbar?(e.openBlock(),e.createElementBlock("div",oe,[e.renderSlot(t.$slots,"toolbar")])):e.createCommentVNode("",!0),e.createVNode(a,{remote:"",ref_key:"$table",ref:S,"checked-row-keys":v.value,"onUpdate:checkedRowKeys":o[0]||(o[0]=r=>v.value=r),"max-height":j.value,loading:m.value,bordered:!1,"single-line":!1,columns:H.value,data:w.value,pagination:c.value,"row-key":r=>r[t.idField]},null,8,["checked-row-keys","max-height","loading","columns","data","pagination","row-key"]),t.$slots.addModal?(e.openBlock(),e.createElementBlock("div",le,[e.createVNode(d,{title:"新增",preset:"dialog",show:u.value,"onUpdate:show":o[1]||(o[1]=r=>u.value=r),closable:!1,"close-on-esc":!1,"mask-closable":!1,style:e.normalizeStyle({width:`${t.modalWidth}px`})},{action:e.withCtx(()=>[e.createVNode(s,null,{default:e.withCtx(()=>[e.createVNode(e.unref(i.NButton),{type:"primary",loading:y.value,onClick:O},{default:e.withCtx(()=>o[6]||(o[6]=[e.createTextVNode("保存",-1)])),_:1,__:[6]},8,["loading"]),e.createVNode(e.unref(i.NButton),{onClick:k},{default:e.withCtx(()=>o[7]||(o[7]=[e.createTextVNode("取消",-1)])),_:1,__:[7]})]),_:1})]),default:e.withCtx(()=>[e.renderSlot(t.$slots,"addModal")]),_:3},8,["show","style"])])):e.createCommentVNode("",!0),t.$slots.editModal?(e.openBlock(),e.createElementBlock("div",ne,[e.createVNode(d,{title:"编辑",show:h.value,"onUpdate:show":o[2]||(o[2]=r=>h.value=r),preset:"dialog",closable:!1,"close-on-esc":!1,"mask-closable":!1,style:e.normalizeStyle({width:`${t.modalWidth}px`})},{action:e.withCtx(()=>[e.createVNode(s,null,{default:e.withCtx(()=>[e.createVNode(e.unref(i.NButton),{type:"primary",loading:y.value,onClick:O},{default:e.withCtx(()=>o[8]||(o[8]=[e.createTextVNode("保存",-1)])),_:1,__:[8]},8,["loading"]),e.createVNode(e.unref(i.NButton),{onClick:k},{default:e.withCtx(()=>o[9]||(o[9]=[e.createTextVNode("取消",-1)])),_:1,__:[9]})]),_:1})]),default:e.withCtx(()=>[e.renderSlot(t.$slots,"editModal")]),_:3},8,["show","style"])])):e.createCommentVNode("",!0)])]),_:3})}}});exports.default=ae;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const s=require("naive-ui"),e=require("vue"),N=require("@vicons/antd"),oe=require("../utils/helper.cjs"),le={id:"data-content"},ne={key:0,class:"rounded-lg bg-gray-50 flex flex-row gap-2 items-center justify-end p-5 mb-5"},ae={key:1},se={key:2},ie=e.defineComponent({__name:"PTable",props:{idField:{default:"id"},item:{default:{}},columns:{},modalWidth:{default:800},hiddenAdd:{type:Boolean,default:!1},hiddenEdit:{type:Boolean,default:!1},hiddenDelete:{type:Boolean,default:!1},onLoad:{},onGet:{},onOpenModal:{},onCloseModal:{},onSave:{},onDelete:{}},setup($,{expose:z}){const B=e.ref(null),L=s.useDialog(),p=s.useMessage(),m=e.ref(!1),v=e.ref([]),w=e.ref([]),y=e.ref(null),u=e.ref(!1),h=e.ref(!1),C=e.ref(!1),c=e.ref({page:1,itemCount:0,pageSize:10,pageSizes:[10,20,30,50],showSizePicker:!0,onChange:async t=>{c.value.page=t,await f()},onUpdatePageSize:async t=>{c.value.pageSize=t,await f()}}),n=$,H=t=>{const o=l=>{const a=[];return t&&t.forEach(i=>{i.key!=="edit"&&i.key!=="delete"&&a.push({label:i.name,key:i.key,props:{onClick:()=>i.action(l)}})}),a};return{title:"操作",key:"actions",width:100,fixed:"right",render:l=>{let a=[];if(n.hiddenEdit||a.push({label:"编辑",key:"edit",props:{onClick:()=>A(l)}}),n.hiddenDelete||a.push({label:"删除",key:"delete",props:{onClick:()=>q(l)}}),a=[...a,...o(l)],!(a.length<=0))return e.h(s.NDropdown,{options:a,placement:"bottom-start"},{default:()=>e.h(s.NButton,{size:"small",type:"primary"},{default:()=>["操作",e.h(s.NIcon,()=>e.h(N.MoreOutlined))]})})}}},I=e.computed(()=>{const t=n.columns.filter(l=>l.key!="action").map(l=>({title:l.title,key:l.key,width:l.width,fixed:l.fixed??!1,render:l.render,ellipsis:l.ellipsis?{tooltip:!0}:!1})),o=n.columns.reduce((l,a)=>a.key==="action"?a:l,void 0)?.action;return o&&o?.length>0||!n.hiddenDelete||!n.hiddenEdit?[{type:"selection",fixed:"left"},...t,H(o)]:[{type:"selection",fixed:"left"},...t]}),S=async()=>{await f()},q=t=>{M([t])},P=()=>{const t=b();M(t)},M=t=>{t&&t.length>0&&L.warning({title:"警告",content:"删除数据不可恢复, 确认删除吗?",positiveText:"确定",negativeText:"取消",onPositiveClick:async()=>{if(n.onDelete)try{await n.onDelete(t)?(f(),p.success("删除成功")):p.error("删除失败")}catch(o){p.error(o.message)}}})},W=()=>{y.value=null,T()},A=async t=>{y.value=t,T(t,async()=>{n.onGet&&(t=await n.onGet(t[n.idField])),Object.assign(n.item,t)})},E=async()=>{if(n.onSave)try{C.value=!0,(u.value?await n.onSave(void 0,e.toRaw(n.item)):await n.onSave(y.value[n.idField],e.toRaw(n.item)))&&(k(),await f())}catch(t){p.error(t.message)}finally{C.value=!1}},T=async(t,o)=>{if(oe.resetObject(n.item),n.onOpenModal){n.onOpenModal(t);return}await o?.(),t?(u.value=!1,h.value=!0):(h.value=!1,u.value=!0)},k=()=>{if(y.value=null,n.onCloseModal){n.onCloseModal();return}u.value=!1,h.value=!1},b=()=>v.value?w.value.filter(o=>v.value.includes(o.id)).map(o=>e.toRaw(o)):[],U=()=>b()[0],j=()=>e.toRaw(w.value),f=async()=>{if(!m.value){m.value=!0;try{if(n.onLoad){var{data:t,total:o}=await n.onLoad(c.value.page,c.value.pageSize);w.value=t,c.value.itemCount=o}}catch(l){p.error(l.message)}finally{m.value=!1}}},F=e.computed(()=>{const t=e.unref(B);if(!t)return;const o=t?.$el,l=o.querySelector(".n-data-table-thead "),{bottomIncludeBody:a}=K(l),i=64;let d=2,r=24;const g=o.querySelector(".n-data-table__pagination");if(g){const x=g.offsetHeight;d+=x||0}else d+=28;return a-(i+d+r)}),G=t=>!t||!t.getBoundingClientRect?0:t.getBoundingClientRect(),K=t=>{const o=document.documentElement,l=o.scrollLeft,a=o.scrollTop,i=o.clientLeft,d=o.clientTop,r=window.pageXOffset,g=window.pageYOffset,D=G(t),{left:x,top:X,width:Y,height:J}=D,Q=(r||l)-(i||0),Z=(g||a)-(d||0),ee=x+r,te=X+g,V=ee-Q,_=te-Z,O=window.document.documentElement.clientWidth,R=window.document.documentElement.clientHeight;return{left:V,top:_,right:O-Y-V,bottom:R-J-_,rightIncludeBody:O-V,bottomIncludeBody:R-_}};return e.onMounted(async()=>await S()),z({getData:j,getSelectedRow:U,getSelectedRows:b,closeModal:k,refreshData:f,resetPage:()=>{c.value.page=1}}),(t,o)=>{const l=s.NTooltip,a=s.NDataTable,i=s.NSpace,d=s.NModal;return e.openBlock(),e.createBlock(e.unref(s.NCard),{title:" ","header-class":"p-4","content-class":"pl-4 pr-4",bordered:!1},{"header-extra":e.withCtx(()=>[t.hiddenAdd?e.createCommentVNode("",!0):(e.openBlock(),e.createBlock(l,{key:0,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(s.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:W},{default:e.withCtx(()=>[e.createVNode(e.unref(N.PlusSquareOutlined))]),_:1})]),default:e.withCtx(()=>[o[3]||(o[3]=e.createElementVNode("span",null,"新增",-1))]),_:1,__:[3]})),t.hiddenDelete?e.createCommentVNode("",!0):(e.openBlock(),e.createBlock(l,{key:1,trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(s.NIcon),{size:"18",class:"mr-1 cursor-pointer hover:text-blue-600",onClick:P},{default:e.withCtx(()=>[e.createVNode(e.unref(N.DeleteOutlined))]),_:1})]),default:e.withCtx(()=>[o[4]||(o[4]=e.createElementVNode("span",null,"删除",-1))]),_:1,__:[4]})),e.createVNode(l,{trigger:"hover"},{trigger:e.withCtx(()=>[e.createVNode(e.unref(s.NIcon),{size:"18",class:"cursor-pointer hover:text-blue-600",onClick:S},{default:e.withCtx(()=>[e.createVNode(e.unref(N.ReloadOutlined))]),_:1})]),default:e.withCtx(()=>[o[5]||(o[5]=e.createElementVNode("span",null,"刷新",-1))]),_:1,__:[5]})]),default:e.withCtx(()=>[e.createElementVNode("div",le,[t.$slots.toolbar?(e.openBlock(),e.createElementBlock("div",ne,[e.renderSlot(t.$slots,"toolbar")])):e.createCommentVNode("",!0),e.createVNode(a,{remote:"",ref_key:"$table",ref:B,"checked-row-keys":v.value,"onUpdate:checkedRowKeys":o[0]||(o[0]=r=>v.value=r),"max-height":F.value,loading:m.value,bordered:!1,"single-line":!1,columns:I.value,data:w.value,pagination:c.value,"row-key":r=>r[t.idField]},null,8,["checked-row-keys","max-height","loading","columns","data","pagination","row-key"]),t.$slots.addModal?(e.openBlock(),e.createElementBlock("div",ae,[e.createVNode(d,{title:"新增",preset:"dialog",show:u.value,"onUpdate:show":o[1]||(o[1]=r=>u.value=r),closable:!1,"close-on-esc":!1,"mask-closable":!1,style:e.normalizeStyle({width:`${t.modalWidth}px`})},{action:e.withCtx(()=>[e.createVNode(i,null,{default:e.withCtx(()=>[e.createVNode(e.unref(s.NButton),{type:"primary",loading:C.value,onClick:E},{default:e.withCtx(()=>o[6]||(o[6]=[e.createTextVNode("保存",-1)])),_:1,__:[6]},8,["loading"]),e.createVNode(e.unref(s.NButton),{onClick:k},{default:e.withCtx(()=>o[7]||(o[7]=[e.createTextVNode("取消",-1)])),_:1,__:[7]})]),_:1})]),default:e.withCtx(()=>[e.renderSlot(t.$slots,"addModal")]),_:3},8,["show","style"])])):e.createCommentVNode("",!0),t.$slots.editModal?(e.openBlock(),e.createElementBlock("div",se,[e.createVNode(d,{title:"编辑",show:h.value,"onUpdate:show":o[2]||(o[2]=r=>h.value=r),preset:"dialog",closable:!1,"close-on-esc":!1,"mask-closable":!1,style:e.normalizeStyle({width:`${t.modalWidth}px`})},{action:e.withCtx(()=>[e.createVNode(i,null,{default:e.withCtx(()=>[e.createVNode(e.unref(s.NButton),{type:"primary",loading:C.value,onClick:E},{default:e.withCtx(()=>o[8]||(o[8]=[e.createTextVNode("保存",-1)])),_:1,__:[8]},8,["loading"]),e.createVNode(e.unref(s.NButton),{onClick:k},{default:e.withCtx(()=>o[9]||(o[9]=[e.createTextVNode("取消",-1)])),_:1,__:[9]})]),_:1})]),default:e.withCtx(()=>[e.renderSlot(t.$slots,"editModal")]),_:3},8,["show","style"])])):e.createCommentVNode("",!0)])]),_:3})}}});exports.default=ie;

package/lib/table/index.d.ts

@@ -8,6 +8,7 @@ declare const _default: {
         getSelectedRow: <T>() => T;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
         idField: string;
+        item: any;
         modalWidth: number;
         hiddenAdd: boolean;
         hiddenEdit: boolean;
@@ -30,6 +31,7 @@ declare const _default: {
         getSelectedRow: <T>() => T;
     }, {}, {}, {}, {
         idField: string;
+        item: any;
         modalWidth: number;
         hiddenAdd: boolean;
         hiddenEdit: boolean;
@@ -47,6 +49,7 @@ declare const _default: {
     getSelectedRow: <T>() => T;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
     idField: string;
+    item: any;
     modalWidth: number;
     hiddenAdd: boolean;
     hiddenEdit: boolean;

package/lib/table/typing.d.ts

@@ -16,7 +16,7 @@ export interface DataTableColumnDefine {
 }
 export interface DataTableProps {
     idField?: string;
-    item: any;
+    item?: any;
     columns: DataTableColumnDefine[];
     modalWidth?: number;
     hiddenAdd?: boolean;
@@ -29,7 +29,7 @@ export interface DataTableProps {
     onGet?: (id: string | number) => Promise<any>;
     onOpenModal?: (item?: any) => void;
     onCloseModal?: (item?: any) => void;
-    onSave?: (id?: string | number) => Promise<boolean> | boolean;
+    onSave?: (id?: string | number, row?: any) => Promise<boolean> | boolean;
     onDelete?: (rows: any[]) => Promise<boolean> | boolean;
 }
 export interface DataTableMethods {