Commit c14741b

authored

Merge pull request #1524 from lowcoder-org/fix/global_unique_variable_name

Check for uniqueness of variable name within new cloned query

2 parents 0cd9490 + 917880e commit c14741bCopy full SHA for c14741b

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -777,13 +777,15 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {`
`777`	`777`
`778`	`778`	`const jsonData = originQuery.toJsonValue();`
`779`	`779`	`//Regenerate variable header`
	`780`	`+ const newKeys:string[] = [];`
`780`	`781`	`jsonData.variables?.variables?.forEach(kv => {`
`781`	`782`	`const [prefix, _] = (kv.key as string).split(/(?=\d+$)/);`
`782`	`783`	`let i=1, newName = "";`
`783`	`784`	`do {`
`784`	`785`	`newName = prefix + (i++);`
`785`		`- } while(editorState.checkRename("", newName));`
	`786`	`+ } while(editorState.checkRename("", newName)\|\|newKeys.includes(newName));`
`786`	`787`	`kv.key = newName;`
	`788`	`+ newKeys.push(newName);`
`787`	`789`	`})`
`788`	`790`
`789`	`791`	`const newQueryName = this.genNewName(editorState);`

Comments

(0)