@oiij/naive-ui 0.0.21 → 0.0.22

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

@@ -1,7 +1,6 @@
-import { DataTableSortState } from 'naive-ui';
-import { FilterState, TableBaseColumn } from 'naive-ui/es/data-table/src/interface';
-import { ContextMenuSelectType, DataTablePlusClickRowType, DataTablePlusExposeActions, DataTablePlusExposeRefs, DataTablePlusProps } from './index';
-declare const _default: <P extends Record<string, any> = Record<string, any>, D extends Record<string, any> = Record<string, any>, R extends Record<string, any> = Record<string, any>>(__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<{
+import { RObject } from '../remote-request/index';
+import { DataTablePlusEmits, DataTablePlusExposeActions, DataTablePlusExposeRefs, DataTablePlusProps } 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<any & DataTablePlusProps<P, D, R> & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{
         refs: DataTablePlusExposeRefs<P, D, R>;
@@ -34,26 +33,7 @@ declare const _default: <P extends Record<string, any> = Record<string, any>, D
             actions: DataTablePlusExposeActions<P, D>;
         }): any;
     };
-    emit: {
-        (e: "before", params: P[]): void;
-        (e: "success", data: D, params: P[]): void;
-        (e: "error", err: Error, params: P[]): void;
-        (e: "finally", params: P[], data?: D, err?: Error): void;
-        (e: "clickRow", data: DataTablePlusClickRowType<R>): void;
-        (e: "contextMenuRow", data: DataTablePlusClickRowType<R>): void;
-        (e: "contextMenuSelect", data: ContextMenuSelectType<R>): void;
-        (e: "load", row: R): Promise<void>;
-        (e: "scroll", ev: Event): void;
-        (e: "update:checkedRowKeys", keys: (string | number)[], rows: R[], meta: {
-            row: R | undefined;
-            action: "check" | "uncheck" | "checkAll" | "uncheckAll";
-        }): void;
-        (e: "update:expandedRowKeys", keys: (string | number)[]): void;
-        (e: "update:filters", filterState: FilterState, sourceColumn: TableBaseColumn): void;
-        (e: "update:sorter", options: DataTableSortState | DataTableSortState[] | null): void;
-        (e: "update:page", page: number): void;
-        (e: "update:pageSize", pageSize: number): void;
-    };
+    emit: DataTablePlusEmits<P, D, R>;
 }>) => import('vue').VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };

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

