Commita68c306

committed

fixed sorting issue in table's data/datetime columns

1 parent10fbb2f commita68c306Copy full SHA for a68c306

File tree

+10

-1

lines changed

client/packages/lowcoder/src/comps/comps/tableComp
- column
  - tableColumnComp.tsx
- tableUtils.tsx

+10

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ export class ColumnComp extends ColumnInitComp {`
`219`	`219`	`constcolumnType=this.children.render.getSelectedComp().getComp().children.compType.getView();`
`220`	`220`	`return{`
`221`	`221`	`...superView,`
	`222`	`+ columnType,`
`222`	`223`	`editable:ColumnTypeCompMap[columnType].canBeEditable()&&superView.editable,`
`223`	`224`	`};`
`224`	`225`	`}`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import { TableColumnLinkStyleType, TableColumnStyleType } from "comps/controls/s`
`21`	`21`	`importTooltipfrom"antd/es/tooltip";`
`22`	`22`	`importInfoCircleOutlinedfrom"@ant-design/icons/InfoCircleOutlined";`
`23`	`23`	`import{EMPTY_ROW_KEY}from"./tableCompView";`
	`24`	`+importdayjsfrom"dayjs";`
`24`	`25`
`25`	`26`	`exportconstCOLUMN_CHILDREN_KEY="children";`
`26`	`27`	`exportconstOB_ROW_ORI_INDEX="__ob_origin_index";`
`@@ -399,7 +400,14 @@ export function columnsToAntdFormat(`
`399`	`400`	`},`
`400`	`401`	`...(column.sortable`
`401`	`402`	`?{`
`402`		`-sorter:{multiple:(sortedColumns.length-mIndex)+1},`
	`403`	`+sorter:{`
	`404`	`+multiple:(sortedColumns.length-mIndex)+1,`
	`405`	`+compare:column.columnType==='date'\|\|column.columnType==='dateTime'`
	`406`	`+ ?(a,b)=>{`
	`407`	`+returndayjs(a[column.dataIndex]asstring).unix()-dayjs(b[column.dataIndex]asstring).unix();`
	`408`	`+}`
	`409`	`+ :undefined`
	`410`	`+},`
`403`	`411`	`sortOrder:sortMap.get(column.dataIndex),`
`404`	`412`	`showSorterTooltip:false,`
`405`	`413`	`}`

Comments

(0)