@vtj/ui 0.8.31 → 0.8.33

package/package.json

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

package/types/adapter.d.ts

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

package/types/components/action/Action.d.ts

@@ -81,7 +81,6 @@ declare const _default: DefineComponent<{
     };
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     background: {
         type: PropType<"hover" | "always" | "none">;
@@ -171,7 +170,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -262,7 +260,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -352,7 +349,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -442,7 +438,6 @@ declare const _default: DefineComponent<{
     };
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     background: {
         type: PropType<"hover" | "always" | "none">;
@@ -532,7 +527,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -622,7 +616,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -712,7 +705,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -728,7 +720,6 @@ declare const _default: DefineComponent<{
     onCommand?: ((item: ActionMenuItem) => any) | undefined;
 }, {
     size: BaseSize;
-    type: BaseType;
     background: "hover" | "always" | "none";
     circle: boolean;
     mode: ActionMode;

package/types/components/action/Trigger.d.ts

@@ -81,7 +81,6 @@ declare const _default: DefineComponent<{
     };
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     background: {
         type: PropType<"hover" | "always" | "none">;
@@ -172,7 +171,6 @@ declare const _default: DefineComponent<{
     };
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     background: {
         type: PropType<"hover" | "always" | "none">;
@@ -188,7 +186,6 @@ declare const _default: DefineComponent<{
     onClick?: ((...args: any[]) => any) | undefined;
 }, {
     size: BaseSize;
-    type: BaseType;
     background: "hover" | "always" | "none";
     circle: boolean;
     mode: ActionMode;

package/types/components/action/types.d.ts

@@ -131,7 +131,6 @@ export declare const actionProps: {
      */
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     /**
      * icon 背景设置，当 mode为 icon 时有效

package/types/components/action-bar/ActionBar.d.ts

@@ -20,7 +20,6 @@ declare const _default: DefineComponent<{
     };
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     background: {
         type: PropType<"hover" | "always" | "none">;
@@ -107,7 +106,6 @@ declare const _default: DefineComponent<{
             };
             type: {
                 type: PropType<BaseType>;
-                default: string;
             };
             background: {
                 type: PropType<"hover" | "always" | "none">;
@@ -247,7 +245,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -337,7 +334,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -364,7 +360,6 @@ declare const _default: DefineComponent<{
     };
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     background: {
         type: PropType<"hover" | "always" | "none">;
@@ -451,7 +446,6 @@ declare const _default: DefineComponent<{
             };
             type: {
                 type: PropType<BaseType>;
-                default: string;
             };
             background: {
                 type: PropType<"hover" | "always" | "none">;
@@ -591,7 +585,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -681,7 +674,6 @@ declare const _default: DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -696,7 +688,6 @@ declare const _default: DefineComponent<{
     }>>>, menu: ActionMenuItem) => any) | undefined;
 }, {
     size: BaseSize;
-    type: BaseType;
     background: "hover" | "always" | "none";
     circle: boolean;
     mode: ActionMode;

package/types/components/action-bar/types.d.ts

@@ -35,7 +35,6 @@ export declare const actionBarProps: {
      */
     type: {
         type: PropType<BaseType>;
-        default: string;
     };
     /**
      * icon 背景设置，当 mode为 icon 时有效

package/types/components/data-item/DataItem.d.ts

@@ -121,7 +121,6 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -211,7 +210,6 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -342,7 +340,6 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;
@@ -432,7 +429,6 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         };
         type: {
             type: PropType<BaseType>;
-            default: string;
         };
         background: {
             type: PropType<"hover" | "always" | "none">;

package/types/components/form/Form.d.ts

@@ -18,11 +18,11 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         default: boolean;
     };
     submitText: {
-        type: StringConstructor;
+        type: PropType<string | null>;
         default: string;
     };
     resetText: {
-        type: StringConstructor;
+        type: PropType<string | null>;
         default: string;
     };
     submitMethod: {
@@ -57,11 +57,11 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
         default: boolean;
     };
     submitText: {
-        type: StringConstructor;
+        type: PropType<string | null>;
         default: string;
     };
     resetText: {
-        type: StringConstructor;
+        type: PropType<string | null>;
         default: string;
     };
     submitMethod: {
@@ -80,8 +80,8 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
     inline: boolean;
     model: Record<string, any>;
     tooltipMessage: boolean | Partial< ElTooltipProps>;
-    submitText: string;
-    resetText: string;
+    submitText: string | null;
+    resetText: string | null;
 }, {}>, {
     default?(_: {}): any;
     footer?(_: {}): any;

package/types/components/form/types.d.ts

@@ -34,14 +34,14 @@ export declare const formProps: {
      * 提交按钮文本
      */
     submitText: {
-        type: StringConstructor;
+        type: PropType<string | null>;
         default: string;
     };
     /**
      * 重置按钮文本
      */
     resetText: {
-        type: StringConstructor;
+        type: PropType<string | null>;
         default: string;
     };
     /**

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

@@ -0,0 +1,181 @@
+import { VxeGridInstance, GridColumns, GridCustomInfo, GridCellRenders, GridSortableEvent } from './types';
+import { DefineComponent, PropType, Ref, ComponentOptionsMixin, PublicProps, ExtractPropTypes } from 'vue';
+import { Options } from 'sortablejs';
+import { VxeTableDataRow, VxeTableConstructor, VxeGridConstructor } from 'vxe-table';
+
+declare const _default: __VLS_WithTemplateSlots< DefineComponent<{
+    columns: {
+        type: PropType<GridColumns>;
+        default(): GridColumns;
+    };
+    rowSortable: {
+        type: PropType<boolean | Options>;
+        default: boolean;
+    };
+    columnSortable: {
+        type: PropType<boolean | Options>;
+        default: boolean;
+    };
+    customable: {
+        type: BooleanConstructor;
+    };
+    getCustom: {
+        type: PropType<(id: string) => Promise< GridCustomInfo>>;
+    };
+    saveCustom: {
+        type: PropType<(info: GridCustomInfo) => Promise<any>>;
+    };
+    resizable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    query: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    queryAll: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryAllParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    delete: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxDeleteParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    save: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxSaveParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    pager: {
+        type: BooleanConstructor;
+    };
+    virtual: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    cellRenders: {
+        type: PropType<GridCellRenders>;
+    };
+    editRenders: {
+        type: ObjectConstructor;
+    };
+    editable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    queryModel: {
+        type: PropType<Record<string, any>>;
+    };
+}, {
+    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>;
+}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    rowSort: (e: GridSortableEvent) => void;
+    columnSort: (e: GridSortableEvent) => void;
+    cellSelected: (params: any) => void;
+}, string, PublicProps, Readonly< ExtractPropTypes<{
+    columns: {
+        type: PropType<GridColumns>;
+        default(): GridColumns;
+    };
+    rowSortable: {
+        type: PropType<boolean | Options>;
+        default: boolean;
+    };
+    columnSortable: {
+        type: PropType<boolean | Options>;
+        default: boolean;
+    };
+    customable: {
+        type: BooleanConstructor;
+    };
+    getCustom: {
+        type: PropType<(id: string) => Promise< GridCustomInfo>>;
+    };
+    saveCustom: {
+        type: PropType<(info: GridCustomInfo) => Promise<any>>;
+    };
+    resizable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    query: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    queryAll: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxQueryAllParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    delete: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxDeleteParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    save: {
+        type: PropType<(params: import("vxe-table/types/grid").VxeGridPropTypes.ProxyAjaxSaveParams<VxeTableDataRow>) => Promise<any>>;
+    };
+    pager: {
+        type: BooleanConstructor;
+    };
+    virtual: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    cellRenders: {
+        type: PropType<GridCellRenders>;
+    };
+    editRenders: {
+        type: ObjectConstructor;
+    };
+    editable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    queryModel: {
+        type: PropType<Record<string, any>>;
+    };
+}>> & {
+    onCellSelected?: ((params: any) => any) | undefined;
+    onRowSort?: ((e: GridSortableEvent) => any) | undefined;
+    onColumnSort?: ((e: GridSortableEvent) => any) | undefined;
+}, {
+    resizable: boolean;
+    editable: boolean;
+    pager: boolean;
+    columns: GridColumns;
+    rowSortable: boolean | Options;
+    columnSortable: boolean | Options;
+    customable: boolean;
+    virtual: boolean;
+}, {}>, Partial<Record<string, (_: {
+    [x: string]: any;
+    $table: VxeTableConstructor<any>;
+    $grid: VxeGridConstructor<any> | null | undefined;
+    row: any;
+    rowIndex: number;
+    $rowIndex: number;
+    _rowIndex: number;
+    column: import("vxe-table/types/table").VxeTableDefines.ColumnInfo<any>;
+    columnIndex: number;
+    $columnIndex: number;
+    _columnIndex: number;
+    checked?: boolean | undefined;
+    indeterminate?: boolean | undefined;
+    items: any[];
+}) => any>>>;
+export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

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

@@ -0,0 +1,12 @@
+/**
+ * 工具条按钮区插槽名称
+ */
+export declare const BUTTONS_SLOT_NAME = "toolbar__buttons";
+/**
+ * 分页左侧模板
+ */
+export declare const PAGER_LEFT_SLOT_NAME = "pager__left";
+/**
+ * 内置插槽名称
+ */
+export declare const SLOTS: string[];

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

@@ -0,0 +1,7 @@
+export * from './useVxe';
+export * from './useProps';
+export * from './useRowSortable';
+export * from './useColumnSortable';
+export * from './useCustom';
+export * from './useVxeSlots';
+export * from './useEditRender';

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

@@ -0,0 +1,5 @@
+import { MaybeRef, Ref } from 'vue';
+import { VxeGridInstance, GridProps, GridEmits, GridSortableEvent } from '../types';
+import { Emits } from '../../shared';
+
+export declare function useColumnSortable(vxeRef: MaybeRef<VxeGridInstance | undefined>, props: GridProps, emit: Emits<GridEmits>, onChange?: (e: GridSortableEvent) => void): Ref<any[]>;