Commit1aa2cb0

committed

check variable name duplication when duplicating the query

1 parent041aef5 commit1aa2cb0Copy full SHA for 1aa2cb0

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -773,12 +773,24 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {`
`773`	`773`	`if(!originQuery){`
`774`	`774`	`return;`
`775`	`775`	`}`
	`776`	`+`
	`777`	`+constjsonData=originQuery.toJsonValue();`
	`778`	`+//Regenerate variable header`
	`779`	`+jsonData.variables?.variables?.forEach(kv=>{`
	`780`	`+const[prefix,_]=(kv.keyasstring).split(/(?=\d+$)/);`
	`781`	`+leti=2,newName="";`
	`782`	`+do{`
	`783`	`+newName=prefix+(i++);`
	`784`	`+}while(editorState.checkRename("",newName));`
	`785`	`+kv.key=newName;`
	`786`	`+})`
	`787`	`+`
`776`	`788`	`constnewQueryName=this.genNewName(editorState);`
`777`	`789`	`constid=genQueryId();`
`778`	`790`	`this.dispatch(`
`779`	`791`	`wrapActionExtraInfo(`
`780`	`792`	`this.pushAction({`
`781`		`- ...originQuery.toJsonValue(),`
	`793`	`+ ...jsonData,`
`782`	`794`	`id:id,`
`783`	`795`	`name:newQueryName,`
`784`	`796`	`isNewCreate:true,`
`@@ -789,7 +801,7 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {`
`789`	`801`	`{`
`790`	`802`	`type:"add",`
`791`	`803`	`compName:name,`
`792`		`-compType:originQuery.children.compType.getView(),`
	`804`	`+compType:jsonData.compType,`
`793`	`805`	`},`
`794`	`806`	`],`
`795`	`807`	`}`

Comments

(0)