Commit 8974731

committed

Fix merge conflicts

1 parent 2d87d6b commit 8974731Copy full SHA for 8974731

File tree

2 files changed

+13

-19

lines changed

client/packages/lowcoder/src/comps/comps/selectInputComp
- checkboxComp.tsx
- radioComp.tsx

2 files changed

+13

-19

lines changed

`‎client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx`

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ const MemoizedCheckboxGroup = memo(({`
`156`	`156`	`disabled: boolean;`
`157`	`157`	`style: CheckboxStyleType;`
`158`	`158`	`layout: ValueFromOption<typeof RadioLayoutOptions>;`
`159`		`- options: Array<{ label: string; value: string; disabled?: boolean }>;`
	`159`	`+ options: Array<{ label: any; value: string; disabled?: boolean }>;`
`160`	`160`	`onChange: (values: string[]) => void;`
`161`	`161`	`viewRef: React.Ref<HTMLDivElement>;`
`162`	`162`	`tabIndex?: number`
`@@ -231,7 +231,11 @@ let CheckboxBasicComp = (function () {`
`231`	`231`	`return props.options`
`232`	`232`	`.filter((option) => option.value !== undefined && !option.hidden)`
`233`	`233`	`.map((option) => ({`
`234`		`- label: option.label,`
	`234`	`+ label: (`
	`235`	`+ <Tooltip title={option.label}>`
	`236`	`+ <span>{option.label}</span>`
	`237`	`+ </Tooltip>`
	`238`	`+ ),`
`235`	`239`	`value: option.value,`
`236`	`240`	`disabled: option.disabled,`
`237`	`241`	`}));`
`@@ -249,15 +253,7 @@ let CheckboxBasicComp = (function () {`
`249`	`253`	`disabled={props.disabled}`
`250`	`254`	`style={props.inputFieldStyle}`
`251`	`255`	`layout={props.layout}`
`252`		`- options={filteredOptions()`
`253`		`- .map((option) => ({`
`254`		`- label: (`
`255`		`- <Tooltip title={option.label}>`
`256`		`- <span>{option.label}</span>`
`257`		`- </Tooltip>`
`258`		`- )`
`259`		`- })`
`260`		`- )}`
	`256`	`+ options={filteredOptions()}`
`261`	`257`	`onChange={handleValidateChange}`
`262`	`258`	`viewRef={props.viewRef}`
`263`	`259`	`tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}`

`‎client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,11 @@ const MemoizedRadio = memo(({`
`134`	`134`	`return options`
`135`	`135`	`.filter((option) => option.value !== undefined && !option.hidden)`
`136`	`136`	`.map((option) => ({`
`137`		`- label: option.label,`
	`137`	`+ label: (`
	`138`	`+ <Tooltip title={option.label}>`
	`139`	`+ <span>{option.label}</span>`
	`140`	`+ </Tooltip>`
	`141`	`+ ),`
`138`	`142`	`value: option.value,`
`139`	`143`	`disabled: option.disabled,`
`140`	`144`	`}));`
`@@ -196,13 +200,7 @@ let RadioBasicComp = (function () {`
`196`	`200`	`style={props.style}`
`197`	`201`	`inputFieldStyle={props.inputFieldStyle}`
`198`	`202`	`layout={props.layout}`
`199`		`- options={props.options.map((option) => ({`
`200`		`- label: (`
`201`		`- <Tooltip title={option.label}>`
`202`		`- <span>{option.label}</span>`
`203`		`- </Tooltip>`
`204`		`- )}`
`205`		`- ))}`
	`203`	`+ options={props.options}`
`206`	`204`	`onChange={handleValidateChange}`
`207`	`205`	`viewRef={(el) => {`
`208`	`206`	`if (!mountedRef.current) return;`

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 8974731

File tree

2 files changed

2 files changed

`‎client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx`

`‎client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx`

0 commit comments