表格表头居中

package.json

@@ -65,6 +65,7 @@
     "@umijs/route-utils": "^1.0.36",
     "ahooks": "^3.0.0",
     "antd": "^4.18.2",
+    "babel-plugin-import": "^1.13.3",
     "classnames": "^2.2.6",
     "dayjs": "^1.10.7",
     "form-render": "1.7.3",
@@ -99,15 +100,19 @@
     "@umijs/preset-dumi": "^1.1.7",
     "@umijs/preset-react": "^1.8.17",
     "@umijs/yorkie": "^2.0.3",
+    "babel-eslint": "^10.1.0",
     "browserslist": "^4.18.1",
     "carlo": "^0.9.46",
     "cross-env": "^7.0.3",
     "cross-port-killer": "^1.1.1",
     "detect-installer": "^1.0.1",
     "enzyme": "^3.11.0",
-    "eslint": "^7.1.0",
+    "eslint": "^6.6.0",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-javascript": "^1.3.4",
     "eslint-plugin-jsx": "^0.1.0",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-typescript": "^0.14.0",
     "express": "^4.17.1",
     "gh-pages": "^3.0.0",

src/pages/Institutions/Company/Detail/components/Organization.tsx

@@ -81,24 +81,26 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
     {
       title: '组织名称',
       dataIndex: 'name',
-      key: 'name'
+      key: 'name',
+      onHeaderCell: () => ({ style: { textAlign: 'center' } })
     },
     {
       title: '包含人员',
       dataIndex: 'accountTotal',
-      key: 'accountTotal'
+      key: 'accountTotal',
+      onHeaderCell: () => ({ style: { textAlign: 'center' } })
     },
     {
       title: '操作',
       dataIndex: 'operation',
       key: 'operation',
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (_, record) => (
         <div className="divide-x divide-bg-gray-400 flex flex-row">
           {record.isStart === false ? (
             <div
               className="px-2 text-primary cursor-pointer hover:text-hex-967bbd"
-              onClick={() => tryMoveOrganization({ ID: record.ID, operation: 'up' })}
-            >
+              onClick={() => tryMoveOrganization({ ID: record.ID, operation: 'up' })}>
               <Tooltip placement="top" title="上移">
                 <ArrowUpOutlined />
               </Tooltip>
@@ -107,8 +109,7 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
           {record.isEnd === false ? (
             <div
               className="px-2 text-primary cursor-pointer hover:text-hex-967bbd"
-              onClick={() => tryMoveOrganization({ ID: record.ID, operation: 'down' })}
-            >
+              onClick={() => tryMoveOrganization({ ID: record.ID, operation: 'down' })}>
               <Tooltip placement="top" title="下移">
                 <ArrowDownOutlined />
               </Tooltip>
@@ -124,8 +125,7 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
                   defaultFormData: record,
                   currentModalType: ModalTypeEnum.MOVE
                 })
-              }}
-            >
+              }}>
               <Tooltip placement="top" title="移动">
                 <SwapOutlined />
               </Tooltip>
@@ -145,8 +145,7 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
                 },
                 currentModalType: ModalTypeEnum.ADDITEM
               })
-            }}
-          >
+            }}>
             <Tooltip placement="top" title="添加子项">
               <PlusSquareOutlined />
             </Tooltip>
@@ -160,8 +159,7 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
                 defaultFormData: record,
                 currentModalType: ModalTypeEnum.UPDATE
               })
-            }}
-          >
+            }}>
             <Tooltip placement="top" title="重命名">
               <EditOutlined />
             </Tooltip>
@@ -232,8 +230,7 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
                     parentID: state.parentID
                   }
                 })
-              }
-            >
+              }>
               添加组织
             </Button>
           ]

src/pages/Institutions/Company/Detail/components/Staff.tsx

