mirrors2/naive-ui-admin
1
0
Fork 0
mirror of https://github.com/jekip/naive-ui-admin.git synced 2026-03-01 00:23:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:jekip/naive-ui-admin into main

Browse Source
This commit is contained in:
xiaoma
2021-12-30 15:04:31 +08:00
parent a8400ac475 d4b173e3c8
commit c0ff8985ea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Table/src/hooks/useDataSource.ts
View File

@@ -47,6 +47,7 @@ export function useDataSource(
try { try {
setLoading(true); setLoading(true);
const { request, pagination }: any = unref(propsRef); const { request, pagination }: any = unref(propsRef);
if (!request) return;
//组装分页信息 //组装分页信息
const pageField = APISETTING.pageField; const pageField = APISETTING.pageField;
const sizeField = APISETTING.sizeField; const sizeField = APISETTING.sizeField;

3
src/components/Table/src/props.ts
View File

@@ -16,7 +16,7 @@ export const basicProps = {
type: String, type: String,
default: 'medium', default: 'medium',
}, },
tableData: { dataSource: {
type: [Object], type: [Object],
default: () => [], default: () => [],
}, },
@@ -28,7 +28,6 @@ export const basicProps = {
request: { request: {
type: Function as PropType<(...arg: any[]) => Promise<any>>, type: Function as PropType<(...arg: any[]) => Promise<any>>,
default: null, default: null,
required: true,
}, },
rowKey: { rowKey: {
type: [String, Function] as PropType<string | ((record) => string)>, type: [String, Function] as PropType<string | ((record) => string)>,