@@ -1,10 +1,11 @@
-import { DataTableColumns, DataTableInst, DataTableProps, DropdownOption, FlexProps, FormItemProps, GridItemProps, GridProps, PaginationProps } from 'naive-ui';
+import { DataTableColumns, DataTableInst, DataTableProps, DataTableSortState, DropdownOption, FlexProps, FormItemProps, GridItemProps, GridProps, 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';
 import { PresetInputOptions } from '../preset-input/index';
-import { RemoteRequestProps } from '../remote-request/index';
+import { RemoteRequestEmits, RemoteRequestProps, RObject } from '../remote-request/index';
 export { default as NDataTablePlus } from './DataTablePlus.vue';
-export interface DataTablePlusExposeActions<P extends Record<string, any>, D extends Record<string, any>> {
+export interface DataTablePlusExposeActions<P extends RObject, D extends RObject> {
     run: (params: P) => void;
     runAsync: (params: P) => Promise<D>;
     refresh: () => void;
@@ -20,14 +21,14 @@ export interface DataTablePlusPagination {
     pageSize: number;
     itemCount: number;
 }
-export type DataTablePlusExposeRefsBase<P extends Record<string, any>, D extends Record<string, any>, R extends Record<string, any>> = Pick<useRequestResult<D, P[], false, false>, 'loading' | 'data' | 'error' | 'params'> & {
+export type DataTablePlusExposeRefsBase<P extends RObject, D extends RObject, R extends RObject> = Pick<useRequestResult<D, P[], false, false>, 'loading' | 'data' | 'error' | 'params'> & {
     pagination: Readonly<Ref<DataTablePlusPagination, DataTablePlusPagination>>;
     rawList: ComputedRef<R[]>;
 };
-export type DataTablePlusExposeRefs<P extends Record<string, any>, D extends Record<string, any>, R extends Record<string, any>> = DataTablePlusExposeRefsBase<P, D, R> & {
+export type DataTablePlusExposeRefs<P extends RObject, D extends RObject, R extends RObject> = DataTablePlusExposeRefsBase<P, D, R> & {
     dataTableRef: Readonly<ShallowRef<DataTableInst | null>>;
 };
-export type DataTablePlusFilterOptions<P extends Record<string, any>, D extends Record<string, any>, R extends Record<string, any>> = (PresetInputOptions & {
+export type DataTablePlusFilterOptions<P extends RObject, D extends RObject, R extends RObject> = (PresetInputOptions & {
     key?: keyof P;
     label?: string | boolean | (FormItemProps & {
         style?: CSSProperties;
@@ -37,18 +38,18 @@ export type DataTablePlusFilterOptions<P extends Record<string, any>, D extends
     gridItemProps?: GridItemProps;
     render?: (refs: DataTablePlusExposeRefs<P, D, R>, actions: DataTablePlusExposeActions<P, D>) => VNode;
 })[];
-export interface DataTablePlusClickRowType<R extends Record<string, any>> {
+export interface DataTablePlusClickRowType<R extends RObject> {
     row: R;
     index: number;
     event: MouseEvent;
 }
-export interface ContextMenuSelectType<R extends Record<string, any>> {
+export interface ContextMenuSelectType<R extends RObject> {
     key: string | number;
     option: DropdownOption;
     row?: R;
 }
 export type DataTablePlusFields = Partial<Record<'page' | 'pageSize' | 'filter' | 'sorter' | 'list' | 'count' | 'rowKey', string>>;
-export type DataTablePlusProps<P extends Record<string, any> = Record<string, any>, D extends Record<string, any> = Record<string, any>, R extends Record<string, any> = Record<string, any>> = RemoteRequestProps<P, D> & {
+export type DataTablePlusProps<P extends RObject, D extends RObject, R extends RObject> = RemoteRequestProps<P, D> & {
     columns?: DataTableColumns<R>;
     filterOptions?: DataTablePlusFilterOptions<P, D, R>;
     filterGridProps?: GridProps;
@@ -61,3 +62,19 @@ export type DataTablePlusProps<P extends Record<string, any> = Record<string, an
     customStyle?: CSSProperties;
     customClass?: string;
 };
+export type DataTablePlusEmits<P extends RObject, D extends RObject, R extends RObject> = RemoteRequestEmits<P, D> & {
+    (e: 'clickRow', data: DataTablePlusClickRowType<R>): void;
+    (e: 'contextMenuRow', data: DataTablePlusClickRowType<R>): void;
+    (e: 'contextMenuSelect', data: ContextMenuSelectType<R>): void;
+    (e: 'load', row: R): Promise<void>;
+    (e: 'scroll', ev: Event): void;
+    (e: 'update:checkedRowKeys', keys: (string | number)[], rows: R[], meta: {
+        row: R | undefined;
+        action: 'check' | 'uncheck' | 'checkAll' | 'uncheckAll';
+    }): void;
+    (e: 'update:expandedRowKeys', keys: (string | number)[]): void;
+    (e: 'update:filters', filterState: FilterState, sourceColumn: TableBaseColumn): void;
+    (e: 'update:sorter', options: DataTableSortState | DataTableSortState[] | null): void;
+    (e: 'update:page', page: number): void;
+    (e: 'update:pageSize', pageSize: number): void;
+};

package/dist/components/preset-form/PresetForm.vue.d.ts

@@ -1,5 +1,6 @@
+import { RObject } from '../remote-request/index';
 import { PresetFormProps } from './index';
-declare const _default: <V extends Record<string, any> = Record<string, any>>(__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<{
+declare const _default: <V 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 onValidated?: ((val: V) => any) | undefined;
     } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onValidated"> & PresetFormProps<V> & Partial<{}>> & import('vue').PublicProps;

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

@@ -3,7 +3,9 @@ import { CSSProperties } from 'vue';
 import { SearchInputProps } from '../search-input/index';
 export { default as NPresetInput } from './PresetInput.vue';
 export interface PresetInputType {
-    'button': ButtonProps;
+    'button': ButtonProps & {
+        label?: string;
+    };
     'color-picker': ColorPickerProps;
     'checkbox': CheckboxGroupProps & {
         options?: CheckboxProps[];

package/dist/components/preset-select/PresetSelect.vue.d.ts

@@ -1,6 +1,6 @@
-import { SelectOption } from 'naive-ui';
-import { PresetSelectExposeActions, PresetSelectExposeRefs, PresetSelectProps, PresetSelectValue } from './index';
-declare const _default: <V extends PresetSelectValue = null, P extends Record<string, any> = Record<string, any>, D extends Record<string, any> = Record<string, any>, R extends Record<string, any> = Record<string, any>>(__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<{
+import { RObject } from '../remote-request/index';
+import { PresetSelectEmits, PresetSelectExposeActions, PresetSelectExposeRefs, PresetSelectProps, PresetSelectValue } from './index';
+declare const _default: <V extends PresetSelectValue, 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<any & PresetSelectProps<V, P, D, R> & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{
         refs: PresetSelectExposeRefs<P, D, R>;
@@ -27,21 +27,7 @@ declare const _default: <V extends PresetSelectValue = null, P extends Record<st
         empty?(_: {}): any;
         arrow?(_: {}): any;
     };
-    emit: {
-        (e: "before", params: P[]): void;
-        (e: "success", data: D, params: P[]): void;
-        (e: "error", err: Error, params: P[]): void;
-        (e: "finally", params: P[], data?: D, err?: Error): void;
-        (e: "blur", ev: FocusEvent): void;
-        (e: "clear"): void;
-        (e: "create", label: string): SelectOption;
-        (e: "focus", ev: FocusEvent): void;
-        (e: "scroll", ev: Event): void;
-        (e: "search", value: string): void;
-        (e: "update:value", val: V | null, option: SelectOption | SelectOption[] | null, raw: R | R[] | null): void;
-        (e: "update:page", page: number): void;
-        (e: "update:pageSize", pageSize: number): void;
-    };
+    emit: PresetSelectEmits<V, P, D, R>;
 }>) => import('vue').VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };

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

@@ -1,22 +1,22 @@
 import { PaginationProps, SelectGroupOption, SelectInst, SelectOption, SelectProps } from 'naive-ui';
 import { ShallowRef } from 'vue';
 import { DataTablePlusExposeActions, DataTablePlusExposeRefsBase } from '../data-table-plus';
-import { RemoteRequestProps } from '../remote-request';
+import { RemoteRequestEmits, RemoteRequestProps, RObject } from '../remote-request';
 export { default as NPresetSelect } from './PresetSelect.vue';
-export type OptionFormat<R extends Record<string, any>> = (row: R) => SelectOption | SelectGroupOption | false | undefined | null;
-export type PresetSelectValue = string | number | (string | number)[] | null;
-export type PresetSelectUpdateValue<V extends PresetSelectValue, R extends Record<string, any>> = (val: V, option: SelectOption | SelectOption[] | null, raw: R | R[] | null) => void;
+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 PresetSelectValue = string | number | (string | number)[];
 export type PresetSelectFields = Partial<Record<'page' | 'pageSize' | 'search' | 'list' | 'count' | 'rowKey' | 'label' | 'value' | 'children', string>>;
 export interface PresetSelectPagination {
     page: number;
     pageSize: number;
     itemCount: number;
 }
-export type PresetSelectExposeRefs<P extends Record<string, any>, D extends Record<string, any>, R extends Record<string, any>> = DataTablePlusExposeRefsBase<P, D, R> & {
+export type PresetSelectExposeRefs<P extends RObject, D extends RObject, R extends RObject> = DataTablePlusExposeRefsBase<P, D, R> & {
     selectRef: Readonly<ShallowRef<SelectInst | null>>;
 };
-export type PresetSelectExposeActions<P extends Record<string, any>, D extends Record<string, any>> = DataTablePlusExposeActions<P, D>;
-export type PresetSelectProps<V extends PresetSelectValue = null, P extends Record<string, any> = Record<string, any>, D extends Record<string, any> = Record<string, any>, R extends Record<string, any> = Record<string, any>> = RemoteRequestProps<P, D> & {
+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> & {
     value?: V;
     fallbackLabel?: string;
     multiple?: boolean;
@@ -27,3 +27,14 @@ export type PresetSelectProps<V extends PresetSelectValue = null, P extends Reco
     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> & {
+    (e: 'blur', ev: FocusEvent): void;
+    (e: 'clear'): void;
+    (e: 'create', label: string): SelectOption;
+    (e: 'focus', ev: FocusEvent): void;
+    (e: 'scroll', ev: Event): void;
+    (e: 'search', value: string): void;
+    (e: 'update:value', val: V | null, option: ArrayAwareType<V, SelectOption>, raw: ArrayAwareType<V, R>): void;
+    (e: 'update:page', page: number): void;
+    (e: 'update:pageSize', pageSize: number): void;
+};

package/dist/components/remote-request/RemoteRequest.vue.d.ts

@@ -1,5 +1,5 @@
-import { RemoteRequestProps } from './index';
-declare const _default: <P extends Record<string, any> = Record<string, any>, D extends Record<string, any> = Record<string, any>>(__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<{
+import { RemoteRequestEmits, RemoteRequestProps, RObject } from './index';
+declare const _default: <P extends RObject, D 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 onError?: ((err: Error, params: P[]) => any) | undefined;
         readonly onSuccess?: ((data: D, params: P[]) => any) | undefined;
@@ -47,12 +47,7 @@ declare const _default: <P extends Record<string, any> = Record<string, any>, D
             };
         }): any;
     };
-    emit: {
-        (e: "before", params: P[]): void;
-        (e: "success", data: D, params: P[]): void;
-        (e: "error", err: Error, params: P[]): void;
-        (e: "finally", params: P[], data?: D, err?: Error): void;
-    };
+    emit: RemoteRequestEmits<P, D>;
 }>) => import('vue').VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };

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

@@ -1,7 +1,8 @@
 import { UseRequestOptions, UseRequestPlugin } from 'vue-hooks-plus/es/useRequest/types';
 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 Record<string, any> = Record<string, any>, D extends Record<string, any> = Record<string, any>> {
+export interface RemoteRequestProps<P extends RObject, D extends RObject> {
     api: (...args: P[]) => Promise<D>;
     defaultParams?: P;
     manual?: boolean;
@@ -9,3 +10,9 @@ export interface RemoteRequestProps<P extends Record<string, any> = Record<strin
     requestOptions?: UseRequestOptions<D, P[]>;
     requestPlugins?: UseRequestPlugin<D, P[]>[];
 }
+export interface RemoteRequestEmits<P extends RObject, D extends RObject> {
+    (e: 'before', params: P[]): void;
+    (e: 'success', data: D, params: P[]): void;
+    (e: 'error', err: Error, params: P[]): void;
+    (e: 'finally', params: P[], data?: D, err?: Error): void;
+}