@vtj/ui 0.8.39 → 0.8.40

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@vtj/ui",
   "private": false,
-  "version": "0.8.39",
+  "version": "0.8.40",
   "type": "module",
   "engines": {
     "node": ">=16.0.0"
   },
   "dependencies": {
-    "@vueuse/core": "~10.9.0",
+    "@vueuse/core": "~10.10.0",
     "element-plus": "~2.7.0",
     "sortablejs": "~1.15.2",
-    "vxe-table": "~4.6.16",
+    "vxe-table": "~4.6.17",
     "vxe-table-plugin-menus": "~4.0.3",
-    "@vtj/icons": "~0.8.39",
-    "@vtj/utils": "~0.8.39"
+    "@vtj/icons": "~0.8.40",
+    "@vtj/utils": "~0.8.40"
   },
   "devDependencies": {
     "@types/qrcode": "^1.5.5",
@@ -21,7 +21,7 @@
     "qrcode": "~1.5.3",
     "vue": "~3.4.15",
     "vue-router": "~4.3.0",
-    "@vtj/cli": "~0.8.13"
+    "@vtj/cli": "~0.8.14"
   },
   "files": [
     "dist",

package/types/adapter.d.ts

@@ -1,5 +1,5 @@
 import { Plugin, InjectionKey } from 'vue';
-import { GridCustomInfo } from './components';
+import { GridCustomInfo, BuiltinFieldEditor } from './components';
 import { VXETableConfigOptions } from 'vxe-table';
 
 export declare const ADAPTER_KEY: InjectionKey<Adapter>;
@@ -11,8 +11,10 @@ export interface UploaderResponse {
 export type Uploader = (file: File) => Promise<string | UploaderResponse | null>;
 export declare function useAdapter(): Adapter;
 export interface Adapter {
+    fieldEditors?: Record<string, BuiltinFieldEditor>;
     uploader?: Uploader;
     vxeConfig?: VXETableConfigOptions;
+    vxePlugin?: any;
     getCustom?: (id: string) => Promise<GridCustomInfo>;
     saveCustom?: (info: GridCustomInfo) => Promise<any>;
     [index: string]: any;

package/types/components/field/Field.d.ts

@@ -35,7 +35,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         default: boolean;
     };
     tooltipPosition: {
-        type: PropType<number | "inner" | "outer">;
+        type: PropType<number | "outer" | "inner">;
         default: string;
     };
     placeholder: {
@@ -108,7 +108,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         default: boolean;
     };
     tooltipPosition: {
-        type: PropType<number | "inner" | "outer">;
+        type: PropType<number | "outer" | "inner">;
         default: string;
     };
     placeholder: {
@@ -152,7 +152,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         [key: string]: any;
     }> | BuiltinFieldEditorType;
     tooltipMessage: boolean | Partial< ElTooltipProps>;
-    tooltipPosition: number | "inner" | "outer";
+    tooltipPosition: number | "outer" | "inner";
 }, {}>, {
     label?(_: {}): any;
     error?(_: {

package/types/components/field/builtin.d.ts

@@ -3,5 +3,6 @@ export interface BuiltinFieldEditor {
     props?: Record<string, any>;
     defaultValue?: any;
 }
-export type BuiltinFieldEditorType = 'none' | 'text' | 'textarea' | 'select' | 'checkbox' | 'radio' | 'number' | 'date' | 'time' | 'datetime' | 'switch' | 'slider' | 'rate' | 'cascader';
+export type BuiltinFieldEditorType = 'none' | 'text' | 'textarea' | 'select' | 'checkbox' | 'radio' | 'number' | 'date' | 'time' | 'datetime' | 'switch' | 'slider' | 'rate' | 'cascader' | 'picker';
 export declare const builtinFieldEditors: Record<BuiltinFieldEditorType, BuiltinFieldEditor>;
+export declare function registerFieldEditors(editors: Record<string, BuiltinFieldEditor>): void;

package/types/components/field/index.d.ts

@@ -2,3 +2,4 @@ import { default as XField } from './Field';
 
 export { XField };
 export * from './types';
+export * from './builtin';

package/types/components/field/types.d.ts

@@ -1,6 +1,6 @@
 import { PropType, VNode, RendererNode, RendererElement } from 'vue';
-import { ComponentPropsType, BaseSize } from '../shared';
-import { ElTooltipProps } from 'element-plus';
+import { ComponentPropsType, BaseSize, UnReadOnly } from '../shared';
+import { ElTooltipProps, FormItemProps } from 'element-plus';
 import { BuiltinFieldEditor, BuiltinFieldEditorType, builtinFieldEditors } from './builtin';
 import { FormModel } from '../../';
 
@@ -80,7 +80,7 @@ export declare const fieldProps: {
      * tooltip信息显示相对输入框的位置
      */
     tooltipPosition: {
-        type: PropType<number | "inner" | "outer">;
+        type: PropType<number | "outer" | "inner">;
         default: string;
     };
     /**
@@ -139,7 +139,7 @@ export declare const fieldProps: {
         type: BooleanConstructor;
     };
 };
-export type FieldProps = ComponentPropsType<typeof fieldProps>;
+export type FieldProps = ComponentPropsType<typeof fieldProps> & Partial<UnReadOnly<FormItemProps>>;
 export type FieldEmits = {
     'update:modelValue': [value: any];
     change: [value: any];

package/types/components/grid/Grid.d.ts

@@ -1,13 +1,16 @@
-import { VxeGridInstance, GridColumns, GridCustomInfo, GridCellRenders, GridEditRenders, GridFilterRenders, GridSortableEvent } from './types';
+import { VxeGridInstance, GridColumns, GridLoader, GridCustomInfo, GridCellRenders, GridEditRenders, GridFilterRenders, GridSortableEvent } from './types';
 import { DefineComponent, PropType, Ref, ComponentOptionsMixin, PublicProps, ExtractPropTypes } from 'vue';
 import { Options } from 'sortablejs';
-import { VxeTableDataRow, VxeTableConstructor, VxeGridConstructor } from 'vxe-table';
+import { VxeTableConstructor, VxeGridConstructor } from 'vxe-table';
 
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
     columns: {
         type: PropType<GridColumns>;
         default(): GridColumns;
     };
+    loader: {
+        type: PropType<GridLoader>;
+    };
     rowSortable: {
         type: PropType<boolean | Options>;
         default: boolean;
@@ -29,20 +32,24 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    query: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryParams<VxeTableDataRow>) => Promise<any>>;
+    pager: {
+        type: BooleanConstructor;
     };
-    queryAll: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryAllParams<VxeTableDataRow>) => Promise<any>>;
+    page: {
+        type: NumberConstructor;
+        default: number;
     };
-    delete: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxDeleteParams<VxeTableDataRow>) => Promise<any>>;
+    pageSize: {
+        type: NumberConstructor;
+        default: number;
     };
-    save: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxSaveParams<VxeTableDataRow>) => Promise<any>>;
+    pageSizes: {
+        type: PropType<number[]>;
+        default: () => number[];
     };
-    pager: {
+    auto: {
         type: BooleanConstructor;
+        default: boolean;
     };
     virtual: {
         type: BooleanConstructor;
@@ -61,37 +68,28 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    queryModel: {
-        type: PropType<Record<string, any>>;
-    };
 }, {
+    load: (reset?: boolean | undefined) => Promise<void>;
+    search: (reset?: boolean | undefined) => void;
     vxeRef: Ref<VxeGridInstance | undefined>;
     rowSortable: Ref<any>;
     columnSortable: Ref<any[]>;
     insertActived: (record?: any, row?: any) => Promise<void>;
-    getProxyInfo: () => {
-        data: any[];
-        filter: any;
-        form: any;
-        sort: import("vxe-table/types/table").VxeTableDefines.SortCheckedParams<any> | {
-            [key: string]: any;
-        };
-        sorts: import("vxe-table/types/table").VxeTableDefines.SortCheckedParams<any>[];
-        pager: {
-            total: number;
-            pageSize: number;
-            currentPage: number;
-        };
-        pendingRecords: any[];
-    } | null | undefined;
-    reload: () => Promise<void>;
     validate: () => Promise<import("vxe-table/types/table").VxeTableDefines.ValidatorErrorMapParams<any> | undefined>;
     getSelected: () => any;
     remove: (rows: any) => Promise<void>;
     getRows: () => any[];
-    loadData: (data: any[], reload?: boolean | undefined) => void;
     setActived: (row: any) => Promise<void | undefined>;
+    doLayout: () => void;
+    getRecords: () => {
+        insertRecords: any[];
+        removeRecords: any[];
+        updateRecords: any[];
+        pendingRecords: any[];
+    } | undefined;
+    setSelectCell: (row?: any, column?: any) => void;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    loaded: (rows: any[]) => void;
     rowSort: (e: GridSortableEvent) => void;
     columnSort: (e: GridSortableEvent) => void;
     cellSelected: (params: any) => void;
@@ -101,6 +99,9 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         type: PropType<GridColumns>;
         default(): GridColumns;
     };
+    loader: {
+        type: PropType<GridLoader>;
+    };
     rowSortable: {
         type: PropType<boolean | Options>;
         default: boolean;
@@ -122,20 +123,24 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    query: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryParams<VxeTableDataRow>) => Promise<any>>;
+    pager: {
+        type: BooleanConstructor;
     };
-    queryAll: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryAllParams<VxeTableDataRow>) => Promise<any>>;
+    page: {
+        type: NumberConstructor;
+        default: number;
     };
-    delete: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxDeleteParams<VxeTableDataRow>) => Promise<any>>;
+    pageSize: {
+        type: NumberConstructor;
+        default: number;
     };
-    save: {
-        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxSaveParams<VxeTableDataRow>) => Promise<any>>;
+    pageSizes: {
+        type: PropType<number[]>;
+        default: () => number[];
     };
-    pager: {
+    auto: {
         type: BooleanConstructor;
+        default: boolean;
     };
     virtual: {
         type: BooleanConstructor;
@@ -154,22 +159,24 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    queryModel: {
-        type: PropType<Record<string, any>>;
-    };
 }>> & {
-    onCellSelected?: ((params: any) => any) | undefined;
+    onLoaded?: ((rows: any[]) => any) | undefined;
     onRowSort?: ((e: GridSortableEvent) => any) | undefined;
     onColumnSort?: ((e: GridSortableEvent) => any) | undefined;
+    onCellSelected?: ((params: any) => any) | undefined;
     onEditChange?: ((data: any[]) => any) | undefined;
 }, {
+    auto: boolean;
     resizable: boolean;
     editable: boolean;
-    pager: boolean;
+    page: number;
+    pageSize: number;
     columns: GridColumns;
     rowSortable: boolean | Options;
     columnSortable: boolean | Options;
     customable: boolean;
+    pager: boolean;
+    pageSizes: number[];
     virtual: boolean;
 }, {}>, Partial<Record<string, (_: {
     [x: string]: any;
@@ -186,7 +193,10 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
     checked?: boolean | undefined;
     indeterminate?: boolean | undefined;
     items: any[];
-}) => any>>>;
+}) => any>> & {
+    empty?(_: {}): any;
+    pager__left?(_: {}): any;
+}>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {

package/types/components/grid/hooks/index.d.ts

@@ -5,3 +5,4 @@ export * from './useColumnSortable';
 export * from './useCustom';
 export * from './useVxeSlots';
 export * from './useEditRender';
+export * from './useLoader';