Browse Source

fix(): table滚动条排查

develop
wanghx 1 year ago
parent
commit
bbb1eea766
  1. 3
      src/components/TableModule/index.jsx
  2. 2
      src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx
  3. 12
      src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
  4. 2
      src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
  5. 2
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
  6. 3
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
  7. 2
      src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx
  8. 11
      src/pages/SystemMgm/AdminMgm/index.scss
  9. 2
      src/pages/SystemMgm/AdminMgm/loadable.jsx
  10. 1
      src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
  11. 11
      src/pages/SystemMgm/RoleMgm/index.scss
  12. 2
      src/pages/SystemMgm/RoleMgm/loadable.jsx
  13. 3
      src/pages/SystemMgm/SystemLog/index.scss

3
src/components/TableModule/index.jsx

@ -1144,9 +1144,12 @@ const TableModule = forwardRef((props, ref) => {
<Table <Table
rowSelection={rowSelection} rowSelection={rowSelection}
rowKey={rowKey} rowKey={rowKey}
className="yisa-table-scroll"
columns={getNewColumns()} columns={getNewColumns()}
dataSource={tableData} dataSource={tableData}
scroll={{ y: "calc(100% - 50px)" }}
pagination={false} pagination={false}
locale={locale} locale={locale}
/> />
</div> </div>

2
src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx

@ -302,11 +302,13 @@ function LiftUpPoleRecord(props) {
<Table <Table
bordered bordered
// className='yisa-table' // className='yisa-table'
className="table yisa-table-scroll"
dataSource={resultData.data} dataSource={resultData.data}
columns={ columns={
handleColumns() handleColumns()
} }
pagination={false} pagination={false}
scroll={{ y: "calc(100% - 50px)" }}
loading={ajaxLoading} loading={ajaxLoading}
/> />
<Pagination <Pagination

12
src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx

@ -24,17 +24,6 @@ function PlateChangeMgm() {
const [total, setTotal] = useState(0); const [total, setTotal] = useState(0);
const columns = [ const columns = [
{ {
title: "序号",
dataIndex: "index",
key: "index",
align: "center",
fixed: "right",
// render: (text, record, index) => index + 1,
render: (_, record, index) => {
return formData.pn ? index + 1 + (formData.pn - 1) * formData.page_size : index + 1
}
},
{
title: "车场名称", title: "车场名称",
dataIndex: "road_name", dataIndex: "road_name",
key: "road_name", key: "road_name",
@ -209,6 +198,7 @@ function PlateChangeMgm() {
return ( return (
<> <>
<TableModule <TableModule
showSerial={true}
columns={columns} columns={columns}
tableData={resultData} tableData={resultData}
formSearch={formSearch} formSearch={formSearch}

2
src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx

@ -583,11 +583,13 @@ function ZombieCarCleanRecord(props) {
bordered bordered
// className='yisa-table' // className='yisa-table'
dataSource={resultData.data} dataSource={resultData.data}
className="table yisa-table-scroll"
columns={ columns={
handleColumns() handleColumns()
} }
// rowSelection={rowSelection} // rowSelection={rowSelection}
pagination={false} pagination={false}
scroll={{ y: "calc(100% - 50px)" }}
loading={ajaxLoading} loading={ajaxLoading}
/> />
<Pagination <Pagination

2
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx

@ -291,12 +291,14 @@ function ChargeRulesMgm() {
<TableModule <TableModule
ref={childRef} ref={childRef}
columns={columns} columns={columns}
className="table yisa-table-scroll"
tableData={tableData} tableData={tableData}
formSearch={formSearch} formSearch={formSearch}
total={total} total={total}
search={fetch} search={fetch}
initFormData={initFormData} initFormData={initFormData}
isExport={false} isExport={false}
scroll={{ y: "calc(100% - 50px)" }}
pageName={'chargeRulesMgm'} pageName={'chargeRulesMgm'}
rightButtonGroup={[addItem()]} rightButtonGroup={[addItem()]}
/> />

3
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx

@ -649,11 +649,12 @@ function OutSegment() {
> >
<div className="table-wrap"> <div className="table-wrap">
<Table <Table
// className="yisa-table"
className="table yisa-table-scroll"
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
pagination={false} pagination={false}
rowKey={(record) => record.id} rowKey={(record) => record.id}
scroll={{ y: "calc(100% - 50px)" }}
/> />
</div> </div>
<div> <div>

2
src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx

@ -198,6 +198,7 @@ function ZombieCarMgm() {
ref={tableRef} ref={tableRef}
columns={columns} columns={columns}
tableData={tableData} tableData={tableData}
className="table yisa-table-scroll"
formSearch={formSearch} formSearch={formSearch}
total={total} total={total}
rowKey={"id"} rowKey={"id"}
@ -207,6 +208,7 @@ function ZombieCarMgm() {
search={fetch} search={fetch}
rightButtonGroup={[cleanZomCarComponent()]} rightButtonGroup={[cleanZomCarComponent()]}
initFormData={initFormData} initFormData={initFormData}
scroll={{ y: "calc(100% - 50px)" }}
exportUrl="/PMS/api/bpm/offroad/export_zomcar" exportUrl="/PMS/api/bpm/offroad/export_zomcar"
/> />
<Modal <Modal

11
src/pages/SystemMgm/AdminMgm/index.scss

@ -79,7 +79,9 @@ $color-primary: var(--color-primary);
} }
} }
} }
.yisa-table-scroll {
height: calc(100% - 50px);
}
.paid-result { .paid-result {
width: 100%; width: 100%;
height: 800px; height: 800px;
@ -88,6 +90,13 @@ $color-primary: var(--color-primary);
margin-left: 17px; margin-left: 17px;
.result { .result {
padding: 25px; padding: 25px;
height: 100%;
display: flex;
flex-direction: column;
.cc-result-flow {
flex: 1;
min-height: 0;
}
.font { .font {
font-family: font-family:
Microsoft YaHei, Microsoft YaHei,

2
src/pages/SystemMgm/AdminMgm/loadable.jsx

@ -742,6 +742,8 @@ function AdminMgm(props) {
columns={ columns={
handleColumns() handleColumns()
} }
className="table yisa-table-scroll"
scroll={{ y: "calc(100% - 50px)" }}
pagination={false} pagination={false}
loading={ajaxLoading} loading={ajaxLoading}
/> />

1
src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx

@ -540,6 +540,7 @@ function BusinessConf(props) {
columns={ columns={
handleColumns() handleColumns()
} }
scroll={{ y: "calc(100% - 50px)" }}
pagination={false} pagination={false}
loading={ajaxLoading} loading={ajaxLoading}
/> />

11
src/pages/SystemMgm/RoleMgm/index.scss

@ -83,7 +83,9 @@ $color-primary: var(--color-primary);
} }
} }
} }
.yisa-table-scroll {
height: calc(100% - 50px);
}
.paid-result { .paid-result {
width: 100%; width: 100%;
height: 800px; height: 800px;
@ -92,6 +94,13 @@ $color-primary: var(--color-primary);
margin-left: 17px; margin-left: 17px;
.result { .result {
padding: 25px; padding: 25px;
height: 100%;
display: flex;
flex-direction: column;
.cc-result-flow {
flex: 1;
min-height: 0;
}
.font { .font {
font-family: font-family:
Microsoft YaHei, Microsoft YaHei,

2
src/pages/SystemMgm/RoleMgm/loadable.jsx

@ -621,6 +621,8 @@ function RoleMgm(props) {
columns={ columns={
handleColumns() handleColumns()
} }
className="table yisa-table-scroll"
scroll={{ y: "calc(100% - 50px)" }}
pagination={false} pagination={false}
loading={ajaxLoading} loading={ajaxLoading}
/> />

3
src/pages/SystemMgm/SystemLog/index.scss

@ -117,6 +117,9 @@ $color-primary: var(--color-primary);
background: var(--color-user-list-bg); background: var(--color-user-list-bg);
border-top-left-radius: 20px; border-top-left-radius: 20px;
box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08); box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08);
.yisa-table-scroll {
height: calc(100% - 1px);
}
.result { .result {
height: 100%; height: 100%;
display: flex; display: flex;

Loading…
Cancel
Save