@aplus-frontend/ui 6.13.1 → 6.13.2

package/es/src/ap-table/hooks/use-table-paging-ng.mjs

@@ -1,4 +1,4 @@
-import { ref as le, reactive as M, unref as m, nextTick as fe, onMounted as ge, watch as de, computed as y, createVNode as C } from "vue";
+import { ref as le, reactive as M, unref as S, nextTick as fe, onMounted as ge, watch as de, computed as y, createVNode as C } from "vue";
 import { useTableSortedAndFiltered as pe } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
 import { parseFieldValue as me, dataIndexToStr as Se, isEqualCustom as he } from "../utils.mjs";
@@ -6,8 +6,8 @@ import { isArray as Q, isEqualWith as ze, isUndefined as Pe } from "lodash-unifi
 import { isDef as $ } from "../../utils/index.mjs";
 import { useLocale as Te } from "../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as we } from "../../config-provider/hooks/use-namespace.mjs";
-const S = 1, I = 20, G = {
-  defaultCurrent: S,
+const h = 1, I = 20, G = {
+  defaultCurrent: h,
   defaultPageSize: I,
   showLessItems: !1,
   showTotal: !0
@@ -20,7 +20,7 @@ function Fe(c) {
 }
 function be(c) {
   const f = {};
-  return c === !1 || (c === !0 || c == null ? (f.current = S, f.pageSize = I) : (f.current = c.defaultCurrent || S, f.pageSize = c.defaultPageSize || I)), f;
+  return c === !1 || (c === !0 || c == null ? (f.current = h, f.pageSize = I) : (f.current = c.defaultCurrent || h, f.pageSize = c.defaultPageSize || I)), f;
 }
 const Ie = ({
   manual: c = !1,
@@ -33,35 +33,35 @@ const Ie = ({
   filterFields: W,
   sortFields: Z,
   namespace: H = "ap-table",
-  pagination: h,
+  pagination: z,
   onClickReset: x,
   onAfterRequest: E
 }) => {
   let v = 0, s = {};
-  const X = Fe(h), Y = (e) => U ? U(e) : e, z = le(), i = M(be(h)), {
+  const X = Fe(z), Y = (e) => U ? U(e) : e, P = le(), i = M(be(z)), {
     getColumnSFConfig: q,
     setSF: R,
     clearAll: k,
     sortedInfo: N,
     filteredInfo: B
   } = pe(), {
-    t: P
+    t: T
   } = Te(), {
-    b: T
+    b: w
   } = we(H), o = M({
     total: j.length,
     records: j,
     loading: !1
-  }), w = () => {
+  }), d = () => {
     var e, t;
-    return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
+    return ((t = (e = P.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
   }, J = async (e) => {
     var r;
     const t = Y(e), n = Date.now();
     v = n, o.loading = !0;
     try {
       const a = await f({
-        ...m(V),
+        ...S(V),
         ...t
       });
       v === n && (o.total = a.total || ((r = a.data) == null ? void 0 : r.length) || 0, o.records = [...a.data || []], o.loading = !1);
@@ -79,11 +79,11 @@ const Ie = ({
       }
     }), t;
   }, ee = async (e) => {
-    var r, a, l, g, d;
-    const t = w(), n = {};
-    Object.entries(t).forEach(([p, b]) => {
-      A && A.indexOf(p) > -1 && (n[p] = b);
-    }), await ((a = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : a.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), fe(() => {
+    var r, a, l, g, p;
+    const t = d(), n = {};
+    Object.entries(t).forEach(([m, b]) => {
+      A && A.indexOf(m) > -1 && (n[m] = b);
+    }), await ((a = (r = P.value) == null ? void 0 : r.apForm) == null ? void 0 : a.resetFields()), (p = (g = (l = P.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || p.call(g, n), fe(() => {
       e == null || e();
     });
   }, F = (e) => {
@@ -96,20 +96,23 @@ const Ie = ({
       ...e
     });
   }, D = () => {
-    const e = w(), t = h !== !1;
-    t && (i.current = S), F({
+    const e = d(), t = z !== !1;
+    t && (i.current = h), F({
       ...e,
       filter: s.filter,
       sort: s.sort,
-      current: t ? S : void 0,
+      current: t ? h : void 0,
       pageSize: t ? s.pageSize || i.pageSize : void 0
     });
   }, ne = () => {
     k(), s.sort = {}, s.filter = {}, x == null || x(), ee(D);
   }, O = () => {
-    F(s);
+    F({
+      ...s,
+      ...d()
+    });
   }, re = (e) => {
-    if (h === !1)
+    if (z === !1)
       O();
     else {
       const {
@@ -121,23 +124,23 @@ const Ie = ({
       });
     }
   }, L = (e, t, n) => {
-    var p, b;
-    const r = w();
+    var m, b;
+    const r = d();
     i.current = e.current, i.pageSize = e.pageSize, R(t, n);
     const a = Q(n) ? [...n] : [n], l = {};
     for (const u of a)
-      (p = m(Z)) != null && p.includes(u.columnKey || u.field) && u.order && (l[Se(u.columnKey || u.field)] = u.order);
+      (m = S(Z)) != null && m.includes(u.columnKey || u.field) && u.order && (l[Se(u.columnKey || u.field)] = u.order);
     const g = {};
     for (const u of Object.keys(t))
-      (b = m(W)) != null && b.includes(u) && t[u] && (g[u] = t[u]);
-    const d = {
+      (b = S(W)) != null && b.includes(u) && t[u] && (g[u] = t[u]);
+    const p = {
       ...r,
       filter: g,
       sort: l,
       current: e.current,
       pageSize: e.pageSize
     };
-    ze(s, d, he) || F(d);
+    ze(s, p, he) || F(p);
   }, ae = (e, t = B.value || {}, n = N.value || {}) => {
     const r = (e == null ? void 0 : e.current) ?? i.current, a = (e == null ? void 0 : e.pageSize) ?? i.pageSize;
     L(
@@ -155,7 +158,7 @@ const Ie = ({
     );
   };
   ge(() => {
-    const e = w(), {
+    const e = d(), {
       current: t,
       pageSize: n
     } = i;
@@ -169,7 +172,7 @@ const Ie = ({
       const r = K(s);
       J(r);
     }
-  }), de(() => m(V), () => {
+  }), de(() => S(V), () => {
     D();
   }, {
     deep: !0
@@ -206,14 +209,14 @@ const Ie = ({
         size: "default",
         pageSizeOptions: Pe(a) ? ["10", "20", "50", "100"] : a,
         showTotal: t ? (l) => C("span", {
-          class: T("pagination-total-wrapper")
-        }, [P("ap.apTable.pagination.totalLeftPrefix"), " ", C("span", {
-          class: T("pagination-count-text")
-        }, [l]), " ", P("ap.apTable.pagination.totalLeftSuffix"), C("span", {
-          class: T("pagination--total-right")
-        }, [P("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
-          class: T("pagination-count-text")
-        }, [m(oe)]), " ", P("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+          class: w("pagination-total-wrapper")
+        }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", C("span", {
+          class: w("pagination-count-text")
+        }, [l]), " ", T("ap.apTable.pagination.totalLeftSuffix"), C("span", {
+          class: w("pagination--total-right")
+        }, [T("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
+          class: w("pagination-count-text")
+        }, [S(oe)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
       onChange: L,
       dataSource: o.records
@@ -228,7 +231,7 @@ const Ie = ({
     };
   }
   return {
-    formRef: z,
+    formRef: P,
     submit: D,
     reset: ne,
     refresh: O,
@@ -247,7 +250,7 @@ const Ie = ({
   };
 };
 export {
-  S as DEFAULT_CURRENT,
+  h as DEFAULT_CURRENT,
   I as DEFAULT_PAGE_SIZE,
   Ie as useTablePaging
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.13.1";
+declare const _default: "6.13.2";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.13.1";
+const e = "6.13.2";
 export {
   e as default
 };

package/lib/src/ap-table/hooks/use-table-paging-ng.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("vue"),ce=require("./use-sorted-filtered.js");require("../../config-provider/index.js");const N=require("../utils.js"),E=require("lodash-unified"),G=require("../../utils/index.js"),ue=require("../../config-provider/hooks/use-locale.js"),le=require("../../config-provider/hooks/use-namespace.js"),p=1,C=20,J={defaultCurrent:p,defaultPageSize:C,showLessItems:!1,showTotal:!0};function fe(u){return u===!1?{}:u==null||u===!0?J:{...J,...u}}function ge(u){const g={};return u===!1||(u===!0||u==null?(g.current=p,g.pageSize=C):(g.current=u.defaultCurrent||p,g.pageSize=u.defaultPageSize||C)),g}const de=({manual:u=!1,request:g,params:U={},defaultData:V=[],formatParams:q,paramsValueTypeMap:A,resetFieldsIgnores:_,filterFields:K,sortFields:Q,namespace:Z="ap-table",pagination:m,onClickReset:v,onAfterRequest:x})=>{let D=0,i={};const $=fe(m),W=e=>q?q(e):e,z=o.ref(),c=o.reactive(ge(m)),{getColumnSFConfig:H,setSF:R,clearAll:X,sortedInfo:I,filteredInfo:j}=ce.useTableSortedAndFiltered(),{t:T}=ue.useLocale(),{b:P}=le.useNamespace(Z),s=o.reactive({total:V.length,records:V,loading:!1}),F=()=>{var e,t;return((t=(e=z.value)==null?void 0:e.apForm)==null?void 0:t.getFieldsValueTransformed(!0))||{}},M=async e=>{var r;const t=W(e),n=Date.now();D=n,s.loading=!0;try{const a=await g({...o.unref(U),...t});D===n&&(s.total=a.total||((r=a.data)==null?void 0:r.length)||0,s.records=[...a.data||[]],s.loading=!1)}catch{D===n&&(s.records=[],s.total=0,s.loading=!1)}finally{x==null||x()}},B=e=>{const t={};return Object.entries(e).forEach(([n,r])=>{if(t[n]=r,A&&r){const a=A[n];a&&(t[n]=N.parseFieldValue(a,r))}}),t},Y=async e=>{var r,a,f,d,S;const t=F(),n={};Object.entries(t).forEach(([h,w])=>{_&&_.indexOf(h)>-1&&(n[h]=w)}),await((a=(r=z.value)==null?void 0:r.apForm)==null?void 0:a.resetFields()),(S=(d=(f=z.value)==null?void 0:f.apForm)==null?void 0:d.setFieldsValue)==null||S.call(d,n),o.nextTick(()=>{e==null||e()})},b=e=>{i=e;const t=B(e);M(t)},k=e=>{b({...i,...e})},L=()=>{const e=F(),t=m!==!1;t&&(c.current=p),b({...e,filter:i.filter,sort:i.sort,current:t?p:void 0,pageSize:t?i.pageSize||c.pageSize:void 0})},ee=()=>{X(),i.sort={},i.filter={},v==null||v(),Y(L)},y=()=>{b(i)},te=e=>{if(m===!1)y();else{const{current:t,pageSize:n}=c,r=s.total-e,a=Math.ceil(r/n),f=t>a?a:t;k({current:f>0?f:1})}},O=(e,t,n)=>{var h,w;const r=F();c.current=e.current,c.pageSize=e.pageSize,R(t,n);const a=E.isArray(n)?[...n]:[n],f={};for(const l of a)(h=o.unref(Q))!=null&&h.includes(l.columnKey||l.field)&&l.order&&(f[N.dataIndexToStr(l.columnKey||l.field)]=l.order);const d={};for(const l of Object.keys(t))(w=o.unref(K))!=null&&w.includes(l)&&t[l]&&(d[l]=t[l]);const S={...r,filter:d,sort:f,current:e.current,pageSize:e.pageSize};E.isEqualWith(i,S,N.isEqualCustom)||b(S)},ne=(e,t=j.value||{},n=I.value||{})=>{const r=(e==null?void 0:e.current)??c.current,a=(e==null?void 0:e.pageSize)??c.pageSize;O({current:r,pageSize:a},t,n,{action:"sort",currentDataSource:[]})};o.onMounted(()=>{const e=F(),{current:t,pageSize:n}=c;if(i={current:t,pageSize:n,filter:{},sort:{},...e},!u){const r=B(i);M(r)}}),o.watch(()=>o.unref(U),()=>{L()},{deep:!0});const re=o.computed(()=>{if(s.total===0)return"-";const{current:e,pageSize:t}=c;return`${e}/${Math.ceil(s.total/t)}`});function ae(e){E.isArray(e)&&(s.records=e,s.total=e.length)}const oe=o.computed(()=>{const{showLessItems:e,showTotal:t,showQuickJumper:n,showSizeChanger:r,pageSizeOptions:a}=$;return{loading:s.loading,pagination:{current:c.current,pageSize:c.pageSize,total:s.total,showSizeChanger:G.isDef(r)?r:!e,showQuickJumper:G.isDef(n)?n:!e,showLessItems:e,size:"default",pageSizeOptions:E.isUndefined(a)?["10","20","50","100"]:a,showTotal:t?f=>o.createVNode("span",{class:P("pagination-total-wrapper")},[T("ap.apTable.pagination.totalLeftPrefix")," ",o.createVNode("span",{class:P("pagination-count-text")},[f])," ",T("ap.apTable.pagination.totalLeftSuffix"),o.createVNode("span",{class:P("pagination--total-right")},[T("ap.apTable.pagination.totalRightPrefix")," ",o.createVNode("span",{class:P("pagination-count-text")},[o.unref(re)])," ",T("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:O,dataSource:s.records}});function se(e,t=!0){Object.assign(c,e),i.current=e.current,i.pageSize=e.pageSize,t&&y()}function ie(){return{...c}}return{formRef:z,submit:L,reset:ee,refresh:y,refreshByDelete:te,data:s,handleTableChange:O,handleTableChangeOptional:ne,tableProps:oe,dataSource:o.computed(()=>s.records),setDataSource:ae,getColumnSFConfig:H,sortedInfo:I,filteredInfo:j,getPaging:ie,setPaging:se}};exports.DEFAULT_CURRENT=p;exports.DEFAULT_PAGE_SIZE=C;exports.useTablePaging=de;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("vue"),ce=require("./use-sorted-filtered.js");require("../../config-provider/index.js");const N=require("../utils.js"),E=require("lodash-unified"),G=require("../../utils/index.js"),ue=require("../../config-provider/hooks/use-locale.js"),le=require("../../config-provider/hooks/use-namespace.js"),p=1,C=20,J={defaultCurrent:p,defaultPageSize:C,showLessItems:!1,showTotal:!0};function fe(u){return u===!1?{}:u==null||u===!0?J:{...J,...u}}function ge(u){const g={};return u===!1||(u===!0||u==null?(g.current=p,g.pageSize=C):(g.current=u.defaultCurrent||p,g.pageSize=u.defaultPageSize||C)),g}const de=({manual:u=!1,request:g,params:U={},defaultData:V=[],formatParams:q,paramsValueTypeMap:A,resetFieldsIgnores:_,filterFields:K,sortFields:Q,namespace:Z="ap-table",pagination:z,onClickReset:v,onAfterRequest:x})=>{let D=0,i={};const $=fe(z),W=e=>q?q(e):e,T=o.ref(),c=o.reactive(ge(z)),{getColumnSFConfig:H,setSF:R,clearAll:X,sortedInfo:I,filteredInfo:j}=ce.useTableSortedAndFiltered(),{t:P}=ue.useLocale(),{b:F}=le.useNamespace(Z),s=o.reactive({total:V.length,records:V,loading:!1}),S=()=>{var e,t;return((t=(e=T.value)==null?void 0:e.apForm)==null?void 0:t.getFieldsValueTransformed(!0))||{}},M=async e=>{var r;const t=W(e),n=Date.now();D=n,s.loading=!0;try{const a=await g({...o.unref(U),...t});D===n&&(s.total=a.total||((r=a.data)==null?void 0:r.length)||0,s.records=[...a.data||[]],s.loading=!1)}catch{D===n&&(s.records=[],s.total=0,s.loading=!1)}finally{x==null||x()}},B=e=>{const t={};return Object.entries(e).forEach(([n,r])=>{if(t[n]=r,A&&r){const a=A[n];a&&(t[n]=N.parseFieldValue(a,r))}}),t},Y=async e=>{var r,a,f,d,h;const t=S(),n={};Object.entries(t).forEach(([m,w])=>{_&&_.indexOf(m)>-1&&(n[m]=w)}),await((a=(r=T.value)==null?void 0:r.apForm)==null?void 0:a.resetFields()),(h=(d=(f=T.value)==null?void 0:f.apForm)==null?void 0:d.setFieldsValue)==null||h.call(d,n),o.nextTick(()=>{e==null||e()})},b=e=>{i=e;const t=B(e);M(t)},k=e=>{b({...i,...e})},L=()=>{const e=S(),t=z!==!1;t&&(c.current=p),b({...e,filter:i.filter,sort:i.sort,current:t?p:void 0,pageSize:t?i.pageSize||c.pageSize:void 0})},ee=()=>{X(),i.sort={},i.filter={},v==null||v(),Y(L)},y=()=>{b({...i,...S()})},te=e=>{if(z===!1)y();else{const{current:t,pageSize:n}=c,r=s.total-e,a=Math.ceil(r/n),f=t>a?a:t;k({current:f>0?f:1})}},O=(e,t,n)=>{var m,w;const r=S();c.current=e.current,c.pageSize=e.pageSize,R(t,n);const a=E.isArray(n)?[...n]:[n],f={};for(const l of a)(m=o.unref(Q))!=null&&m.includes(l.columnKey||l.field)&&l.order&&(f[N.dataIndexToStr(l.columnKey||l.field)]=l.order);const d={};for(const l of Object.keys(t))(w=o.unref(K))!=null&&w.includes(l)&&t[l]&&(d[l]=t[l]);const h={...r,filter:d,sort:f,current:e.current,pageSize:e.pageSize};E.isEqualWith(i,h,N.isEqualCustom)||b(h)},ne=(e,t=j.value||{},n=I.value||{})=>{const r=(e==null?void 0:e.current)??c.current,a=(e==null?void 0:e.pageSize)??c.pageSize;O({current:r,pageSize:a},t,n,{action:"sort",currentDataSource:[]})};o.onMounted(()=>{const e=S(),{current:t,pageSize:n}=c;if(i={current:t,pageSize:n,filter:{},sort:{},...e},!u){const r=B(i);M(r)}}),o.watch(()=>o.unref(U),()=>{L()},{deep:!0});const re=o.computed(()=>{if(s.total===0)return"-";const{current:e,pageSize:t}=c;return`${e}/${Math.ceil(s.total/t)}`});function ae(e){E.isArray(e)&&(s.records=e,s.total=e.length)}const oe=o.computed(()=>{const{showLessItems:e,showTotal:t,showQuickJumper:n,showSizeChanger:r,pageSizeOptions:a}=$;return{loading:s.loading,pagination:{current:c.current,pageSize:c.pageSize,total:s.total,showSizeChanger:G.isDef(r)?r:!e,showQuickJumper:G.isDef(n)?n:!e,showLessItems:e,size:"default",pageSizeOptions:E.isUndefined(a)?["10","20","50","100"]:a,showTotal:t?f=>o.createVNode("span",{class:F("pagination-total-wrapper")},[P("ap.apTable.pagination.totalLeftPrefix")," ",o.createVNode("span",{class:F("pagination-count-text")},[f])," ",P("ap.apTable.pagination.totalLeftSuffix"),o.createVNode("span",{class:F("pagination--total-right")},[P("ap.apTable.pagination.totalRightPrefix")," ",o.createVNode("span",{class:F("pagination-count-text")},[o.unref(re)])," ",P("ap.apTable.pagination.totalRightSuffix")])]):void 0},onChange:O,dataSource:s.records}});function se(e,t=!0){Object.assign(c,e),i.current=e.current,i.pageSize=e.pageSize,t&&y()}function ie(){return{...c}}return{formRef:T,submit:L,reset:ee,refresh:y,refreshByDelete:te,data:s,handleTableChange:O,handleTableChangeOptional:ne,tableProps:oe,dataSource:o.computed(()=>s.records),setDataSource:ae,getColumnSFConfig:H,sortedInfo:I,filteredInfo:j,getPaging:ie,setPaging:se}};exports.DEFAULT_CURRENT=p;exports.DEFAULT_PAGE_SIZE=C;exports.useTablePaging=de;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.13.1";
+declare const _default: "6.13.2";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.13.1";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.13.2";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.13.1",
+  "version": "6.13.2",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -61,8 +61,8 @@
     "scroll-into-view-if-needed": "^3.1.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/utils": "1.0.61",
-    "@aplus-frontend/hooks": "1.0.7"
+    "@aplus-frontend/hooks": "1.0.7",
+    "@aplus-frontend/utils": "1.0.61"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.1.12",