@aplus-frontend/ui 0.0.14 → 0.0.16

package/lib/src/ap-action/item-popconfirm/index.vue.d.ts

@@ -1,4 +1,4 @@
-import { ApActionItemPopconfirmProps, ActionColor } from '../interface';
+import { ApActionItemPopconfirmProps, ApActionItemSlots, ActionColor } from '../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, HTMLAttributes, CSSProperties } from 'vue';
 import { LegacyButtonType, ButtonHTMLType } from 'ant-design-vue/es/button/buttonTypes';
 import { ButtonType, ButtonShape, ButtonSize } from 'ant-design-vue/es/button';
@@ -10,7 +10,7 @@ import { LiteralUnion } from 'ant-design-vue/es/_util/type';
 import { PresetColorType } from 'ant-design-vue/es/_util/colors';
 import { AlignType, BuildInPlacements } from 'ant-design-vue/es/vc-trigger/interface';
 
-declare const _default: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApActionItemPopconfirmProps>, {
+declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApActionItemPopconfirmProps>, {
     color: string;
     disabled: boolean;
     visible: boolean;
@@ -322,7 +322,7 @@ declare const _default: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRunt
         onOpenChange: PropType<(vis: boolean) => void>;
         'onUpdate:open': PropType<(vis: boolean) => void>;
     }>>;
-}, {}>;
+}, {}>, Readonly<ApActionItemSlots> & ApActionItemSlots>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToRuntimeProps<T> = {
@@ -341,3 +341,8 @@ type __VLS_WithDefaults<P, D> = {
 type __VLS_Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/lib/src/ap-action/item-popconfirm/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("ant-design-vue");require("../item/index.vue.js");const c=require("lodash-unified"),p=require("../item/index.vue2.js"),s=e.defineComponent({name:"ApActionItemPopconfirm",__name:"index",props:{text:{},color:{default:"primary"},disabled:{type:Boolean,default:!1},visible:{type:Boolean,default:!0},onAction:{},onClick:{},loading:{type:Boolean,default:!1},popconfirmProps:{default:()=>({})}},setup(a){const o=a;async function l(n){var r,t,i;(t=(r=o.popconfirmProps).onConfirm)==null||t.call(r,n),await((i=o.onAction)==null?void 0:i.call(o,n))}return(n,r)=>(e.openBlock(),e.createBlock(e.unref(u.Popconfirm),e.mergeProps(o.popconfirmProps,{onConfirm:l,disabled:!o.popconfirmProps,"overlay-style":{zIndex:1060}}),{default:e.withCtx(()=>[e.createVNode(p.default,e.normalizeProps(e.guardReactiveProps(e.unref(c.omit)(o,["popconfirmProps","onAction"]))),null,16)]),_:1},16,["disabled"]))}});exports.default=s;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),c=require("ant-design-vue");require("../item/index.vue.js");const p=require("lodash-unified"),d=require("../item/index.vue2.js"),f=e.defineComponent({name:"ApActionItemPopconfirm",__name:"index",props:{text:{},color:{default:"primary"},disabled:{type:Boolean,default:!1},visible:{type:Boolean,default:!0},onAction:{},onClick:{},loading:{type:Boolean,default:!1},popconfirmProps:{default:()=>({})}},setup(a){const s=e.useSlots(),o=a;async function l(r){var t,i,n;(i=(t=o.popconfirmProps).onConfirm)==null||i.call(t,r),await((n=o.onAction)==null?void 0:n.call(o,r))}return(r,t)=>(e.openBlock(),e.createBlock(e.unref(c.Popconfirm),e.mergeProps(o.popconfirmProps,{onConfirm:l,disabled:!o.popconfirmProps,"overlay-style":{zIndex:1060}}),{default:e.withCtx(()=>[e.createVNode(d.default,e.normalizeProps(e.guardReactiveProps(e.unref(p.omit)(o,["popconfirmProps","onAction"]))),e.createSlots({_:2},[e.renderList(s,(i,n)=>({name:n,fn:e.withCtx(u=>[e.renderSlot(r.$slots,n,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040)]),_:3},16,["disabled"]))}});exports.default=f;

package/lib/src/ap-form/ap-form-item.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),B=require("ant-design-vue"),d=require("lodash-unified"),S=require("./constant.js"),_=require("@ant-design/icons-vue");require("../config-provider/index.js");const w=require("./context.js");require("./style/ap-form-item.css");const A=require("../config-provider/hooks/use-namespace.js"),R=e.defineComponent({name:"ApFormItem",__name:"ap-form-item",props:{htmlFor:{},prefixCls:{},label:{},help:{},extra:{},labelCol:{},wrapperCol:{},hasFeedback:{type:Boolean,default:!1},colon:{type:Boolean,default:void 0},labelAlign:{},prop:{},name:{},rules:{},autoLink:{type:Boolean,default:!0},required:{type:Boolean,default:void 0},validateFirst:{type:Boolean,default:void 0},validateStatus:{},validateTrigger:{},messageVariables:{},hidden:{type:Boolean},noStyle:{type:Boolean},tooltip:{},span:{},order:{},offset:{},push:{},pull:{},xs:{},sm:{},md:{},lg:{},xl:{},xxl:{},flex:{},bordered:{type:Boolean,default:!1},valuePropName:{default:"value"}},setup(F,{expose:b}){var v,y;const t=F,r=e.useSlots(),{model:u,updateModel:s}=w.useInjectForm(),{m:c}=A.useNamespace("ap-form-item"),i=e.ref(!1),n=e.ref(),f=e.computed(()=>t.name?d.isArray(t.name)?t.name.reduce((o,l)=>o==null?void 0:o[l],e.unref(u)):u==null?void 0:u.value[t.name]:null),m=e.ref((y=(v=r.default)==null?void 0:v.call(r))==null?void 0:y[0]);e.watch(()=>{var o;return(o=r.default)==null?void 0:o.call(r)},o=>{m.value=o==null?void 0:o[0]});function C(o){s==null||s(t.name,o)}function g(){i.value=!0}function N(){i.value=!1}const p=e.computed(()=>{var l,a;if(!t.name)return(l=r.default())==null?void 0:l[0];const o=e.unref(m);return o?e.cloneVNode(o,{[t.valuePropName]:e.unref(f),[`onUpdate:${t.valuePropName}`]:C,bordered:t.bordered?!1:(a=o==null?void 0:o.props)==null?void 0:a.bordered,onFocus:g,onBlur:N}):null});function q(){var o;(o=n.value)==null||o.onFieldBlur()}function x(){var o;(o=n.value)==null||o.onFieldChange()}function k(){var o;(o=n.value)==null||o.clearValidate()}function V(){var o;(o=n.value)==null||o.resetField()}function P(){return e.unref(f)}return b({onFieldBlur:q,onFieldChange:x,clearValidate:k,resetField:V,getFieldValue:P}),(o,l)=>(e.openBlock(),e.createBlock(e.unref(B.Form).Item,e.mergeProps({ref_key:"formItemRef",ref:n},e.unref(d.omit)(t,[...e.unref(S.apFormItemColPropKeys),"tooltip"]),{class:{[e.unref(c)("bordered")]:o.bordered,[e.unref(c)("focused")]:o.bordered&&i.value},colon:o.bordered?!1:t.colon}),e.createSlots({default:e.withCtx(()=>[p.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(p.value),{key:0})):e.createCommentVNode("",!0)]),_:2},[t.tooltip?{name:"tooltip",fn:e.withCtx(({class:a})=>[e.createElementVNode("span",{class:e.normalizeClass(a)},[e.createVNode(e.unref(B.Tooltip),{title:t.tooltip},{default:e.withCtx(()=>[e.createVNode(e.unref(_.QuestionCircleOutlined),{style:{color:"#0070ff"}})]),_:1},8,["title"])],2)]),key:"0"}:void 0,e.renderList(e.unref(d.omit)(r,"default"),(a,h)=>({name:h,fn:e.withCtx(I=>[e.renderSlot(o.$slots,h,e.normalizeProps(e.guardReactiveProps(I||{})))])}))]),1040,["class","colon"]))}});exports.default=R;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),B=require("ant-design-vue"),_=require("ant-design-vue/es/theme/internal"),d=require("lodash-unified"),T=require("./constant.js"),w=require("@ant-design/icons-vue");require("../config-provider/index.js");const z=require("./context.js");require("./style/ap-form-item.css");const A=require("../config-provider/hooks/use-namespace.js"),R=e.defineComponent({name:"ApFormItem",__name:"ap-form-item",props:{htmlFor:{},prefixCls:{},label:{},help:{},extra:{},labelCol:{},wrapperCol:{},hasFeedback:{type:Boolean,default:!1},colon:{type:Boolean,default:void 0},labelAlign:{},prop:{},name:{},rules:{},autoLink:{type:Boolean,default:!0},required:{type:Boolean,default:void 0},validateFirst:{type:Boolean,default:void 0},validateStatus:{},validateTrigger:{},messageVariables:{},hidden:{type:Boolean},noStyle:{type:Boolean},tooltip:{},span:{},order:{},offset:{},push:{},pull:{},xs:{},sm:{},md:{},lg:{},xl:{},xxl:{},flex:{},bordered:{type:Boolean,default:!1},valuePropName:{default:"value"}},setup(F,{expose:b}){var v,y;const t=F,r=e.useSlots(),{model:u,updateModel:s}=z.useInjectForm(),{m:c}=A.useNamespace("ap-form-item"),i=e.ref(!1),n=e.ref(),[,C]=_.useToken(),f=e.computed(()=>t.name?d.isArray(t.name)?t.name.reduce((o,l)=>o==null?void 0:o[l],e.unref(u)):u==null?void 0:u.value[t.name]:null),m=e.ref((y=(v=r.default)==null?void 0:v.call(r))==null?void 0:y[0]);e.watch(()=>{var o;return(o=r.default)==null?void 0:o.call(r)},o=>{m.value=o==null?void 0:o[0]});function g(o){s==null||s(t.name,o)}function k(){i.value=!0}function q(){i.value=!1}const p=e.computed(()=>{var l,a;if(!t.name)return(l=r.default())==null?void 0:l[0];const o=e.unref(m);return o?e.cloneVNode(o,{[t.valuePropName]:e.unref(f),[`onUpdate:${t.valuePropName}`]:g,bordered:t.bordered?!1:(a=o==null?void 0:o.props)==null?void 0:a.bordered,onFocus:k,onBlur:q}):null});function N(){var o;(o=n.value)==null||o.onFieldBlur()}function x(){var o;(o=n.value)==null||o.onFieldChange()}function P(){var o;(o=n.value)==null||o.clearValidate()}function V(){var o;(o=n.value)==null||o.resetField()}function S(){return e.unref(f)}return b({onFieldBlur:N,onFieldChange:x,clearValidate:P,resetField:V,getFieldValue:S}),(o,l)=>(e.openBlock(),e.createBlock(e.unref(B.Form).Item,e.mergeProps({ref_key:"formItemRef",ref:n},e.unref(d.omit)(t,[...e.unref(T.apFormItemColPropKeys),"tooltip"]),{class:{[e.unref(c)("bordered")]:o.bordered,[e.unref(c)("focused")]:o.bordered&&i.value},colon:o.bordered?!1:t.colon}),e.createSlots({default:e.withCtx(()=>[p.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(p.value),{key:0})):e.createCommentVNode("",!0)]),_:2},[t.tooltip?{name:"tooltip",fn:e.withCtx(({class:a})=>[e.createElementVNode("span",{class:e.normalizeClass(a)},[e.createVNode(e.unref(B.Tooltip),{title:t.tooltip},{default:e.withCtx(()=>[e.createVNode(e.unref(w.QuestionCircleOutlined),{style:e.normalizeStyle({color:e.unref(C).colorPrimary})},null,8,["style"])]),_:1},8,["title"])],2)]),key:"0"}:void 0,e.renderList(e.unref(d.omit)(r,"default"),(a,h)=>({name:h,fn:e.withCtx(I=>[e.renderSlot(o.$slots,h,e.normalizeProps(e.guardReactiveProps(I||{})))])}))]),1040,["class","colon"]))}});exports.default=R;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),d=require("ant-design-vue");require("../ap-form.vue.js");require("../../hooks/index.js");const P=require("../../utils/slot.js");require("../../config-provider/index.js");const T=require("lodash-unified");require("../style/modal-form.css");const S=require("../../utils/index.js"),M=require("../../hooks/useControllableValue.js"),R=require("../../config-provider/hooks/use-locale.js"),j=require("../../config-provider/hooks/use-global-config.js"),O=require("../../config-provider/hooks/use-namespace.js"),D=require("../ap-form.vue2.js");function U(u){return typeof u=="function"||Object.prototype.toString.call(u)==="[object Object]"&&!e.isVNode(u)}const z=e.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0}},emits:["update:open"],setup(u,{expose:F,emit:y}){const o=u,m=e.useSlots(),C=y,n=e.ref(),c=e.ref(),i=e.ref(!1),{value:B,updateValue:f}=M.useControllableValue(o,C,{valuePropName:"open",defaultValue:!1}),{t:b}=R.useLocale(),v=j.useGlobalConfig("uiMode"),{b:k,e:g}=O.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&c.value&&((l=t.setFieldsValue)==null||l.call(t,c.value),c.value=void 0)});const h=P.getSingleVNode(m.trigger),q=h?e.cloneVNode(h,{onClick:()=>{f(!0)}}):null,N=e.computed(()=>{var l,a,r,p;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let s;t.push(e.createVNode(d.Button,{onClick:V,disabled:i.value},U(s=b("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=o.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(d.Button,e.mergeProps(((a=o.submitter)==null?void 0:a.resetButtonProps)||{},{key:"submit",disabled:i.value,onClick:_}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.resetText)||b("ap.common.resetText")]}})),((r=o.submitter)==null?void 0:r.submitButtonProps)!==!1&&t.push(e.createVNode(d.Button,e.mergeProps({type:"primary",key:"submit"},((p=o.submitter)==null?void 0:p.submitButtonProps)||{},{loading:i.value,onClick:w}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.submitText)||b("ap.common.okText")]}})),e.createVNode(d.Flex,{justify:"flex-end",class:g(e.unref(v)==="admin"?"footer-admin":"footer")},{default:()=>[m.submitter?m.submitter(t):t]})});function _(){var t,l,a;o.submitter!==!1&&((t=n.value)==null||t.resetFields(),(a=(l=o.submitter)==null?void 0:l.onReset)==null||a.call(l))}async function w(){var t,l,a,r;if(o.submitter!==!1)try{const p=await((t=n.value)==null?void 0:t.validateFields());(a=(l=o.submitter)==null?void 0:l.onSubmit)==null||a.call(l),i.value=!0,await((r=o.onFinish)==null?void 0:r.call(o,S.convertReactiveToRaw(p)))&&f(!1)}finally{i.value=!1}}function V(){e.unref(i)||f(!1)}function x(t){!t&&e.unref(i)||f(t)}return F({resetFields:t=>{var l;(l=n.value)==null||l.resetFields(t)},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validate(t,l)},scrollToField:(t,l={})=>{var a;(a=n.value)==null||a.scrollToField(t,l)},setFieldValue:(t,l)=>{var a,r;(r=(a=n.value)==null?void 0:a.setFieldValue)==null||r.call(a,t,l)},setFieldsValue:t=>{var l,a;if(!n.value){c.value=t;return}(a=(l=n.value)==null?void 0:l.setFieldsValue)==null||a.call(l,t)}}),(t,l)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(d.Modal),e.mergeProps(t.modalProps,{open:e.unref(B),"onUpdate:open":x,onCancel:V,footer:null,width:t.width,class:e.unref(k)(),"body-style":{padding:e.unref(v)==="admin"?"0px !important":"20px !important"}}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(v)==="admin"?"content-admin":"content"))},[e.createVNode(D.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(T.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:3},16)],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(N.value)))]),_:3},16,["open","width","class","body-style"]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(q))))],64))}});exports.default=z;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue");require("../ap-form.vue.js");require("../../hooks/index.js");const S=require("../../utils/slot.js");require("../../config-provider/index.js");const T=require("lodash-unified");require("../style/modal-form.css");const M=require("../../utils/index.js"),R=require("../../hooks/useControllableValue.js"),j=require("../../config-provider/hooks/use-locale.js"),O=require("../../config-provider/hooks/use-global-config.js"),D=require("../../config-provider/hooks/use-namespace.js"),U=require("../ap-form.vue2.js");function F(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const z=e.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0}},emits:["update:open"],setup(d,{expose:y,emit:C}){const o=d,m=e.useSlots(),B=C,n=e.ref(),c=e.ref(),r=e.ref(!1),{value:k,updateValue:f}=R.useControllableValue(o,B,{valuePropName:"open",defaultValue:!1}),{t:b}=j.useLocale(),v=O.useGlobalConfig("uiMode","aplus"),{b:N,e:g}=D.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&c.value&&((l=t.setFieldsValue)==null||l.call(t,c.value),c.value=void 0)});const h=S.getSingleVNode(m.trigger),q=h?e.cloneVNode(h,{onClick:()=>{f(!0)}}):null,_=e.computed(()=>{var l,a,u,p;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let s;t.push(e.createVNode(i.Button,{onClick:V,disabled:r.value},F(s=b("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=o.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((a=o.submitter)==null?void 0:a.resetButtonProps)||{},{key:"submit",disabled:r.value,onClick:w}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.resetText)||b("ap.common.resetText")]}})),((u=o.submitter)==null?void 0:u.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((p=o.submitter)==null?void 0:p.submitButtonProps)||{},{loading:r.value,onClick:x}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.submitText)||b("ap.common.okText")]}})),e.createVNode(i.Flex,{justify:"flex-end",class:g(e.unref(v)==="admin"?"footer-admin":"footer")},{default:()=>[m.submitter?m.submitter(t):e.createVNode(i.Space,null,F(t)?t:{default:()=>[t]})]})});function w(){var t,l,a;o.submitter!==!1&&((t=n.value)==null||t.resetFields(),(a=(l=o.submitter)==null?void 0:l.onReset)==null||a.call(l))}async function x(){var t,l,a,u;if(o.submitter!==!1)try{const p=await((t=n.value)==null?void 0:t.validateFields());(a=(l=o.submitter)==null?void 0:l.onSubmit)==null||a.call(l),r.value=!0,await((u=o.onFinish)==null?void 0:u.call(o,M.convertReactiveToRaw(p)))&&f(!1)}finally{r.value=!1}}function V(){e.unref(r)||f(!1)}function P(t){!t&&e.unref(r)||f(t)}return y({resetFields:t=>{var l;(l=n.value)==null||l.resetFields(t)},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validate(t,l)},scrollToField:(t,l={})=>{var a;(a=n.value)==null||a.scrollToField(t,l)},setFieldValue:(t,l)=>{var a,u;(u=(a=n.value)==null?void 0:a.setFieldValue)==null||u.call(a,t,l)},setFieldsValue:t=>{var l,a;if(!n.value){c.value=t;return}(a=(l=n.value)==null?void 0:l.setFieldsValue)==null||a.call(l,t)}}),(t,l)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(t.modalProps,{open:e.unref(k),"onUpdate:open":P,onCancel:V,footer:null,width:t.width,class:e.unref(N)(),"body-style":{padding:e.unref(v)==="admin"?"0px !important":"20px !important"}}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(v)==="admin"?"content-admin":"content"))},[e.createVNode(U.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(T.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:3},16)],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(_.value)))]),_:3},16,["open","width","class","body-style"]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(q))))],64))}});exports.default=z;

package/lib/src/ap-table/ap-table.vue.d.ts

@@ -34,7 +34,7 @@ type ApTableSlots = {
  */
 declare function setSearchFormValues(fields: any): void;
 declare function getSearchFormValues(): Partial<any> | undefined;
-declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any, "text">>, {
+declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any>>, {
     bordered: boolean;
     childrenColumnName: string;
     defaultExpandAllRows: boolean;
@@ -59,7 +59,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     setSearchFormValues: typeof setSearchFormValues;
     getSearchFormValues: typeof getSearchFormValues;
     dataSource: ComputedRef<any[]>;
-}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any, "text">>, {
+}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any>>, {
     bordered: boolean;
     childrenColumnName: string;
     defaultExpandAllRows: boolean;

package/lib/src/ap-table/ap-table.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),y=require("ant-design-vue"),j=require("../ap-form/index.js"),c=require("./constants.js");require("../config-provider/index.js");const M=require("./hooks/use-table-paging.js"),x=require("lodash-unified");require("./style/ap-table.css");const W=require("@ant-design/icons-vue"),u=require("./utils.js"),A=require("./hooks/use-table-content-height.js"),H=require("../config-provider/hooks/use-locale.js"),K=require("../config-provider/hooks/use-namespace.js"),$=require("../config-provider/hooks/use-global-config.js"),G={key:0},U=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},rowSelection:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1}},setup(w,{expose:R}){const o=w,h=e.useSlots(),{t:B}=H.useLocale(),{e:p,b:d}=K.useNamespace("ap-table"),T=$.useGlobalConfig("uiMode"),{height:v,contentRef:P}=A.default(),f=e.computed(()=>{var r;let a=((r=o.columns)==null?void 0:r.filter(t=>!t.hideInTable))||[];return a=a.map(t=>({...u.apColumnToColumn(t),customRender({value:n,...l}){let s;if(t.customRender)s=t.customRender({value:n,...l,column:t});else{const F=u.getTableRenderType(t),_=c.apTableRenderItemMap[F],D=u.getTableRenderProps(t,{value:n,...l});s=e.createVNode(_,e.mergeProps(D,{mode:"read"}),null)}return O(t,n,s)}})),a}),b=e.computed(()=>{var a,r,t;return((t=(r=(a=o.columns)==null?void 0:a.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!c.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:r.sort((n,l)=>{let s=u.getColumnOrder(n.order);return u.getColumnOrder(l.order)-s}))==null?void 0:t.map(n=>{const l=u.updateFormProps(n,u.getFieldProps(n.fieldProps));return{...n,fieldProps:{label:n.title,name:n.dataIndex,...l||{},placeholder:u.getPlaceholder(B,n.valueType,l==null?void 0:l.placeholder)}}}))||[]}),k=e.computed(()=>e.unref(f).filter(a=>a.sorter===!0).map(a=>a.dataIndex)),I=e.computed(()=>e.unref(f).filter(a=>a.filters&&!a.onFilter).map(a=>a.dataIndex)),{formRef:m,submit:C,reset:S,tableProps:i,handleTableChange:q,data:g}=M.useTablePaging({async request(a){var t,n;const r=await((t=o.request)==null?void 0:t.call(o,a));return(n=o.onLoad)==null||n.call(o,(r==null?void 0:r.data)||[]),{data:(r==null?void 0:r.data)||[],total:(r==null?void 0:r.total)||0}},filterFields:e.unref(I),sortFields:e.unref(k),defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,defaultCurrent:o.pagination?o.pagination.defaultCurrent:void 0,defaultPageSize:o.pagination?o.pagination.defaultPageSize:void 0,formatParams:o.beforeSearchSubmit}),V=e.computed(()=>{if(o.scroll)return o.scroll;if(o.adaptive&&g.value.total>0)return{y:e.unref(v)}}),E=e.computed(()=>({...o,...e.unref(i),loading:x.isUndefined(o.loading)?e.unref(i).loading:o.loading,pagination:o.pagination===!1?!1:e.unref(i).pagination,scroll:e.unref(V)})),N=e.computed(()=>[o.card?null:d("wrapper"),o.adaptive?d("adaptive"):null].filter(Boolean));function O(a,r,t){return c.noRenderAsFormItemValueList.includes(a.valueType)?t:a.copyable||a.ellipsis?e.createVNode(y.Typography.Text,{copyable:a.copyable?{text:r,tooltip:!1}:!1,ellipsis:a.ellipsis?{tooltip:r}:!1,content:t},null):t}e.watch(()=>e.unref(g).loading,a=>{var r;(r=o.onLoadingChange)==null||r.call(o,a)});function z(a){var r,t,n;(n=(t=(r=m.value)==null?void 0:r.apForm)==null?void 0:t.setFieldsValue)==null||n.call(t,a)}function L(){var a,r,t;return(t=(r=(a=m.value)==null?void 0:a.apForm)==null?void 0:r.getFieldsValue)==null?void 0:t.call(r,!0)}return R({submit:()=>C(),reset:()=>S(),setSearchFormValues:z,getSearchFormValues:L,dataSource:e.computed(()=>e.unref(g).records)}),(a,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(N.value)},[a.searchForm!==!1&&b.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(a.card?e.unref(p)("search-wrapper"):null),style:e.normalizeStyle(a.searchFormWrapperStyle)},[e.createVNode(e.unref(j.ApForm).SearchForm,e.mergeProps(a.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"",onSubmit:e.unref(C),onReset:e.unref(S),"submit-loading":e.unref(i).loading}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(b.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.customRenderFormItem?t.customRenderFormItem(t):e.unref(c.apTableFormItemMap)[t.valueType||"text"]),e.mergeProps({key:t.dataIndex,ref_for:!0},t.fieldProps||{},{span:t.span}),null,16,["span"]))),128))]),_:2},[h.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(a.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:P,class:e.normalizeClass([e.unref(p)("table-wrapper"),a.card?e.unref(p)("table-wrapper-card"):null]),style:e.normalizeStyle(a.tableWrapperStyle)},[e.renderSlot(a.$slots,"title"),e.createVNode(e.unref(y.Table),e.mergeProps({class:e.unref(T)==="admin"?e.unref(d)("table-admin"):e.unref(d)("table")},E.value,{onChange:e.unref(q),columns:f.value}),e.createSlots({headerCell:e.withCtx(({column:t,title:n})=>[t.tooltip?(e.openBlock(),e.createElementBlock("span",G,[e.createElementVNode("span",null,e.toDisplayString(n),1),e.createVNode(e.unref(y.Tooltip),{title:t.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(W.QuestionCircleOutlined),{style:{color:"#0070ff","padding-left":"4px"}})]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(x.omit)(h,["title","searchFormExtra"]),(t,n)=>({name:n,fn:e.withCtx(l=>[e.renderSlot(a.$slots,n,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","onChange","columns"])],6)],2))}});exports.default=U;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),y=require("ant-design-vue"),M=require("ant-design-vue/es/theme/internal"),W=require("../ap-form/index.js"),c=require("./constants.js");require("../config-provider/index.js");const A=require("./hooks/use-table-paging.js"),x=require("lodash-unified");require("./style/ap-table.css");const H=require("@ant-design/icons-vue"),u=require("./utils.js"),K=require("./hooks/use-table-content-height.js"),$=require("../config-provider/hooks/use-locale.js"),G=require("../config-provider/hooks/use-namespace.js"),U=require("../config-provider/hooks/use-global-config.js"),Q={key:0},J=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},rowSelection:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1}},setup(w,{expose:R}){const o=w,h=e.useSlots(),[,B]=M.useToken(),{t:T}=$.useLocale(),{e:p,b:s}=G.useNamespace("ap-table"),P=U.useGlobalConfig("uiMode","aplus"),{height:k,contentRef:v}=K.default(),f=e.computed(()=>{var r;let t=((r=o.columns)==null?void 0:r.filter(a=>!a.hideInTable))||[];return t=t.map(a=>({...u.apColumnToColumn(a),customRender({value:n,...l}){let d;if(a.customRender)d=a.customRender({value:n,...l,column:a});else{const F=u.getTableRenderType(a),D=c.apTableRenderItemMap[F],j=u.getTableRenderProps(a,{value:n,...l});d=e.createVNode(D,e.mergeProps(j,{mode:"read"}),null)}return L(a,n,d)}})),t}),b=e.computed(()=>{var t,r,a;return((a=(r=(t=o.columns)==null?void 0:t.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!c.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:r.sort((n,l)=>{let d=u.getColumnOrder(n.order);return u.getColumnOrder(l.order)-d}))==null?void 0:a.map(n=>{const l=u.updateFormProps(n,u.getFieldProps(n.fieldProps));return{...n,fieldProps:{label:n.title,name:n.dataIndex,...l||{},placeholder:u.getPlaceholder(T,n.valueType,l==null?void 0:l.placeholder)}}}))||[]}),I=e.computed(()=>e.unref(f).filter(t=>t.sorter===!0).map(t=>t.dataIndex)),q=e.computed(()=>e.unref(f).filter(t=>t.filters&&!t.onFilter).map(t=>t.dataIndex)),{formRef:m,submit:C,reset:S,tableProps:i,handleTableChange:V,data:g}=A.useTablePaging({async request(t){var a,n;const r=await((a=o.request)==null?void 0:a.call(o,t));return(n=o.onLoad)==null||n.call(o,(r==null?void 0:r.data)||[]),{data:(r==null?void 0:r.data)||[],total:(r==null?void 0:r.total)||0}},filterFields:e.unref(q),sortFields:e.unref(I),defaultParams:o.params,defaultData:o.defaultData,manual:o.manual,defaultCurrent:o.pagination?o.pagination.defaultCurrent:void 0,defaultPageSize:o.pagination?o.pagination.defaultPageSize:void 0,formatParams:o.beforeSearchSubmit}),E=e.computed(()=>o.scroll?o.scroll:o.adaptive&&g.value.total>0?{y:e.unref(k)}:{x:!0}),N=e.computed(()=>({...o,...e.unref(i),loading:x.isUndefined(o.loading)?e.unref(i).loading:o.loading,pagination:o.pagination===!1?!1:e.unref(i).pagination,scroll:e.unref(E)})),z=e.computed(()=>[s(),o.card?null:s("wrapper"),o.adaptive?s("adaptive"):null].filter(Boolean));function L(t,r,a){return c.noRenderAsFormItemValueList.includes(t.valueType)?a:t.copyable||t.ellipsis?e.createVNode(y.Typography.Text,{copyable:t.copyable?{text:r,tooltip:!1}:!1,ellipsis:t.ellipsis?{tooltip:r}:!1,content:a},null):a}e.watch(()=>e.unref(g).loading,t=>{var r;(r=o.onLoadingChange)==null||r.call(o,t)});function O(t){var r,a,n;(n=(a=(r=m.value)==null?void 0:r.apForm)==null?void 0:a.setFieldsValue)==null||n.call(a,t)}function _(){var t,r,a;return(a=(r=(t=m.value)==null?void 0:t.apForm)==null?void 0:r.getFieldsValue)==null?void 0:a.call(r,!0)}return R({submit:()=>C(),reset:()=>S(),setSearchFormValues:O,getSearchFormValues:_,dataSource:e.computed(()=>e.unref(g).records)}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(z.value)},[t.searchForm!==!1&&b.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(p)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(W.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"",onSubmit:e.unref(C),onReset:e.unref(S),"submit-loading":e.unref(i).loading}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(b.value,a=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.customRenderFormItem?a.customRenderFormItem(a):e.unref(c.apTableFormItemMap)[a.valueType||"text"]),e.mergeProps({key:a.dataIndex,ref_for:!0},a.fieldProps||{},{span:a.span}),null,16,["span"]))),128))]),_:2},[h.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:v,class:e.normalizeClass([e.unref(p)("table-wrapper"),t.card?e.unref(p)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.renderSlot(t.$slots,"title"),e.createVNode(e.unref(y.Table),e.mergeProps({class:e.unref(P)==="admin"?e.unref(s)("table-admin"):e.unref(s)("table")},N.value,{onChange:e.unref(V),columns:f.value}),e.createSlots({headerCell:e.withCtx(({column:a,title:n})=>[a.tooltip?(e.openBlock(),e.createElementBlock("span",Q,[e.createElementVNode("span",null,e.toDisplayString(n),1),e.createVNode(e.unref(y.Tooltip),{title:a.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(H.QuestionCircleOutlined),{style:e.normalizeStyle({paddingLeft:"4px",color:e.unref(B).colorPrimary})},null,8,["style"])]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(x.omit)(h,["title","searchFormExtra"]),(a,n)=>({name:n,fn:e.withCtx(l=>[e.renderSlot(t.$slots,n,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","onChange","columns"])],6)],2))}});exports.default=J;

package/lib/src/ap-table/interface.d.ts

@@ -54,6 +54,7 @@ export type ApTableValueFields = {
      */
     password: ApFormItemTextPasswordProps;
 };
+export type ApTableValueTypes = keyof ApTableValueFields;
 export type ValueEnum = Record<string, ValueEnumType>;
 export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'> & {
     sorter?: string | boolean | CompareFn<T> | {
@@ -62,8 +63,8 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'>
         multiple?: number;
     };
 };
-export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = ExtraProColumnType<RecordType> & {
-    children?: ApColumnType<any, RecordType>[];
+export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? ExtraProColumnType<RecordType> & {
+    children?: ApColumnType<RecordType, ValueType>[];
     /**
      * 表单项所占据的格子数（1-24格）
      */
@@ -91,11 +92,11 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', Re
     /**
      * 自定义查询表单渲染
      */
-    customRenderFormItem?: (config: ApColumnType) => any;
+    customRenderFormItem?: (config: ApColumnType<RecordType, ValueType>) => any;
     /**
      * 指定值类型（将会用于默认渲染和查询表单生成）
      */
-    valueType?: keyof ApTableValueFields;
+    valueType?: ValueType;
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
@@ -105,7 +106,7 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', Re
         record: RecordType;
         index: number;
         renderIndex: number;
-        column: ApColumnType<ValueType, RecordType>;
+        column: ApColumnType<RecordType, ValueType>;
     }) => ApTableValueFields[ValueType]);
     /**
      * 用于表单项排序的字段
@@ -116,16 +117,16 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', Re
      * 表头的菜单筛选项，设置为true后会尝试使用valueEnum生成filters
      */
     filters?: ColumnType<RecordType>['filters'] | true;
-};
+} : never;
 export type RequestData<T> = {
     data: T[] | undefined;
     total: number;
 } & Record<string, any>;
-export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends keyof ApTableValueFields = 'text'> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size'> & {
+export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size'> & {
     /**
      * 列配置
      */
-    columns?: ApColumnType<any, RecordType>[];
+    columns?: ApColumnType<RecordType, any>[];
     /**
      * 是否启用卡片样式
      */
@@ -138,13 +139,13 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
      * 自定义渲染搜索表单
      * @deprecated 未实现 暂不可用
      */
-    searchFormRender?: (props: ApTableProps<RecordType, ParamsType, ValueType>, defaultDom: any) => any;
+    searchFormRender?: (props: ApTableProps<RecordType, ParamsType>, defaultDom: any) => any;
     /**
      * 请求获取dataSource
      * @param params
      * @returns
      */
-    request?: (params: ParamsType & {
+    request?: (params: Partial<ParamsType> & {
         pageSize?: number;
         current?: number;
         sort?: Record<string, SortOrder>;
@@ -229,6 +230,6 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
      */
     dataSource: ComputedRef<RecordType>;
 };
-export type FixedApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = Omit<ApColumnType<ValueType, RecordType>, 'filters'> & {
+export type FixedApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = Omit<ApColumnType<RecordType, ValueType>, 'filters'> & {
     filters?: ColumnType<RecordType>['filters'];
 };

package/lib/src/ap-table/style/ap-table.css

@@ -72,3 +72,9 @@
 .aplus-ap-table-table-admin tr > td.ant-table-cell {
   border-top-color: #E9E9E9;
 }
+.aplus-ap-table .ant-table-middle .ant-table-cell {
+  padding: 12px 16px !important;
+}
+.aplus-ap-table .ant-table-small .ant-table-cell {
+  padding: 9px 16px !important;
+}