| @@ -38,8 +38,8 @@ var formation = new Formation(teamsCount,5); | |||||
| <button class="btn-clear-data" onclick="clearData();"></button> | <button class="btn-clear-data" onclick="clearData();"></button> | ||||
| <button class="btn-capture" onclick="capture();"></button> | <button class="btn-capture" onclick="capture();"></button> | ||||
| <a class="down-capture display-none" target="_blank"></a> | <a class="down-capture display-none" target="_blank"></a> | ||||
| <button class="btn-solo-link" onclick="turnPage(1);"></button> | |||||
| <button class="btn-triple-link" onclick="turnPage(3);"></button> | |||||
| <button class="btn-solo-link" onclick="turnPage(1,arguments[0]);"></button> | |||||
| <button class="btn-triple-link" onclick="turnPage(3,arguments[0]);"></button> | |||||
| <button class="btn-swap-AB-team" onclick="swapABCteam();"></button> | <button class="btn-swap-AB-team" onclick="swapABCteam();"></button> | ||||
| <a class="help-link" target="_blank" href="https://github.com/Mapaler/PADDashFormation/blob/master/help.md"></a> | <a class="help-link" target="_blank" href="https://github.com/Mapaler/PADDashFormation/blob/master/help.md"></a> | ||||
| </div> | </div> | ||||
| @@ -219,8 +219,9 @@ function swapABCteam() | |||||
| } | } | ||||
| } | } | ||||
| //在单人和多人之间转移数据 | //在单人和多人之间转移数据 | ||||
| function turnPage(toPage) | |||||
| function turnPage(toPage,e = null) | |||||
| { | { | ||||
| console.log(e) | |||||
| let pagename = null; | let pagename = null; | ||||
| switch(toPage) | switch(toPage) | ||||
| { | { | ||||
| @@ -269,7 +270,14 @@ function turnPage(toPage) | |||||
| pagename = "triple.html"; | pagename = "triple.html"; | ||||
| break; | break; | ||||
| } | } | ||||
| location.href = creatNewUrl({url:pagename, notPushState:true}); | |||||
| const newURL = creatNewUrl({url:pagename, notPushState:true}); | |||||
| if (e && e.ctrlKey) | |||||
| { | |||||
| window.open(newURL); | |||||
| }else | |||||
| { | |||||
| location.href = newURL; | |||||
| } | |||||
| } | } | ||||
| window.onload = function() | window.onload = function() | ||||
| { | { | ||||
| @@ -38,8 +38,8 @@ var formation = new Formation(teamsCount,6); | |||||
| <button class="btn-clear-data" onclick="clearData();"></button> | <button class="btn-clear-data" onclick="clearData();"></button> | ||||
| <button class="btn-capture" onclick="capture();"></button> | <button class="btn-capture" onclick="capture();"></button> | ||||
| <a class="down-capture display-none" target="_blank"></a> | <a class="down-capture display-none" target="_blank"></a> | ||||
| <button class="btn-multi-link" onclick="turnPage(2);"></button> | |||||
| <button class="btn-triple-link" onclick="turnPage(3);"></button> | |||||
| <button class="btn-multi-link" onclick="turnPage(2,arguments[0]);"></button> | |||||
| <button class="btn-triple-link" onclick="turnPage(3,arguments[0]);"></button> | |||||
| <a class="help-link" target="_blank" href="https://github.com/Mapaler/PADDashFormation/blob/master/help.md"></a> | <a class="help-link" target="_blank" href="https://github.com/Mapaler/PADDashFormation/blob/master/help.md"></a> | ||||
| </div> | </div> | ||||
| <div> | <div> | ||||
| @@ -51,8 +51,8 @@ var formation = new Formation(teamsCount,6); | |||||
| <button class="btn-clear-data" onclick="clearData();"></button> | <button class="btn-clear-data" onclick="clearData();"></button> | ||||
| <button class="btn-capture" onclick="capture();"></button> | <button class="btn-capture" onclick="capture();"></button> | ||||
| <a class="down-capture display-none" target="_blank"></a> | <a class="down-capture display-none" target="_blank"></a> | ||||
| <button class="btn-solo-link" onclick="turnPage(1);"></button> | |||||
| <button class="btn-multi-link" onclick="turnPage(2);"></button> | |||||
| <button class="btn-solo-link" onclick="turnPage(1,arguments[0]);"></button> | |||||
| <button class="btn-multi-link" onclick="turnPage(2,arguments[0]);"></button> | |||||
| <button class="btn-swap-ABC-team" onclick="swapABCteam();"></button> | <button class="btn-swap-ABC-team" onclick="swapABCteam();"></button> | ||||
| <a class="help-link" target="_blank" href="https://github.com/Mapaler/PADDashFormation/blob/master/help.md"></a> | <a class="help-link" target="_blank" href="https://github.com/Mapaler/PADDashFormation/blob/master/help.md"></a> | ||||
| </div> | </div> | ||||