@oiij/naive-ui 0.0.40 → 0.0.41

package/dist/components/data-table-plus/DataTablePlus.vue.d.ts

@@ -56,6 +56,10 @@ declare const _default: <P extends RObject, D extends RObject, R extends RObject
             refs: DataTablePlusExposeRefs<P, D, R>;
             actions: DataTablePlusExposeActions<P, D>;
         }): any;
+        'filter-modal'?(_: {
+            refs: DataTablePlusExposeRefs<P, D, R>;
+            actions: DataTablePlusExposeActions<P, D>;
+        }): any;
     };
     emit: DataTablePlusEmits<P, D, R>;
 }>) => import('vue').VNode & {

package/dist/components/data-table-plus/FlexFilter.vue.d.ts

@@ -0,0 +1,24 @@
+import { FlexProps } from 'naive-ui';
+import { RObject } from '../remote-request/index';
+import { DataTablePlusExposeActions, DataTablePlusExposeRefs, DataTablePlusFilterOptionItem } from './index';
+declare const _default: <P extends RObject, D extends RObject, R extends RObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly "onUpdate:value"?: ((val: unknown, key: keyof P) => any) | undefined;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onUpdate:value"> & {
+        options?: DataTablePlusFilterOptionItem<P, D, R>[];
+        exposeRefs: DataTablePlusExposeRefs<P, D, R>;
+        exposeActions: DataTablePlusExposeActions<P, D>;
+        params: P[];
+        flexProps?: FlexProps;
+    } & Partial<{}>> & import('vue').PublicProps;
+    expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
+    attrs: any;
+    slots: {};
+    emit: (e: "update:value", val: unknown, key: keyof P) => void;
+}>) => import('vue').VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/dist/components/data-table-plus/GridFilter.vue.d.ts

@@ -0,0 +1,24 @@
+import { GridProps } from 'naive-ui';
+import { RObject } from '../remote-request/index';
+import { DataTablePlusExposeActions, DataTablePlusExposeRefs, DataTablePlusFilterOptionItem } from './index';
+declare const _default: <P extends RObject, D extends RObject, R extends RObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly "onUpdate:value"?: ((val: unknown, key: keyof P) => any) | undefined;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onUpdate:value"> & {
+        options?: DataTablePlusFilterOptionItem<P, D, R>[];
+        exposeRefs: DataTablePlusExposeRefs<P, D, R>;
+        exposeActions: DataTablePlusExposeActions<P, D>;
+        params: P[];
+        gridProps?: GridProps;
+    } & Partial<{}>> & import('vue').PublicProps;
+    expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
+    attrs: any;
+    slots: {};
+    emit: (e: "update:value", val: unknown, key: keyof P) => void;
+}>) => import('vue').VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/dist/components/data-table-plus/index.d.ts

@@ -1,4 +1,4 @@
-import { DataTableColumns, DataTableFilterState, DataTableInst, DataTableProps, DataTableSortState, DropdownOption, FlexProps, FormItemProps, GridItemProps, GridProps, PaginationProps } from 'naive-ui';
+import { DataTableColumns, DataTableFilterState, DataTableInst, DataTableProps, DataTableSortState, DropdownOption, FlexProps, FormItemProps, GridItemProps, GridProps, ModalProps, PaginationProps } from 'naive-ui';
 import { FilterState, TableBaseColumn } from 'naive-ui/es/data-table/src/interface';
 import { ComputedRef, CSSProperties, Ref, ShallowRef, VNode } from 'vue';
 import { useRequestResult } from 'vue-hooks-plus/es/useRequest/types';
@@ -6,7 +6,7 @@ import { PresetInputOptions } from '../preset-input/index';
 import { RemoteRequestEmits, RemoteRequestProps, RObject } from '../remote-request/index';
 import { SearchInputProps } from '../search-input/index';
 export { default as NDataTablePlus } from './DataTablePlus.vue';
