Procházet zdrojové kódy

feat: createSchemaField将基础组件全量渲染

lanjianrong před 3 roky
rodič
revize
0e0abeac6e

+ 1 - 8
src/global.less

@@ -119,20 +119,13 @@ ol {
   .ant-page-header-heading-left {
     margin-bottom: 0 !important;
   }
-  // .ant-page-header-heading {
-  //   margin-top: 0 !important;
-  //   .ant-page-header-heading-left {
-  //     margin: 0 !important;
-  //   }
-  // }
   .ant-page-header-footer {
     margin-top: 0 !important;
   }
 }
 
 .ant-pro-page-container-children-content {
-  // height: calc(100vh - 138px);
-  margin: 0 24px 0;
+  margin: 0 24px 0 !important;
 }
 
 .dn-app {

+ 0 - 35
src/pages/Admin.tsx

@@ -1,35 +0,0 @@
-import React from 'react'
-import { HeartTwoTone, SmileTwoTone } from '@ant-design/icons'
-import { Card, Typography, Alert } from 'antd'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { useIntl } from 'umi'
-
-export default (): React.ReactNode => {
-  const intl = useIntl()
-  return (
-    <PageHeaderWrapper
-      content={intl.formatMessage({
-        id: 'pages.admin.subPage.title',
-        defaultMessage: 'This page can only be viewed by admin'
-      })}>
-      <Card>
-        <Alert
-          message={intl.formatMessage({
-            id: 'pages.welcome.alertMessage',
-            defaultMessage: 'Faster and stronger heavy-duty components have been released.'
-          })}
-          type="success"
-          showIcon
-          banner
-          style={{
-            margin: -12,
-            marginBottom: 48
-          }}
-        />
-        <Typography.Title level={2} style={{ textAlign: 'center' }}>
-          <SmileTwoTone /> 指标库后台 <HeartTwoTone twoToneColor="#eb2f96" /> You
-        </Typography.Title>
-      </Card>
-    </PageHeaderWrapper>
-  )
-}

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

@@ -13,9 +13,16 @@ import {
   Submit,
   FormLayout,
   FormItem,
+  TreeSelect,
   Input,
   Select,
-  FormGrid
+  FormGrid,
+  Radio,
+  Checkbox,
+  NumberPicker,
+  Password,
+  DatePicker,
+  TimePicker
 } from '@formily/antd'
 import { createSchemaField } from '@formily/react'
 
@@ -46,7 +53,14 @@ const CompanyDrawer: React.FC<CompanyModalProps> = ({
       FormItem,
       FormGrid,
       Input,
-      Select
+      Select,
+      Radio,
+      Checkbox,
+      NumberPicker,
+      TreeSelect,
+      Password,
+      DatePicker,
+      TimePicker
     }
   })
   useEffect(() => {

+ 14 - 2
src/pages/Institutions/Staff/components/StaffDetail.tsx

@@ -22,7 +22,13 @@ import {
   Form,
   TreeSelect,
   FormButtonGroup,
-  Submit
+  Submit,
+  Radio,
+  Checkbox,
+  NumberPicker,
+  Password,
+  DatePicker,
+  TimePicker
 } from '@formily/antd'
 type StaffModalProps = ConnectProps & {
   readOnly: boolean
@@ -155,7 +161,13 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
       Input,
       Switch,
       Select,
-      TreeSelect
+      TreeSelect,
+      Radio,
+      Checkbox,
+      NumberPicker,
+      Password,
+      DatePicker,
+      TimePicker
     }
   })
 

+ 21 - 2
src/pages/Project/Management/Detail/components/ProjectInfo.tsx

@@ -1,6 +1,18 @@
 import { createForm, onFieldMount } from '@formily/core'
 import { createSchemaField, FormProvider } from '@formily/react'
-import { FormLayout, FormItem, Input, Select } from '@formily/antd'
+import {
+  FormLayout,
+  FormItem,
+  Input,
+  Select,
+  Radio,
+  Checkbox,
+  NumberPicker,
+  Password,
+  DatePicker,
+  TimePicker,
+  TreeSelect
+} from '@formily/antd'
 import { BaseMenuEnum, SchemaEnum } from '@/pages/Schema/Base'
 import type { ConnectProps } from 'umi'
 import { connect } from 'umi'
@@ -51,7 +63,14 @@ const ProjectInfo: React.FC<ProjectInfoProps> = ({
       FormLayout,
       FormItem,
       Input,
-      Select
+      Select,
+      Radio,
+      Checkbox,
+      NumberPicker,
+      Password,
+      DatePicker,
+      TimePicker,
+      TreeSelect
     }
   })
   return (

+ 24 - 2
src/pages/Project/Management/List/components/ProjectModal.tsx

@@ -3,7 +3,22 @@ import { message } from 'antd'
 import { addProject, updateProject } from '@/services/api/project'
 import { BaseMenuEnum, SchemaEnum } from '@/pages/Schema/Base'
 import { createForm, onFieldMount } from '@formily/core'
-import { Form, FormButtonGroup, Submit, FormLayout, FormItem, Input, Select } from '@formily/antd'
+import {
+  Form,
+  FormButtonGroup,
+  Submit,
+  FormLayout,
+  FormItem,
+  Input,
+  Select,
+  Radio,
+  Checkbox,
+  NumberPicker,
+  Password,
+  DatePicker,
+  TimePicker,
+  TreeSelect
+} from '@formily/antd'
 import { createSchemaField } from '@formily/react'
 
 import type { SchemaBaseModelState } from '@/pages/Schema/Base/model'
@@ -48,7 +63,14 @@ const ProjectModal: React.FC<ProjectModalProps> = ({
       FormLayout,
       FormItem,
       Input,
-      Select
+      Select,
+      Radio,
+      Checkbox,
+      NumberPicker,
+      Password,
+      DatePicker,
+      TimePicker,
+      TreeSelect
     }
   })
 

+ 25 - 3
src/pages/Schema/Base/index.tsx

@@ -6,8 +6,23 @@ import { history, connect, Link } from 'umi'
 import type { ProjectModelState, SchemaBaseModelState } from 'umi'
 import { createForm, onFieldMount, onFieldReact } from '@formily/core'
 import { createSchemaField } from '@formily/react'
-import { FormItem, Input, Switch, Select, FormGrid, FormLayout, Form } from '@formily/antd'
-
+import {
+  FormItem,
+  Input,
+  Switch,
+  Select,
+  FormGrid,
+  FormLayout,
+  Form,
+  Radio,
+  Checkbox,
+  NumberPicker,
+  Password,
+  DatePicker,
+  TimePicker,
+  TreeSelect
+} from '@formily/antd'
+import 'antd/dist/antd.less'
 import {
   projectSchema,
   institutionSchema,
@@ -111,7 +126,14 @@ const Index: React.FC<BaseProps> = ({ base, pTypeList, dispatch }) => {
         FormGrid,
         Input,
         Switch,
-        Select
+        Select,
+        Radio,
+        Checkbox,
+        NumberPicker,
+        Password,
+        DatePicker,
+        TimePicker,
+        TreeSelect
       }
     })
     return (

+ 0 - 8
src/pages/Welcome.less

@@ -1,8 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.pre {
-  margin: 12px 0;
-  padding: 12px 20px;
-  background: @input-bg;
-  box-shadow: @card-shadow;
-}

+ 0 - 21
src/pages/Welcome.tsx

@@ -1,21 +0,0 @@
-import React from 'react'
-import { PageContainer } from '@ant-design/pro-layout'
-import { Card } from 'antd'
-// import { useIntl, FormattedMessage } from 'umi'
-// import styles from './Welcome.less'
-
-// const CodePreview: React.FC = ({ children }) => (
-//   <pre className={styles.pre}>
-//     <code>
-//       <Typography.Text copyable>{children}</Typography.Text>
-//     </code>
-//   </pre>
-// )
-
-export default (): React.ReactNode => {
-  return (
-    <PageContainer>
-      <Card>欢迎您</Card>
-    </PageContainer>
-  )
-}