diff --git a/.umirc.ts b/.umirc.ts index e571a850d..cddff7582 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -8,6 +8,7 @@ export default defineConfig({ define: { 'process.env.API_URL': process.env.API_URL, }, + // mfsu: {}, // ssr: {}, // exportStatic: {}, mode: 'site', diff --git a/package.json b/package.json index b87f3e913..2dab39f96 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@umijs/plugin-antd": "^0.9.1", "antd": "^4.16.11", "dotenv": "^8.2.0", - "dumi": "^1.1.16", + "dumi": "^1.1.25", "eslint": "^7.4.0", "eslint-plugin-import": "^2.22.0", "eslint-plugin-node": "^11.1.0", diff --git a/packages/client/src/resource.ts b/packages/client/src/resource.ts index efb9c416d..89b28a0d8 100644 --- a/packages/client/src/resource.ts +++ b/packages/client/src/resource.ts @@ -22,6 +22,7 @@ export interface ListOptions { filter?: any; defaultAppends?: any[]; appends?: string[]; + perPage?: number; } export class Resource { diff --git a/packages/client/src/schemas/index.tsx b/packages/client/src/schemas/index.tsx index 94b19c0e8..402935168 100644 --- a/packages/client/src/schemas/index.tsx +++ b/packages/client/src/schemas/index.tsx @@ -1,19 +1,13 @@ import React from 'react'; -import { ISchema as FormilyISchema, observer, Schema, useField } from '@formily/react'; -import constate from 'constate'; -import { useState } from 'react'; -import { createContext } from 'react'; - +import { ISchema as IFormilySchema, observer, Schema, useField } from '@formily/react'; import { extend } from 'umi-request'; -import { isVoidField } from '@formily/core'; -import { useCookieState, useRequest } from 'ahooks'; -export { FormilyISchema }; +export type FormilyISchema = IFormilySchema -export interface ISchema extends FormilyISchema { +export interface ISchema extends IFormilySchema { [key: string]: any; properties?: { - [key: string]: ISchema | FormilyISchema; + [key: string]: ISchema | IFormilySchema; }; } diff --git a/yarn.lock b/yarn.lock index 89216bfe9..f0a3f11fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7763,7 +7763,7 @@ dumi-theme-default@1.1.8: prismjs "^1.21.0" rc-tabs "^11.7.1" -dumi@^1.1.16: +dumi@^1.1.25: version "1.1.25" resolved "https://registry.npmjs.org/dumi/-/dumi-1.1.25.tgz#8d86043cbcb35d02e7eff5097f43d266634d48bc" integrity sha512-YJGjtFILtfy8v09+CXprFOagZTHk5oWCU3zt1FblDcxYO7CXmKFyPatqyeZLKAih+q6iOfBcqTa1taE61WC56A==