parent
							
								
									e07ee53db7
								
							
						
					
					
						commit
						f4e75348d7
					
				| @ -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, | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user