@gx-design-vue/pro-table 0.2.0-beta.7 → 0.2.0-beta.71

package/dist/style.d.ts

@@ -1,7 +1,3 @@
+import type { GenerateStyle } from 'ant-design-vue/es/theme/internal';
 import type { ProAliasToken } from '@gx-design-vue/pro-provider';
-export interface ProToken extends ProAliasToken {
-    antCls: string;
-    componentCls: string;
-}
-declare const _default: (_prefixCls?: string | import("vue").Ref<string> | undefined) => import("ant-design-vue/es/theme/internal").UseComponentStyleResult;
-export default _default;
+export declare const genProTabelStyle: GenerateStyle<ProAliasToken>;

package/dist/types/ColumnTypings.d.ts

@@ -1,4 +1,4 @@
-import type { RecordType, VueNode } from '@gx-design-vue/pro-utils';
+import type { ProColumn, RecordType, VueNode } from '@gx-design-vue/pro-utils';
 import type { DefaultRecordType } from '../typing';
 import type { ColumnType } from '../_utils';
 /**
@@ -28,8 +28,8 @@ export type ProSchemaValueEnumType = {
     disabled?: boolean;
 };
 type ProSchemaValueType<ValueType> = (ValueType | ProFieldValueType);
-export type ProSearchMap<ValueType = 'text'> = {
-    name?: string;
+export type ProSearchMap<ValueType = 'text', ParamsKey = string> = {
+    name?: ParamsKey;
     /** 选择如何渲染相应的模式 */
     valueType?: ProSchemaValueType<ValueType>;
     /** valueType为date|dateMonth|dateRange|time生效 */
@@ -55,7 +55,7 @@ export type ProSearchMap<ValueType = 'text'> = {
     initialValue?: any;
     /** 针对select、treeselect取值的key */
     valueKey?: string;
-    /** 表单的属性值（ant-design）*/
+    /** 表单的属性值（ant-design） */
     field?: RecordType;
     /**
      * 支持 object 和Map，Map 是支持其他基础类型作为 key
@@ -64,24 +64,27 @@ export type ProSearchMap<ValueType = 'text'> = {
      */
     valueEnum?: ProSchemaValueEnumType[];
 };
