From f4e75348d7e16925ad4d1f18c6fa05ff72c54604 Mon Sep 17 00:00:00 2001
From: sealday <sealday@gmail.com>
Date: Thu, 21 Mar 2024 22:14:32 +0800
Subject: [PATCH] Revert "fix: modal app not found"

This reverts commit f5a83d48dacbbd9ae4184c140714c6fcfc05d721.
---
 .../src/schema-settings/SchemaSettings.tsx    | 93 +++++++++----------
 1 file changed, 44 insertions(+), 49 deletions(-)

diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx
index 457237373..cbea0aee2 100644
--- a/packages/core/client/src/schema-settings/SchemaSettings.tsx
+++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx
@@ -67,8 +67,6 @@ import {
   useRecord,
   useSchemaSettingsItem,
   useSortFields,
-  useApp,
-  ApplicationContext,
 } from '..';
 import {
   BlockRequestContext_deprecated,
@@ -972,7 +970,6 @@ export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props)
   const record = useCollectionRecord();
   const { association } = useDataBlockProps() || {};
   const formCtx = useFormBlockContext();
-  const app = useApp();
 
   // 解决变量`当前对象`值在弹窗中丢失的问题
   const { formValue: subFormValue, collection: subFormCollection } = useSubFormValue();
@@ -991,53 +988,51 @@ export const SchemaSettingsModalItem: FC<SchemaSettingsModalItemProps> = (props)
           { title: schema.title || title, width },
           () => {
             return (
-              <ApplicationContext.Provider value={app}>
-                <CollectionRecordProvider record={record}>
-                  <FormBlockContext.Provider value={formCtx}>
-                    <SubFormProvider value={{ value: subFormValue, collection: subFormCollection }}>
-                      <FormActiveFieldsProvider
-                        name="form"
-                        getActiveFieldsName={upLevelActiveFields?.getActiveFieldsName}
-                      >
-                        <Router location={location} navigator={null}>
-                          <BlockRequestContext_deprecated.Provider value={ctx}>
-                            <DataSourceApplicationProvider dataSourceManager={dm} dataSource={dataSourceKey}>
-                              <AssociationOrCollectionProvider
-                                allowNull
-                                collection={collection.name}
-                                association={association}
-                              >
-                                <SchemaComponentOptions scope={options.scope} components={options.components}>
-                                  <FormLayout
-                                    layout={'vertical'}
-                                    className={css`
-                                      // screen > 576px
-                                      @media (min-width: 576px) {
-                                        min-width: 520px;
-                                      }
+              <CollectionRecordProvider record={record}>
+                <FormBlockContext.Provider value={formCtx}>
+                  <SubFormProvider value={{ value: subFormValue, collection: subFormCollection }}>
+                    <FormActiveFieldsProvider
+                      name="form"
+                      getActiveFieldsName={upLevelActiveFields?.getActiveFieldsName}
+                    >
+                      <Router location={location} navigator={null}>
+                        <BlockRequestContext_deprecated.Provider value={ctx}>
+                          <DataSourceApplicationProvider dataSourceManager={dm} dataSource={dataSourceKey}>
+                            <AssociationOrCollectionProvider
+                              allowNull
+                              collection={collection.name}
+                              association={association}
+                            >
+                              <SchemaComponentOptions scope={options.scope} components={options.components}>
+                                <FormLayout
+                                  layout={'vertical'}
+                                  className={css`
+                                    // screen > 576px
+                                    @media (min-width: 576px) {
+                                      min-width: 520px;
+                                    }
 
-                                      // screen <= 576px
-                                      @media (max-width: 576px) {
-                                        min-width: 320px;
-                                      }
-                                    `}
-                                  >
-                                    <APIClientProvider apiClient={apiClient}>
-                                      <ConfigProvider locale={locale}>
-                                        <SchemaComponent components={components} scope={scope} schema={schema} />
-                                      </ConfigProvider>
-                                    </APIClientProvider>
-                                  </FormLayout>
-                                </SchemaComponentOptions>
-                              </AssociationOrCollectionProvider>
-                            </DataSourceApplicationProvider>
-                          </BlockRequestContext_deprecated.Provider>
-                        </Router>
-                      </FormActiveFieldsProvider>
-                    </SubFormProvider>
-                  </FormBlockContext.Provider>
-                </CollectionRecordProvider>
-              </ApplicationContext.Provider>
+                                    // screen <= 576px
+                                    @media (max-width: 576px) {
+                                      min-width: 320px;
+                                    }
+                                  `}
+                                >
+                                  <APIClientProvider apiClient={apiClient}>
+                                    <ConfigProvider locale={locale}>
+                                      <SchemaComponent components={components} scope={scope} schema={schema} />
+                                    </ConfigProvider>
+                                  </APIClientProvider>
+                                </FormLayout>
+                              </SchemaComponentOptions>
+                            </AssociationOrCollectionProvider>
+                          </DataSourceApplicationProvider>
+                        </BlockRequestContext_deprecated.Provider>
+                      </Router>
+                    </FormActiveFieldsProvider>
+                  </SubFormProvider>
+                </FormBlockContext.Provider>
+              </CollectionRecordProvider>
             );
           },
           theme,