Commit 92808bd6e674ff0998fb6a61bb38d15ef380cf3d
1 parent
25b2b5cc
mes分页
Showing
1 changed file
with
2 additions
and
4 deletions
src/mes/common/commonModelComponent/index.js
| @@ -264,7 +264,6 @@ const useCommonModelEvent = props => { | @@ -264,7 +264,6 @@ const useCommonModelEvent = props => { | ||
| 264 | // 初始化事件 | 264 | // 初始化事件 |
| 265 | useEffect( | 265 | useEffect( |
| 266 | async () => { | 266 | async () => { |
| 267 | - console.log(props?.mesPageChange, 'props?.mesPageChange'); | ||
| 268 | 267 | ||
| 269 | if (commonUtils.isNotEmptyArr(formData)) { | 268 | if (commonUtils.isNotEmptyArr(formData)) { |
| 270 | let pageLayout = []; | 269 | let pageLayout = []; |
| @@ -912,9 +911,8 @@ const useCommonModelEvent = props => { | @@ -912,9 +911,8 @@ const useCommonModelEvent = props => { | ||
| 912 | // 2026 新增如果是indexPage/commonList那么需要真分页 | 911 | // 2026 新增如果是indexPage/commonList那么需要真分页 |
| 913 | const { sName, bPagination = false } = config || {}; | 912 | const { sName, bPagination = false } = config || {}; |
| 914 | let isPagination = false | 913 | let isPagination = false |
| 915 | - if (sName.includes('/indexPage/commonList') && bPagination) { | 914 | + if (sName?.includes('/indexPage/commonList') && bPagination) { |
| 916 | isPagination = true | 915 | isPagination = true |
| 917 | - console.log(props, 'isPagination'); | ||
| 918 | 916 | ||
| 919 | } | 917 | } |
| 920 | const result = | 918 | const result = |
| @@ -2581,7 +2579,7 @@ const CommonTableComponent = props => { | @@ -2581,7 +2579,7 @@ const CommonTableComponent = props => { | ||
| 2581 | onTableBtnClick, | 2579 | onTableBtnClick, |
| 2582 | tableProps: { | 2580 | tableProps: { |
| 2583 | onChange: () => { }, | 2581 | onChange: () => { }, |
| 2584 | - rowKey: baseProps?.config?.sId === "17091154460006421964039036672000" ? 'sSlaveId' : 'sId', | 2582 | + rowKey: baseProps?.config?.sId === "17091154460006421964039036672000" || baseProps?.config?.sName?.includes('/indexPage/commonList') ? 'sSlaveId' : 'sId', |
| 2585 | mesTotalCount, | 2583 | mesTotalCount, |
| 2586 | mesPageSize, | 2584 | mesPageSize, |
| 2587 | mesPageNum, | 2585 | mesPageNum, |