@duxweb/dvha-core 1.0.17 → 1.0.18

package/dist/cjs/hooks/form.cjs

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

package/dist/cjs/hooks/tree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("vue");require("../utils/bus.cjs");const s=require("../utils/tree.cjs"),v=require("./data.cjs");function m(e){const{data:o,isLoading:l}=v.useList({get path(){return e.path||""},get filters(){return e.params},get providerName(){return e.providerName}}),u=a.computed(()=>{var r,n,i,t,d,c;return e.converTree?s.arrayToTree(((n=o.value)==null?void 0:n.data)||[],{idKey:((i=e.treeOptions)==null?void 0:i.valueKey)||"id",parentKey:((t=e.treeOptions)==null?void 0:t.parentKey)||"parentId",sortKey:((d=e.treeOptions)==null?void 0:d.sortKey)||"sort",childrenKey:((c=e.treeOptions)==null?void 0:c.childrenKey)||"children"}):((r=o.value)==null?void 0:r.data)||[]}),y=a.computed(()=>{var r,n;return s.treeToArr(u.value,((r=e.treeOptions)==null?void 0:r.valueKey)||"id",((n=e.treeOptions)==null?void 0:n.childrenKey)||"children")}),h=a.computed(()=>l.value);return{options:a.computed(()=>{const r=n=>n.map(i=>{const t={...i};return Array.isArray(t.children)&&(t.children.length===0?delete t.children:t.children=r(t.children)),t});return r(u.value||[])}),loading:h,expanded:y}}exports.useTree=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("vue");require("../utils/bus.cjs");const s=require("../utils/tree.cjs"),v=require("./data.cjs");function m(e){const{data:o,isLoading:l}=v.useList({get path(){return e.path||""},get filters(){return e.params},get providerName(){return e.providerName}}),u=a.computed(()=>{var r,n,i,t,d,c;return e.converTree?s.arrayToTree(((n=o.value)==null?void 0:n.data)||[],{idKey:((i=e.treeOptions)==null?void 0:i.valueKey)||"id",parentKey:((t=e.treeOptions)==null?void 0:t.parentKey)||"parent_id",sortKey:((d=e.treeOptions)==null?void 0:d.sortKey)||"sort",childrenKey:((c=e.treeOptions)==null?void 0:c.childrenKey)||"children"}):((r=o.value)==null?void 0:r.data)||[]}),y=a.computed(()=>{var r,n;return s.treeToArr(u.value,((r=e.treeOptions)==null?void 0:r.valueKey)||"id",((n=e.treeOptions)==null?void 0:n.childrenKey)||"children")}),h=a.computed(()=>l.value);return{options:a.computed(()=>{const r=n=>n.map(i=>{const t={...i};return Array.isArray(t.children)&&(t.children.length===0?delete t.children:t.children=r(t.children)),t});return r(u.value||[])}),loading:h,expanded:y}}exports.useTree=m;

package/dist/esm/hooks/form.js

@@ -1,8 +1,8 @@
-import { cloneDeep as c } from "lodash-es";
+import { cloneDeep as d } from "lodash-es";
 import { toRef as N, ref as b, computed as o, watch as E } from "vue";
 import { useOne as L, useCreate as O, useUpdate as S } from "./data.js";
 function w(e) {
-  const i = N(e, "form", {}), n = b(c(e.form || {})), d = o(() => e.action === "edit" || e.id), { data: v, isLoading: l, refetch: f } = L({
+  const i = N(e, "form", {}), n = b(d(e.form || {})), c = o(() => e.action === "edit" || e.id), { data: v, isLoading: l, refetch: r } = L({
     path: e.path || "",
     id: e.id,
     options: {
@@ -12,16 +12,17 @@ function w(e) {
   });
   E([() => e.action, () => e.id], async () => {
     var t;
-    if (!d.value)
+    if (!c.value)
       return;
-    await f();
-    const a = c(((t = v.value) == null ? void 0 : t.data) || {});
+    await r();
+    const a = d(((t = v.value) == null ? void 0 : t.data) || {});
     Object.assign(i.value, a), Object.assign(n.value, a);
   }, {
-    immediate: !0
+    immediate: !0,
+    deep: !0
   });
-  const r = () => {
-    const a = c(n.value);
+  const f = () => {
+    const a = d(n.value);
     Object.assign(i.value, a);
   }, u = O({
     path: e.path ?? "",
@@ -60,9 +61,9 @@ function w(e) {
     form: i,
     initData: n,
     isLoading: h,
-    isEdit: d,
+    isEdit: c,
     onSubmit: g,
-    onReset: r
+    onReset: f
   };
 }
 export {

package/dist/esm/hooks/tree.js

@@ -17,7 +17,7 @@ function T(e) {
     var r, n, i, t, l, s;
     return e.converTree ? m(((n = o.value) == null ? void 0 : n.data) || [], {
       idKey: ((i = e.treeOptions) == null ? void 0 : i.valueKey) || "id",
-      parentKey: ((t = e.treeOptions) == null ? void 0 : t.parentKey) || "parentId",
+      parentKey: ((t = e.treeOptions) == null ? void 0 : t.parentKey) || "parent_id",
       sortKey: ((l = e.treeOptions) == null ? void 0 : l.sortKey) || "sort",
       childrenKey: ((s = e.treeOptions) == null ? void 0 : s.childrenKey) || "children"
     }) : ((r = o.value) == null ? void 0 : r.data) || [];

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

@@ -1,8 +1,9 @@
 import type { MaybeRef } from 'vue';
 import type { IDataProviderError, IDataProviderResponse } from '../types';
+type Key = string | number | undefined;
 export interface IUseFormProps {
     path?: string;
-    id?: string | number;
+    id?: Key;
     form?: MaybeRef<Record<string, any>>;
     onSuccess?: (data: IDataProviderResponse) => void;
     onError?: (error: IDataProviderError) => void;
@@ -13,7 +14,8 @@ export declare function useForm(props: IUseFormProps): {
     form: import("vue").Ref<MaybeRef<Record<string, any>>, MaybeRef<Record<string, any>>>;
     initData: any;
     isLoading: import("vue").ComputedRef<boolean>;
-    isEdit: import("vue").ComputedRef<string | number | true | undefined>;
+    isEdit: import("vue").ComputedRef<true | Key>;
     onSubmit: (data?: Record<string, any>) => void;
     onReset: () => void;
 };
+export {};

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

@@ -5,7 +5,7 @@ export interface UseExtendFormProps extends IUseFormProps {
 }
 export declare function useExtendForm(props: UseExtendFormProps): {
     isLoading: import("vue").ComputedRef<boolean>;
-    isEdit: import("vue").ComputedRef<string | number | true | undefined>;
+    isEdit: import("vue").ComputedRef<true | (string | number | undefined)>;
     form: import("vue").Ref<import("vue").MaybeRef<Record<string, any>>, import("vue").MaybeRef<Record<string, any>>>;
     onSubmit: (data?: Record<string, any>) => void;
     onReset: () => void;

package/package.json

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