Browse Source

feat: 企事业单位信息表单内容

outaozhen 3 years ago
parent
commit
c5a74df182

+ 1 - 2
src/pages/Institutions/Company/List/components/CompanyDrawer.tsx

@@ -5,7 +5,7 @@ import { addInstitution, updateInstitution } from '@/services/api/institution'
 import { ModalType } from '@/utils/enum'
 import type { SchemaBaseModelState } from '@/pages/Schema/Base/model'
 import type { ConnectProps } from 'umi'
-import { BaseMenuEnum, SchemaEnum } from '@/pages/Schema/Base'
+import { BaseMenuEnum } from '@/pages/Schema/Base'
 import { createForm } from '@formily/core'
 import {
   Form,
@@ -107,7 +107,6 @@ const CompanyDrawer: React.FC<CompanyModalProps> = ({
     <div className="mt-6">
       <div className="max-w-800px">
         <Form form={formInstance} labelCol={6} wrapperCol={8}>
-          <SchemaField schema={SchemaEnum?.[BaseMenuEnum.COMPANY]} />
           <SchemaField schema={companySchema} />
           <FormButtonGroup.Sticky>
             <FormButtonGroup.FormItem labelCol={4}>

+ 1 - 12
src/pages/Schema/Base/index.tsx

@@ -23,14 +23,7 @@ import {
   TreeSelect
 } from '@formily/antd'
 import 'antd/dist/antd.less'
-import {
-  projectSchema,
-  institutionSchema,
-  staffSchema,
-  useAsyncDataSource,
-  loadAccountTypeData,
-  loadProjectTypeData
-} from '@/utils/schema'
+import { projectSchema, institutionSchema, staffSchema } from '@/utils/schema'
 import type { ConnectProps } from 'umi'
 import { Button } from 'antd'
 
@@ -140,10 +133,6 @@ const Index: React.FC<BaseProps> = ({ base, pTypeList, dispatch }) => {
     })
     return (
       <Form form={normalForm} labelCol={4} wrapperCol={8}>
-        <SchemaField
-          schema={SchemaEnum?.[state.activeKey]}
-          scope={{ useAsyncDataSource, loadAccountTypeData, loadProjectTypeData }}
-        />
         <SchemaField schema={currentSchema} />
       </Form>
     )