fix: approval, fixed sort (#1356)
Reviewed-on: daoyoucloud/tachybase#1356
This commit is contained in:
		
							parent
							
								
									2bfc1d1eee
								
							
						
					
					
						commit
						f8fb5b187a
					
				@ -71,7 +71,10 @@ export const useTableBlockProps = () => {
 | 
				
			|||||||
            ? [sorter.field]
 | 
					            ? [sorter.field]
 | 
				
			||||||
            : [`-${sorter.field}`]
 | 
					            : [`-${sorter.field}`]
 | 
				
			||||||
          : parentSort;
 | 
					          : parentSort;
 | 
				
			||||||
      ctx.service.run({ ...ctx.service.params?.[0], page: current, pageSize, sort });
 | 
					      // NOTE: 这里将原本就有的排序参数保留
 | 
				
			||||||
 | 
					      const sortParams = ctx.params.sort || [];
 | 
				
			||||||
 | 
					      const sortFinal = [...new Set([...sortParams, ...(sort || [])])];
 | 
				
			||||||
 | 
					      ctx.service.run({ ...ctx.service.params?.[0], page: current, pageSize, sort: sortFinal });
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    onClickRow(record, setSelectedRow, selectedRow) {
 | 
					    onClickRow(record, setSelectedRow, selectedRow) {
 | 
				
			||||||
      const { targets, uid } = findFilterTargets(fieldSchema);
 | 
					      const { targets, uid } = findFilterTargets(fieldSchema);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user