@aplus-frontend/ui 0.0.4 → 0.0.6

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

@@ -69,9 +69,9 @@ export type ApFieldTextAreaExpose = {
 };
 export type ApFieldDateRangeProps = BasicApFieldProps<Omit<RangePickerProps, 'value' | 'onChange' | 'onPanelChange' | 'defaultValue' | 'onOk' | 'renderExtraFooter' | 'onUpdate:value' | 'mode'>> & {
     emptyText?: string;
-    value?: RangeValue<number>;
+    value?: RangeValue<number> | null;
     defaultValue?: RangeValue<number>;
-    onChange?: (ts: RangeValue<number>, dayStr: [string, string]) => void;
+    onChange?: (ts: RangeValue<number> | null, dayStr: [string, string]) => void;
     onOk?: (ts: RangeValue<number>) => void;
     format?: LiteralUnion<ApFormatPresetType, string>;
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue"),k=require("lodash-unified"),y=require("../constant.js"),s=require("./helper.js");require("../../config-provider/index.js");require("../style/ap-form-item-group.css");const C=require("../../config-provider/hooks/use-namespace.js");function _(r){return typeof r=="function"||Object.prototype.toString.call(r)==="[object Object]"&&!e.isVNode(r)}const h=e.defineComponent({name:"ApFormItemGroup",__name:"index",props:{align:{},justify:{},prefixCls:{},gutter:{default:16},wrap:{type:Boolean,default:void 0},countPerRow:{default:3}},setup(r){const{b:u}=C.useNamespace("ap-form-item-group"),{countPerRow:p,...d}=r,c=e.useSlots();e.watch(()=>c.default(),t=>{a.value=s.genRealChildren(t)});const a=e.shallowRef(s.genRealChildren(c.default())),f=e.computed(()=>e.unref(a).map((t,l)=>{const o=t.props,n=k.pick(o,y.apFormItemColPropKeys),m=n!=null&&n.span?{}:s.buildColSpan(p),g=!!(o!=null&&o.hidden);return e.createVNode(i.Col,e.mergeProps({key:l},m,n,{class:g?u("col-hidden"):""}),_(t)?t:{default:()=>[t]})}));return(t,l)=>(e.openBlock(),e.createBlock(e.unref(i.Row),e.mergeProps({class:e.unref(u)()},d),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(f.value,(o,n)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o),{key:n}))),128))]),_:1},16,["class"]))}});exports.default=h;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue"),C=require("lodash-unified"),h=require("../constant.js"),u=require("./helper.js");require("../../config-provider/index.js");require("../style/ap-form-item-group.css");const k=require("../../config-provider/hooks/use-namespace.js");function y(r){return typeof r=="function"||Object.prototype.toString.call(r)==="[object Object]"&&!e.isVNode(r)}const _=e.defineComponent({name:"ApFormItemGroup",__name:"index",props:{align:{},justify:{},prefixCls:{},gutter:{default:16},wrap:{type:Boolean,default:void 0},countPerRow:{default:3}},setup(r){const{b:l}=k.useNamespace("ap-form-item-group"),{countPerRow:p,...d}=r,s=e.useSlots();e.watch(()=>s.default(),t=>{a.value=u.genRealChildren(t)}),e.onBeforeUpdate(()=>{a.value=u.genRealChildren(s.default())});const a=e.shallowRef(u.genRealChildren(s.default())),f=e.computed(()=>e.unref(a).map((t,c)=>{const o=t.props,n=C.pick(o,h.apFormItemColPropKeys),m=n!=null&&n.span?{}:u.buildColSpan(p),g=!!(o!=null&&o.hidden);return e.createVNode(i.Col,e.mergeProps({key:c},m,n,{class:g?l("col-hidden"):""}),y(t)?t:{default:()=>[t]})}));return(t,c)=>(e.openBlock(),e.createBlock(e.unref(i.Row),e.mergeProps({class:e.unref(l)()},d),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(f.value,(o,n)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o),{key:n}))),128))]),_:1},16,["class"]))}});exports.default=_;

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

@@ -1,7 +1,11 @@
-import { ApFormProps } from './interface';
+import { ApFormProps, WatchFunc } from './interface';
 import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign } from 'ant-design-vue/es/form/interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 
+/**
+ * 订阅事件
+ */
+declare function registerWatch(callback: WatchFunc): () => void;
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormProps>, {
     layout: string;
     hideRequiredMark: boolean;
@@ -23,7 +27,8 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     }> | undefined;
     scrollToField: (name: NamePath, options?: {}) => void;
     setFieldsValue: (values: Record<string, any>) => void;
-    setFieldValue: (key: string, newValue: any) => void;
+    setFieldValue: (key: any, newValue: any) => void;
+    registerWatch: typeof registerWatch;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormProps>, {
     layout: string;
     hideRequiredMark: boolean;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("vue"),c=require("ant-design-vue"),f=require("./context.js"),F=require("lodash-unified"),p=a.defineComponent({__name:"ap-form",props:{initialValues:{},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:{},onFinish:{},onFinishFailed:{},onValidate:{}},setup(d,{expose:n}){const s=d;function u(e,l){if(F.isArray(e)){let t=r;for(let i=0;i<e.length-1;i++)t=t[e[i]];t[e[e.length-1]]=l}else r[e]=l}const o=a.ref(),r=a.reactive(s.initialValues||{});return f.useProvideForm({model:a.computed(()=>r),updateModel:u}),n({resetFields:e=>{var l;(l=o.value)==null||l.resetFields(e)},clearValidate:e=>{var l;(l=o.value)==null||l.clearValidate(e)},validateFields:(e,l)=>{var t;return(t=o.value)==null?void 0:t.validateFields(e,l)},getFieldsValue:e=>{var l;return(l=o.value)==null?void 0:l.getFieldsValue(e)},validate:(e,l)=>{var t;return(t=o.value)==null?void 0:t.validate(e,l)},scrollToField:(e,l={})=>{var t;(t=o.value)==null||t.scrollToField(e,l)},setFieldsValue:e=>{Object.assign(r,e)},setFieldValue:(e,l)=>{r[e]=l}}),(e,l)=>(a.openBlock(),a.createBlock(a.unref(c.Form),a.mergeProps({ref_key:"formRef",ref:o},s,{model:r}),{default:a.withCtx(()=>[a.renderSlot(e.$slots,"default")]),_:3},16,["model"]))}});exports.default=p;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("vue"),q=require("ant-design-vue"),M=require("./context.js"),C=require("lodash-unified"),T=a.defineComponent({__name:"ap-form",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:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{}},setup(_,{expose:b}){const i=_;function B(e,t){var m;if(C.isArray(e)){let d=o;for(let c=0;c<e.length-1;c++)d=d[e[c]];d[e[e.length-1]]=t}else o[e]=t;let l=C.isArray(e)?e[0]:e;(m=i.onValuesChange)==null||m.call(i,{[l]:o[l]},o),n()}const r=a.ref(),o=a.reactive(i.initialValues||{});let s=[];const f=e=>{var t;(t=r.value)==null||t.resetFields(e),n()},g=e=>{var t;(t=r.value)==null||t.clearValidate(e)},h=(e,t)=>{var l;return(l=r.value)==null?void 0:l.validateFields(e,t)},u=e=>{var t;return(t=r.value)==null?void 0:t.getFieldsValue(e)},p=(e,t)=>{var l;return(l=r.value)==null?void 0:l.validate(e,t)},v=(e,t={})=>{var l;(l=r.value)==null||l.scrollToField(e,t)},F=e=>{Object.assign(o,e),n()},y=(e,t)=>{o[e]=t,n()};function V(e){return s.push(e),()=>{s=s.filter(t=>t!==e)}}function n(){if(s.length){const e=u(!0);s.forEach(t=>{t(e)})}}return M.useProvideForm({model:a.computed(()=>o),updateModel:B,formInstance:{resetFields:f,clearValidate:g,validateFields:h,getFieldsValue:u,validate:p,scrollToField:v,setFieldsValue:F,setFieldValue:y,registerWatch:V}}),b({resetFields:f,clearValidate:g,validateFields:h,getFieldsValue:u,validate:p,scrollToField:v,setFieldsValue:F,setFieldValue:y,registerWatch:V}),(e,t)=>(a.openBlock(),a.createBlock(a.unref(q.Form),a.mergeProps({ref_key:"formRef",ref:r},i,{model:o}),{default:a.withCtx(()=>[a.renderSlot(e.$slots,"default")]),_:3},16,["model"]))}});exports.default=T;

