Commit 6e02ce7

authored

Merge pull request #2042 from iamfaran/fix/scanner

[Fix]: Scanner duplicate code, and open URL on success

2 parents ae4a1a2 + 022cd51 commit 6e02ce7Copy full SHA for 6e02ce7

File tree

1 file changed

+15

-2

lines changed

client/packages/lowcoder/src/comps/comps/buttonComp
- scannerComp.tsx

1 file changed

+15

-2

lines changed

`‎client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx‎`

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import React, {`
`30`	`30`	`useState,`
`31`	`31`	`useContext,`
`32`	`32`	`} from "react";`
`33`		`-import { arrayStringExposingStateControl } from "comps/controls/codeStateControl";`
	`33`	`+import { arrayStringExposingStateControl,stringExposingStateControl } from "comps/controls/codeStateControl";`
`34`	`34`	`import { BoolControl } from "comps/controls/boolControl";`
`35`	`35`	`import { RefControl } from "comps/controls/refControl";`
`36`	`36`	`import { EditorContext } from "comps/editorState";`
`@@ -120,6 +120,7 @@ const BarcodeScannerComponent = React.lazy(`
`120`	`120`	`const ScannerTmpComp = (function () {`
`121`	`121`	`const childrenMap = {`
`122`	`122`	`data: arrayStringExposingStateControl("data"),`
	`123`	`+ value: stringExposingStateControl("value"),`
`123`	`124`	`text: withDefault(StringControl, trans("scanner.text")),`
`124`	`125`	`continuous: BoolControl,`
`125`	`126`	`uniqueData: withDefault(BoolControl, true),`
`@@ -150,17 +151,27 @@ const ScannerTmpComp = (function () {`
`150`	`151`	`}, [success, showModal]);`
`151`	`152`
`152`	`153`	`const continuousValue = useRef<string[]>([]);`
	`154`	`+ const seenSetRef = useRef<Set<string>>(new Set());`
`153`	`155`
`154`	`156`	`const handleUpdate = (err: any, result: any) => {`
`155`	`157`	`if (result) {`
`156`	`158`	`if (props.continuous) {`
`157`		`- continuousValue.current = [...continuousValue.current, result.text];`
	`159`	`+ const scannedText: string = result.text;`
	`160`	`+ if (props.uniqueData && seenSetRef.current.has(scannedText)) {`
	`161`	`+ return;`
	`162`	`+ }`
	`163`	`+ continuousValue.current = [...continuousValue.current, scannedText];`
	`164`	`+ if (props.uniqueData) {`
	`165`	`+ seenSetRef.current.add(scannedText);`
	`166`	`+ }`
`158`	`167`	`const val = props.uniqueData`
`159`	`168`	`? [...new Set(continuousValue.current)]`
`160`	`169`	`: continuousValue.current;`
	`170`	`+ props.value.onChange(scannedText);`
`161`	`171`	`props.data.onChange(val);`
`162`	`172`	`props.onEvent("success");`
`163`	`173`	`} else {`
	`174`	`+ props.value.onChange(result.text);`
`164`	`175`	`props.data.onChange([result.text]);`
`165`	`176`	`setShowModal(false);`
`166`	`177`	`setSuccess(true);`
`@@ -205,6 +216,7 @@ const ScannerTmpComp = (function () {`
`205`	`216`	`props.onEvent("click");`
`206`	`217`	`setShowModal(true);`
`207`	`218`	`continuousValue.current = [];`
	`219`	`+ seenSetRef.current = new Set();`
`208`	`220`	`}}`
`209`	`221`	`>`
`210`	`222`	`<span>{props.text}</span>`
`@@ -317,6 +329,7 @@ const ScannerTmpComp = (function () {`
`317`	`329`
`318`	`330`	`export const ScannerComp = withExposingConfigs(ScannerTmpComp, [`
`319`	`331`	`new NameConfig("data", trans("data")),`
	`332`	`+ new NameConfig("value", trans("value")),`
`320`	`333`	`new NameConfig("text", trans("button.textDesc")),`
`321`	`334`	`...CommonNameConfig,`
`322`	`335`	`]);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 6e02ce7

File tree

1 file changed

1 file changed

`‎client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx‎`

0 commit comments