@aplus-frontend/ui 0.4.35 → 0.4.36

package/es/src/ap-form/hooks/use-watch.d.ts

@@ -2,5 +2,8 @@ import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 type ApFormIns<T> = ApFormExpose<T>;
-declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined, ValueType | undefined>;
+type WatchOptions<ValueType> = {
+    initialValue: ValueType;
+};
+export declare function useWatch<ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, formOrOptions?: Ref<ApFormIns<StoreType> | undefined> | WatchOptions<ValueType>, options?: WatchOptions<ValueType>): Ref<ValueType | undefined, ValueType | undefined>;
 export default useWatch;

package/es/src/ap-form/hooks/use-watch.mjs

@@ -1,40 +1,42 @@
-import { useInjectForm as V } from "../context.mjs";
-import { ref as N, watchEffect as A, unref as l, watch as M } from "vue";
-import { isArray as R } from "lodash-unified";
-import { INTERNAL_FORM_INSTANCE_MARK as y } from "../constant.mjs";
-function w(t, e) {
-  return R(e) ? e.reduce((n, u) => n == null ? void 0 : n[u], t) : t == null ? void 0 : t[e];
+import { useInjectForm as M } from "../context.mjs";
+import { ref as R, watchEffect as d, unref as s, watch as y } from "vue";
+import { isArray as E } from "lodash-unified";
+import { INTERNAL_FORM_INSTANCE_MARK as _ } from "../constant.mjs";
+function N(e, t) {
+  return E(t) ? t.reduce((n, l) => n == null ? void 0 : n[l], e) : e == null ? void 0 : e[t];
 }
-function I(t) {
+function V(e) {
   try {
-    return JSON.stringify(t);
+    return JSON.stringify(e);
   } catch {
     return Math.random();
   }
 }
-const F = (t, e) => {
-  const { internalInstance: n, model: u } = V(), i = N();
-  let a = "", o = !0;
-  return A((s) => {
-    var f;
-    const r = ((f = e == null ? void 0 : e.value) == null ? void 0 : f.getInternalInstance(y)) || n;
-    if (!r) {
-      o = !1;
+function W(e, t, n) {
+  const { internalInstance: l, model: v } = M(), g = (n == null ? void 0 : n.initialValue) || (t == null ? void 0 : t.initialValue) || void 0, r = R(g);
+  let u = V(g), h = !0;
+  const i = t && "value" in t ? t : void 0;
+  return d((f) => {
+    var w;
+    const a = ((w = i == null ? void 0 : i.value) == null ? void 0 : w.getInternalInstance(_)) || l;
+    if (!a) {
+      h = !1;
       return;
     }
-    const c = r.registerWatch((S) => {
-      const g = w(S, l(t)), h = I(g);
-      h !== a && (i.value = g, a = h);
-    }, o);
-    s(c);
-  }), M(
-    () => l(t),
-    (s) => {
-      const r = w(l(u), s), c = I(r);
-      c !== a && (i.value = r, a = c);
+    const c = a.registerWatch((A) => {
+      const I = N(A, s(e)), S = V(I);
+      S !== u && (r.value = I, u = S);
+    }, h);
+    f(c);
+  }), y(
+    () => s(e),
+    (f) => {
+      const a = N(s(v), f), c = V(a);
+      c !== u && (r.value = a, u = c);
     }
-  ), i;
-};
+  ), r;
+}
 export {
-  F as default
+  W as default,
+  W as useWatch
 };

package/es/src/ap-form/index.mjs

@@ -4,7 +4,7 @@ import "./item-group/index.vue2.mjs";
 import "./list/index.vue2.mjs";
 import "./search-form/index.vue2.mjs";
 import "./modal-form/index.vue2.mjs";
-import m from "./hooks/use-watch.mjs";
+import { useWatch as m } from "./hooks/use-watch.mjs";
 import "./dependency/index.vue2.mjs";
 import "./set/index.vue2.mjs";
 import "./drawer-form/index.vue2.mjs";

package/es/src/business/ap-batch-action-group/MenuItemGroup.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as _, ref as h, createBlock as a, openBlock as s, unref as u, withCtx as d, createElementBlock as v, Fragment as t, renderList as y, mergeProps as k, createElementVNode as w, withDirectives as g, createVNode as C, vShow as b, resolveDynamicComponent as L, h as M } from "vue";
+import { defineComponent as _, ref as v, createBlock as a, openBlock as s, unref as u, withCtx as d, createElementBlock as h, Fragment as t, renderList as y, mergeProps as k, createElementVNode as w, withDirectives as g, createVNode as C, vShow as b, resolveDynamicComponent as L, h as M } from "vue";
 import { LoadingOutlined as B } from "@ant-design/icons-vue";
 import { Menu as R, MenuItem as x } from "@aplus-frontend/antdv";
 const D = { style: { display: "flex", "align-items": "center" } }, P = /* @__PURE__ */ _({
@@ -9,31 +9,31 @@ const D = { style: { display: "flex", "align-items": "center" } }, P = /* @__PUR
     menuList: {}
   },
   setup(f) {
-    const o = f, r = h({});
-    async function p(e, c) {
-      var l;
-      const n = (e == null ? void 0 : e.id) || c;
+    const l = f, r = v({});
+    async function p(o, c) {
+      var e;
+      const n = (o == null ? void 0 : o.id) || c;
       r.value[n] = !0;
       try {
-        await ((l = e == null ? void 0 : e.onClick) == null ? void 0 : l.call(e, { selectedRows: o == null ? void 0 : o.selectedRows }));
+        await ((e = o == null ? void 0 : o.onClick) == null ? void 0 : e.call(o, { selectedRows: l == null ? void 0 : l.selectedRows }));
       } finally {
-        r.value[n] = !1;
+        r.value[n] = void 0;
       }
     }
-    return (e, c) => (s(), a(u(R), null, {
+    return (o, c) => (s(), a(u(R), null, {
       default: d(() => [
-        (s(!0), v(t, null, y(o.menuList, (n, l) => (s(), a(u(x), k({
-          key: (n == null ? void 0 : n.id) || l,
+        (s(!0), h(t, null, y(l.menuList, (n, e) => (s(), a(u(x), k({
+          key: (n == null ? void 0 : n.id) || e,
           ref_for: !0
         }, {
           ...n,
-          onClick: () => p(n, l),
-          disabled: r.value[(n == null ? void 0 : n.id) || l] ?? (n == null ? void 0 : n.disabled) ?? !1
+          onClick: () => p(n, e),
+          disabled: r.value[(n == null ? void 0 : n.id) || e] ?? (n == null ? void 0 : n.disabled) ?? !1
         }), {
           default: d(() => [
             w("div", D, [
               g(C(u(B), { style: { "margin-right": "10px" } }, null, 512), [
-                [b, r.value[(n == null ? void 0 : n.id) || l]]
+                [b, r.value[(n == null ? void 0 : n.id) || e]]
               ]),
               (s(), a(L(M(t, [n == null ? void 0 : n.content]))))
             ])

package/lib/src/ap-form/hooks/use-watch.d.ts

@@ -2,5 +2,8 @@ import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 type ApFormIns<T> = ApFormExpose<T>;
-declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined, ValueType | undefined>;
+type WatchOptions<ValueType> = {
+    initialValue: ValueType;
+};
+export declare function useWatch<ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, formOrOptions?: Ref<ApFormIns<StoreType> | undefined> | WatchOptions<ValueType>, options?: WatchOptions<ValueType>): Ref<ValueType | undefined, ValueType | undefined>;
 export default useWatch;

package/lib/src/ap-form/hooks/use-watch.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const I=require("../context.js"),n=require("vue"),M=require("lodash-unified"),V=require("../constant.js");function h(e,t){return M.isArray(t)?t.reduce((r,s)=>r==null?void 0:r[s],e):e==null?void 0:e[t]}function d(e){try{return JSON.stringify(e)}catch{return Math.random()}}const N=(e,t)=>{const{internalInstance:r,model:s}=I.useInjectForm(),i=n.ref();let c="",o=!0;return n.watchEffect(l=>{var f;const u=((f=t==null?void 0:t.value)==null?void 0:f.getInternalInstance(V.INTERNAL_FORM_INSTANCE_MARK))||r;if(!u){o=!1;return}const a=u.registerWatch(w=>{const g=h(w,n.unref(e)),S=d(g);S!==c&&(i.value=g,c=S)},o);l(a)}),n.watch(()=>n.unref(e),l=>{const u=h(n.unref(s),l),a=d(u);a!==c&&(i.value=u,c=a)}),i};exports.default=N;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const _=require("../context.js"),u=require("vue"),o=require("lodash-unified"),q=require("../constant.js");function w(t,e){return o.isArray(e)?e.reduce((n,r)=>n==null?void 0:n[r],t):t==null?void 0:t[e]}function g(t){try{return JSON.stringify(t)}catch{return Math.random()}}function I(t,e,n){const{internalInstance:r,model:M}=_.useInjectForm(),V=(n==null?void 0:n.initialValue)||(e==null?void 0:e.initialValue)||void 0,i=u.ref(V);let c=g(V),d=!0;const s=e&&"value"in e?e:void 0;return u.watchEffect(f=>{var h;const a=((h=s==null?void 0:s.value)==null?void 0:h.getInternalInstance(q.INTERNAL_FORM_INSTANCE_MARK))||r;if(!a){d=!1;return}const l=a.registerWatch(N=>{const S=w(N,u.unref(t)),v=g(S);v!==c&&(i.value=S,c=v)},d);f(l)}),u.watch(()=>u.unref(t),f=>{const a=w(u.unref(M),f),l=g(a);l!==c&&(i.value=a,c=l)}),i}exports.default=I;exports.useWatch=I;

package/lib/src/ap-form/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("./ap-form.vue.js");require("./item/index.vue2.js");require("./item-group/index.vue2.js");require("./list/index.vue2.js");require("./search-form/index.vue2.js");require("./modal-form/index.vue2.js");const s=require("./hooks/use-watch.js");require("./dependency/index.vue2.js");require("./set/index.vue2.js");require("./drawer-form/index.vue2.js");require("./render/control.vue2.js");require("./render/item.vue2.js");require("./provider/index.vue2.js");require("./items/index.js");require("./interface.js");const c=require("./ap-form.vue2.js"),r=require("./item/index.vue.js"),t=require("./item-group/index.vue.js"),u=require("./list/index.vue.js"),_=require("./search-form/index.vue.js"),i=require("./modal-form/index.vue.js"),p=require("./dependency/index.vue.js"),o=require("./set/index.vue.js"),n=require("./drawer-form/index.vue.js"),a=require("./render/control.vue.js"),d=require("./render/item.vue.js"),l=require("./provider/index.vue.js"),e=c.default;e.FormItem=r.default;e.FormItemGroup=t.default;e.FormList=u.default;e.SearchForm=_.default;e.ModalForm=i.default;e.useWatch=s.default;e.Dependency=p.default;e.Set=o.default;e.DrawerForm=n.default;e.ControlRender=a.default;e.ItemRender=d.default;e.Provider=l.default;exports.ApFormItem=r.default;exports.ApFormItemGroup=t.default;exports.ApFormList=u.default;exports.ApFormSearchForm=_.default;exports.ApFormModalForm=i.default;exports.ApFormDependency=p.default;exports.ApFormSet=o.default;exports.ApFormDrawerForm=n.default;exports.ApFormControlRender=a.default;exports.ApFormItemRender=d.default;exports.ApFormProvider=l.default;exports.ApForm=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("./ap-form.vue.js");require("./item/index.vue2.js");require("./item-group/index.vue2.js");require("./list/index.vue2.js");require("./search-form/index.vue2.js");require("./modal-form/index.vue2.js");const l=require("./hooks/use-watch.js");require("./dependency/index.vue2.js");require("./set/index.vue2.js");require("./drawer-form/index.vue2.js");require("./render/control.vue2.js");require("./render/item.vue2.js");require("./provider/index.vue2.js");require("./items/index.js");require("./interface.js");const c=require("./ap-form.vue2.js"),r=require("./item/index.vue.js"),t=require("./item-group/index.vue.js"),u=require("./list/index.vue.js"),_=require("./search-form/index.vue.js"),i=require("./modal-form/index.vue.js"),p=require("./dependency/index.vue.js"),o=require("./set/index.vue.js"),n=require("./drawer-form/index.vue.js"),a=require("./render/control.vue.js"),s=require("./render/item.vue.js"),d=require("./provider/index.vue.js"),e=c.default;e.FormItem=r.default;e.FormItemGroup=t.default;e.FormList=u.default;e.SearchForm=_.default;e.ModalForm=i.default;e.useWatch=l.useWatch;e.Dependency=p.default;e.Set=o.default;e.DrawerForm=n.default;e.ControlRender=a.default;e.ItemRender=s.default;e.Provider=d.default;exports.ApFormItem=r.default;exports.ApFormItemGroup=t.default;exports.ApFormList=u.default;exports.ApFormSearchForm=_.default;exports.ApFormModalForm=i.default;exports.ApFormDependency=p.default;exports.ApFormSet=o.default;exports.ApFormDrawerForm=n.default;exports.ApFormControlRender=a.default;exports.ApFormItemRender=s.default;exports.ApFormProvider=d.default;exports.ApForm=e;

package/lib/src/business/ap-batch-action-group/MenuItemGroup.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("@ant-design/icons-vue"),s=require("@aplus-frontend/antdv"),f={style:{display:"flex","align-items":"center"}},p=e.defineComponent({__name:"MenuItemGroup",props:{selectedRows:{},buttonProps:{},menuList:{}},setup(a){const r=a,c=e.ref({});async function t(l,u){var o;const n=(l==null?void 0:l.id)||u;c.value[n]=!0;try{await((o=l==null?void 0:l.onClick)==null?void 0:o.call(l,{selectedRows:r==null?void 0:r.selectedRows}))}finally{c.value[n]=!1}}return(l,u)=>(e.openBlock(),e.createBlock(e.unref(s.Menu),null,{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(r.menuList,(n,o)=>(e.openBlock(),e.createBlock(e.unref(s.MenuItem),e.mergeProps({key:(n==null?void 0:n.id)||o,ref_for:!0},{...n,onClick:()=>t(n,o),disabled:c.value[(n==null?void 0:n.id)||o]??(n==null?void 0:n.disabled)??!1}),{default:e.withCtx(()=>[e.createElementVNode("div",f,[e.withDirectives(e.createVNode(e.unref(d.LoadingOutlined),{style:{"margin-right":"10px"}},null,512),[[e.vShow,c.value[(n==null?void 0:n.id)||o]]]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[n==null?void 0:n.content]))))])]),_:2},1040))),128))]),_:1}))}});exports.default=p;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("@ant-design/icons-vue"),s=require("@aplus-frontend/antdv"),f={style:{display:"flex","align-items":"center"}},p=e.defineComponent({__name:"MenuItemGroup",props:{selectedRows:{},buttonProps:{},menuList:{}},setup(a){const r=a,c=e.ref({});async function t(o,u){var l;const n=(o==null?void 0:o.id)||u;c.value[n]=!0;try{await((l=o==null?void 0:o.onClick)==null?void 0:l.call(o,{selectedRows:r==null?void 0:r.selectedRows}))}finally{c.value[n]=void 0}}return(o,u)=>(e.openBlock(),e.createBlock(e.unref(s.Menu),null,{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(r.menuList,(n,l)=>(e.openBlock(),e.createBlock(e.unref(s.MenuItem),e.mergeProps({key:(n==null?void 0:n.id)||l,ref_for:!0},{...n,onClick:()=>t(n,l),disabled:c.value[(n==null?void 0:n.id)||l]??(n==null?void 0:n.disabled)??!1}),{default:e.withCtx(()=>[e.createElementVNode("div",f,[e.withDirectives(e.createVNode(e.unref(d.LoadingOutlined),{style:{"margin-right":"10px"}},null,512),[[e.vShow,c.value[(n==null?void 0:n.id)||l]]]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.h(e.Fragment,[n==null?void 0:n.content]))))])]),_:2},1040))),128))]),_:1}))}});exports.default=p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.4.35",
+  "version": "0.4.36",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -65,8 +65,8 @@
     "sortablejs": "^1.15.2",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/hooks": "1.0.7",
-    "@aplus-frontend/utils": "1.0.52"
+    "@aplus-frontend/utils": "1.0.52",
+    "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.0.13",