فهرست منبع

fix: 单位下客户表格对齐问题

outaozhen 4 سال پیش
والد
کامیت
0509306e0e
3فایلهای تغییر یافته به همراه10 افزوده شده و 12 حذف شده
  1. 1 1
      package.json
  2. 7 7
      src/pages/Customer/Company/components/CompanyDetail/TabList.jsx
  3. 2 4
      src/pages/User/Account/Settings/index.jsx

+ 1 - 1
package.json

@@ -53,7 +53,7 @@
     "@ant-design/pro-form": "1.42.1",
     "@ant-design/pro-form": "1.42.1",
     "@ant-design/pro-layout": "6.19.3",
     "@ant-design/pro-layout": "6.19.3",
     "@ant-design/pro-table": "2.43.4",
     "@ant-design/pro-table": "2.43.4",
-    "@arco-design/web-react": "^2.24.0",
+    "@arco-design/web-react": "^2.25.0",
     "@icon-park/react": "^1.3.3",
     "@icon-park/react": "^1.3.3",
     "@types/react-window": "^1.8.5",
     "@types/react-window": "^1.8.5",
     "@umijs/route-utils": "^1.0.33",
     "@umijs/route-utils": "^1.0.33",

+ 7 - 7
src/pages/Customer/Company/components/CompanyDetail/TabList.jsx

@@ -3,8 +3,8 @@ import ContactDetail from '@/pages/Customer/Client/components/ClientDetail'
 import LocksDetail from '@/pages/Product/Lock/LockStore/components/LocksDetail'
 import LocksDetail from '@/pages/Product/Lock/LockStore/components/LocksDetail'
 import React, { useRef, useState } from 'react'
 import React, { useRef, useState } from 'react'
 import { Tabs, message, Dropdown, Menu, Typography } from 'antd'
 import { Tabs, message, Dropdown, Menu, Typography } from 'antd'
-// import { Table } from '@arco-design/web-react'
-// import '@arco-design/web-react/dist/css/arco.css'
+import { Table } from '@arco-design/web-react'
+import '@arco-design/web-react/dist/css/arco.css'
 import styles from './index.less'
 import styles from './index.less'
 import AddContact from '@/pages/Customer/Client/components/AddClient'
 import AddContact from '@/pages/Customer/Client/components/AddClient'
 import { apiAddClient, apiAddCustomerService, updateClient } from '@/services/customer'
 import { apiAddClient, apiAddCustomerService, updateClient } from '@/services/customer'
@@ -162,7 +162,7 @@ const CompanyTabList = ({
     {
     {
       title: '姓名',
       title: '姓名',
       dataIndex: 'clientName',
       dataIndex: 'clientName',
-      width: 100,
+      // width: 100,
       headerCellStyle: {
       headerCellStyle: {
         backgroundColor: '#fafafa'
         backgroundColor: '#fafafa'
       },
       },
@@ -374,15 +374,15 @@ const CompanyTabList = ({
         <Tabs>
         <Tabs>
           <TabPane tab={<span>客户{renderBadge(client.total, true)}</span>} key="1">
           <TabPane tab={<span>客户{renderBadge(client.total, true)}</span>} key="1">
             <div className={['sheet-right-panel', styles.tableCont].join(' ')} ref={tRef}>
             <div className={['sheet-right-panel', styles.tableCont].join(' ')} ref={tRef}>
-              {/* <Table
+              <Table
                 virtualized
                 virtualized
                 scroll={{ y: clientHeight }}
                 scroll={{ y: clientHeight }}
                 border={false}
                 border={false}
                 columns={columns}
                 columns={columns}
                 data={client.client}
                 data={client.client}
                 pagination={false}
                 pagination={false}
-              /> */}
-              <ProTable
+              />
+              {/* <ProTable
                 size="small"
                 size="small"
                 columns={columns}
                 columns={columns}
                 search={false}
                 search={false}
@@ -391,7 +391,7 @@ const CompanyTabList = ({
                 rowKey={record => record.id}
                 rowKey={record => record.id}
                 pagination={false}
                 pagination={false}
                 scroll={{ y: clientHeight }}
                 scroll={{ y: clientHeight }}
-              />
+              /> */}
               {/* <VirtualTable
               {/* <VirtualTable
                 size="small"
                 size="small"
                 columns={columns}
                 columns={columns}

+ 2 - 4
src/pages/User/Account/Settings/index.jsx

@@ -70,8 +70,7 @@ const Settings = () => {
           if (ref) {
           if (ref) {
             dom.current = ref
             dom.current = ref
           }
           }
-        }}
-      >
+        }}>
         <div className={styles.leftMenu}>
         <div className={styles.leftMenu}>
           <Menu
           <Menu
             mode={initConfig.mode}
             mode={initConfig.mode}
@@ -81,8 +80,7 @@ const Settings = () => {
                 ...initConfig,
                 ...initConfig,
                 selectKey: key
                 selectKey: key
               })
               })
-            }}
-          >
+            }}>
             {getMenu()}
             {getMenu()}
           </Menu>
           </Menu>
         </div>
         </div>