package/lib/src/ap-form/context.d.ts

@@ -1,9 +1,23 @@
 import { NamePath } from 'ant-design-vue/es/form/interface';
 import { ComputedRef, InjectionKey } from 'vue';
+import { ApFormExpose } from './interface';
 
 type ApFormContextProps<ModelType> = {
+    /**
+     * Form数据源
+     */
     model?: ComputedRef<ModelType>;
+    /**
+     * 更新数据源的方法
+     * @param name
+     * @param value
+     * @returns
+     */
     updateModel?: (name: NamePath, value: any) => void;
+    /**
+     * ApForm内部实例
+     */
+    formInstance?: ApFormExpose;
 };
 export declare const ApFormContextKey: InjectionKey<ApFormContextProps<any>>;
 export declare function useProvideForm<ModelType>(state: ApFormContextProps<ModelType>): void;

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

@@ -0,0 +1,7 @@
+import { NamePath } from 'ant-design-vue/es/form/interface';
+import { ApFormExpose } from '../interface';
+import { Ref } from 'vue';
+
+type ApFormIns = ApFormExpose;
+declare const useWatch: <ValueType = any>(name: NamePath, form?: Ref<ApFormIns | undefined>) => Ref<ValueType | undefined>;
+export default useWatch;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const g=require("../context.js"),a=require("vue"),h=require("lodash-unified");function S(t,e){return h.isArray(e)?e.reduce((r,n)=>r==null?void 0:r[n],t):t==null?void 0:t[e]}function d(t){try{return JSON.stringify(t)}catch{return Math.random()}}const y=(t,e)=>{const{formInstance:r}=g.useInjectForm(),n=a.ref();let u="";return a.watchEffect(o=>{const c=(e==null?void 0:e.value)||r;if(!c)return;const l=c.registerWatch(f=>{const s=S(f,t),i=d(s);i!==u&&(n.value=s,u=i)});o(l)}),n};exports.default=y;

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

@@ -4,6 +4,7 @@ import { default as ApFormItemGroup } from './ap-form-item-group/index.vue';
 import { default as ApFormList } from './ap-form-list.vue';
 import { default as ApFormSearchForm } from './search-form/index.vue';
 import { default as ApFormModalForm } from './modal-form/index.vue';