@@ -62,16 +62,15 @@ const Staff: React.FC<ListProps> = ({
     {
       dataIndex: 'account',
       title: '帐号',
-      width: 100
+      width: 100,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } })
     },
     {
       dataIndex: 'name',
       title: '姓名',
-<<<<<<< HEAD
-      renderText: (text, record) => `${text}${record.ID === managerID ? ' (管理员) ' : null}`
-=======
-      width: 70
->>>>>>> ba83460... feat: 调整表格、表单列宽
+      renderText: (text, record) => `${text}${record.ID === managerID ? ' (管理员) ' : null}`,
+      width: 70,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } })
     },
     {
       dataIndex: 'enable',
@@ -79,6 +78,7 @@ const Staff: React.FC<ListProps> = ({
       title: '状态',
       filters: true,
       width: 66,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       filterMultiple: false,
       valueEnum: {
         true: { text: '启用', status: 'Success' },
@@ -90,6 +90,7 @@ const Staff: React.FC<ListProps> = ({
       key: 'gender',
       title: '性别',
       width: 56,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (_, { gender }) => {
         return <span>{genderEum[gender]}</span>
       }
@@ -99,6 +100,7 @@ const Staff: React.FC<ListProps> = ({
       key: 'organizationalStructureID',
       title: '组织架构',
       width: 130,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: (_, record) => record.organizationalStructure?.name
     },
     {
@@ -106,19 +108,22 @@ const Staff: React.FC<ListProps> = ({
       key: 'institutionID',
       title: '所属企事业单位',
       width: 270,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: (_, record) => record.institution.name
     },
     {
       dataIndex: 'phone',
       key: 'phone',
       title: '手机',
-      width: 100
+      width: 100,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } })
     },
     {
       dataIndex: 'createdTime',
       key: 'createdTime',
       title: '创建时间',
       width: 90,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: text => dayjs(text).format('YYYY-MM-DD')
     },
     {
@@ -126,6 +131,7 @@ const Staff: React.FC<ListProps> = ({
       key: 'created',
       title: '创建者',
       width: 100,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: (_, record) => record?.created?.name
     },
     {
@@ -134,6 +140,7 @@ const Staff: React.FC<ListProps> = ({
       title: '账号类型',
       filters: true,
       width: 80,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       filterMultiple: false,
       valueEnum: accountTypeList.reduce((prev, curr) => {
         const items = { ...prev }
@@ -147,6 +154,7 @@ const Staff: React.FC<ListProps> = ({
       title: '操作',
       dataIndex: 'operation',
       width: 45,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (_, record) => (
         <div className="divide-x divide-bg-gray-400 flex flex-row">
           <div
@@ -202,7 +210,6 @@ const Staff: React.FC<ListProps> = ({
             onSearch: val => setState({ ...state, params: { ...state.params, search: val } })
           },
           actions: [
-<<<<<<< HEAD
             state.total && state.total > memberTotal ? (
               <Tooltip placement="top" title="成员已满，无法新增">
                 <Button type="primary" disabled>
@@ -228,25 +235,6 @@ const Staff: React.FC<ListProps> = ({
                 添加人员
               </Button>
             )
-=======
-            <Button
-              type="primary"
-              onClick={() => {
-                setState({
-                  ...state,
-                  visible: true,
-                  currentModalType: ModalType.ADD,
-                  institutionDisable: true,
-                  title: '',
-                  defaultFormData: {
-                    institutionID: dataID,
-                    institutionDisable: true
-                  }
-                })
-              }}>
-              添加人员
-            </Button>
->>>>>>> dee655f... feat: 企事业单位详情内tab页下表格高度优化
           ]
         }}
       />

src/pages/Institutions/Company/List/index.tsx

@@ -74,6 +74,7 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
       dataIndex: 'name',
       title: '企事业单位名称',
       width: 286,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (name, record) => (
         <span
           onClick={() =>
@@ -93,7 +94,8 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
     {
       dataIndex: 'acronym',
       title: '企事业单位简称',
-      width: 286
+      width: 286,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } })
     },
     {
       dataIndex: 'institutionAcountTotal',

src/pages/Project/Created/index.tsx

@@ -62,6 +62,7 @@ const Created = () => {
       dataIndex: 'institutionID',
       title: '企事业单位',
       width: 286,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: (_, record) => record?.institution?.name
     },
     {
@@ -75,6 +76,7 @@ const Created = () => {
       dataIndex: 'opreate',
       title: '操作',
       width: 61,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (_, record) => (
         <div
           className="text-hex-fd3995 cursor-pointer hover:text-hex-e7026e"

src/pages/Project/Management/List/index.tsx

@@ -67,6 +67,7 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
       dataIndex: 'name',
       title: '项目名称',
       width: 286,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (text, record) => (
         <span
           className="text-primary cursor-pointer hover:text-hex-967bbd"
@@ -111,6 +112,7 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
       key: 'createdID',
       title: '创建人',
       width: 326,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: (_, record) =>
         record?.created?.ID
           ? `${record?.created?.name}（${record?.created?.institution?.name}）`
@@ -121,6 +123,7 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
       key: 'reportAccount',
       title: '编辑者',
       width: 256,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       renderText: (_, record) => (
         <div>
           {record.reportAccount?.map(item => (
@@ -139,6 +142,7 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
       title: '操作',
       dataIndex: 'operation',
       width: 91,
+      onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       render: (_, record) => (
         <div className="divide-x divide-bg-gray-400 flex flex-row">
           <div