@duxweb/dvha-core 1.1.4 → 1.1.5

package/dist/cjs/hooks/form.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("lodash-es"),n=require("vue"),s=require("./data.cjs");function b(a){const t=n.toRef(a,"form",{}),o=n.toRef(a,"id",void 0),i=n.ref(r.cloneDeep(t.value||{})),l=n.ref(r.cloneDeep(t.value||{})),u=n.computed(()=>a.action==="edit"||!!o.value),{data:m,isLoading:g,refetch:f}=s.useOne({get path(){return a.path||""},get id(){return o.value},options:{enabled:!1},providerName:a.providerName}),c=()=>{let e={};u.value?e=r.cloneDeep(i.value):e=r.cloneDeep(l.value),Object.assign(t.value,e)};n.watch([o,u],async()=>{if(!u.value){c();return}await f();const e=r.cloneDeep(m.value?.data||{});Object.assign(t.value,e),Object.assign(i.value,e)},{immediate:!0,deep:!0});const d=s.useCreate({path:a.path??"",data:t.value,onSuccess:e=>{c(),a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),v=s.useUpdate({get path(){return a.path??""},get id(){return o.value},data:t.value,onSuccess:e=>{a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),D=e=>{u.value?v.mutate({id:o.value,data:e||t.value}):d.mutate({data:e||t.value})},h=n.computed(()=>g.value||d.isLoading.value||v.isLoading.value);return{form:t,initData:u.value?i.value:l.value,isLoading:h,isEdit:u,onSubmit:D,onReset:c}}exports.useForm=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("lodash-es"),u=require("vue"),l=require("./data.cjs");function R(a){const t=u.toRef(a,"form",{}),o=u.toRef(a,"id",void 0),i=u.toRef(a,"meta",{}),v=u.toRef(a,"params",{}),c=u.ref(r.cloneDeep(t.value||{})),d=u.ref(r.cloneDeep(t.value||{})),n=u.computed(()=>a.action==="edit"||!!o.value),{data:m,isLoading:b,refetch:g}=l.useOne({get path(){return a.path||""},get id(){return o.value},get meta(){return{params:{...v.value},...i.value}},options:{enabled:!1},providerName:a.providerName}),s=()=>{let e={};n.value?e=r.cloneDeep(c.value):e=r.cloneDeep(d.value),Object.assign(t.value,e)};u.watch([o,n],async()=>{if(!n.value){s();return}await g();const e=r.cloneDeep(m.value?.data||{});Object.assign(t.value,e),Object.assign(c.value,e)},{immediate:!0,deep:!0}),u.watch([v,i],async()=>{if(!n.value)return;await g();const e=r.cloneDeep(m.value?.data||{});Object.assign(t.value,e),Object.assign(c.value,e)},{deep:!0});const f=l.useCreate({path:a.path??"",data:t.value,get meta(){return i.value||{}},onSuccess:e=>{s(),a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),D=l.useUpdate({get path(){return a.path??""},get id(){return o.value},data:t.value,get meta(){return i.value||{}},onSuccess:e=>{a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),h=e=>{n.value?D.mutate({id:o.value,data:e||t.value}):f.mutate({data:e||t.value})},O=u.computed(()=>b.value||f.isLoading.value||D.isLoading.value);return{form:t,initData:n.value?c.value:d.value,isLoading:O,isEdit:n,onSubmit:h,onReset:s}}exports.useForm=R;

package/dist/cjs/hooks/formExtend.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("vue"),c=require("./form.cjs"),f=require("./formValidate.cjs");function l(e){const o=s.toRef(e,"form",{}),{validate:i,reset:u}=f.useValidateForm({data:o,rules:e.rules}),a=s.computed(()=>{const{form:n,...r}=e;return{...r}}),t=c.useForm({...a.value,form:o.value}),m=n=>{i().then(r=>{if(!r.valid){e.onError?.({message:"表单验证失败"});return}t.onSubmit(n)})},d=()=>{t.onReset(),u()};return{isLoading:t.isLoading,isEdit:t.isEdit,form:o,onSubmit:m,onReset:d}}exports.useExtendForm=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("vue"),d=require("./form.cjs"),c=require("./formValidate.cjs");function l(e){const o=m.toRef(e,"form",{}),{validate:r,reset:n}=c.useValidateForm({data:o,rules:e.rules}),t=d.useForm({id:e.id,path:e.path,form:o,action:e.action,onSuccess:e.onSuccess,onError:e.onError,providerName:e.providerName,meta:e.meta,params:e.params}),i=s=>{r().then(u=>{if(!u.valid){e.onError?.({message:"表单验证失败"});return}t.onSubmit(s)})},a=()=>{t.onReset(),n()};return{isLoading:t.isLoading,isEdit:t.isEdit,form:o,onSubmit:i,onReset:a}}exports.useExtendForm=l;

package/dist/esm/hooks/form.js

@@ -1,52 +1,72 @@
-import { cloneDeep as i } from "lodash-es";
-import { toRef as v, ref as l, computed as m, watch as b } from "vue";
-import { useOne as E, useCreate as L, useUpdate as O } from "./data.js";
-function w(a) {
-  const t = v(a, "form", {}), u = v(a, "id", void 0), o = l(i(t.value || {})), s = l(i(t.value || {})), n = m(() => a.action === "edit" || !!u.value), { data: f, isLoading: g, refetch: h } = E({
+import { cloneDeep as n } from "lodash-es";
+import { toRef as s, ref as h, computed as b, watch as O } from "vue";
+import { useOne as E, useCreate as L, useUpdate as S } from "./data.js";
+function x(a) {
+  const t = s(a, "form", {}), r = s(a, "id", void 0), i = s(a, "meta", {}), l = s(a, "params", {}), o = h(n(t.value || {})), c = h(n(t.value || {})), u = b(() => a.action === "edit" || !!r.value), { data: d, isLoading: D, refetch: m } = E({
     get path() {
       return a.path || "";
     },
     get id() {
-      return u.value;
+      return r.value;
+    },
+    get meta() {
+      return {
+        params: {
+          ...l.value
+        },
+        ...i.value
+      };
     },
     options: {
       enabled: !1
     },
     providerName: a.providerName
-  }), r = () => {
+  }), v = () => {
     let e = {};
-    n.value ? e = i(o.value) : e = i(s.value), Object.assign(t.value, e);
+    u.value ? e = n(o.value) : e = n(c.value), Object.assign(t.value, e);
   };
-  b([u, n], async () => {
-    if (!n.value) {
-      r();
+  O([r, u], async () => {
+    if (!u.value) {
+      v();
       return;
     }
-    await h();
-    const e = i(f.value?.data || {});
+    await m();
+    const e = n(d.value?.data || {});
     Object.assign(t.value, e), Object.assign(o.value, e);
   }, {
     immediate: !0,
     deep: !0
-  });
-  const c = L({
+  }), O([l, i], async () => {
+    if (!u.value)
+      return;
+    await m();
+    const e = n(d.value?.data || {});
+    Object.assign(t.value, e), Object.assign(o.value, e);
+  }, { deep: !0 });
+  const g = L({
     path: a.path ?? "",
     data: t.value,
+    get meta() {
+      return i.value || {};
+    },
     onSuccess: (e) => {
-      r(), a.onSuccess?.(e);
+      v(), a.onSuccess?.(e);
     },
     onError: (e) => {
       a.onError?.(e);
     },
     providerName: a.providerName
-  }), d = O({
+  }), f = S({
     get path() {
       return a.path ?? "";
     },
     get id() {
-      return u.value;
+      return r.value;
     },
     data: t.value,
+    get meta() {
+      return i.value || {};
+    },
     onSuccess: (e) => {
       a.onSuccess?.(e);
     },
@@ -54,23 +74,23 @@ function w(a) {
       a.onError?.(e);
     },
     providerName: a.providerName
-  }), D = (e) => {
-    n.value ? d.mutate({
-      id: u.value,
+  }), N = (e) => {
+    u.value ? f.mutate({
+      id: r.value,
       data: e || t.value
-    }) : c.mutate({
+    }) : g.mutate({
       data: e || t.value
     });
-  }, N = m(() => g.value || c.isLoading.value || d.isLoading.value);
+  }, j = b(() => D.value || g.isLoading.value || f.isLoading.value);
   return {
     form: t,
-    initData: n.value ? o.value : s.value,
-    isLoading: N,
-    isEdit: n,
-    onSubmit: D,
-    onReset: r
+    initData: u.value ? o.value : c.value,
+    isLoading: j,
+    isEdit: u,
+    onSubmit: N,
+    onReset: v
   };
 }
 export {
-  w as useForm
+  x as useForm
 };

package/dist/esm/hooks/formExtend.js

@@ -1,39 +1,41 @@
-import { toRef as f, computed as d } from "vue";
-import { useForm as c } from "./form.js";
-import { useValidateForm as l } from "./formValidate.js";
-function g(o) {
-  const e = f(o, "form", {}), { validate: s, reset: i } = l({
-    data: e,
-    rules: o.rules
-  }), m = d(() => {
-    const { form: n, ...r } = o;
-    return {
-      ...r
-    };
-  }), t = c({
-    ...m.value,
-    form: e.value
-  }), u = (n) => {
-    s().then((r) => {
-      if (!r.valid) {
-        o.onError?.({
+import { toRef as d } from "vue";
+import { useForm as u } from "./form.js";
+import { useValidateForm as c } from "./formValidate.js";
+function v(t) {
+  const o = d(t, "form", {}), { validate: i, reset: n } = c({
+    data: o,
+    rules: t.rules
+  }), e = u({
+    id: t.id,
+    path: t.path,
+    form: o,
+    action: t.action,
+    onSuccess: t.onSuccess,
+    onError: t.onError,
+    providerName: t.providerName,
+    meta: t.meta,
+    params: t.params
+  }), r = (m) => {
+    i().then((s) => {
+      if (!s.valid) {
+        t.onError?.({
           message: "表单验证失败"
         });
         return;
       }
-      t.onSubmit(n);
+      e.onSubmit(m);
     });
   }, a = () => {
-    t.onReset(), i();
+    e.onReset(), n();
   };
   return {
-    isLoading: t.isLoading,
-    isEdit: t.isEdit,
-    form: e,
-    onSubmit: u,
+    isLoading: e.isLoading,
+    isEdit: e.isEdit,
+    form: o,
+    onSubmit: r,
     onReset: a
   };
 }
 export {
-  g as useExtendForm
+  v as useExtendForm
 };

package/dist/types/hooks/form.d.ts

@@ -9,6 +9,8 @@ export interface IUseFormProps {
     onError?: (error: IDataProviderError) => void;
     action?: 'create' | 'edit';
     providerName?: string;
+    meta?: MaybeRef<Record<string, any>>;
+    params?: MaybeRef<Record<string, any>>;
 }
 export declare function useForm(props: IUseFormProps): {
     form: import("vue").Ref<MaybeRef<Record<string, any>>, MaybeRef<Record<string, any>>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {