Fix/initializer improve (#4533)

* fix: imporve code * fix: test bug
nocobase · May 30, 2024 · d83c102 · d83c102
1 parent 950495c
commit d83c102
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 2 deletions.
diff --git a/packages/core/client/docs/en-US/core/application/application.md b/packages/core/client/docs/en-US/core/application/application.md
@@ -325,6 +325,25 @@ const anyVar = '';
 app.addScopes({ useSomeThing, anyVar })
 ```
 
+### app.getCollectionManager()
+
+Get the [collection manager](/core/data-source/collection-manager) instance of the specified data source.
+
+- Type
+
+```tsx | pure
+class Application {
+  getCollectionManager(dataSource?: string): CollectionManager;
+}
+```
+
+- Example
+
+```tsx | pure
+app.getCollectionManager() // Get the default data source collection manager
+app.getCollectionManager('test') // Get the specified data source collection manager
+```
+
 ## Hooks
 
 ### useApp()

diff --git a/packages/core/client/docs/zh-CN/core/application/application.md b/packages/core/client/docs/zh-CN/core/application/application.md
@@ -324,6 +324,25 @@ const anyVar = '';
 app.addScopes({ useSomeThing, anyVar })
 ```
 
+### app.getCollectionManager()
+
+获取指定数据源的 [collection manager](/core/data-source/collection-manager) 实例。
+
+- 类型
+
+```tsx | pure
+class Application {
+  getCollectionManager(dataSource?: string): CollectionManager;
+}
+```
+
+- 示例
+
+```tsx | pure
+app.getCollectionManager() // 获取默认数据源的 collection manager
+app.getCollectionManager('test') // 获取指定数据源的 collection manager
+```
+
 ## Hooks
 
 ### useApp()

diff --git a/packages/core/client/src/application/schema-settings/types.ts b/packages/core/client/src/application/schema-settings/types.ts
@@ -9,6 +9,7 @@
 
 import { ComponentType } from 'react';
 import {
+  SchemaSettingsActionModalItemProps,
   SchemaSettingsCascaderItemProps,
   SchemaSettingsItemProps,
   SchemaSettingsModalItemProps,
@@ -77,7 +78,7 @@ export type SchemaSettingItemModalType = SchemaSettingsItemCommon<SchemaSettings
   type: 'modal';
 };
 
-export type SchemaSettingItemActionModalType = SchemaSettingsItemCommon<SchemaSettingsSelectItemProps> & {
+export type SchemaSettingItemActionModalType = SchemaSettingsItemCommon<SchemaSettingsActionModalItemProps> & {
   type: 'actionModal';
 };
 

diff --git a/packages/core/client/src/schema-component/antd/action/types.ts b/packages/core/client/src/schema-component/antd/action/types.ts
@@ -30,6 +30,7 @@ export interface ActionContextProps {
   modalProps?: ModalProps;
   submitted?: boolean;
   setSubmitted?: (v: boolean) => void;
+  children?: React.ReactNode;
 }
 
 export type UseActionType = (callback?: () => void) => {

diff --git a/packages/core/client/src/schema-component/types.ts b/packages/core/client/src/schema-component/types.ts
@@ -40,4 +40,5 @@ export interface ISchemaComponentOptionsProps {
   scope?: any;
   components?: SchemaReactComponents;
   inherit?: boolean;
+  children?: React.ReactNode;
 }
diff --git a/packages/core/test/src/client/index.tsx b/packages/core/test/src/client/index.tsx
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import { render } from '@testing-library/react';
+import { render, waitFor, screen } from '@testing-library/react';
 import { sleep } from '../web';
 
 export * from './utils';
@@ -22,6 +22,19 @@ function customRender(ui: React.ReactElement, options = {}) {
   });
 }
 
+export async function waitForApp() {
+  return waitFor(() => {
+    // @ts-ignore
+    expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+  });
+}
+
+export async function renderApp(element: React.JSX.Element) {
+  const res = render(element);
+  await waitForApp();
+  return res;
+}
+
 export * from '@testing-library/react';
 export { default as userEvent } from '@testing-library/user-event';
 // override render export