Commit 53e5d26a1ff2f5553c24781639597d05f2427d41
1 parent
a80102cf
1.commonListTab处理表格虚拟滚动无限下拉问题
Showing
1 changed file
with
67 additions
and
52 deletions
src/components/Common/CommonListTab/index.js
| @@ -1111,7 +1111,7 @@ const CommonListTabComponent = Form.create({ | @@ -1111,7 +1111,7 @@ const CommonListTabComponent = Form.create({ | ||
| 1111 | props.onGetChart() | 1111 | props.onGetChart() |
| 1112 | } | 1112 | } |
| 1113 | </div> : | 1113 | </div> : |
| 1114 | - <StaticEditTable {...slave2TableProps} tableBelone="list" /> | 1114 | + <StaticEditTable {...slave2TableProps} tableBelone="list" noVlistTable /> |
| 1115 | } | 1115 | } |
| 1116 | </TabPane> : '' | 1116 | </TabPane> : '' |
| 1117 | } | 1117 | } |
| @@ -1264,58 +1264,73 @@ const CommonListTabComponent = Form.create({ | @@ -1264,58 +1264,73 @@ const CommonListTabComponent = Form.create({ | ||
| 1264 | </Layout> | 1264 | </Layout> |
| 1265 | {/* {!commonUtils.isEmpty(props.routing) ? '' : <SlaveMemo {...props} />} */} | 1265 | {/* {!commonUtils.isEmpty(props.routing) ? '' : <SlaveMemo {...props} />} */} |
| 1266 | {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} | 1266 | {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} |
| 1267 | - {commonUtils.isEmptyArr(treeProps.treeData) || !commonUtils.isEmpty(props.routing) ? '' : <div className="xly-eject"> <a onClick={props.onEject}> <img src={Eject} alt="eject" /></a> </div>} | ||
| 1268 | - {commonUtils.isEmptyArr(treeProps.treeData) || !commonUtils.isEmpty(props.routing) ? '' : | ||
| 1269 | - <div className="xly-filter-tree"> | ||
| 1270 | - <StaticEditTree {...treeProps} /> | ||
| 1271 | - <div className="xly-tree-close" > | ||
| 1272 | - {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} | ||
| 1273 | - <a onClick={props.onEject}> <img src={Close} alt="close" /></a> | 1267 | + {commonUtils.isEmptyArr(treeProps.treeData) || !commonUtils.isEmpty(props.routing) ? ( |
| 1268 | + "" | ||
| 1269 | + ) : ( | ||
| 1270 | + <div className="xly-eject"> | ||
| 1271 | + {" "} | ||
| 1272 | + <a onClick={props.onEject}> | ||
| 1273 | + {" "} | ||
| 1274 | + <img src={Eject} alt="eject" /> | ||
| 1275 | + </a>{" "} | ||
| 1274 | </div> | 1276 | </div> |
| 1275 | - </div> | ||
| 1276 | - } | ||
| 1277 | - { | ||
| 1278 | - logVisible ? | ||
| 1279 | - <AntdDraggableModal | ||
| 1280 | - width="1200" | ||
| 1281 | - title="查看操作日志" | ||
| 1282 | - visible={logVisible} | ||
| 1283 | - onCancel={props.onCancelModal.bind(this, 'logVisible')} | ||
| 1284 | - onOk={props.onSelectModal.bind(this, 'logVisible')} | ||
| 1285 | - footer={null} | ||
| 1286 | - > | ||
| 1287 | - <CommonListSelect {...logProps} /> | ||
| 1288 | - </AntdDraggableModal> : '' | ||
| 1289 | - } | ||
| 1290 | - { | ||
| 1291 | - props.bDataAuditProgress ? | ||
| 1292 | - <div className="dataAuditProgress"> | ||
| 1293 | - <Slider | ||
| 1294 | - min={1} | ||
| 1295 | - max={props.dataAuditProcessMaxValue} | ||
| 1296 | - tooltipVisible | ||
| 1297 | - step={1} | ||
| 1298 | - draggableTrack | ||
| 1299 | - defaultValue={3} | ||
| 1300 | - value={props.dataAuditProcessValue} | ||
| 1301 | - /> | ||
| 1302 | - </div> : '' | ||
| 1303 | - | ||
| 1304 | - } | ||
| 1305 | - { | ||
| 1306 | - props.workScheduleVisible ? | ||
| 1307 | - <AntdDraggableModal | ||
| 1308 | - className="workScheduleModal" | ||
| 1309 | - width={1300} | ||
| 1310 | - title={commonUtils.isEmptyObject(searchWorkSchedule) ? searchWorkTitle : searchWorkSchedule.app.currentPane.title} | ||
| 1311 | - visible={props.workScheduleVisible} | ||
| 1312 | - onCancel={props.onCloseModel.bind(this, 'workScheduleVisible')} | ||
| 1313 | - onSaveState={props.onSaveState} | ||
| 1314 | - footer={null} | ||
| 1315 | - > | ||
| 1316 | - <CommonListSelect {...searchWorkSchedule} /> | ||
| 1317 | - </AntdDraggableModal> : null | ||
| 1318 | - } | 1277 | + )} |
| 1278 | + {commonUtils.isEmptyArr(treeProps.treeData) || !commonUtils.isEmpty(props.routing) ? ( | ||
| 1279 | + "" | ||
| 1280 | + ) : ( | ||
| 1281 | + <div className="xly-filter-tree"> | ||
| 1282 | + <StaticEditTree {...treeProps} /> | ||
| 1283 | + <div className="xly-tree-close"> | ||
| 1284 | + {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} | ||
| 1285 | + <a onClick={props.onEject}> | ||
| 1286 | + {" "} | ||
| 1287 | + <img src={Close} alt="close" /> | ||
| 1288 | + </a> | ||
| 1289 | + </div> | ||
| 1290 | + </div> | ||
| 1291 | + )} | ||
| 1292 | + {logVisible ? ( | ||
| 1293 | + <AntdDraggableModal | ||
| 1294 | + width="1200" | ||
| 1295 | + title="查看操作日志" | ||
| 1296 | + visible={logVisible} | ||
| 1297 | + onCancel={props.onCancelModal.bind(this, "logVisible")} | ||
| 1298 | + onOk={props.onSelectModal.bind(this, "logVisible")} | ||
| 1299 | + footer={null} | ||
| 1300 | + > | ||
| 1301 | + <CommonListSelect {...logProps} /> | ||
| 1302 | + </AntdDraggableModal> | ||
| 1303 | + ) : ( | ||
| 1304 | + "" | ||
| 1305 | + )} | ||
| 1306 | + {props.bDataAuditProgress ? ( | ||
| 1307 | + <div className="dataAuditProgress"> | ||
| 1308 | + <Slider | ||
| 1309 | + min={1} | ||
| 1310 | + max={props.dataAuditProcessMaxValue} | ||
| 1311 | + tooltipVisible | ||
| 1312 | + step={1} | ||
| 1313 | + draggableTrack | ||
| 1314 | + defaultValue={3} | ||
| 1315 | + value={props.dataAuditProcessValue} | ||
| 1316 | + /> | ||
| 1317 | + </div> | ||
| 1318 | + ) : ( | ||
| 1319 | + "" | ||
| 1320 | + )} | ||
| 1321 | + {props.workScheduleVisible ? ( | ||
| 1322 | + <AntdDraggableModal | ||
| 1323 | + className="workScheduleModal" | ||
| 1324 | + width={1300} | ||
| 1325 | + title={commonUtils.isEmptyObject(searchWorkSchedule) ? searchWorkTitle : searchWorkSchedule.app.currentPane.title} | ||
| 1326 | + visible={props.workScheduleVisible} | ||
| 1327 | + onCancel={props.onCloseModel.bind(this, "workScheduleVisible")} | ||
| 1328 | + onSaveState={props.onSaveState} | ||
| 1329 | + footer={null} | ||
| 1330 | + > | ||
| 1331 | + <CommonListSelect {...searchWorkSchedule} /> | ||
| 1332 | + </AntdDraggableModal> | ||
| 1333 | + ) : null} | ||
| 1319 | </Form> | 1334 | </Form> |
| 1320 | ); | 1335 | ); |
| 1321 | }); | 1336 | }); |