@chewel611/naive-ui-plus 0.0.29 → 0.0.31

package/es/table/PTable.vue.js

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

package/es/table/index.d.ts

@@ -4,16 +4,10 @@ export declare const PTablePlugin: {
         refreshData: () => Promise<void>;
         getData: <T>() => T[];
         getSelectedRows: <T>() => T[];
-        closeModal: () => void;
         resetPage: () => void;
         getSelectedRow: <T>() => T;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
         idField: string;
-        item: any;
-        modalWidth: number;
-        hiddenAdd: boolean;
-        hiddenEdit: boolean;
-        hiddenDelete: boolean;
     }, false, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {
         $table: unknown;
     }, any, import('vue').ComponentProvideOptions, {
@@ -27,16 +21,10 @@ export declare const PTablePlugin: {
         refreshData: () => Promise<void>;
         getData: <T>() => T[];
         getSelectedRows: <T>() => T[];
-        closeModal: () => void;
         resetPage: () => void;
         getSelectedRow: <T>() => T;
     }, {}, {}, {}, {
         idField: string;
-        item: any;
-        modalWidth: number;
-        hiddenAdd: boolean;
-        hiddenEdit: boolean;
-        hiddenDelete: boolean;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -45,20 +33,12 @@ export declare const PTablePlugin: {
     refreshData: () => Promise<void>;
     getData: <T>() => T[];
     getSelectedRows: <T>() => T[];
-    closeModal: () => void;
     resetPage: () => void;
     getSelectedRow: <T>() => T;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
     idField: string;
-    item: any;
-    modalWidth: number;
-    hiddenAdd: boolean;
-    hiddenEdit: boolean;
-    hiddenDelete: boolean;
 }, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & (new () => {
     $slots: {
         toolbar?(_: {}): any;
-        addModal?(_: {}): any;
-        editModal?(_: {}): any;
     };
 }) & import('vue').Plugin;

package/es/table/typing.d.ts

@@ -1,8 +1,8 @@
-import { VNodeChild } from 'vue';
+import { VNodeChild, Component } from 'vue';
 export type DataTableColumnActionDefine = {
     name: string;
     key: string;
-    icon?: string;
+    icon?: Component;
     action: (row: any) => void;
 };
 export type DataTableColumnDefine = {
@@ -17,27 +17,19 @@ export type DataTableColumnDefine = {
 export type DataTableProps = {
     title?: string;
     idField?: string;
-    item?: any;
     columns: DataTableColumnDefine[];
-    modalWidth?: number;
-    hiddenAdd?: boolean;
-    hiddenEdit?: boolean;
-    hiddenDelete?: boolean;
     onLoad: (page: number, pageSize: number) => Promise<{
         data: any[];
         total: number;
     }>;
-    onGet?: (id: string | number) => Promise<any>;
-    onOpenModal?: (item?: any) => void;
-    onCloseModal?: (item?: any) => void;
-    onSave?: (id?: string | number, row?: any) => Promise<boolean> | boolean;
-    onDelete?: (rows: any[]) => Promise<boolean> | boolean;
+    onDelete?: (rows: any[]) => Promise<boolean>;
+    onAdd?: () => Promise<void>;
+    onEdit?: (row: any) => Promise<void>;
 };
 export type DataTableMethods = {
     refreshData: () => Promise<void>;
     getData: <T>() => T[];
     getSelectedRows: <T>() => T[];
-    closeModal: () => void;
     resetPage: () => void;
     getSelectedRow: <T>() => T;
 };

package/lib/modal/PModal.d.ts

@@ -2113,8 +2113,10 @@ declare const __VLS_component: import('vue').DefineComponent<ModalProps, {
 }>, {
     width: number;
     height: number;
-    closable: boolean;
     saveBtnText: string;
+    cancelBtnText: string;
+    hideCancelBtn: boolean;
+    hideSaveBtn: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     $modal: import('vue').CreateComponentPublicInstanceWithMixins<Readonly<import('vue').ExtractPropTypes<{
         draggable: import('vue').PropType<boolean | import('naive-ui/es/modal/src/interface').ModalDraggableOptions>;