feat: 1111

src/pages/Institutions/Staff/components/StaffDrawer.tsx

@@ -24,10 +24,10 @@ type StaffModalProps = ConnectProps & {
     ID: string
     name: string
     accountType: string
-    dataID: string
+    institutionID: string
   }
   accountTypeList: API.AccountType
-  organizationList: API.OrganizationalStructureListItem
+  organizationList: API.OrganizationalStructureListItem[]
   reload: () => void
   schema?: Record<string, any> | null
 }
@@ -45,29 +45,24 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
 }) => {
   const form = useForm()
   useEffect(() => {
-    if (visible) {
-      if (!schema) {
-        dispatch({
-          type: 'schemaBase/querySchema',
-          payload: {
-            columnType: BaseMenuEnum.STAFF
-          }
-        })
-      }
-      if (!organizationList?.length) {
-        dispatch({
-          type: 'institutions/queryOrganizationList',
-          payload: {
-            dataID: defaultFormData?.dataID,
-            structureType: '1'
-          }
-        })
-      }
+    if (!schema) {
+      dispatch({
+        type: 'schemaBase/querySchema',
+        payload: {
+          columnType: BaseMenuEnum.STAFF
+        }
+      })
+    }
+    if (defaultFormData?.institutionID && !organizationList?.length) {
+      dispatch({
+        type: 'institutions/queryOrganizationList',
+        payload: {
+          dataID: defaultFormData?.institutionID,
+          structureType: '1'
+        }
+      })
     }
-  }, [visible])
-  // useEffect(() => {
-  //   defaultFormData && ref.current?.setFieldsValue({ ...defaultFormData })
-  // }, [defaultFormData])
+  }, [visible, defaultFormData?.institutionID])
 
   const { run: tryUpdateAccount } = useRequest(updateAccount, {
     manual: true,
@@ -84,7 +79,7 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
   })
 
   const onMount = () => {
-    console.log(defaultFormData)
+    console.log(organizationList)
 
     form.setValues({ ...defaultFormData })
     delay(80).then(() => {
@@ -92,15 +87,20 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
         enum: accountTypeList.map(item => item.value),
         enumNames: accountTypeList.map(item => item.label)
       })
-      form.setSchemaByPath('institution', {
+
+      // console.log('organizationList', organizationList)
+    })
+    delay(500).then(() => {
+      form.setSchemaByPath('organizationalStructureID', {
         // enum: organizationList.map(item => item.value),
         // enumNames: organizationList.map(item => item.label),
         description: '',
         type: 'string',
         widget: 'treeSelect',
         props: {
+          // defaultValue: defaultFormData.institutionID,
           treeDefaultExpandAll: true,
-          treeData: organizationList.map(item => item.label)
+          treeData: organizationList
         }
       })
     })
@@ -187,10 +187,7 @@ export default connect(
       label: item.name,
       value: item.value
     })),
-    organizationList: institutions.organizationType.map(item => ({
-      label: item
-      // value: item.dataID
-    })),
+    organizationList: institutions.organizationType,
     schema: schemaBase.base[BaseMenuEnum.STAFF]?.schema
   })
 )(StaffDrawer)

src/pages/Institutions/Staff/index.tsx

@@ -122,9 +122,8 @@ const CompanyList: React.FC<ListProps> = ({ schema, dispatch, accountTypeList })
                 defaultFormData: {
                   ...record,
                   institution: null,
-                  institutionID: record.ID,
-                  accountType: record.accountType,
-                  dataID: record.institution.ID
+                  institutionID: record.institution.ID,
+                  accountType: record.accountType
                 }
               })
             }}>

src/pages/Schema/Base/detail.tsx

@@ -50,7 +50,7 @@ const Detail: React.FC<DetailProps> = ({ dispatch, base, location }) => {
     }
   }, [columnType])
   return (
-    <PageContainer title={menuOptions[columnType]?.label + '数据模型'}>
+    <PageContainer title={menuOptions.find(item => item.value === columnType)?.label + '数据模型'}>
       <div className="bg-white shadow-card p-4" style={{ height: 'calc(100vh - 196px)' }}>
         <Generator
           ref={genRef}