@duxweb/dvha-core 1.0.30 → 1.0.31

package/dist/cjs/preset/dataProvider.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("axios"),i=require("lodash-es");function s(t){const h=(a,c)=>{const l=`${i.trim(t.apiUrl,"/")}${c?`/${i.trim(c,"/")}`:""}`;return a?`${l}/${i.trim(a||"","/")}`:l};return{apiUrl:h,getList:(a,c,l)=>{const e={};return a.pagination&&typeof a.pagination=="object"&&(e.page=a.pagination.page,e.pageSize=a.pagination.pageSize),d.get(h(a.path,c?.config.apiBasePath)||"",{params:{...e,...a.filters,...a.sorters},headers:{Authorization:l?.token},...a.meta}).then(r=>t.successCallback?t.successCallback(r):u(r)).catch(r=>{throw t.errorCallback?t.errorCallback(r):n(r)})},create:(a,c,l)=>d.post(h(a.path,c?.config.apiBasePath)||"",a.data,{headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),update:(a,c,l)=>d.put(h(a.id?`${a.path}/${a.id}`:a.path,c?.config.apiBasePath)||"",a.data,{headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),deleteOne:(a,c,l)=>d.delete(h(a.id?`${a.path}/${a.id}`:a.path,c?.config.apiBasePath)||"",{headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),getOne:(a,c,l)=>d.get(h(a.id?`${a.path}/${a.id}`:a.path,c?.config.apiBasePath)||"",{headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),getMany:(a,c,l)=>d.get(h(a.path,c?.config.apiBasePath)||"",{params:{ids:a.ids},headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),createMany:(a,c,l)=>d.post(h(a.path,c?.config.apiBasePath)||"",a.data,{headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),updateMany:(a,c,l)=>d.put(h(a.path,c?.config.apiBasePath)||"",{ids:a.ids,data:a.data},{headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),deleteMany:(a,c,l)=>d.delete(h(a.path,c?.config.apiBasePath)||"",{params:{ids:a.ids},headers:{Authorization:l?.token},...a.meta}).then(e=>t.successCallback?t.successCallback(e):u(e)).catch(e=>{throw t.errorCallback?t.errorCallback(e):n(e)}),custom:(a,c,l)=>{let e={...a.query};return a.sorters&&typeof a.sorters=="object"&&(e={...e,...a.sorters}),a.filters&&typeof a.filters=="object"&&(e={...e,...a.filters}),d.request({url:h(a.path,c?.config.apiBasePath)||"",method:a.method||"GET",data:a.payload,params:e,signal:a.signal,headers:{Authorization:l?.token,...a.headers},onUploadProgress:r=>{const k=Math.round(r.loaded*100/(r.total||1));a.onUploadProgress?.({loaded:r.loaded,total:r.total,percent:k})},onDownloadProgress:r=>{const k=Math.round(r.loaded*100/(r.total||1));a.onDownloadProgress?.({loaded:r.loaded,total:r.total,percent:k})},...a.meta}).then(r=>t.successCallback?t.successCallback(r):u(r)).catch(r=>{throw t.errorCallback?t.errorCallback(r):n(r)})},getTotal:a=>t.getTotal?t.getTotal(a):a.meta?.total||0}}function u(t){return{message:t.data?.message,data:t.data?.data,meta:t.data?.meta,raw:t.data}}function n(t){return{message:t.response?.data?.message||t?.message,data:t.response?.data?.data,meta:t.response?.data?.meta,status:t.response?.data?.code||t.response?.status||500,raw:t.response?.data}}exports.simpleDataProvider=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("axios"),f=require("lodash-es");function b(e){return Object.values(e).some(l=>l instanceof File?!0:Array.isArray(l)?l.some(a=>a instanceof File):l&&typeof l=="object"?b(l):!1)}function C(e){const l=new FormData,a=(d,r="")=>{Object.entries(d).forEach(([t,c])=>{const i=r?`${r}[${t}]`:t;c instanceof File?l.append(i,c):Array.isArray(c)?c.forEach((s,k)=>{s instanceof File?l.append(`${i}[${k}]`,s):s!=null&&l.append(`${i}[${k}]`,String(s))}):c&&typeof c=="object"?a(c,i):c!=null&&l.append(i,String(c))})};return a(e),l}function m(e){const l=(a,d)=>{const r=`${f.trim(e.apiUrl,"/")}${d?`/${f.trim(d,"/")}`:""}`;return a?`${r}/${f.trim(a||"","/")}`:r};return{apiUrl:l,getList:(a,d,r)=>{const t={};return a.pagination&&typeof a.pagination=="object"&&(t.page=a.pagination.page,t.pageSize=a.pagination.pageSize),n.get(l(a.path,d?.config.apiBasePath)||"",{params:{...t,...a.filters,...a.sorters},headers:{Authorization:r?.token},...a.meta}).then(c=>e.successCallback?e.successCallback(c):h(c)).catch(c=>{throw e.errorCallback?e.errorCallback(c):u(c)})},create:(a,d,r)=>{let t=a.data;return a.data&&typeof a.data=="object"&&!Array.isArray(a.data)&&!(a.data instanceof FormData)&&b(a.data)&&(t=C(a.data)),n.post(l(a.path,d?.config.apiBasePath)||"",t,{headers:{Authorization:r?.token},...a.meta}).then(c=>e.successCallback?e.successCallback(c):h(c)).catch(c=>{throw e.errorCallback?e.errorCallback(c):u(c)})},update:(a,d,r)=>{let t=a.data;return a.data&&typeof a.data=="object"&&!Array.isArray(a.data)&&!(a.data instanceof FormData)&&b(a.data)&&(t=C(a.data)),n.put(l(a.id?`${a.path}/${a.id}`:a.path,d?.config.apiBasePath)||"",t,{headers:{Authorization:r?.token},...a.meta}).then(c=>e.successCallback?e.successCallback(c):h(c)).catch(c=>{throw e.errorCallback?e.errorCallback(c):u(c)})},deleteOne:(a,d,r)=>n.delete(l(a.id?`${a.path}/${a.id}`:a.path,d?.config.apiBasePath)||"",{headers:{Authorization:r?.token},...a.meta}).then(t=>e.successCallback?e.successCallback(t):h(t)).catch(t=>{throw e.errorCallback?e.errorCallback(t):u(t)}),getOne:(a,d,r)=>n.get(l(a.id?`${a.path}/${a.id}`:a.path,d?.config.apiBasePath)||"",{headers:{Authorization:r?.token},...a.meta}).then(t=>e.successCallback?e.successCallback(t):h(t)).catch(t=>{throw e.errorCallback?e.errorCallback(t):u(t)}),getMany:(a,d,r)=>n.get(l(a.path,d?.config.apiBasePath)||"",{params:{ids:a.ids},headers:{Authorization:r?.token},...a.meta}).then(t=>e.successCallback?e.successCallback(t):h(t)).catch(t=>{throw e.errorCallback?e.errorCallback(t):u(t)}),createMany:(a,d,r)=>n.post(l(a.path,d?.config.apiBasePath)||"",a.data,{headers:{Authorization:r?.token},...a.meta}).then(t=>e.successCallback?e.successCallback(t):h(t)).catch(t=>{throw e.errorCallback?e.errorCallback(t):u(t)}),updateMany:(a,d,r)=>n.put(l(a.path,d?.config.apiBasePath)||"",{ids:a.ids,data:a.data},{headers:{Authorization:r?.token},...a.meta}).then(t=>e.successCallback?e.successCallback(t):h(t)).catch(t=>{throw e.errorCallback?e.errorCallback(t):u(t)}),deleteMany:(a,d,r)=>n.delete(l(a.path,d?.config.apiBasePath)||"",{params:{ids:a.ids},headers:{Authorization:r?.token},...a.meta}).then(t=>e.successCallback?e.successCallback(t):h(t)).catch(t=>{throw e.errorCallback?e.errorCallback(t):u(t)}),custom:(a,d,r)=>{let t={...a.query};return a.sorters&&typeof a.sorters=="object"&&(t={...t,...a.sorters}),a.filters&&typeof a.filters=="object"&&(t={...t,...a.filters}),n.request({url:l(a.path,d?.config.apiBasePath)||"",method:a.method||"GET",data:a.payload,params:t,signal:a.signal,headers:{Authorization:r?.token,...a.headers},onUploadProgress:c=>{const i=Math.round(c.loaded*100/(c.total||1));a.onUploadProgress?.({loaded:c.loaded,total:c.total,percent:i})},onDownloadProgress:c=>{const i=Math.round(c.loaded*100/(c.total||1));a.onDownloadProgress?.({loaded:c.loaded,total:c.total,percent:i})},...a.meta}).then(c=>e.successCallback?e.successCallback(c):h(c)).catch(c=>{throw e.errorCallback?e.errorCallback(c):u(c)})},getTotal:a=>e.getTotal?e.getTotal(a):a.meta?.total||0}}function h(e){return{message:e.data?.message,data:e.data?.data,meta:e.data?.meta,raw:e.data}}function u(e){return{message:e.response?.data?.message||e?.message,data:e.response?.data?.data,meta:e.response?.data?.meta,status:e.response?.data?.code||e.response?.status||500,raw:e.response?.data}}exports.simpleDataProvider=m;

package/dist/esm/preset/dataProvider.js

@@ -1,162 +1,182 @@
-import d from "axios";
-import { trim as b } from "lodash-es";
-function i(t) {
-  const h = (a, c) => {
-    const l = `${b(t.apiUrl, "/")}${c ? `/${b(c, "/")}` : ""}`;
-    return a ? `${l}/${b(a || "", "/")}` : l;
+import n from "axios";
+import { trim as s } from "lodash-es";
+function b(e) {
+  return Object.values(e).some((l) => l instanceof File ? !0 : Array.isArray(l) ? l.some((a) => a instanceof File) : l && typeof l == "object" ? b(l) : !1);
+}
+function C(e) {
+  const l = new FormData(), a = (d, r = "") => {
+    Object.entries(d).forEach(([t, c]) => {
+      const f = r ? `${r}[${t}]` : t;
+      c instanceof File ? l.append(f, c) : Array.isArray(c) ? c.forEach((i, k) => {
+        i instanceof File ? l.append(`${f}[${k}]`, i) : i != null && l.append(`${f}[${k}]`, String(i));
+      }) : c && typeof c == "object" ? a(c, f) : c != null && l.append(f, String(c));
+    });
+  };
+  return a(e), l;
+}
+function y(e) {
+  const l = (a, d) => {
+    const r = `${s(e.apiUrl, "/")}${d ? `/${s(d, "/")}` : ""}`;
+    return a ? `${r}/${s(a || "", "/")}` : r;
   };
   return {
-    apiUrl: h,
-    getList: (a, c, l) => {
-      const e = {};
-      return a.pagination && typeof a.pagination == "object" && (e.page = a.pagination.page, e.pageSize = a.pagination.pageSize), d.get(h(a.path, c?.config.apiBasePath) || "", {
+    apiUrl: l,
+    getList: (a, d, r) => {
+      const t = {};
+      return a.pagination && typeof a.pagination == "object" && (t.page = a.pagination.page, t.pageSize = a.pagination.pageSize), n.get(l(a.path, d?.config.apiBasePath) || "", {
         params: {
-          ...e,
+          ...t,
           ...a.filters,
           ...a.sorters
         },
         headers: {
-          Authorization: l?.token
+          Authorization: r?.token
         },
         ...a.meta
-      }).then((r) => t.successCallback ? t.successCallback(r) : u(r)).catch((r) => {
-        throw t.errorCallback ? t.errorCallback(r) : n(r);
+      }).then((c) => e.successCallback ? e.successCallback(c) : h(c)).catch((c) => {
+        throw e.errorCallback ? e.errorCallback(c) : u(c);
       });
     },
-    create: (a, c, l) => d.post(h(a.path, c?.config.apiBasePath) || "", a.data, {
-      headers: {
-        Authorization: l?.token
-      },
-      ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
-    }),
-    update: (a, c, l) => d.put(h(a.id ? `${a.path}/${a.id}` : a.path, c?.config.apiBasePath) || "", a.data, {
-      headers: {
-        Authorization: l?.token
-      },
-      ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
-    }),
-    deleteOne: (a, c, l) => d.delete(h(a.id ? `${a.path}/${a.id}` : a.path, c?.config.apiBasePath) || "", {
+    create: (a, d, r) => {
+      let t = a.data;
+      return a.data && typeof a.data == "object" && !Array.isArray(a.data) && !(a.data instanceof FormData) && b(a.data) && (t = C(a.data)), n.post(l(a.path, d?.config.apiBasePath) || "", t, {
+        headers: {
+          Authorization: r?.token
+        },
+        ...a.meta
+      }).then((c) => e.successCallback ? e.successCallback(c) : h(c)).catch((c) => {
+        throw e.errorCallback ? e.errorCallback(c) : u(c);
+      });
+    },
+    update: (a, d, r) => {
+      let t = a.data;
+      return a.data && typeof a.data == "object" && !Array.isArray(a.data) && !(a.data instanceof FormData) && b(a.data) && (t = C(a.data)), n.put(l(a.id ? `${a.path}/${a.id}` : a.path, d?.config.apiBasePath) || "", t, {
+        headers: {
+          Authorization: r?.token
+        },
+        ...a.meta
+      }).then((c) => e.successCallback ? e.successCallback(c) : h(c)).catch((c) => {
+        throw e.errorCallback ? e.errorCallback(c) : u(c);
+      });
+    },
+    deleteOne: (a, d, r) => n.delete(l(a.id ? `${a.path}/${a.id}` : a.path, d?.config.apiBasePath) || "", {
       headers: {
-        Authorization: l?.token
+        Authorization: r?.token
       },
       ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
+    }).then((t) => e.successCallback ? e.successCallback(t) : h(t)).catch((t) => {
+      throw e.errorCallback ? e.errorCallback(t) : u(t);
     }),
-    getOne: (a, c, l) => d.get(h(a.id ? `${a.path}/${a.id}` : a.path, c?.config.apiBasePath) || "", {
+    getOne: (a, d, r) => n.get(l(a.id ? `${a.path}/${a.id}` : a.path, d?.config.apiBasePath) || "", {
       headers: {
-        Authorization: l?.token
+        Authorization: r?.token
       },
       ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
+    }).then((t) => e.successCallback ? e.successCallback(t) : h(t)).catch((t) => {
+      throw e.errorCallback ? e.errorCallback(t) : u(t);
     }),
-    getMany: (a, c, l) => d.get(h(a.path, c?.config.apiBasePath) || "", {
+    getMany: (a, d, r) => n.get(l(a.path, d?.config.apiBasePath) || "", {
       params: {
         ids: a.ids
       },
       headers: {
-        Authorization: l?.token
+        Authorization: r?.token
       },
       ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
+    }).then((t) => e.successCallback ? e.successCallback(t) : h(t)).catch((t) => {
+      throw e.errorCallback ? e.errorCallback(t) : u(t);
     }),
-    createMany: (a, c, l) => d.post(h(a.path, c?.config.apiBasePath) || "", a.data, {
+    createMany: (a, d, r) => n.post(l(a.path, d?.config.apiBasePath) || "", a.data, {
       headers: {
-        Authorization: l?.token
+        Authorization: r?.token
       },
       ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
+    }).then((t) => e.successCallback ? e.successCallback(t) : h(t)).catch((t) => {
+      throw e.errorCallback ? e.errorCallback(t) : u(t);
     }),
-    updateMany: (a, c, l) => d.put(h(a.path, c?.config.apiBasePath) || "", {
+    updateMany: (a, d, r) => n.put(l(a.path, d?.config.apiBasePath) || "", {
       ids: a.ids,
       data: a.data
     }, {
       headers: {
-        Authorization: l?.token
+        Authorization: r?.token
       },
       ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
+    }).then((t) => e.successCallback ? e.successCallback(t) : h(t)).catch((t) => {
+      throw e.errorCallback ? e.errorCallback(t) : u(t);
     }),
-    deleteMany: (a, c, l) => d.delete(h(a.path, c?.config.apiBasePath) || "", {
+    deleteMany: (a, d, r) => n.delete(l(a.path, d?.config.apiBasePath) || "", {
       params: {
         ids: a.ids
       },
       headers: {
-        Authorization: l?.token
+        Authorization: r?.token
       },
       ...a.meta
-    }).then((e) => t.successCallback ? t.successCallback(e) : u(e)).catch((e) => {
-      throw t.errorCallback ? t.errorCallback(e) : n(e);
+    }).then((t) => e.successCallback ? e.successCallback(t) : h(t)).catch((t) => {
+      throw e.errorCallback ? e.errorCallback(t) : u(t);
     }),
-    custom: (a, c, l) => {
-      let e = {
+    custom: (a, d, r) => {
+      let t = {
         ...a.query
       };
-      return a.sorters && typeof a.sorters == "object" && (e = {
-        ...e,
+      return a.sorters && typeof a.sorters == "object" && (t = {
+        ...t,
         ...a.sorters
-      }), a.filters && typeof a.filters == "object" && (e = {
-        ...e,
+      }), a.filters && typeof a.filters == "object" && (t = {
+        ...t,
         ...a.filters
-      }), d.request({
-        url: h(a.path, c?.config.apiBasePath) || "",
+      }), n.request({
+        url: l(a.path, d?.config.apiBasePath) || "",
         method: a.method || "GET",
         data: a.payload,
-        params: e,
+        params: t,
         signal: a.signal,
         headers: {
-          Authorization: l?.token,
+          Authorization: r?.token,
           ...a.headers
         },
-        onUploadProgress: (r) => {
-          const k = Math.round(r.loaded * 100 / (r.total || 1));
+        onUploadProgress: (c) => {
+          const f = Math.round(c.loaded * 100 / (c.total || 1));
           a.onUploadProgress?.({
-            loaded: r.loaded,
-            total: r.total,
-            percent: k
+            loaded: c.loaded,
+            total: c.total,
+            percent: f
           });
         },
-        onDownloadProgress: (r) => {
-          const k = Math.round(r.loaded * 100 / (r.total || 1));
+        onDownloadProgress: (c) => {
+          const f = Math.round(c.loaded * 100 / (c.total || 1));
           a.onDownloadProgress?.({
-            loaded: r.loaded,
-            total: r.total,
-            percent: k
+            loaded: c.loaded,
+            total: c.total,
+            percent: f
           });
         },
         ...a.meta
-      }).then((r) => t.successCallback ? t.successCallback(r) : u(r)).catch((r) => {
-        throw t.errorCallback ? t.errorCallback(r) : n(r);
+      }).then((c) => e.successCallback ? e.successCallback(c) : h(c)).catch((c) => {
+        throw e.errorCallback ? e.errorCallback(c) : u(c);
       });
     },
-    getTotal: (a) => t.getTotal ? t.getTotal(a) : a.meta?.total || 0
+    getTotal: (a) => e.getTotal ? e.getTotal(a) : a.meta?.total || 0
   };
 }
-function u(t) {
+function h(e) {
   return {
-    message: t.data?.message,
-    data: t.data?.data,
-    meta: t.data?.meta,
-    raw: t.data
+    message: e.data?.message,
+    data: e.data?.data,
+    meta: e.data?.meta,
+    raw: e.data
   };
 }
-function n(t) {
+function u(e) {
   return {
-    message: t.response?.data?.message || t?.message,
-    data: t.response?.data?.data,
-    meta: t.response?.data?.meta,
-    status: t.response?.data?.code || t.response?.status || 500,
-    raw: t.response?.data
+    message: e.response?.data?.message || e?.message,
+    data: e.response?.data?.data,
+    meta: e.response?.data?.meta,
+    status: e.response?.data?.code || e.response?.status || 500,
+    raw: e.response?.data
   };
 }
 export {
-  i as simpleDataProvider
+  y as simpleDataProvider
 };

package/package.json

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