@aplus-frontend/ui 6.39.1 → 6.39.2

package/es/src/ap-form/modal-form/index.vue.d.ts

@@ -912,15 +912,7 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
             type: PropType<string | number | Partial<Record< Breakpoint, string | number>>>;
             default: string | number | Partial<Record< Breakpoint, string | number>>;
         };
-        footer: {
-            type: PropType< VueNode | ((params: {
-                originNode: VueNode;
-                extra: {
-                    okBtn: VueNode;
-                    cancelBtn: VueNode;
-                };
-            }) => VueNode)>;
-        };
+        footer: VueTypeValidableDef<any>;
         okText: VueTypeValidableDef<any>;
         okType: PropType<LegacyButtonType>;
         cancelText: VueTypeValidableDef<any>;

package/es/src/business/ap-table-modal/table-modal.vue2.mjs

@@ -1,8 +1,8 @@
-import { defineComponent as E, ref as d, unref as r, computed as G, h as H, createBlock as g, openBlock as w, mergeProps as m, withCtx as k, createCommentVNode as U, createVNode as h, resolveDynamicComponent as j } from "vue";
-import { message as R, Modal as q } from "@aplus-frontend/antdv";
+import { defineComponent as E, ref as d, unref as r, computed as G, h as H, createBlock as w, openBlock as g, mergeProps as m, withCtx as k, createCommentVNode as U, createVNode as h, resolveDynamicComponent as q } from "vue";
+import { message as R, Modal as V } from "@aplus-frontend/antdv";
 import "../../config-provider/index.mjs";
-import { ApTable as V } from "../../ap-table/index.mjs";
-import { cloneDeep as $, omit as T } from "lodash-unified";
+import { ApTable as $ } from "../../ap-table/index.mjs";
+import { cloneDeep as j, omit as T } from "lodash-unified";
 import { transformTableParams as z } from "@aplus-frontend/utils";
 import "./modal-title.vue.mjs";
 import { AsyncOpenResultError as y } from "./interface.mjs";
