@duxweb/dvha-core 1.1.4 → 1.1.6

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/cjs/hooks/upload.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("@vueuse/core"),V=require("lodash-es"),c=require("vue"),_=require("./upload/local.cjs");function H(l){l=l||{};const v=c.ref(!1),o=c.ref([]),u=c.ref(-1),d=c.ref(new Map),S=l.driver||_.createLocalUploadDriver(),P=c.computed(()=>{const{onProgress:e,onDataCallback:t,onCancel:a,onComplete:n,maxFileSize:i,maxFileCount:s,accept:r,multiple:f,autoUpload:m,options:M,onSuccess:U,onError:Q,method:R,driver:W,params:X,...O}=l;return O}),A=c.computed(()=>l.method||"POST"),F=c.computed(()=>{const e=o.value.length,t=o.value.reduce((s,r)=>s+(r.filesize||0),0);let a=0,n=0;return o.value.forEach((s,r)=>{r<u.value?a+=s.filesize||0:r===u.value&&(a+=s.progress?.loaded||0)}),t>0&&(n=Math.round(a/t*100)),{index:u.value>=0?u.value+1:0,totalFiles:e,currentFile:o.value[u.value],totalPercent:n,totalLoaded:a,totalSize:t}}),w=e=>{if(e===0)return"0 Bytes";const t=1024,a=["Bytes","KB","MB","GB"],n=Math.floor(Math.log(e)/Math.log(t));return`${Number.parseFloat((e/t**n).toFixed(2))} ${a[n]}`},g=e=>{if(e===0)return"0 B/s";const t=1024,a=["B/s","KB/s","MB/s","GB/s"],n=Math.floor(Math.log(e)/Math.log(t));return`${Number.parseFloat((e/t**n).toFixed(2))} ${a[n]}`},b=()=>V.uniqueId("upload-"),$=async(e,t,a)=>{switch(t){case"file":{if(!(e instanceof File))throw new TypeError('Payload must be a File when type is "file"');return e}case"blob":{if(!(e instanceof Blob))throw new TypeError('Payload must be a Blob when type is "blob"');return new File([e],"blob-file",{type:e.type})}case"base64":{if(typeof e!="string")throw new TypeError('Payload must be a string when type is "base64"');const n=e.includes(",")?e.split(",")[1]:e,i=e.includes(",")?e.split(",")[0].split(":")[1].split(";")[0]:"application/octet-stream",s=atob(n),r=new Uint8Array(s.length);for(let m=0;m<s.length;m++)r[m]=s.charCodeAt(m);const f=new Blob([r],{type:i});return new File([f],"base64-file",{type:i})}case"arrayBuffer":{if(!(e instanceof ArrayBuffer))throw new TypeError('Payload must be ArrayBuffer when type is "arrayBuffer"');const n=new Blob([e]);return new File([n],"array-buffer-file",{type:"application/octet-stream"})}default:throw new Error(`Unsupported upload type: ${t}`)}},x=e=>{if(l.maxFileSize&&e.size>l.maxFileSize)throw new Error(`File size cannot exceed ${w(l.maxFileSize)}`);if(l.maxFileCount&&o.value.length>=l.maxFileCount)throw new Error(`File count cannot exceed ${l.maxFileCount}`)},I=async(e,t,a)=>{const n=await $(e,t);x(n);const i={id:b(),file:n,filename:n.name,filesize:n.size,filetype:n.type,filesizeText:w(n.size),status:"pending",progress:{loaded:0,total:n.size,percent:0,speed:0,speedText:g(0),remainingTime:0,uploadTime:0}};return o.value.push(i),i},h=(e,t)=>{const a=o.value.findIndex(n=>n.id===e);a!==-1&&(o.value[a]={...o.value[a],...t})},T=()=>{o.value.every(t=>t.status!=="uploading")&&l.onComplete?.(o.value)},p=e=>{const t=o.value.find(a=>a.id===e);if(!t||t.status!=="pending"&&t.status!=="uploading")return!1;if(t.status==="uploading"){const a=d.value.get(e);a&&(a.abort(),d.value.delete(e))}return h(e,{status:"cancelled"}),l.onCancel?.(e),T(),!0},k=e=>{e?e.forEach(t=>p(t)):o.value.forEach(t=>p(t.id))},q=async e=>{if(!e.file)throw new Error("File not found");x(e.file);const t=new AbortController;d.value.set(e.id,t);const a=Date.now();return h(e.id,{status:"uploading"}),S.upload(e.file,{...P.value,method:A.value,signal:t.signal,params:l.params,onUploadProgress:n=>{const r=(Date.now()-a)/1e3,f=r>0?n.loaded/r:0,m=(n.total||0)-n.loaded,M=f>0?m/f:0,U={loaded:n.loaded,total:n.total,percent:n.percent||0,speed:Math.round(f),speedText:g(f),uploadTime:Math.round(r),remainingTime:Math.round(M)};h(e.id,{status:"uploading",progress:U}),l.onProgress?.(F.value)}}).then(n=>{if(e.status==="cancelled")throw new Error("Upload cancelled");const i=l.onDataCallback?.(n,e)||n.data,s=Math.round((Date.now()-a)/1e3),r={...e,status:"success",data:n,...i,progress:{...e.progress,loaded:e.filesize||0,percent:100,speed:0,speedText:g(0),uploadTime:s,remainingTime:0}};return h(e.id,r),d.value.delete(e.id),l.onSuccess?.(n),r}).catch(n=>{throw n.message==="canceled"||e.status==="cancelled"?new Error("Upload cancelled"):(h(e.id,{status:"error",error:n.message}),d.value.delete(e.id),n)}).finally(()=>{T()})},z=async()=>{const e=o.value.filter(t=>t.status==="pending");if(e.length===0)return[];v.value=!0;try{const t=[];for(let a=0;a<e.length;a++){const n=e[a],i=o.value.findIndex(r=>r.id===n.id);u.value=i;const s=await q(n);t.push(s)}return t}catch(t){throw l.onError?.({status:t?.status||500,message:t?.message||"upload failed"}),t}finally{v.value=!1,u.value=-1}},y=()=>{o.value.forEach(e=>{p(e.id)}),d.value.clear(),o.value=[],u.value=-1},C=async(e,t="file")=>{try{if(!l.multiple&&e.length>1)throw new Error("Single file mode: only one file can be selected");if(!l.multiple&&o.value.length>0&&y(),l.maxFileCount&&o.value.length+e.length>l.maxFileCount)throw new Error(`Adding ${e.length} files would exceed the maximum limit of ${l.maxFileCount}`);for(const a of e)await I(a,t)}catch(a){throw l.onError?.({status:a?.status||400,message:a?.message||"Failed to add files"}),a}l.autoUpload&&z().catch(a=>{console.warn("Auto upload failed:",a)})},E=e=>{const t=o.value.find(n=>n.id===e);if(t&&t.status==="uploading"){h(e,{status:"cancelled"});const n=d.value.get(e);if(!n)return;n.abort(),d.value.delete(e)}const a=o.value.findIndex(n=>n.id===e);a!==-1&&o.value.splice(a,1)},D=e=>{e?e.forEach(t=>E(t)):o.value.forEach(t=>E(t.id))},{files:G,open:K,reset:B}=j.useFileDialog({accept:l.accept,multiple:l.multiple||!1}),L=e=>({id:b(),...e,filesizeText:e.filesize?w(e.filesize):void 0,status:e.url?"success":"pending",progress:{loaded:0,total:e.filesize||0,percent:e.url?100:0,speed:0,speedText:g(0),remainingTime:0,uploadTime:0}});c.watch(G,async e=>{if(e&&e.length>0){const t=Array.from(e);B(),await C(t,"file").catch(a=>{console.warn("Failed to add selected files:",a)})}});const N=c.computed(()=>o.value.filter(e=>e.status==="success").map(e=>({url:e.url,filename:e.filename,filesize:e.filesize,filetype:e.filetype})));return{isUploading:v,uploadFiles:o,dataFiles:N,progress:F,open:K,trigger:z,resetFiles:B,clearFiles:y,removeFiles:D,addFiles:C,addDataFiles:e=>{!l.multiple&&o.value.length>0&&y();const t=e.map(a=>L(a));o.value.push(...t)},cancelFiles:k}}exports.useUpload=H;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("@vueuse/core"),V=require("lodash-es"),c=require("vue"),_=require("./upload/local.cjs");function H(l){l=l||{};const v=c.ref(!1),o=c.ref([]),u=c.ref(-1),d=c.ref(new Map),S=l.driver||_.createLocalUploadDriver(),P=c.computed(()=>{const{onProgress:e,onDataCallback:t,onCancel:a,onComplete:n,maxFileSize:i,maxFileCount:s,accept:r,multiple:f,autoUpload:m,options:M,onSuccess:U,onError:Q,method:R,driver:W,params:X,...O}=l;return O}),A=c.computed(()=>l.method||"POST"),F=c.computed(()=>{const e=o.value.length,t=o.value.reduce((s,r)=>s+(r.filesize||0),0);let a=0,n=0;return o.value.forEach((s,r)=>{r<u.value?a+=s.filesize||0:r===u.value&&(a+=s.progress?.loaded||0)}),t>0&&(n=Math.round(a/t*100)),{index:u.value>=0?u.value+1:0,totalFiles:e,currentFile:o.value[u.value],totalPercent:n,totalLoaded:a,totalSize:t}}),w=e=>{if(e===0)return"0 Bytes";const t=1024,a=["Bytes","KB","MB","GB"],n=Math.floor(Math.log(e)/Math.log(t));return`${Number.parseFloat((e/t**n).toFixed(2))} ${a[n]}`},g=e=>{if(e===0)return"0 B/s";const t=1024,a=["B/s","KB/s","MB/s","GB/s"],n=Math.floor(Math.log(e)/Math.log(t));return`${Number.parseFloat((e/t**n).toFixed(2))} ${a[n]}`},b=()=>V.uniqueId("upload-"),$=async(e,t,a)=>{switch(t){case"file":{if(!(e instanceof File))throw new TypeError('Payload must be a File when type is "file"');return e}case"blob":{if(!(e instanceof Blob))throw new TypeError('Payload must be a Blob when type is "blob"');return new File([e],"blob-file",{type:e.type})}case"base64":{if(typeof e!="string")throw new TypeError('Payload must be a string when type is "base64"');const n=e.includes(",")?e.split(",")[1]:e,i=e.includes(",")?e.split(",")[0].split(":")[1].split(";")[0]:"application/octet-stream",s=atob(n),r=new Uint8Array(s.length);for(let m=0;m<s.length;m++)r[m]=s.charCodeAt(m);const f=new Blob([r],{type:i});return new File([f],"base64-file",{type:i})}case"arrayBuffer":{if(!(e instanceof ArrayBuffer))throw new TypeError('Payload must be ArrayBuffer when type is "arrayBuffer"');const n=new Blob([e]);return new File([n],"array-buffer-file",{type:"application/octet-stream"})}default:throw new Error(`Unsupported upload type: ${t}`)}},x=e=>{if(l.maxFileSize&&e.size>l.maxFileSize)throw new Error(`File size cannot exceed ${w(l.maxFileSize)}`);if(l.maxFileCount&&o.value.length>l.maxFileCount)throw new Error(`File count cannot exceed ${l.maxFileCount}`)},I=async(e,t,a)=>{const n=await $(e,t);x(n);const i={id:b(),file:n,filename:n.name,filesize:n.size,filetype:n.type,filesizeText:w(n.size),status:"pending",progress:{loaded:0,total:n.size,percent:0,speed:0,speedText:g(0),remainingTime:0,uploadTime:0}};return o.value.push(i),i},h=(e,t)=>{const a=o.value.findIndex(n=>n.id===e);a!==-1&&(o.value[a]={...o.value[a],...t})},T=()=>{o.value.every(t=>t.status!=="uploading")&&l.onComplete?.(o.value)},p=e=>{const t=o.value.find(a=>a.id===e);if(!t||t.status!=="pending"&&t.status!=="uploading")return!1;if(t.status==="uploading"){const a=d.value.get(e);a&&(a.abort(),d.value.delete(e))}return h(e,{status:"cancelled"}),l.onCancel?.(e),T(),!0},k=e=>{e?e.forEach(t=>p(t)):o.value.forEach(t=>p(t.id))},q=async e=>{if(!e.file)throw new Error("File not found");x(e.file);const t=new AbortController;d.value.set(e.id,t);const a=Date.now();return h(e.id,{status:"uploading"}),S.upload(e.file,{...P.value,method:A.value,signal:t.signal,params:l.params,onUploadProgress:n=>{const r=(Date.now()-a)/1e3,f=r>0?n.loaded/r:0,m=(n.total||0)-n.loaded,M=f>0?m/f:0,U={loaded:n.loaded,total:n.total,percent:n.percent||0,speed:Math.round(f),speedText:g(f),uploadTime:Math.round(r),remainingTime:Math.round(M)};h(e.id,{status:"uploading",progress:U}),l.onProgress?.(F.value)}}).then(n=>{if(e.status==="cancelled")throw new Error("Upload cancelled");const i=l.onDataCallback?.(n,e)||n.data,s=Math.round((Date.now()-a)/1e3),r={...e,status:"success",data:n,...i,progress:{...e.progress,loaded:e.filesize||0,percent:100,speed:0,speedText:g(0),uploadTime:s,remainingTime:0}};return h(e.id,r),d.value.delete(e.id),l.onSuccess?.(n),r}).catch(n=>{throw n.message==="canceled"||e.status==="cancelled"?new Error("Upload cancelled"):(h(e.id,{status:"error",error:n.message}),d.value.delete(e.id),n)}).finally(()=>{T()})},z=async()=>{const e=o.value.filter(t=>t.status==="pending");if(e.length===0)return[];v.value=!0;try{const t=[];for(let a=0;a<e.length;a++){const n=e[a],i=o.value.findIndex(r=>r.id===n.id);u.value=i;const s=await q(n);t.push(s)}return t}catch(t){throw l.onError?.({status:t?.status||500,message:t?.message||"upload failed"}),t}finally{v.value=!1,u.value=-1}},y=()=>{o.value.forEach(e=>{p(e.id)}),d.value.clear(),o.value=[],u.value=-1},C=async(e,t="file")=>{try{if(!l.multiple&&e.length>1)throw new Error("Single file mode: only one file can be selected");if(!l.multiple&&o.value.length>0&&y(),l.maxFileCount&&o.value.length+e.length>l.maxFileCount)throw new Error(`Adding ${e.length} files would exceed the maximum limit of ${l.maxFileCount}`);for(const a of e)await I(a,t)}catch(a){throw l.onError?.({status:a?.status||400,message:a?.message||"Failed to add files"}),a}l.autoUpload&&z().catch(a=>{console.warn("Auto upload failed:",a)})},E=e=>{const t=o.value.find(n=>n.id===e);if(t&&t.status==="uploading"){h(e,{status:"cancelled"});const n=d.value.get(e);if(!n)return;n.abort(),d.value.delete(e)}const a=o.value.findIndex(n=>n.id===e);a!==-1&&o.value.splice(a,1)},D=e=>{e?e.forEach(t=>E(t)):o.value.forEach(t=>E(t.id))},{files:G,open:K,reset:B}=j.useFileDialog({accept:l.accept,multiple:l.multiple||!1}),L=e=>({id:b(),...e,filesizeText:e.filesize?w(e.filesize):void 0,status:e.url?"success":"pending",progress:{loaded:0,total:e.filesize||0,percent:e.url?100:0,speed:0,speedText:g(0),remainingTime:0,uploadTime:0}});c.watch(G,async e=>{if(e&&e.length>0){const t=Array.from(e);B(),await C(t,"file").catch(a=>{console.warn("Failed to add selected files:",a)})}});const N=c.computed(()=>o.value.filter(e=>e.status==="success").map(e=>({url:e.url,filename:e.filename,filesize:e.filesize,filetype:e.filetype})));return{isUploading:v,uploadFiles:o,dataFiles:N,progress:F,open:K,trigger:z,resetFiles:B,clearFiles:y,removeFiles:D,addFiles:C,addDataFiles:e=>{!l.multiple&&o.value.length>0&&y();const t=e.map(a=>L(a));o.value.push(...t)},cancelFiles:k}}exports.useUpload=H;

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/esm/hooks/upload.js

@@ -63,7 +63,7 @@ function ne(l) {
   }, T = (e) => {
     if (l.maxFileSize && e.size > l.maxFileSize)
       throw new Error(`File size cannot exceed ${p(l.maxFileSize)}`);
-    if (l.maxFileCount && o.value.length >= l.maxFileCount)
+    if (l.maxFileCount && o.value.length > l.maxFileCount)
       throw new Error(`File count cannot exceed ${l.maxFileCount}`);
   }, k = async (e, t, n) => {
     const a = await I(e, t);

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.6",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {