Sfoglia il codice sorgente

fix: 动态字段补充

outaozhen 3 anni fa
parent
commit
9db689aa47

+ 4 - 5
src/pages/Institutions/Company/Detail/components/Staff.tsx

@@ -9,11 +9,12 @@ import StaffDrawer, { ModalType } from '@/pages/Institutions/Staff/components/St
 import type { SchemaBaseModelState } from '@/pages/Schema/Base/model'
 import { BaseMenuEnum } from '@/pages/Schema/Base'
 import type { InstitutionsModelState } from '@/pages/Institutions/model'
+import { generateColumns } from '@/utils/util'
 
 type ListProps = ConnectProps & {
   accountType: API.AccountType[]
 }
-const Staff: React.FC<ListProps> = ({ dataID, dispatch, accountTypeList }) => {
+const Staff: React.FC<ListProps> = ({ schema, dataID, dispatch, accountTypeList }) => {
   const tRef = useRef<ActionType>(null)
   // console.log(accountTypeList)
 
@@ -32,9 +33,7 @@ const Staff: React.FC<ListProps> = ({ dataID, dispatch, accountTypeList }) => {
   }, [])
   const [state, setState] = useState({
     params: {
-      search: null,
-      accountType: 1,
-      dataID
+      search: null
     },
     visible: false,
     currentModalType: ModalType.ADD,
@@ -98,7 +97,7 @@ const Staff: React.FC<ListProps> = ({ dataID, dispatch, accountTypeList }) => {
         rowKey="ID"
         params={state.params}
         actionRef={tRef}
-        columns={columns}
+        columns={generateColumns(columns, schema)}
         search={false}
         request={async (params, filter, sorter) => {
           const { code = -1, data: { items = [], totle = 0 } = {} } = await queryAcountList({

+ 0 - 2
src/pages/Institutions/Staff/components/StaffDrawer.tsx

@@ -43,8 +43,6 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
   organizationList,
   reload
 }) => {
-  console.log(organizationList)
-
   const form = useForm()
   useEffect(() => {
     if (visible) {

+ 3 - 2
src/pages/Institutions/Staff/index.tsx

@@ -13,13 +13,14 @@ import StaffDrawer, { ModalType } from './components/StaffDrawer'
 import type { SchemaBaseModelState } from '@/pages/Schema/Base/model'
 import { BaseMenuEnum } from '@/pages/Schema/Base'
 import StaffDetailModal from '../Company/Detail/components/StaffDetailModal'
+import { generateColumns } from '@/utils/util'
 
 type ListProps = ConnectProps & {
   accountTypeList: { label: string; value: string }[]
   schema?: Record<string, any> | null
 }
 
-const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
+const CompanyList: React.FC<ListProps> = ({ schema, dispatch, accountTypeList }) => {
   // console.log(accountTypeList)
 
   const tRef = useRef<ActionType>(null)
@@ -149,7 +150,7 @@ const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
         rowKey="ID"
         params={state.params}
         actionRef={tRef}
-        columns={columns}
+        columns={generateColumns(columns, schema)}
         request={async (params, filter, sorter) => {
           const { code = -1, data: { items = [], totle = 0 } = {} } = await queryAcountList({
             ...params,

+ 2 - 1
src/pages/Project/Management/index.tsx

@@ -13,6 +13,7 @@ import dayjs from 'dayjs'
 import { PageContainer } from '@ant-design/pro-layout'
 import type { SchemaBaseModelState } from '@/pages/Schema/Base/model'
 import { BaseMenuEnum } from '@/pages/Schema/Base'
+import { generateColumns } from '@/utils/util'
 
 type ListProps = ConnectProps & {
   pTypeList: { label: string; value: string }[]
@@ -115,7 +116,7 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
         rowKey="ID"
         params={state.params}
         actionRef={tRef}
-        columns={columns}
+        columns={generateColumns(columns, schema)}
         request={async (params, filter, sorter) => {
           const { code = -1, data: { items = [], totle = 0 } = {} } = await getProjectList({
             ...params,