@@ -38,7 +38,7 @@ const ue = /* @__PURE__ */ E({
     afterOpenChange: {},
     centered: { type: Boolean, default: void 0 },
     width: {},
-    footer: { type: [Object, String, Number, Boolean, null, Array, Function] },
+    footer: {},
     okText: {},
     okType: {},
     cancelText: {},
@@ -65,10 +65,10 @@ const ue = /* @__PURE__ */ E({
   },
   emits: ["finish"],
   setup(S, { expose: B, emit: P }) {
-    const e = S, M = P, s = d(!1), v = d({}), i = d(null), a = d([]), b = d();
+    const e = S, M = P, s = d(!1), v = d({}), i = d(null), a = d([]), C = d();
     let f = null, u = null;
-    const { t: C } = W(), K = async (t = [], o = {}) => {
-      switch (a.value = [...t], s.value = !0, v.value = o?.extraParams, b.value = o.apTableDataSources || e.apTableProps?.dataSource, o.refreshMode || "reset") {
+    const { t: b } = W(), K = async (t = [], o = {}) => {
+      switch (a.value = [...t], s.value = !0, v.value = o?.extraParams, C.value = o.apTableDataSources || e.apTableProps?.dataSource, o.refreshMode || "reset") {
         case "reset":
           i.value?.reset();
           break;
@@ -99,7 +99,7 @@ const ue = /* @__PURE__ */ E({
         return;
       }
       if (e.getRowKey) {
-        const t = $(r(a)), o = t.map(e.getRowKey);
+        const t = j(r(a)), o = t.map(e.getRowKey);
         if (e.onOk && await e.onOk({
           keys: o,
           rows: t
@@ -122,7 +122,7 @@ const ue = /* @__PURE__ */ E({
         onSelectAll(o, n) {
           if (n.length > e.maxCount) {
             R.warning(
-              C("ap.apTableModal.messageMaxCount", {
+              b("ap.apTableModal.messageMaxCount", {
                 maxCount: e.maxCount
               })
             );
@@ -130,7 +130,7 @@ const ue = /* @__PURE__ */ E({
           }
           const l = i.value?.dataSource;
           if (o) {
-            const c = r(l).filter((p) => !a.value.some((L) => t(L) === t(p)));
+            const c = r(l).filter((p) => !a.value.some((F) => t(F) === t(p)));
             a.value = a.value.concat(c);
           } else
             a.value = a.value?.filter((c) => !l.some((p) => t(p) === t(c)));
@@ -139,7 +139,7 @@ const ue = /* @__PURE__ */ E({
           if (n) {
             if (a.value.length >= e.maxCount) {
               R.warning(
-                C("ap.apTableModal.messageMaxCount", {
+                b("ap.apTableModal.messageMaxCount", {
                   maxCount: e.maxCount
                 })
               );
@@ -159,7 +159,7 @@ const ue = /* @__PURE__ */ E({
         }),
         ...e.rowSelection || {}
       };
-    }), N = () => e.isRenderModalTitleSuffix ? H(
+    }), D = () => e.isRenderModalTitleSuffix ? H(
       J,
       {
         title: e.title,
@@ -169,9 +169,9 @@ const ue = /* @__PURE__ */ E({
       {
         default: e.renderModalTitleSuffix ?? void 0
       }
-    ) : e.title, A = () => i.value, D = () => {
+    ) : e.title, L = () => i.value, N = () => {
       a.value = [];
-    }, F = (t) => {
+    }, A = (t) => {
       const o = e.getRowKey;
       if (!o) return;
       const n = a.value.findIndex(
@@ -182,8 +182,8 @@ const ue = /* @__PURE__ */ E({
     return B({
       open: K,
       close: x,
-      getApTableInstance: A
-    }), (t, o) => (w(), g(r(q), m(
+      getApTableInstance: L
+    }), (t, o) => (g(), w(r(V), m(
       {
         open: s.value,
         "onUpdate:open": o[0] || (o[0] = (n) => s.value = n)
@@ -203,21 +203,21 @@ const ue = /* @__PURE__ */ E({
         "tableLayoutConfig"
       ]),
       {
-        title: N(),
+        title: D(),
         centered: e.centered ?? !0,
         onOk: _,
         onCancel: x
       }
     ), {
       default: k(() => [
-        e.renderHeader ? (w(), g(j(e.renderHeader), { key: 0 })) : U("", !0),
+        e.renderHeader ? (g(), w(q(e.renderHeader), { key: 0 })) : U("", !0),
         h(Q, m(e.tableLayoutConfig || {}, {
           "selected-list": a.value,
-          onClear: D,
-          onDeleteItem: F
+          onClear: N,
+          onDeleteItem: A
         }), {
           default: k(() => [
-            h(r(V), m({
+            h(r($), m({
               ref_key: "apTableRef",
               ref: i,
               scroll: { y: 450 },
@@ -226,7 +226,7 @@ const ue = /* @__PURE__ */ E({
               request: O,
               "row-key": t.getRowKey,
               "row-selection": I.value,
-              "data-source": b.value,
+              "data-source": C.value,
               "search-form": {
                 sortable: !1,
                 countPerRow: 2

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.39.1";
+declare const _default: "6.39.2";
 export default _default;

package/es/src/version.mjs

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

package/lib/src/ap-form/modal-form/index.vue.d.ts

@@ -912,15 +912,7 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
             type: PropType<string | number | Partial<Record< Breakpoint, string | number>>>;
             default: string | number | Partial<Record< Breakpoint, string | number>>;
         };
-        footer: {
-            type: PropType< VueNode | ((params: {
-                originNode: VueNode;
-                extra: {
-                    okBtn: VueNode;
-                    cancelBtn: VueNode;
-                };
-            }) => VueNode)>;
-        };
+        footer: VueTypeValidableDef<any>;
         okText: VueTypeValidableDef<any>;
         okType: PropType<LegacyButtonType>;
         cancelText: VueTypeValidableDef<any>;

package/lib/src/business/ap-table-modal/table-modal.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const O=require("../../ap-table/index.js"),m=require("lodash-unified"),A=require("@aplus-frontend/utils");require("./modal-title.vue.js");const y=require("./interface.js");require("./table-layout/index.vue.js");const I=require("../../config-provider/hooks/use-locale.js"),N=require("./modal-title.vue2.js"),L=require("./table-layout/index.vue2.js"),D=t.defineComponent({__name:"table-modal",props:{columns:{},getRowKey:{},api:{type:Function,default:async()=>({records:[],total:0})},apTableProps:{},maxCount:{default:1/0},isRenderModalTitleSuffix:{type:Boolean,default:!0},renderModalTitleSuffix:{},disabledCheckbox:{type:[Boolean,Function]},rowSelection:{},tableLayoutConfig:{},renderHeader:{},onOk:{},prefixCls:{},confirmLoading:{type:Boolean,default:void 0},title:{},closable:{type:Boolean,default:void 0},closeIcon:{},onCancel:{},"onUpdate:visible":{},"onUpdate:open":{},onChange:{},afterClose:{},afterOpenChange:{},centered:{type:Boolean,default:void 0},width:{},footer:{type:[Object,String,Number,Boolean,null,Array,Function]},okText:{},okType:{},cancelText:{},icon:{},maskClosable:{type:Boolean,default:void 0},forceRender:{type:Boolean,default:void 0},okButtonProps:{},cancelButtonProps:{},destroyOnClose:{type:Boolean,default:void 0},wrapClassName:{},maskTransitionName:{},transitionName:{},getContainer:{type:[String,Boolean,Function],default:void 0},zIndex:{},bodyStyle:{},maskStyle:{},mask:{type:Boolean,default:void 0},keyboard:{type:Boolean,default:void 0},wrapProps:{},focusTriggerAfterClose:{type:Boolean,default:void 0},modalRender:{},mousePosition:{},loading:{type:Boolean}},emits:["finish"],setup(g,{expose:w,emit:k}){const e=g,h=k,s=t.ref(!1),v=t.ref({}),u=t.ref(null),a=t.ref([]),b=t.ref();let d=null,i=null;const{t:C}=I.useLocale(),R=async(o=[],n={})=>{switch(a.value=[...o],s.value=!0,v.value=n?.extraParams,b.value=n.apTableDataSources||e.apTableProps?.dataSource,n.refreshMode||"reset"){case"reset":u.value?.reset();break;case"submit":u.value?.submit();break;case"none":break}return new Promise((l,r)=>{d=l,i=r})},x=()=>{s.value=!1,d=null,i?.(y.AsyncOpenResultError.ModalCancel),i=null},T=async o=>{o=A.transformTableParams({...o,...v.value});const n=e.api,{records:l,total:r}=await n(o);return{data:l,total:r}},S=async()=>{if(a.value.length>e.maxCount){i?.(y.AsyncOpenResultError.ExceedMaxCount);return}if(e.getRowKey){const o=m.cloneDeep(t.unref(a)),n=o.map(e.getRowKey);if(e.onOk&&await e.onOk({keys:n,rows:o})===!1)return;h("finish",n,o),d?.({keys:n,rows:o})}else{i?.(y.AsyncOpenResultError.NotFineGetRowKey);return}s.value=!1},_=t.computed(()=>{if(!e.getRowKey)return;const o=e.getRowKey;return{fixed:!0,selectedRowKeys:a.value.map(o),columnWidth:50,preserveSelectedRowKeys:!0,onSelectAll(n,l){if(l.length>e.maxCount){p.message.warning(C("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}const r=u.value?.dataSource;if(n){const c=t.unref(r).filter(f=>!a.value.some(K=>o(K)===o(f)));a.value=a.value.concat(c)}else a.value=a.value?.filter(c=>!r.some(f=>o(f)===o(c)))},onSelect(n,l){if(l){if(a.value.length>=e.maxCount){p.message.warning(C("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}e.rowSelection?.type==="radio"?a.value=[n]:a.value.push(n)}else{const r=a.value.findIndex(c=>o(n)===o(c));a.value.splice(r,1)}},getCheckboxProps:n=>({disabled:typeof e.disabledCheckbox=="function"?e.disabledCheckbox(n,a.value):e.disabledCheckbox}),...e.rowSelection||{}}}),B=()=>e.isRenderModalTitleSuffix?t.h(N.default,{title:e.title,count:a.value.length||0,maxCount:e.maxCount},{default:e.renderModalTitleSuffix??void 0}):e.title,P=()=>u.value,M=()=>{a.value=[]},q=o=>{const n=e.getRowKey;if(!n)return;const l=a.value.findIndex(r=>n(o)===n(r));a.value.splice(l,1)};return w({open:R,close:x,getApTableInstance:P}),(o,n)=>(t.openBlock(),t.createBlock(t.unref(p.Modal),t.mergeProps({open:s.value,"onUpdate:open":n[0]||(n[0]=l=>s.value=l)},t.unref(m.omit)(e,["api","getRowKey","centered","apTableProps","onOk","maxCount","title","renderModalTitleSuffix","isRenderModalTitleSuffix","rowSelection","disabledCheckbox","tableLayoutConfig"]),{title:B(),centered:e.centered??!0,onOk:S,onCancel:x}),{default:t.withCtx(()=>[e.renderHeader?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(e.renderHeader),{key:0})):t.createCommentVNode("",!0),t.createVNode(L.default,t.mergeProps(e.tableLayoutConfig||{},{"selected-list":a.value,onClear:M,onDeleteItem:q}),{default:t.withCtx(()=>[t.createVNode(t.unref(O.ApTable),t.mergeProps({ref_key:"apTableRef",ref:u,scroll:{y:450},style:{padding:"0px"},columns:o.columns,request:T,"row-key":o.getRowKey,"row-selection":_.value,"data-source":b.value,"search-form":{sortable:!1,countPerRow:2}},t.unref(m.omit)(e.apTableProps,"dataSource")),null,16,["columns","row-key","row-selection","data-source"])]),_:1},16,["selected-list"])]),_:1},16,["open","title","centered"]))}});exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const O=require("../../ap-table/index.js"),m=require("lodash-unified"),I=require("@aplus-frontend/utils");require("./modal-title.vue.js");const y=require("./interface.js");require("./table-layout/index.vue.js");const A=require("../../config-provider/hooks/use-locale.js"),L=require("./modal-title.vue2.js"),N=require("./table-layout/index.vue2.js"),D=t.defineComponent({__name:"table-modal",props:{columns:{},getRowKey:{},api:{type:Function,default:async()=>({records:[],total:0})},apTableProps:{},maxCount:{default:1/0},isRenderModalTitleSuffix:{type:Boolean,default:!0},renderModalTitleSuffix:{},disabledCheckbox:{type:[Boolean,Function]},rowSelection:{},tableLayoutConfig:{},renderHeader:{},onOk:{},prefixCls:{},confirmLoading:{type:Boolean,default:void 0},title:{},closable:{type:Boolean,default:void 0},closeIcon:{},onCancel:{},"onUpdate:visible":{},"onUpdate:open":{},onChange:{},afterClose:{},afterOpenChange:{},centered:{type:Boolean,default:void 0},width:{},footer:{},okText:{},okType:{},cancelText:{},icon:{},maskClosable:{type:Boolean,default:void 0},forceRender:{type:Boolean,default:void 0},okButtonProps:{},cancelButtonProps:{},destroyOnClose:{type:Boolean,default:void 0},wrapClassName:{},maskTransitionName:{},transitionName:{},getContainer:{type:[String,Boolean,Function],default:void 0},zIndex:{},bodyStyle:{},maskStyle:{},mask:{type:Boolean,default:void 0},keyboard:{type:Boolean,default:void 0},wrapProps:{},focusTriggerAfterClose:{type:Boolean,default:void 0},modalRender:{},mousePosition:{},loading:{type:Boolean}},emits:["finish"],setup(g,{expose:w,emit:k}){const e=g,h=k,s=t.ref(!1),v=t.ref({}),u=t.ref(null),n=t.ref([]),C=t.ref();let d=null,i=null;const{t:b}=A.useLocale(),R=async(o=[],a={})=>{switch(n.value=[...o],s.value=!0,v.value=a?.extraParams,C.value=a.apTableDataSources||e.apTableProps?.dataSource,a.refreshMode||"reset"){case"reset":u.value?.reset();break;case"submit":u.value?.submit();break;case"none":break}return new Promise((l,r)=>{d=l,i=r})},x=()=>{s.value=!1,d=null,i?.(y.AsyncOpenResultError.ModalCancel),i=null},T=async o=>{o=I.transformTableParams({...o,...v.value});const a=e.api,{records:l,total:r}=await a(o);return{data:l,total:r}},S=async()=>{if(n.value.length>e.maxCount){i?.(y.AsyncOpenResultError.ExceedMaxCount);return}if(e.getRowKey){const o=m.cloneDeep(t.unref(n)),a=o.map(e.getRowKey);if(e.onOk&&await e.onOk({keys:a,rows:o})===!1)return;h("finish",a,o),d?.({keys:a,rows:o})}else{i?.(y.AsyncOpenResultError.NotFineGetRowKey);return}s.value=!1},_=t.computed(()=>{if(!e.getRowKey)return;const o=e.getRowKey;return{fixed:!0,selectedRowKeys:n.value.map(o),columnWidth:50,preserveSelectedRowKeys:!0,onSelectAll(a,l){if(l.length>e.maxCount){p.message.warning(b("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}const r=u.value?.dataSource;if(a){const c=t.unref(r).filter(f=>!n.value.some(K=>o(K)===o(f)));n.value=n.value.concat(c)}else n.value=n.value?.filter(c=>!r.some(f=>o(f)===o(c)))},onSelect(a,l){if(l){if(n.value.length>=e.maxCount){p.message.warning(b("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}e.rowSelection?.type==="radio"?n.value=[a]:n.value.push(a)}else{const r=n.value.findIndex(c=>o(a)===o(c));n.value.splice(r,1)}},getCheckboxProps:a=>({disabled:typeof e.disabledCheckbox=="function"?e.disabledCheckbox(a,n.value):e.disabledCheckbox}),...e.rowSelection||{}}}),B=()=>e.isRenderModalTitleSuffix?t.h(L.default,{title:e.title,count:n.value.length||0,maxCount:e.maxCount},{default:e.renderModalTitleSuffix??void 0}):e.title,P=()=>u.value,M=()=>{n.value=[]},q=o=>{const a=e.getRowKey;if(!a)return;const l=n.value.findIndex(r=>a(o)===a(r));n.value.splice(l,1)};return w({open:R,close:x,getApTableInstance:P}),(o,a)=>(t.openBlock(),t.createBlock(t.unref(p.Modal),t.mergeProps({open:s.value,"onUpdate:open":a[0]||(a[0]=l=>s.value=l)},t.unref(m.omit)(e,["api","getRowKey","centered","apTableProps","onOk","maxCount","title","renderModalTitleSuffix","isRenderModalTitleSuffix","rowSelection","disabledCheckbox","tableLayoutConfig"]),{title:B(),centered:e.centered??!0,onOk:S,onCancel:x}),{default:t.withCtx(()=>[e.renderHeader?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(e.renderHeader),{key:0})):t.createCommentVNode("",!0),t.createVNode(N.default,t.mergeProps(e.tableLayoutConfig||{},{"selected-list":n.value,onClear:M,onDeleteItem:q}),{default:t.withCtx(()=>[t.createVNode(t.unref(O.ApTable),t.mergeProps({ref_key:"apTableRef",ref:u,scroll:{y:450},style:{padding:"0px"},columns:o.columns,request:T,"row-key":o.getRowKey,"row-selection":_.value,"data-source":C.value,"search-form":{sortable:!1,countPerRow:2}},t.unref(m.omit)(e.apTableProps,"dataSource")),null,16,["columns","row-key","row-selection","data-source"])]),_:1},16,["selected-list"])]),_:1},16,["open","title","centered"]))}});exports.default=D;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.39.1";
+declare const _default: "6.39.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.39.1";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.39.2";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.39.1",
+  "version": "6.39.2",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -41,15 +41,15 @@
     "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
-    "@aplus-frontend/antdv": "^1.2.14",
-    "@aplus-frontend/icon": "^1.2.6",
+    "@aplus-frontend/antdv": "^1.2.16",
+    "@aplus-frontend/icon": "^1.3.2",
     "@aplus-frontend/oss": "^1.1.2",
     "vue": "^3.5.17",
     "vxe-table": "^4.13.37"
   },
   "devDependencies": {
-    "@aplus-frontend/antdv": "^1.2.14",
-    "@aplus-frontend/icon": "^1.2.6",
+    "@aplus-frontend/antdv": "^1.2.16",
+    "@aplus-frontend/icon": "^1.3.2",
     "@aplus-frontend/oss": "^1.1.2",
     "@types/sortablejs": "^1.15.8",
     "@vue/test-utils": "^2.4.6",

package/theme/ag-grid-modal/index.css

@@ -774,6 +774,7 @@
   flex-grow: 1;
   height: 0;
   overflow-y: hidden;
+  padding-top: 8px;
 }
 .aplus-ag-grid-modal--table-layout-right-content:hover {
   overflow-y: auto;

package/theme/ag-grid-modal/index.less

@@ -54,6 +54,7 @@
         flex-grow: 1;
         height: 0;
         overflow-y: hidden;
+        padding-top: 8px;
 
         &:hover {
            overflow-y: auto;

package/theme/index.css

@@ -5079,6 +5079,7 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
   flex-grow: 1;
   height: 0;
   overflow-y: hidden;
+  padding-top: 8px;
 }
 .aplus-ag-grid-modal--table-layout-right-content:hover {
   overflow-y: auto;