-export interface DataTablePlusExposeActions<P extends RObject, D extends RObject> {
+export interface DataTablePlusExposeActions<P extends RObject = RObject, D extends RObject = RObject> {
     run: (params: P) => void;
     runAsync: (params: P) => Promise<D>;
     refresh: () => void;
@@ -16,22 +16,24 @@ export interface DataTablePlusExposeActions<P extends RObject, D extends RObject
     setParams: (params: Partial<P>) => void;
     runParams: (params: Partial<P>) => void;
     runParamsAsync: (params: Partial<P>) => Promise<D>;
+    showFilterModal: () => void;
+    resetParams: () => void;
 }
 export interface DataTablePlusPagination {
     page: number;
     pageSize: number;
     itemCount: number;
 }
-export type DataTablePlusExposeRefsBase<P extends RObject, D extends RObject, R extends RObject> = Pick<useRequestResult<D, P[], false, false>, 'loading' | 'data' | 'error' | 'params'> & {
+export type DataTablePlusExposeRefsBase<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = Pick<useRequestResult<D, P[], false, false>, 'loading' | 'data' | 'error' | 'params'> & {
     pagination: Readonly<Ref<DataTablePlusPagination, DataTablePlusPagination>>;
     rawList: ComputedRef<R[]>;
 };
-export type DataTablePlusExposeRefs<P extends RObject, D extends RObject, R extends RObject> = DataTablePlusExposeRefsBase<P, D, R> & {
+export type DataTablePlusExposeRefs<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = DataTablePlusExposeRefsBase<P, D, R> & {
     filters: Ref<DataTableFilterState | undefined>;
     sorters: Ref<Record<string, DataTableSortState> | undefined>;
     dataTableRef: Readonly<ShallowRef<DataTableInst | null>>;
 };
-export type DataTablePlusFilterOptions<P extends RObject, D extends RObject, R extends RObject> = (PresetInputOptions & {
+export type DataTablePlusFilterOptionItem<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = PresetInputOptions & {
     key?: keyof P;
     label?: string | boolean | (FormItemProps & {
         style?: CSSProperties;
@@ -42,26 +44,32 @@ export type DataTablePlusFilterOptions<P extends RObject, D extends RObject, R e
     gridSpan?: string | number;
     gridItemProps?: GridItemProps;
     render?: (refs: DataTablePlusExposeRefs<P, D, R>, actions: DataTablePlusExposeActions<P, D>) => VNode | null;
-})[];
+};
+export type DataTablePlusFilterOptions<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = DataTablePlusFilterOptionItem<P, D, R>[];
 export type DataTablePlusFields = Partial<Record<'page' | 'pageSize' | 'filter' | 'sorter' | 'list' | 'count' | 'rowKey' | 'search' | 'children', string>>;
-export type DataTablePlusProps<P extends RObject, D extends RObject, R extends RObject> = RemoteRequestProps<P, D> & {
+export type DataTablePlusProps<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = RemoteRequestProps<P, D> & {
     title?: string;
     columns?: DataTableColumns<R>;
     filterOptions?: DataTablePlusFilterOptions<P, D, R>;
     filterGridProps?: GridProps;
     filterFlexProps?: FlexProps;
     filterLayout?: 'grid' | 'flex' | ['grid' | 'flex'];
+    filterCollapsedType?: 'collapsed' | 'modal';
+    filterModalTrigger?: 'manual' | 'auto';
+    filterLabel?: string;
+    filterModalProps?: ModalProps;
     contextMenuOptions?: DropdownOption[];
     fields?: DataTablePlusFields;
     search?: SearchInputProps | boolean;
     pagination?: Omit<PaginationProps, 'page' | 'pageSize'> | boolean;
+    clearable?: boolean;
     columnsFilterOptions?: (filters: DataTableFilterState) => Record<string, any>;
     columnsSorterOptions?: (sorters: Record<string, DataTableSortState>) => Record<string, any>;
     dataTableProps?: DataTableProps;
     customStyle?: CSSProperties;
     customClass?: string;
 };
-export type DataTablePlusEmits<P extends RObject, D extends RObject, R extends RObject> = RemoteRequestEmits<P, D> & {
+export type DataTablePlusEmits<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = RemoteRequestEmits<P, D> & {
     (e: 'clickRow', row: R, index: number, event: MouseEvent, currentData: R[]): void;
     (e: 'contextMenuRow', row: R, index: number, event: MouseEvent, currentData: R[]): void;
     (e: 'load', row: R): Promise<void>;

package/dist/components/preset-form/index.d.ts

@@ -8,7 +8,7 @@ export type PresetFormExposeRefs<V extends Record<string, any> = Record<string,
 export type PresetFormExposeActions<V extends Record<string, any> = Record<string, any>> = Pick<NaiveFormReturns<V>, 'validate' | 'resetValidation' | 'resetForm' | 'reset' | 'clear' | 'onValidated'> & {
     setValues: (value: Partial<V>) => void;
 };
-export type PresetFormOptions<V extends Record<string, any> = Record<string, any>> = (PresetInputOptions & {
+export type PresetFormOptionsItem<V extends Record<string, any> = Record<string, any>> = PresetInputOptions & {
     key?: keyof V;
     label?: string | boolean | (FormItemProps & {
         style?: CSSProperties;
@@ -21,7 +21,8 @@ export type PresetFormOptions<V extends Record<string, any> = Record<string, any
     gridSpan?: string | number;
     gridItemProps?: GridItemProps;
     render?: (refs: PresetFormExposeRefs<V>, actions: PresetFormExposeActions<V>) => VNode | null;
-})[];
+};
+export type PresetFormOptions<V extends Record<string, any> = Record<string, any>> = PresetFormOptionsItem<V>[];
 export interface PresetFormProps<V extends Record<string, any> = Record<string, any>> {
     options?: PresetFormOptions<V>;
     values?: V;

package/dist/components/preset-picker/PresetPicker.vue.d.ts

@@ -4,14 +4,14 @@ declare const _default: <V extends PresetPickerValue, R extends RObject>(__VLS_p
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly onClose?: (() => any) | undefined;
         readonly "onUpdate:value"?: ((val: V | null, raw: R | R[] | null) => any) | undefined;
+        readonly onPositiveClick?: (() => any) | undefined;
         readonly onAfterEnter?: (() => any) | undefined;
         readonly onAfterLeave?: (() => any) | undefined;
         readonly onEsc?: (() => any) | undefined;
         readonly onMaskClick?: (() => any) | undefined;
         readonly onNegativeClick?: (() => any) | undefined;
-        readonly onPositiveClick?: (() => any) | undefined;
         readonly "onUpdate:show"?: ((value: boolean) => any) | undefined;
-    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onAfterEnter" | "onAfterLeave" | "onUpdate:show" | "onUpdate:value" | "onClose" | "onEsc" | "onMaskClick" | "onNegativeClick" | "onPositiveClick"> & PresetPickerProps<V, R> & Partial<{}>> & import('vue').PublicProps;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onAfterEnter" | "onAfterLeave" | "onUpdate:show" | "onUpdate:value" | "onClose" | "onEsc" | "onPositiveClick" | "onNegativeClick" | "onMaskClick"> & PresetPickerProps<V, R> & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{
         refs: PresetPickerExposeRefs<R>;
         actions: PresetPickerExposeActions<R>;

package/dist/components/preset-picker/index.d.ts

@@ -4,13 +4,13 @@ import { Ref } from 'vue';
 import { RObject } from '../remote-request/index';
 export { default as NPresetPicker } from './PresetPicker.vue';
 export type PresetPickerValue = string | number | (string | number)[] | null;
-export type PresetPickerExposeRefs<R extends RObject> = {
+export type PresetPickerExposeRefs<R extends RObject = RObject> = {
     showModalFlag: Ref<boolean, boolean>;
     checkedRowKeys: Ref<(string | number)[], (string | number)[]>;
     checkedRows: Ref<R[], R[]>;
     columns: DataTableColumns<any>;
 };
-export type PresetPickerExposeActions<R extends RObject> = {
+export type PresetPickerExposeActions<R extends RObject = RObject> = {
     showModal: () => void;
     updateCheckedRowKeysEffect: (keys: (string | number)[], rows: (R | undefined)[], meta: {
         row: R | undefined;
@@ -21,7 +21,7 @@ export type PresetPickerExposeActions<R extends RObject> = {
     setCheckedRowKeys: (keys: (string | number)[]) => void;
     setCheckedRows: (rows: R[]) => void;
 };
-export type PresetPickerProps<V extends PresetPickerValue, R extends RObject> = {
+export type PresetPickerProps<V extends PresetPickerValue, R extends RObject = RObject> = {
     value?: V;
     fallbackLabel?: string | ((val: string | number) => string);
     multiple?: boolean;
@@ -40,7 +40,7 @@ export type PresetPickerProps<V extends PresetPickerValue, R extends RObject> =
     badgeProps?: BadgeProps;
     modalProps?: ModalProps;
 };
-export type PresetPickerEmits<V extends PresetPickerValue, R extends RObject> = {
+export type PresetPickerEmits<V extends PresetPickerValue, R extends RObject = RObject> = {
     (e: 'update:value', val: V | null, raw: R | R[] | null): void;
     (e: 'afterEnter'): void;
     (e: 'afterLeave'): void;

package/dist/components/preset-select/index.d.ts

@@ -4,7 +4,7 @@ import { DataTablePlusExposeActions, DataTablePlusExposeRefsBase } from '../data
 import { RemoteRequestEmits, RemoteRequestProps, RObject } from '../remote-request/index';
 export { default as NPresetSelect } from './PresetSelect.vue';
 export type ArrayAwareType<V, T> = V extends null ? null : (V extends any[] ? T[] : T) | null;
-export type OptionFormat<R extends RObject> = (row: R) => SelectOption | SelectGroupOption | false | undefined | null;
+export type OptionFormat<R extends RObject = RObject> = (row: R) => SelectOption | SelectGroupOption | false | undefined | null;
 export type PresetSelectValue = string | number | (string | number)[] | null;
 export type PresetSelectFields = Partial<Record<'page' | 'pageSize' | 'search' | 'list' | 'count' | 'rowKey' | 'label' | 'value' | 'children', string>>;
 export interface PresetSelectPagination {
@@ -12,11 +12,11 @@ export interface PresetSelectPagination {
     pageSize: number;
     itemCount: number;
 }
-export type PresetSelectExposeRefs<P extends RObject, D extends RObject, R extends RObject> = DataTablePlusExposeRefsBase<P, D, R> & {
+export type PresetSelectExposeRefs<P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = DataTablePlusExposeRefsBase<P, D, R> & {
     selectRef: Readonly<ShallowRef<SelectInst | null>>;
 };
-export type PresetSelectExposeActions<P extends RObject, D extends RObject> = DataTablePlusExposeActions<P, D>;
-export type PresetSelectProps<V extends PresetSelectValue, P extends RObject, D extends RObject, R extends RObject> = RemoteRequestProps<P, D> & {
+export type PresetSelectExposeActions<P extends RObject = RObject, D extends RObject = RObject> = Omit<DataTablePlusExposeActions<P, D>, 'showFilterModal' | 'resetParams'>;
+export type PresetSelectProps<V extends PresetSelectValue, P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = RemoteRequestProps<P, D> & {
     value?: V;
     fallbackLabel?: string | ((val: string | number) => SelectOption);
     multiple?: boolean;
@@ -28,7 +28,7 @@ export type PresetSelectProps<V extends PresetSelectValue, P extends RObject, D
     selectProps?: SelectProps;
     pagination?: Omit<PaginationProps, 'page' | 'pageSize'> | boolean;
 };
-export type PresetSelectEmits<V extends PresetSelectValue, P extends RObject, D extends RObject, R extends RObject> = RemoteRequestEmits<P, D> & {
+export type PresetSelectEmits<V extends PresetSelectValue, P extends RObject = RObject, D extends RObject = RObject, R extends RObject = RObject> = RemoteRequestEmits<P, D> & {
     (e: 'blur', ev: FocusEvent): void;
     (e: 'clear'): void;
     (e: 'create', label: string): SelectOption;

package/dist/components/remote-request/index.d.ts

@@ -2,7 +2,7 @@ import { UseRequestOptions, UseRequestPlugin } from 'vue-hooks-plus/es/useReques
 export { default as NRemoteRequest } from './RemoteRequest.vue';
 export type RObject = Record<string, any>;
 export type RemoteRequestFields = Partial<Record<string, string>>;
-export interface RemoteRequestProps<P extends RObject, D extends RObject> {
+export interface RemoteRequestProps<P extends RObject = RObject, D extends RObject = RObject> {
     api: (...args: P[]) => Promise<D>;
     defaultParams?: Partial<P>;
     manual?: boolean;
@@ -10,7 +10,7 @@ export interface RemoteRequestProps<P extends RObject, D extends RObject> {
     requestOptions?: UseRequestOptions<D, P[]>;
     requestPlugins?: UseRequestPlugin<D, P[]>[];
 }
-export interface RemoteRequestEmits<P extends RObject, D extends RObject> {
+export interface RemoteRequestEmits<P extends RObject = RObject, D extends RObject = RObject> {
     (e: 'before', params: P[]): void;
     (e: 'success', data: D, params: P[]): void;
     (e: 'error', err: Error, params: P[]): void;