+import { default as useWatch } from './hooks/use-watch';
 
 type ApFormMixedProps = typeof _ApForm & {
     FormItem: typeof ApFormItem;
@@ -11,6 +12,7 @@ type ApFormMixedProps = typeof _ApForm & {
     FormList: typeof ApFormList;
     SearchForm: typeof ApFormSearchForm;
     ModalForm: typeof ApFormModalForm;
+    useWatch: typeof useWatch;
 };
 declare const ApForm: ApFormMixedProps;
 export * from './items';

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("./ap-form.vue.js");require("./ap-form-item.vue2.js");require("./ap-form-item-group/index.vue2.js");require("./ap-form-list.vue2.js");require("./search-form/index.vue2.js");require("./modal-form/index.vue2.js");require("./items/index.js");require("./interface.js");const p=require("./ap-form.vue2.js"),r=require("./ap-form-item.vue.js"),t=require("./ap-form-item-group/index.vue.js"),u=require("./ap-form-list.vue.js"),_=require("./search-form/index.vue.js"),o=require("./modal-form/index.vue.js"),e=p.default;e.FormItem=r.default;e.FormItemGroup=t.default;e.FormList=u.default;e.SearchForm=_.default;e.ModalForm=o.default;exports.ApFormItem=r.default;exports.ApFormItemGroup=t.default;exports.ApFormList=u.default;exports.ApFormSearchForm=_.default;exports.ApFormModalForm=o.default;exports.ApForm=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("./ap-form.vue.js");require("./ap-form-item.vue2.js");require("./ap-form-item-group/index.vue2.js");require("./ap-form-list.vue2.js");require("./search-form/index.vue2.js");require("./modal-form/index.vue2.js");const p=require("./hooks/use-watch.js");require("./items/index.js");require("./interface.js");const i=require("./ap-form.vue2.js"),r=require("./ap-form-item.vue.js"),t=require("./ap-form-item-group/index.vue.js"),u=require("./ap-form-list.vue.js"),_=require("./search-form/index.vue.js"),o=require("./modal-form/index.vue.js"),e=i.default;e.FormItem=r.default;e.FormItemGroup=t.default;e.FormList=u.default;e.SearchForm=_.default;e.ModalForm=o.default;e.useWatch=p.default;exports.ApFormItem=r.default;exports.ApFormItemGroup=t.default;exports.ApFormList=u.default;exports.ApFormSearchForm=_.default;exports.ApFormModalForm=o.default;exports.ApForm=e;

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

@@ -1,6 +1,7 @@
 import { ButtonProps, ColProps, FormItemProps, FormProps, ModalProps, RowProps } from 'ant-design-vue';
 import { FormItemExpose } from 'ant-design-vue/es/form/FormItem';
-import { NamePath, ValidateOptions } from 'ant-design-vue/es/form/interface';
+import { InternalNamePath, NamePath, ValidateOptions } from 'ant-design-vue/es/form/interface';
+import { Recordable } from '../type';
 
 export type ApFormColProps = Omit<ColProps, 'prefixCls'>;
 export type ApFormItemProps = FormItemProps & Partial<ApFormColProps> & {
@@ -13,18 +14,27 @@ export type ApFormItemProps = FormItemProps & Partial<ApFormColProps> & {
 export type ApFormItemGroupProps = RowProps & {
     countPerRow?: number;
 };
-export type ApFormProps = {
-    initialValues?: Record<string, any>;
-} & Omit<FormProps, 'model'>;
+export type ApFormProps = Omit<FormProps, 'model'> & {
+    initialValues?: Recordable;
+    /**
+     * 字段值更新时触发
+     * @param changedValues 更改的字段值
+     * @param allValues 更改后的字段值
+     * @returns
+     */
+    onValuesChange?: (changedValues: Recordable, allValues: Recordable) => void;
+};
+export type WatchFunc = (values?: Recordable) => void;
 export type ApFormExpose<ModelType = any> = {
     setFieldsValue?: (fields: Partial<ModelType>) => void;
     setFieldValue?: (key: keyof ModelType, value: any) => void;
     resetFields: (name?: NamePath) => void;
     clearValidate: (name?: NamePath) => void;
-    validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<ModelType>>;
-    getFieldsValue: (nameList?: (string | number)[] | true) => Partial<ModelType>;
-    validate: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<ModelType>>;
+    validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<ModelType>> | undefined;
+    getFieldsValue: (nameList?: true | InternalNamePath[]) => Partial<ModelType> | undefined;
+    validate: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<ModelType>> | undefined;
     scrollToField: (name: NamePath, options?: any) => void;
+    registerWatch: (callback: WatchFunc) => () => void;
 };
 export type ApFormItemExpose = FormItemExpose & {
     getFieldValue: () => any;

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

@@ -1,6 +1,6 @@
 import { ApFormModalFormProps, ApFormSubmitterConfig } from '../interface';
 import { VNode, DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties } from 'vue';
-import { NamePath, ValidateOptions, FormLabelAlign } from 'ant-design-vue/es/form/interface';
+import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign } from 'ant-design-vue/es/form/interface';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { LegacyButtonType, ButtonHTMLType } from 'ant-design-vue/es/button/buttonTypes';
 import { ButtonType, ButtonShape, ButtonSize } from 'ant-design-vue/es/button';
@@ -31,7 +31,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     resetFields: (name?: NamePath | undefined) => void;
     clearValidate: (name?: NamePath | undefined) => void;
     validateFields: (nameList?: string | NamePath[] | undefined, options?: ValidateOptions | undefined) => Promise<Partial<any>> | undefined;
-    getFieldsValue: (nameList?: true | (string | number)[] | undefined) => Partial<any> | undefined;
+    getFieldsValue: (nameList?: true | InternalNamePath[] | undefined) => Partial<any> | undefined;
     validate: (nameList?: string | NamePath[] | undefined, options?: ValidateOptions | undefined) => Promise<Partial<any>> | undefined;
     scrollToField: (name: NamePath, options?: {}) => void;
     setFieldValue: (key: string, newValue: any) => void;

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"),i=require("ant-design-vue");require("../ap-form.vue.js");require("../../hooks/index.js");const T=require("../../utils/slot.js");require("../../config-provider/index.js");const R=require("lodash-unified");require("../style/modal-form.css");const j=require("../../utils/index.js"),M=require("../../hooks/useControllableValue.js"),O=require("../../config-provider/hooks/use-locale.js"),D=require("../../config-provider/hooks/use-namespace.js"),U=require("../ap-form.vue2.js");function g(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const L=e.defineComponent({__name:"index",props:{initialValues:{},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:{},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:C,emit:B}){const o=d,m=e.useSlots(),N=B,s=e.ref(),c=e.ref(),r=e.ref(!1),{value:k,updateValue:f}=M.useControllableValue(o,N,{valuePropName:"open",defaultValue:!1}),{t:v}=O.useLocale(),{b:_,e:h}=D.useNamespace("ap-form-modal-form");e.watch(()=>s.value,l=>{var t;l&&c.value&&((t=l.setFieldsValue)==null||t.call(l,c.value),c.value=void 0)});const V=T.getSingleVNode(m.trigger),q=V?e.cloneVNode(V,{onClick:()=>{f(!0)}}):null,w=e.computed(()=>{var u,p,b,y;let l;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let n;t.push(e.createVNode(i.Button,{onClick:F,disabled:r.value},g(n=v("ap.common.cancelText"))?n:{default:()=>[n]}))}return((u=o.submitter)==null?void 0:u.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((p=o.submitter)==null?void 0:p.resetButtonProps)||{},{key:"submit",disabled:r.value,onClick:x}),{default:()=>{var n;return[((n=o.submitter)==null?void 0:n.resetText)||v("ap.common.resetText")]}})),((b=o.submitter)==null?void 0:b.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((y=o.submitter)==null?void 0:y.submitButtonProps)||{},{loading:r.value,onClick:P}),{default:()=>{var n;return[((n=o.submitter)==null?void 0:n.submitText)||v("ap.common.okText")]}})),m.submitter?e.createVNode(i.Flex,{justify:"flex-end",class:h("footer")},g(l=m.submitter(t))?l:{default:()=>[l]}):e.createVNode(i.Flex,{justify:"flex-end",class:h("footer")},{default:()=>[e.createVNode(i.Space,null,g(t)?t:{default:()=>[t]})]})});function x(){var l,t,a;o.submitter!==!1&&((l=s.value)==null||l.resetFields(),(a=(t=o.submitter)==null?void 0:t.onReset)==null||a.call(t))}async function P(){var l,t,a,u;if(o.submitter!==!1)try{const p=await((l=s.value)==null?void 0:l.validateFields());(a=(t=o.submitter)==null?void 0:t.onSubmit)==null||a.call(t),r.value=!0,await((u=o.onFinish)==null?void 0:u.call(o,j.convertReactiveToRaw(p)))&&f(!1)}finally{r.value=!1}}function F(){e.unref(r)||f(!1)}function S(l){!l&&e.unref(r)||f(l)}return C({resetFields:l=>{var t;(t=s.value)==null||t.resetFields(l)},clearValidate:l=>{var t;(t=s.value)==null||t.clearValidate(l)},validateFields:(l,t)=>{var a;return(a=s.value)==null?void 0:a.validateFields(l,t)},getFieldsValue:l=>{var t;return(t=s.value)==null?void 0:t.getFieldsValue(l)},validate:(l,t)=>{var a;return(a=s.value)==null?void 0:a.validate(l,t)},scrollToField:(l,t={})=>{var a;(a=s.value)==null||a.scrollToField(l,t)},setFieldValue:(l,t)=>{var a,u;(u=(a=s.value)==null?void 0:a.setFieldValue)==null||u.call(a,l,t)},setFieldsValue:l=>{var t,a;if(!s.value){c.value=l;return}(a=(t=s.value)==null?void 0:t.setFieldsValue)==null||a.call(t,l)}}),(l,t)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(l.modalProps,{open:e.unref(k),"onUpdate:open":S,onCancel:F,footer:null,width:l.width,class:e.unref(_)()}),{title:e.withCtx(()=>[e.renderSlot(l.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createVNode(U.default,e.mergeProps({ref_key:"formRef",ref:s},e.unref(R.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(l.$slots,"default")]),_:3},16),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(w.value)))]),_:3},16,["open","width","class"]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(q))))],64))}});exports.default=L;
+"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 T=require("../../utils/slot.js");require("../../config-provider/index.js");const R=require("lodash-unified");require("../style/modal-form.css");const j=require("../../utils/index.js"),M=require("../../hooks/useControllableValue.js"),O=require("../../config-provider/hooks/use-locale.js"),D=require("../../config-provider/hooks/use-namespace.js"),U=require("../ap-form.vue2.js");function g(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const L=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:C,emit:B}){const o=d,m=e.useSlots(),N=B,s=e.ref(),c=e.ref(),r=e.ref(!1),{value:k,updateValue:f}=M.useControllableValue(o,N,{valuePropName:"open",defaultValue:!1}),{t:v}=O.useLocale(),{b:_,e:h}=D.useNamespace("ap-form-modal-form");e.watch(()=>s.value,l=>{var t;l&&c.value&&((t=l.setFieldsValue)==null||t.call(l,c.value),c.value=void 0)});const V=T.getSingleVNode(m.trigger),q=V?e.cloneVNode(V,{onClick:()=>{f(!0)}}):null,w=e.computed(()=>{var u,p,b,y;let l;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let n;t.push(e.createVNode(i.Button,{onClick:F,disabled:r.value},g(n=v("ap.common.cancelText"))?n:{default:()=>[n]}))}return((u=o.submitter)==null?void 0:u.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((p=o.submitter)==null?void 0:p.resetButtonProps)||{},{key:"submit",disabled:r.value,onClick:x}),{default:()=>{var n;return[((n=o.submitter)==null?void 0:n.resetText)||v("ap.common.resetText")]}})),((b=o.submitter)==null?void 0:b.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((y=o.submitter)==null?void 0:y.submitButtonProps)||{},{loading:r.value,onClick:P}),{default:()=>{var n;return[((n=o.submitter)==null?void 0:n.submitText)||v("ap.common.okText")]}})),m.submitter?e.createVNode(i.Flex,{justify:"flex-end",class:h("footer")},g(l=m.submitter(t))?l:{default:()=>[l]}):e.createVNode(i.Flex,{justify:"flex-end",class:h("footer")},{default:()=>[e.createVNode(i.Space,null,g(t)?t:{default:()=>[t]})]})});function x(){var l,t,a;o.submitter!==!1&&((l=s.value)==null||l.resetFields(),(a=(t=o.submitter)==null?void 0:t.onReset)==null||a.call(t))}async function P(){var l,t,a,u;if(o.submitter!==!1)try{const p=await((l=s.value)==null?void 0:l.validateFields());(a=(t=o.submitter)==null?void 0:t.onSubmit)==null||a.call(t),r.value=!0,await((u=o.onFinish)==null?void 0:u.call(o,j.convertReactiveToRaw(p)))&&f(!1)}finally{r.value=!1}}function F(){e.unref(r)||f(!1)}function S(l){!l&&e.unref(r)||f(l)}return C({resetFields:l=>{var t;(t=s.value)==null||t.resetFields(l)},clearValidate:l=>{var t;(t=s.value)==null||t.clearValidate(l)},validateFields:(l,t)=>{var a;return(a=s.value)==null?void 0:a.validateFields(l,t)},getFieldsValue:l=>{var t;return(t=s.value)==null?void 0:t.getFieldsValue(l)},validate:(l,t)=>{var a;return(a=s.value)==null?void 0:a.validate(l,t)},scrollToField:(l,t={})=>{var a;(a=s.value)==null||a.scrollToField(l,t)},setFieldValue:(l,t)=>{var a,u;(u=(a=s.value)==null?void 0:a.setFieldValue)==null||u.call(a,l,t)},setFieldsValue:l=>{var t,a;if(!s.value){c.value=l;return}(a=(t=s.value)==null?void 0:t.setFieldsValue)==null||a.call(t,l)}}),(l,t)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(l.modalProps,{open:e.unref(k),"onUpdate:open":S,onCancel:F,footer:null,width:l.width,class:e.unref(_)()}),{title:e.withCtx(()=>[e.renderSlot(l.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createVNode(U.default,e.mergeProps({ref_key:"formRef",ref:s},e.unref(R.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(l.$slots,"default")]),_:3},16),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(w.value)))]),_:3},16,["open","width","class"]),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(q))))],64))}});exports.default=L;

package/lib/src/ap-form/search-form/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("../ap-form.vue.js");require("../ap-form-item-group/index.vue2.js");require("../ap-form-item.vue2.js");require("../../hooks/index.js");const N=require("../ap-form-item-group/helper.js"),D=require("@ant-design/icons-vue");require("../../config-provider/index.js");require("../style/search-form.css");const L=require("lodash-unified"),U=require("../../hooks/useControllableValue.js"),z=require("../../config-provider/hooks/use-namespace.js"),W=require("../../config-provider/hooks/use-locale.js"),b=require("../ap-form-item.vue.js"),$=require("../ap-form.vue2.js"),G=require("../ap-form-item-group/index.vue.js");function H(c){return typeof c=="function"||Object.prototype.toString.call(c)==="[object Object]"&&!e.isVNode(c)}const s=24,J=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{initialValues:{},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:{},onFinish:{},onFinishFailed:{},onValidate:{},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4},submitLoading:{type:Boolean}},emits:["update:collapse"],setup(c,{expose:q,emit:B}){var v;const o=e.useSlots(),a=c,S=B,{value:f,updateValue:w}=U.useControllableValue(a,S,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:P}=z.useNamespace("ap-form-search-form"),{t:g}=W.useLocale(),h=e.ref();function k(){w(!e.unref(f))}function T(){var t;(t=h.value)==null||t.validateFields().then(a.onSubmit)}function A(){var t,d,p;a.customReset||(d=(t=h.value)==null?void 0:t.resetFields)==null||d.call(t),(p=a.onReset)==null||p.call(a)}const C=e.shallowRef(N.genRealChildren(o.default())),i=e.shallowRef((v=o.extra)==null?void 0:v.call(o)),y=e.computed(()=>Math.floor(s/a.countPerRow));e.watch(()=>o.default(),t=>{C.value=N.genRealChildren(t)}),e.watch(()=>{var t;return(t=o.extra)==null?void 0:t.call(o)},t=>{i.value=t});const E=e.computed(()=>{let t;const d=[...e.unref(C)],p=[],F=[],n=e.unref(y);let m=0;d.forEach(l=>{const r=l.props;r!=null&&r.hidden?p.push(l):(m+=r.span||n,F.push(l))});const R=s-(m+n)%s,I=R<n?s:R,_=s-n*(e.unref(i)&&!a.extraInAction?2:1),M=!a.forceExpand&&m>_;let x=0;const j=F.map((l,r)=>{const V=l.props;return x+=V.span||n,e.cloneVNode(l,{span:V.span||n,key:`ApFormSearchFormItem-${r}`,hidden:!a.forceExpand&&e.unref(f)&&x>_})}),O=s-Math.min(_,x)-n;return e.createVNode(e.Fragment,null,[j,p,e.createVNode(b.default,{span:e.unref(y)},{default:()=>[e.createVNode(u.Flex,{justify:"space-between"},{default:()=>[e.createVNode(u.Space,null,{default:()=>[e.createVNode(u.Button,{type:"primary",onClick:T,loading:a.submitLoading},{default:()=>[a.searchText||g("ap.apForm.search.search")]}),e.createVNode(u.Button,{onClick:A},{default:()=>[a.resetText||g("ap.apForm.search.reset")]}),M?e.createVNode(u.Button,{onClick:k,icon:e.createVNode(D.DoubleRightOutlined,{style:"color:#B8C3D1",rotate:e.unref(f)?90:-90},null)},null):null]}),a.extraInAction?e.unref(i):null]})]}),!a.extraInAction&&e.unref(i)?e.createVNode(b.default,{span:e.unref(f)?O:I},{default:()=>[e.createVNode(u.Flex,{justify:"end"},H(t=e.unref(i))?t:{default:()=>[t]})]}):null])});return q({apForm:e.computed(()=>e.unref(h))}),(t,d)=>(e.openBlock(),e.createBlock($.default,e.mergeProps({class:e.unref(P)(),ref_key:"apForm",ref:h},e.unref(L.omit)(a,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[e.createVNode(G.default,{"count-per-row":a.countPerRow},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(E.value)))]),_:1},8,["count-per-row"])]),_:1},16,["class"]))}});exports.default=J;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),s=require("ant-design-vue");require("../ap-form.vue.js");require("../ap-form-item-group/index.vue2.js");require("../ap-form-item.vue2.js");require("../../hooks/index.js");const N=require("../ap-form-item-group/helper.js"),D=require("@ant-design/icons-vue");require("../../config-provider/index.js");require("../style/search-form.css");const L=require("lodash-unified"),U=require("../../hooks/useControllableValue.js"),z=require("../../config-provider/hooks/use-namespace.js"),W=require("../../config-provider/hooks/use-locale.js"),b=require("../ap-form-item.vue.js"),$=require("../ap-form.vue2.js"),G=require("../ap-form-item-group/index.vue.js");function H(i){return typeof i=="function"||Object.prototype.toString.call(i)==="[object Object]"&&!e.isVNode(i)}const c=24,J=e.defineComponent({name:"ApFormSearchForm",__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:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4},submitLoading:{type:Boolean}},emits:["update:collapse"],setup(i,{expose:q,emit:B}){var v;const o=e.useSlots(),a=i,S=B,{value:f,updateValue:w}=U.useControllableValue(a,S,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:P}=z.useNamespace("ap-form-search-form"),{t:g}=W.useLocale(),h=e.ref();function k(){w(!e.unref(f))}function T(){var t,n;(n=(t=h.value)==null?void 0:t.validateFields())==null||n.then(a.onSubmit)}function A(){var t,n,p;a.customReset||(n=(t=h.value)==null?void 0:t.resetFields)==null||n.call(t),(p=a.onReset)==null||p.call(a)}const C=e.shallowRef(N.genRealChildren(o.default())),d=e.shallowRef((v=o.extra)==null?void 0:v.call(o)),y=e.computed(()=>Math.floor(c/a.countPerRow));e.watch(()=>o.default(),t=>{C.value=N.genRealChildren(t)}),e.watch(()=>{var t;return(t=o.extra)==null?void 0:t.call(o)},t=>{d.value=t});const E=e.computed(()=>{let t;const n=[...e.unref(C)],p=[],F=[],l=e.unref(y);let m=0;n.forEach(r=>{const u=r.props;u!=null&&u.hidden?p.push(r):(m+=u.span||l,F.push(r))});const R=c-(m+l)%c,I=R<l?c:R,_=c-l*(e.unref(d)&&!a.extraInAction?2:1),M=!a.forceExpand&&m>_;let x=0;const j=F.map((r,u)=>{const V=r.props;return x+=V.span||l,e.cloneVNode(r,{span:V.span||l,key:`ApFormSearchFormItem-${u}`,hidden:!a.forceExpand&&e.unref(f)&&x>_})}),O=c-Math.min(_,x)-l;return e.createVNode(e.Fragment,null,[j,p,e.createVNode(b.default,{span:e.unref(y)},{default:()=>[e.createVNode(s.Flex,{justify:"space-between"},{default:()=>[e.createVNode(s.Space,null,{default:()=>[e.createVNode(s.Button,{type:"primary",onClick:T,loading:a.submitLoading},{default:()=>[a.searchText||g("ap.apForm.search.search")]}),e.createVNode(s.Button,{onClick:A},{default:()=>[a.resetText||g("ap.apForm.search.reset")]}),M?e.createVNode(s.Button,{onClick:k,icon:e.createVNode(D.DoubleRightOutlined,{style:"color:#B8C3D1",rotate:e.unref(f)?90:-90},null)},null):null]}),a.extraInAction?e.unref(d):null]})]}),!a.extraInAction&&e.unref(d)?e.createVNode(b.default,{span:e.unref(f)?O:I},{default:()=>[e.createVNode(s.Flex,{justify:"end"},H(t=e.unref(d))?t:{default:()=>[t]})]}):null])});return q({apForm:e.computed(()=>e.unref(h))}),(t,n)=>(e.openBlock(),e.createBlock($.default,e.mergeProps({class:e.unref(P)(),ref_key:"apForm",ref:h},e.unref(L.omit)(a,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[e.createVNode(G.default,{"count-per-row":a.countPerRow},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(E.value)))]),_:1},8,["count-per-row"])]),_:1},16,["class"]))}});exports.default=J;

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