-export type ProColumnType<RecordType = DefaultRecordType> = ColumnType<RecordType> & {
-    children?: ProColumnsType<RecordType>;
+export type ProColumnType<DataValue = DefaultRecordType, SearchParama = RecordType> = ProColumn<Omit<ColumnType<DataValue>, 'key' | 'dataIndex' | 'width'> & {
+    children?: ProColumnsType<DataValue, SearchParama>;
     uuid?: string | number;
+    index?: number;
     /** 不在列表中显示 */
     show?: boolean;
+    key?: keyof DataValue | string;
+    dataIndex?: keyof DataValue | string;
     /** 列表顺序值 */
     order?: number;
     /** 不在配置工具中显示 */
     hideInSetting?: boolean;
     /** 表单搜索配置 */
-    searchConfig?: ProSearchMap;
+    searchConfig?: ProSearchMap<undefined, keyof DataValue | keyof SearchParama>;
     /** 是否拷贝 */
     copyable?: boolean;
     /** 值为空时，默认取值 */
     columnEmptyText?: string;
     valueType?: ProColumnsValueType;
-};
-export type ProColumnsType<RecordType = DefaultRecordType> = (ProColumnType<RecordType>)[];
+}>;
+export type ProColumnsType<DataValue = DefaultRecordType, SearchParama = RecordType> = ProColumnType<DataValue, SearchParama>[];
 export type ProColumnsValueType = 'text' | 'link' | 'time' | 'dateMonth' | 'dateTime' | {
     node?: string;
     class?: string;

package/dist/types/SlotsTypings.d.ts

@@ -1,12 +1,41 @@
 import type { CustomRender, WithFalse } from '@gx-design-vue/pro-utils';
-export type HeaderTitleRender = WithFalse<CustomRender>;
-export type TitleTipRender = WithFalse<CustomRender>;
-export type ToolBarBtnRender = WithFalse<CustomRender>;
-export type OptionsExtraRender = WithFalse<CustomRender>;
-export type SettingExtraRender = WithFalse<CustomRender>;
-export type PageItemRender = WithFalse<(opt: {
+import type { ProColumnType } from '../types/ColumnTypings';
+import type { ColumnType, RenderExpandIconProps } from '../_utils';
+export type ProTableBodyCellProps<T = Record<string, any>> = {
+    text: any;
+    value: any;
+    record: T;
+    index: number;
+    column: ProColumnType;
+};
+export type AntTabelSlotsType = {
+    emptyText?: any;
+    expandIcon?: RenderExpandIconProps<any>;
+    title?: any;
+    footer?: any;
+    summary?: any;
+    expandedRowRender?: any;
+    expandColumnTitle?: any;
+    bodyCell?: (props: ProTableBodyCellProps<any>) => void;
+    headerCell?: (props: {
+        title: any;
+        column: ColumnType;
+    }) => void;
+    customFilterIcon?: any;
+    customFilterDropdown?: any;
+    default: any;
+};
+export type ProTableSlotsKey = 'search' | 'headerTitle' | 'toolBarBtn' | 'titleTip' | 'settingExtra' | 'optionsExtra' | 'pageItemRender' | 'customRender';
+export declare const proTableSlotsKey: ProTableSlotsKey[];
+export type Slots = Readonly<Omit<Record<ProTableSlotsKey, () => void>, 'customRender'> & {
+    customRender: (currentData: any[], dataSource: any[]) => void;
+}>;
+export type PageItemFn = (opt: {
     page: number;
     type: 'page' | 'prev' | 'next' | 'jump-prev' | 'jump-next';
     originalElement: any;
-}) => CustomRender>;
-export type CustomizeRender = WithFalse<(dataSource: any[]) => CustomRender>;
+}) => CustomRender;
+export type CustomDataFn<T = any> = (currenData: T[], dataSource: T[]) => CustomRender;
+export type DefaultRender = WithFalse<CustomRender>;
+export type PageItemRender = WithFalse<PageItemFn>;
+export type CustomDataRender = WithFalse<CustomDataFn>;

package/dist/types/TableTypings.d.ts

@@ -1,19 +1,20 @@
-import type { CSSProperties } from 'vue';
-import type { RecordType, WithFalse, CustomRender, VueNode, SizeType, Breakpoint } from '@gx-design-vue/pro-utils';
-import type { ProSearchMap, ProColumnType, ProColumnsType } from './ColumnTypings';
-import type { DefaultRecordType } from '../typing';
-import type { HeaderTitleRender, ToolBarBtnRender, CustomizeRender, TitleTipRender, OptionsExtraRender, SettingExtraRender, PageItemRender } from './SlotsTypings';
-import type { TableRowSelection, TablePaginationConfig, SpinProps, TableFilters, TableSorter, TableProps } from '../_utils';
+import type { CSSProperties, ComputedRef, Ref } from 'vue';
+import type { Breakpoint, CustomRender, RecordType, SizeType, VueNode, WithFalse } from '@gx-design-vue/pro-utils';
+import type { ProColumnType, ProColumnsType, ProSearchMap } from './ColumnTypings';
+import type { CustomDataRender, DefaultRender, PageItemRender } from './SlotsTypings';
+import type { FilterValue, SorterResult, TableCurrentDataSource, TablePaginationConfig, TableProps, TableRowSelection } from '../_utils';
 import type { ColumnSettingProps } from '../components/ColumnSetting';
 import type { ColumnsState, ColumnsStateType } from '../hooks/useColumnSetting';
-export type ProTabelFeachParams = {
-    params?: any;
-    filters?: TableFilters;
-    sorter?: TableSorter;
+export type ProTabelFeachParams<R = RecordType> = {
+    params?: R;
+    filters?: Record<string, FilterValue | null>;
+    sorter?: SorterResult | SorterResult[];
     pagination?: ProTablePagination;
     removeKeys?: (string | number)[];
     immediate?: boolean;
     isPolling?: boolean;
+    showLoading?: boolean;
+    extra?: TableCurrentDataSource;
 };
 export type TablePaginationPosition = 'topLeft' | 'topCenter' | 'topRight' | 'bottomLeft' | 'bottomCenter' | 'bottomRight';
 export type ProFieldEmptyText = string | false;
@@ -25,20 +26,25 @@ export interface ProTablePaginationConfig extends Omit<TablePaginationConfig, 'p
     position?: TablePaginationPosition[];
 }
 export type ProTablePagination = ProTablePaginationConfig | false;
+export type PageState = {
+    pageSize: number;
+    pageNum: number;
+};
 export type RequestData<T = any> = {
     data: T[] | undefined;
     success: boolean;
     total: number;
-} & RecordType;
-export type RequsetConfig = {
-    params: {
-        pageSize?: number;
-        pageNum?: number;
-    };
-    sort: TableSorter;
-    filter: TableFilters;
 };
-export type RequsetFunction<T = any> = (params: RequsetConfig['params'], sort: RequsetConfig['sort'], filter: RequsetConfig['filter']) => Promise<Partial<RequestData<T>>>;
+export type RequsetConfig<T> = {
+    params: T extends undefined ? PageState : {
+        pageSize: number;
+        pageNum: number;
+    } & Partial<T>;
+    sorter: SorterResult | SorterResult[];
+    filter: Record<string, FilterValue | null>;
+    extra: TableCurrentDataSource;
+};
+export type RequsetFunction<T = any, D = undefined> = (params: RequsetConfig<D>['params'], sort: RequsetConfig<D>['sorter'], filter: RequsetConfig<D>['filter']) => Promise<Partial<RequestData<T>> | undefined>;
 export type ColConfig = Partial<Record<Breakpoint, number>>;
 export type SearchConfig = {
     searchText?: string;
@@ -57,45 +63,69 @@ export interface OptionConfig {
     fullScreen?: (() => VueNode | JSX.Element) | boolean | (() => Promise<void>);
 }
 /** action表格实例 */
-export interface ProCoreActionType {
-    pageParams?: RecordType | boolean;
-    getLoadingStatus?: boolean | SpinProps | undefined;
+export interface ProCoreActionType<T = RecordType, R = RecordType> {
+    /** @name loadingStatus */
+    loading: Ref<boolean>;
+    dataSource: ComputedRef<T[]>;
+    getLoadingStatus: () => boolean;
+    pagination: R | boolean;
+    pageState: PageState;
+    rowsSelection?: () => {
+        keys: (string | number)[];
+        items: T[];
+        clear: () => void;
+    };
     /** @name 刷新 */
-    reload?: (info?: ProTabelFeachParams) => void;
+    reload: (info?: ProTabelFeachParams<R>) => void;
     /** @name 刷新并清空表单，重置为第一页 */
-    reloadAndRest?: (callBack?: () => void) => void;
-    /** @name 设置翻页、排序、筛选*/
-    changePageInfo?: (pagination: ProTablePaginationConfig, filters: any, sorter: any) => void;
+    reloadAndReset: (options?: {
+        callBack?: () => void;
+        wait?: boolean;
+    }) => void;
+    /** @name 设置翻页 */
+    setPagination: (pagination: ProTablePaginationConfig) => void;
+    /** @name 设置翻页、排序、筛选、并且reload */
+    setPageAndReload: (pagination: ProTablePaginationConfig, filters?: Record<string, FilterValue | null>, sorter?: SorterResult | SorterResult[], extra?: TableCurrentDataSource) => void;
     /** @name 更新TableData属性值 */
-    reSetDataList?: (data: RecordType[]) => void;
+    reSetDataList: (data: T[]) => void;
     /** @name 更新TableData属性值 */
-    changeDataValue?: ({ key, params }: {
-        key?: string;
-        params: RecordType;
+    setData: ({ key, record, type }: {
+        key?: keyof T;
+        record: Partial<T>;
+        type: 'update' | 'push' | 'delete' | 'unshift';
     }) => void;
     /** @name 改变loading状态 */
-    loadingOperation?: (loading: boolean) => void;
+    setLoading: (loading: boolean) => void;
 }
 /** form查询表单实例 */
-export interface ProCoreFormType {
+export interface ProCoreFormType<R = RecordType> {
     /** @name 获取表格-表单请求参数 */
-    formParams?: RecordType;
+    getFormState?: () => R;
     /** @name 获取表格-内部表单参数 */
-    getFormState?: () => RecordType;
+    getFormInnerState?: () => R;
     /** @name 重置内部表单组件参数 */
-    restForm?: (callBack?: () => void) => void;
+    restFormState?: (callBack?: () => void) => void;
 }
-export interface ProTableRef {
-    formRef: () => ProCoreFormType;
-    actionRef: () => ProCoreActionType;
+export interface ProTableRef<T = RecordType, R = RecordType> {
+    formRef: () => ProCoreFormType<R>;
+    actionRef: () => ProCoreActionType<T, R>;
 }
-export type ProTableProps<RecordType extends DefaultRecordType = DefaultRecordType> = Omit<TableProps<RecordType>, 'columns'> & Partial<{
-    tableClassName: string;
-    tableStyle: CSSProperties;
+export type ProTableProps<DataRecord extends object = Record<string, any>, ParamsType extends object = Record<string, any>> = Omit<TableProps, 'columns' | 'dataSource'> & Partial<{
+    dataSource: DataRecord[];
+    tableProps: {
+        class?: string;
+        style?: CSSProperties;
+    };
     rowKey: string;
     titleTipText: string;
     autoScroll: boolean;
+    emptyTextProps: {
+        class?: string;
+        style?: CSSProperties;
+        extraProps?: Record<string, any>;
+    };
     columnEmptyText: ProFieldEmptyText;
+    showLoading: boolean;
     neverScroll: boolean;
     modalScroll: boolean;
     scrollBreakpoint: Breakpoint | number;
@@ -107,30 +137,31 @@ export type ProTableProps<RecordType extends DefaultRecordType = DefaultRecordTy
     align: ProColumnType['align'];
     options: OptionConfig | boolean;
     rowSelection: ProTableRowSelection;
-    columns: ProColumnsType<RecordType>;
+    columns: ProColumnsType<DataRecord, ParamsType>;
     columnsState: ColumnsStateType;
     waitRequest: boolean;
     polling: number;
     debounceTime: number;
-    request: RequsetFunction<RecordType>;
-    params: Record<string, unknown>;
+    request: RequsetFunction<DataRecord, ParamsType>;
+    params: ParamsType;
     postData: (data: any[]) => any;
     pagination: ProTablePagination;
-    search: SearchConfig;
-    searchMap: ProSearchMap[];
-    onReset: (params?: Partial<Record<string, any>>) => any;
-    onReload: (params?: Partial<Record<string, any>>) => any;
-    onSubmit: (params?: Partial<Record<string, any>>) => any;
+    search: SearchConfig | boolean;
+    searchMap: ProSearchMap<undefined, keyof ParamsType | keyof DataRecord>[];
+    onReset: (params?: Partial<ParamsType>) => any;
+    onReload: (params?: Partial<ParamsType>) => any;
+    onSubmit: (params?: Partial<ParamsType>) => any;
     onSizeChange: (size: string) => any;
     onLoadingChange: (loading: boolean) => any;
     onRequestError: (e: Error) => void;
     onBeforeSearchSubmit: RequsetFunction<RecordType>;
     onColumnsStateChange: (data: ColumnsState[]) => void;
-    titleTip: TitleTipRender;
-    headerTitle: HeaderTitleRender;
-    toolBarBtn: ToolBarBtnRender;
-    customRender: CustomizeRender;
-    optionsExtra: OptionsExtraRender;
-    settingExtra: SettingExtraRender;
+    titleTip: DefaultRender;
+    emptyText: DefaultRender;
+    headerTitle: DefaultRender;
+    toolBarBtn: DefaultRender;
+    customRender: CustomDataRender;
+    optionsExtra: DefaultRender;
+    settingExtra: DefaultRender;
     pageItemRender: PageItemRender;
 }>;

package/dist/utils/utils.d.ts

@@ -1,2 +1,4 @@
 import type { ProColumnsValueType } from '../types/ColumnTypings';
-export declare function valueFormat(value: any, format: ProColumnsValueType | undefined, className: string): any;
+import type { ProTablePagination } from '../types/TableTypings';
+export declare function valueFormat(value: any, format: ProColumnsValueType | undefined, className: string, hashId: string): any;
+export declare function getCuurentData(data: any[], pageInfo: ProTablePagination): any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gx-design-vue/pro-table",
-  "version": "0.2.0-beta.7",
+  "version": "0.2.0-beta.71",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -14,57 +14,35 @@
     "dist",
     "volar.d.ts"
   ],
+  "type": "module",
   "types": "./dist",
-  "main": "./dist/pro-table.umd.js",
-  "module": "./dist/pro-table.mjs",
+  "main": "./dist/pro-table.umd.cjs",
+  "module": "./dist/pro-table.js",
   "exports": {
     ".": {
-      "import": "./dist/pro-table.mjs",
-      "require": "./dist/pro-table.umd.js"
+      "import": "./dist/pro-table.js",
+      "require": "./dist/pro-table.umd.cjs"
     }
   },
   "dependencies": {
     "@vueuse/core": "^9.10.0",
-    "@gx-design-vue/pro-utils": "^0.2.0-beta.6",
-    "@gx-design-vue/pro-hooks": "^0.2.0-beta.6",
-    "@gx-design-vue/pro-provider": "^0.1.0-beta.14",
-    "ant-design-vue": "^4.0.0",
+    "@gx-design-vue/pro-utils": "^0.2.0-beta.47",
+    "@gx-design-vue/pro-hooks": "^0.2.0-beta.32",
+    "@gx-design-vue/pro-provider": "^0.1.0-beta.92",
+    "@gx-design-vue/pro-app": "^0.1.0-beta.22",
     "dayjs": "^1.11.0",
-    "lodash-es": "^4.17.21",
-    "vue": "^3.2.45",
-    "vue-types": "^4.1.1"
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^8.3.0",
-    "@rushstack/eslint-patch": "^1.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/jsdom": "^16.2.14",
-    "@types/node": "^16.11.26",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vitejs/plugin-vue-jsx": "^3.0.1",
-    "@vue/eslint-config-prettier": "^7.0.0",
-    "@vue/eslint-config-typescript": "^10.0.0",
-    "@vue/tsconfig": "^0.1.3",
-    "eslint": "^8.13.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.6.0",
-    "jsdom": "^19.0.0",
-    "less": "^4.1.2",
-    "postcss": "^8.4.12",
-    "postcss-html": "^1.4.1",
-    "postcss-less": "^6.0.0",
-    "prettier": "^2.6.2",
-    "rollup": "^2.70.2",
-    "stylelint": "^14.7.1",
-    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-recommended": "^7.0.0",
-    "stylelint-config-recommended-vue": "^1.4.0",
-    "stylelint-config-standard": "^25.0.0",
-    "stylelint-order": "^5.0.0",
-    "typescript": "^4.6.4",
-    "vite": "^4.3.8",
-    "vue-eslint-parser": "^9.0.3",
-    "vue-tsc": "^1.0.24"
+    "typescript": "^5.3.3"
   },
-  "description": "Gx Design"
+  "peerDependencies": {
+    "vue": ">=3.0.0",
+    "ant-design-vue": "^4.1.2"
+  },
+  "description": "Gx Design Pro Table",
+  "authors": [
+    "gx12358 <gx12358@gmail.com> (https://github.com/gx12358)"
+  ]
 }

package/volar.d.ts

@@ -1,8 +1,8 @@
 // Auto generated component declarations
-declare module "vue" {
+declare module 'vue' {
   export interface GlobalComponents {
-    GProTable: typeof import("@gx-design-vue/pro-table")["GProTable"];
+    GProTable: typeof import('@gx-design-vue/pro-table')['GProTable'];
   }
 }
 
-export {};
+export {}

package/dist/_utils/typings.d.ts

@@ -1,9 +0,0 @@
-export type SpinProps = {
-    prefixCls?: string;
-    spinning?: boolean;
-    size?: 'small' | 'default' | 'large';
-    wrapperClassName?: string;
-    tip?: string;
-    delay?: number;
-    indicator?: any;
-};