From b6ddbf5eac5be65bceb48e2c8f23ef9709691bd7 Mon Sep 17 00:00:00 2001 From: Josmar Soares Trigueiro Junior Date: Mon, 28 Oct 2024 15:44:11 -0300 Subject: [PATCH 1/2] fix: add a new counting to order the quickorder list --- react/UploadBlock.tsx | 2 ++ react/components/ReviewBlock.tsx | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/react/UploadBlock.tsx b/react/UploadBlock.tsx index ab1173e5..c28ca700 100644 --- a/react/UploadBlock.tsx +++ b/react/UploadBlock.tsx @@ -213,6 +213,7 @@ const UploadBlock: FunctionComponent< const handleFile = (files: any) => { doFile(files) + onRefidLoading(false) } const handleReset = () => { @@ -435,6 +436,7 @@ const UploadBlock: FunctionComponent< reviewedItems={reviewItems} hiddenColumns={hiddenColumns ?? []} onReviewItems={onReviewItems} + refidLoading={refidLoading} onRefidLoading={onRefidLoading} backList={backList} /> diff --git a/react/components/ReviewBlock.tsx b/react/components/ReviewBlock.tsx index 228b51f9..05822a2f 100644 --- a/react/components/ReviewBlock.tsx +++ b/react/components/ReviewBlock.tsx @@ -433,6 +433,8 @@ const ReviewBlock: FunctionComponent = ({ const createSchema = (columnsToBeHidden: string[]) => { if (columnsToBeHidden.indexOf('line') === -1) { + let count = 0 + tableSchema.properties.line = { type: 'object', title: intl.formatMessage({ @@ -440,8 +442,10 @@ const ReviewBlock: FunctionComponent = ({ }), width: 50, // eslint-disable-next-line react/display-name - cellRenderer: ({ rowData }: any) => { - return
{parseInt(rowData.line, 10) + 1}
+ cellRenderer: () => { + count++ + + return
{refidLoading ? '-' : count}
}, } } From ef4730dd2e1cccb00fa1a58069b76e79c416ea65 Mon Sep 17 00:00:00 2001 From: Josmar Soares Trigueiro Junior Date: Mon, 28 Oct 2024 15:45:19 -0300 Subject: [PATCH 2/2] doc: update changelog file --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d27a9f78..7b43d2f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Fixed quickorder listing counter ## [3.16.1] - 2024-11-12 ### Fixed