@@ -28,6 +28,7 @@ type ApTableSlots = {
  * @param fields
  */
 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">>, {
     bordered: boolean;
     childrenColumnName: string;
@@ -50,6 +51,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     submit: () => void;
     reset: () => void;
     setSearchFormValues: typeof setSearchFormValues;
+    getSearchFormValues: typeof getSearchFormValues;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any, "text">>, {
     bordered: boolean;
     childrenColumnName: string;

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"),f=require("ant-design-vue"),E=require("../ap-form/index.js"),i=require("./constants.js");require("../config-provider/index.js");const O=require("./hooks/use-table-paging.js"),S=require("lodash-unified");require("./style/ap-table.css");const z=require("@ant-design/icons-vue"),d=require("./utils.js"),L=require("../config-provider/hooks/use-locale.js"),D=require("../config-provider/hooks/use-namespace.js"),j=require("../config-provider/hooks/use-global-config.js"),M={key:0},_=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"}},setup(w,{expose:F}){const r=w,{t:R}=L.useLocale(),{e:m,b:c}=D.useNamespace("ap-table"),B=j.useGlobalConfig("uiMode"),p=e.computed(()=>{var o;let a=((o=r.columns)==null?void 0:o.filter(t=>!t.hideInTable))||[];return a=a.map(t=>({...d.apColumnToColumn(t),customRender({value:n,...l}){let s;if(t.customRender)s=t.customRender({value:n,...l,column:t});else{const C=d.getTableRenderType(t),N=i.apTableRenderItemMap[C],V=d.getTableRenderProps(t,{value:n,...l});s=e.createVNode(N,e.mergeProps(V,{mode:"read"}),null)}return q(t,n,s)}})),a}),g=e.computed(()=>{var a,o,t;return((t=(o=(a=r.columns)==null?void 0:a.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!i.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:o.sort((n,l)=>{let s=d.getColumnOrder(n.order);return d.getColumnOrder(l.order)-s}))==null?void 0:t.map(n=>{const l=d.updateFormProps(n,d.getFieldProps(n.fieldProps));return{...n,fieldProps:{label:n.title,name:n.dataIndex,...l||{},placeholder:d.getPlaceholder(R,n.valueType,l==null?void 0:l.placeholder)}}}))||[]}),x=e.computed(()=>e.unref(p).filter(a=>a.sorter===!0).map(a=>a.dataIndex)),T=e.computed(()=>e.unref(p).filter(a=>a.filters&&!a.onFilter).map(a=>a.dataIndex)),{formRef:y,submit:b,reset:h,tableProps:u,handleTableChange:P,data:k}=O.useTablePaging({async request(a){var t,n;const o=await((t=r.request)==null?void 0:t.call(r,a));return(n=r.onLoad)==null||n.call(r,(o==null?void 0:o.data)||[]),{data:(o==null?void 0:o.data)||[],total:(o==null?void 0:o.total)||0}},filterFields:e.unref(T),sortFields:e.unref(x),defaultParams:r.params,defaultData:r.defaultData,manual:r.manual,defaultCurrent:r.pagination?r.pagination.defaultCurrent:void 0,defaultPageSize:r.pagination?r.pagination.defaultPageSize:void 0,formatParams:r.beforeSearchSubmit}),I=e.computed(()=>({...r,...e.unref(u),loading:S.isUndefined(r.loading)?e.unref(u).loading:r.loading,pagination:r.pagination===!1?!1:e.unref(u).pagination}));function q(a,o,t){return i.noRenderAsFormItemValueList.includes(a.valueType)?t:a.copyable||a.ellipsis?e.createVNode(f.Typography.Text,{copyable:a.copyable?{text:o,tooltip:!1}:!1,ellipsis:a.ellipsis?{tooltip:o}:!1,content:t},null):t}e.watch(()=>e.unref(k).loading,a=>{var o;(o=r.onLoadingChange)==null||o.call(r,a)});function v(a){var o,t,n;(n=(t=(o=y.value)==null?void 0:o.apForm)==null?void 0:t.setFieldsValue)==null||n.call(t,a)}return F({submit:()=>b(),reset:()=>h(),setSearchFormValues:v}),(a,o)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(a.card?null:e.unref(c)("wrapper"))},[a.searchForm!==!1&&g.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(a.card?e.unref(m)("search-wrapper"):null),style:e.normalizeStyle(a.searchFormWrapperStyle)},[e.createVNode(e.unref(E.ApForm).SearchForm,e.mergeProps(a.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"",onSubmit:e.unref(b),onReset:e.unref(h),"submit-loading":e.unref(u).loading}),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(g.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.customRenderFormItem?t.customRenderFormItem(t):e.unref(i.apTableFormItemMap)[t.valueType||"text"]),e.mergeProps({key:t.dataIndex,ref_for:!0},t.fieldProps||{},{span:t.span}),null,16,["span"]))),128))]),_:1},16,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(a.card?e.unref(m)("table-wrapper"):null),style:e.normalizeStyle(a.tableWrapperStyle)},[e.renderSlot(a.$slots,"title"),e.createVNode(e.unref(f.Table),e.mergeProps({class:e.unref(B)==="admin"?e.unref(c)("table-admin"):e.unref(c)("table")},I.value,{onChange:e.unref(P),columns:p.value}),e.createSlots({headerCell:e.withCtx(({column:t,title:n})=>[t.tooltip?(e.openBlock(),e.createElementBlock("span",M,[e.createElementVNode("span",null,e.toDisplayString(n),1),e.createVNode(e.unref(f.Tooltip),{title:t.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(z.QuestionCircleOutlined),{style:{color:"#0070ff","padding-left":"4px"}})]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(S.omit)(a.$slots,"title"),(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=_;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),m=require("ant-design-vue"),O=require("../ap-form/index.js"),i=require("./constants.js");require("../config-provider/index.js");const z=require("./hooks/use-table-paging.js"),S=require("lodash-unified");require("./style/ap-table.css");const L=require("@ant-design/icons-vue"),d=require("./utils.js"),D=require("../config-provider/hooks/use-locale.js"),j=require("../config-provider/hooks/use-namespace.js"),M=require("../config-provider/hooks/use-global-config.js"),_={key:0},A=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"}},setup(F,{expose:w}){const o=F,{t:R}=D.useLocale(),{e:g,b:c}=j.useNamespace("ap-table"),B=M.useGlobalConfig("uiMode"),p=e.computed(()=>{var n;let a=((n=o.columns)==null?void 0:n.filter(t=>!t.hideInTable))||[];return a=a.map(t=>({...d.apColumnToColumn(t),customRender({value:r,...l}){let u;if(t.customRender)u=t.customRender({value:r,...l,column:t});else{const C=d.getTableRenderType(t),N=i.apTableRenderItemMap[C],E=d.getTableRenderProps(t,{value:r,...l});u=e.createVNode(N,e.mergeProps(E,{mode:"read"}),null)}return v(t,r,u)}})),a}),y=e.computed(()=>{var a,n,t;return((t=(n=(a=o.columns)==null?void 0:a.filter(r=>!r.hideInSearch&&r.dataIndex&&(r.valueType||r.customRenderFormItem)&&!i.noRenderAsFormItemValueList.includes(r.valueType)))==null?void 0:n.sort((r,l)=>{let u=d.getColumnOrder(r.order);return d.getColumnOrder(l.order)-u}))==null?void 0:t.map(r=>{const l=d.updateFormProps(r,d.getFieldProps(r.fieldProps));return{...r,fieldProps:{label:r.title,name:r.dataIndex,...l||{},placeholder:d.getPlaceholder(R,r.valueType,l==null?void 0:l.placeholder)}}}))||[]}),x=e.computed(()=>e.unref(p).filter(a=>a.sorter===!0).map(a=>a.dataIndex)),T=e.computed(()=>e.unref(p).filter(a=>a.filters&&!a.onFilter).map(a=>a.dataIndex)),{formRef:f,submit:b,reset:h,tableProps:s,handleTableChange:P,data:k}=z.useTablePaging({async request(a){var t,r;const n=await((t=o.request)==null?void 0:t.call(o,a));return(r=o.onLoad)==null||r.call(o,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:e.unref(T),sortFields:e.unref(x),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}),I=e.computed(()=>({...o,...e.unref(s),loading:S.isUndefined(o.loading)?e.unref(s).loading:o.loading,pagination:o.pagination===!1?!1:e.unref(s).pagination}));function v(a,n,t){return i.noRenderAsFormItemValueList.includes(a.valueType)?t:a.copyable||a.ellipsis?e.createVNode(m.Typography.Text,{copyable:a.copyable?{text:n,tooltip:!1}:!1,ellipsis:a.ellipsis?{tooltip:n}:!1,content:t},null):t}e.watch(()=>e.unref(k).loading,a=>{var n;(n=o.onLoadingChange)==null||n.call(o,a)});function V(a){var n,t,r;(r=(t=(n=f.value)==null?void 0:n.apForm)==null?void 0:t.setFieldsValue)==null||r.call(t,a)}function q(){var a,n,t;return(t=(n=(a=f.value)==null?void 0:a.apForm)==null?void 0:n.getFieldsValue)==null?void 0:t.call(n,!0)}return w({submit:()=>b(),reset:()=>h(),setSearchFormValues:V,getSearchFormValues:q}),(a,n)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(a.card?null:e.unref(c)("wrapper"))},[a.searchForm!==!1&&y.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(a.card?e.unref(g)("search-wrapper"):null),style:e.normalizeStyle(a.searchFormWrapperStyle)},[e.createVNode(e.unref(O.ApForm).SearchForm,e.mergeProps(a.searchForm||{},{ref_key:"formRef",ref:f,"custom-reset":"",onSubmit:e.unref(b),onReset:e.unref(h),"submit-loading":e.unref(s).loading}),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(y.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.customRenderFormItem?t.customRenderFormItem(t):e.unref(i.apTableFormItemMap)[t.valueType||"text"]),e.mergeProps({key:t.dataIndex,ref_for:!0},t.fieldProps||{},{span:t.span}),null,16,["span"]))),128))]),_:1},16,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass(a.card?e.unref(g)("table-wrapper"):null),style:e.normalizeStyle(a.tableWrapperStyle)},[e.renderSlot(a.$slots,"title"),e.createVNode(e.unref(m.Table),e.mergeProps({class:e.unref(B)==="admin"?e.unref(c)("table-admin"):e.unref(c)("table")},I.value,{onChange:e.unref(P),columns:p.value}),e.createSlots({headerCell:e.withCtx(({column:t,title:r})=>[t.tooltip?(e.openBlock(),e.createElementBlock("span",_,[e.createElementVNode("span",null,e.toDisplayString(r),1),e.createVNode(e.unref(m.Tooltip),{title:t.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(L.QuestionCircleOutlined),{style:{color:"#0070ff","padding-left":"4px"}})]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(S.omit)(a.$slots,"title"),(t,r)=>({name:r,fn:e.withCtx(l=>[e.renderSlot(a.$slots,r,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","onChange","columns"])],6)],2))}});exports.default=A;

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

@@ -196,9 +196,26 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
      */
     size?: 'middle' | 'small';
 };
-export type ApTableExpose = {
+export type ApTableExpose<SearchParamsType = Recordable> = {
+    /**
+     * 查询表单提交
+     */
     submit: () => void;
+    /**
+     * 查询表单重置
+     */
     reset: () => void;
+    /**
+     * 设置查询表单的值
+     * @param fields
+     * @returns
+     */
+    setSearchFormValues: (fields: Partial<SearchParamsType>) => void;
+    /**
+     * 获取查询表单值
+     * @returns
+     */
+    getSearchFormValues: () => Partial<SearchParamsType>;
 };
 export type FixedApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = Omit<ApColumnType<ValueType, RecordType>, 'filters'> & {
     filters?: ColumnType<RecordType>['filters'];

package/lib/src/pro-form/helper.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("lodash-unified"),n=["Divider","BasicTitle"];function c(e){return n.includes(e||"")}function s(e,i,t){Reflect.has(e,"type")||(["DatePicker","MonthPicker","WeekPicker","TimePicker"].includes(i)?e.type=t?"string":"object":["RangePicker","Upload","CheckboxGroup","TimePicker"].includes(i)?e.type="array":["InputNumber"].includes(i)&&(e.type="number"))}const o=["ApiTransfer","ApiTree","ApiTreeSelect","ApiRadioGroup","ApiCascader","AutoComplete","RadioButtonGroup","ApiSelect"];function p(e,i="",t){return e.includes("Input")||e.includes("Complete")?t("ap.common.inputText")+i:e.includes("Picker")||e.includes("Select")||e.includes("Cascader")||e.includes("Checkbox")||e.includes("Radio")||e.includes("Switch")?t("ap.common.chooseText")+i:""}const a=["DatePicker","MonthPicker","WeekPicker","TimePicker"];function d(){return[...a,"RangePicker"]}const l=d(),r=["Input","InputPassword","InputNumber","InputSearch","InputTextArea"];function T(e,i){return e&&r.includes(e)&&i&&u.isNumber(i)?`${i}`:i}exports.NO_AUTO_LINK_COMPONENTS=o;exports.createPlaceholderMessage=p;exports.dateItemType=l;exports.defaultValueComponents=r;exports.handleInputNumberValue=T;exports.isIncludeSimpleComponents=c;exports.setComponentRuleType=s;exports.simpleComponents=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("lodash-unified"),n=["Divider","BasicTitle"];function c(e){return n.includes(e||"")}function s(e,i,t){Reflect.has(e,"type")||(["DatePicker","MonthPicker","WeekPicker","TimePicker"].includes(i)?e.type=t?"string":"object":["RangePicker","Upload","CheckboxGroup","TimePicker"].includes(i)?e.type="array":["InputNumber"].includes(i)&&(e.type="number"))}const l=["ApiTransfer","ApiTree","ApiTreeSelect","ApiRadioGroup","ApiCascader","AutoComplete","RadioButtonGroup","ApiSelect"];function o(e,i="",t){return e.includes("Input")||e.includes("Complete")?t("ap.common.inputText"):e.includes("Picker")||e.includes("Select")||e.includes("Cascader")||e.includes("Checkbox")||e.includes("Radio")||e.includes("Switch")?t("ap.common.chooseText"):""}const a=["DatePicker","MonthPicker","WeekPicker","TimePicker"];function p(){return[...a,"RangePicker"]}const d=p(),r=["Input","InputPassword","InputNumber","InputSearch","InputTextArea"];function T(e,i){return e&&r.includes(e)&&i&&u.isNumber(i)?`${i}`:i}exports.NO_AUTO_LINK_COMPONENTS=l;exports.createPlaceholderMessage=o;exports.dateItemType=d;exports.defaultValueComponents=r;exports.handleInputNumberValue=T;exports.isIncludeSimpleComponents=c;exports.setComponentRuleType=s;exports.simpleComponents=n;

package/lib/src/theme/antd-global-overwrite/admin/alert.css

@@ -4,6 +4,9 @@
   padding: 6px 12px;
   border-radius: 4px;
 }
+.ant-alert .ant-alert-close-icon {
+  line-height: 18px;
+}
 .ant-alert .ant-alert-icon {
   font-size: 16px;
   transform: translateY(1px);

package/lib/src/theme/antd-global-overwrite/admin/index.css

@@ -4,6 +4,9 @@
   padding: 6px 12px;
   border-radius: 4px;
 }
+.ant-alert .ant-alert-close-icon {
+  line-height: 18px;
+}
 .ant-alert .ant-alert-icon {
   font-size: 16px;
   transform: translateY(1px);

package/lib/src/theme/antd-global-overwrite/aplus/alert.css

@@ -4,6 +4,9 @@
   padding: 6px 12px;
   border-radius: 4px;
 }
+.ant-alert .ant-alert-close-icon {
+  line-height: 18px;
+}
 .ant-alert .ant-alert-icon {
   font-size: 16px;
   transform: translateY(1px);

package/lib/src/theme/antd-global-overwrite/aplus/index.css

@@ -4,6 +4,9 @@
   padding: 6px 12px;
   border-radius: 4px;
 }
+.ant-alert .ant-alert-close-icon {
+  line-height: 18px;
+}
 .ant-alert .ant-alert-icon {
   font-size: 16px;
   transform: translateY(1px);

package/lib/src/utils/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("vue"),a=require("lodash-unified");function f(e){return(e==null?void 0:e.parentNode)??document.body}function l(e){return typeof e<"u"}function y(e){const t={};return Object.keys(e).map(n=>{t[n]=u.unref(e[n])}),t}function d(e,t=[],n){const i=Object.assign({},e),s=Object.keys(i);for(let r=0;r<s.length;r+=1){const o=s[r];(t.includes(o)||n!=null&&n(o,i[o]))&&delete i[o]}return i}function p(e){return/^[A-Z][A-Za-z]*$/.test(e)}function c(e){if(Array.isArray(e))return e.map(t=>c(t));if(typeof e=="object"&&e!==null){const t={};for(const n in e)t[n]=c(e[n]);return u.markRaw(t)}return e}function g(e){const t={...e};for(const n of Object.keys(t))a.isUndefined(t[n])&&delete t[n];return console.log("copy",t),t}exports.convertReactiveToRaw=c;exports.getDynamicProps=y;exports.getPopupContainer=f;exports.isDef=l;exports.isPascalCase=p;exports.omitUndefined=g;exports.omitWhen=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("vue"),a=require("lodash-unified");function f(e){return(e==null?void 0:e.parentNode)??document.body}function l(e){return typeof e<"u"}function y(e){const t={};return Object.keys(e).map(n=>{t[n]=u.unref(e[n])}),t}function d(e,t=[],n){const i=Object.assign({},e),s=Object.keys(i);for(let o=0;o<s.length;o+=1){const r=s[o];(t.includes(r)||n!=null&&n(r,i[r]))&&delete i[r]}return i}function p(e){return/^[A-Z][A-Za-z]*$/.test(e)}function c(e){if(Array.isArray(e))return e.map(t=>c(t));if(typeof e=="object"&&e!==null){const t={};for(const n in e)t[n]=c(e[n]);return u.markRaw(t)}return e}function m(e){const t={...e};for(const n of Object.keys(t))a.isUndefined(t[n])&&delete t[n];return t}exports.convertReactiveToRaw=c;exports.getDynamicProps=y;exports.getPopupContainer=f;exports.isDef=l;exports.isPascalCase=p;exports.omitUndefined=m;exports.omitWhen=d;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [
@@ -61,7 +61,7 @@
     "@aplus-frontend/oss": "^1.0.11",
     "mime": "^4.0.3",
     "@aplus-frontend/hooks": "1.0.4",
-    "@aplus-frontend/utils": "1.0.20"
+    "@aplus-frontend/utils": "1.0.21"
   },
   "peerDependencies": {
     "ant-design-vue": "^4.2.1",