2.2.0 dev lxy 1218 (#73)

* Modification: Migrate login interface

* Change 'China' to 'Chinese Mainland'

* Add: wcp_networktestdialog

* Optimization: Main process freezing when connecting devices

* Add: wcp_gettimelapseinstance & wcp_defectdetactionconfig

* Change: network test level

* Optimization: U1 piece-by-piece printing alarm alert

* Optimization: Adjust the display order of brands for the selected models

* Fix: WebpresetDialog now loads presets synchronously to prevent crashes

* Add: wcp_sw_SubscribePageStateChange & wcp_sw_UnsubscribePageStateChange
This commit is contained in:
xiaoyeliu
2025-12-18 20:02:40 +08:00
committed by GitHub
parent e145435f6f
commit ece21860e7
11 changed files with 271 additions and 19 deletions

View File

@@ -1,10 +1,12 @@
var VendorPriority = new Array("Snapmaker");
function OnInit()
{
//let strInput=JSON.stringify(cData);
//HandleStudio(strInput);
TranslatePage();
RequestProfile();
}
@@ -52,21 +54,22 @@ function HandleModelList( pVal )
return;
pModel=pVal['model'];
let nTotal=pModel.length;
let ModelHtml={};
let VendorHtmlArray={};
for(let n=0;n<nTotal;n++)
{
let OneModel=pModel[n];
let strVendor=OneModel['vendor'];
//Add Vendor Html Node
if($(".OneVendorBlock[vendor='"+strVendor+"']").length==0)
if(!VendorHtmlArray.hasOwnProperty(strVendor))
{
let sVV=strVendor;
if( sVV=="BBL" )
sVV="Bambu Lab";
sVV="Bambu Lab";
if( sVV=="Custom")
sVV="Custom Printer";
if( sVV=="Other")
@@ -83,16 +86,16 @@ function HandleModelList( pVal )
'<div class="PrinterArea"> '+
'</div>'+
'</div>';
$('#Content').append(HtmlNewVendor);
VendorHtmlArray[strVendor]=HtmlNewVendor;
}
let ModelName=OneModel['model'];
//Collect Html Node Nozzel Html
if( !ModelHtml.hasOwnProperty(strVendor))
ModelHtml[strVendor]='';
let NozzleArray=OneModel['nozzle_diameter'].split(';');
let HtmlNozzel='';
for(let m=0;m<NozzleArray.length;m++)
@@ -101,13 +104,30 @@ function HandleModelList( pVal )
/* ORCA use label tag to allow checkbox to toggle when user ckicked to text */
HtmlNozzel += '<label class="pNozzel TextS2"><input type="checkbox" model="' + OneModel['model'] + '" nozzel="' + nNozzel + '" vendor="' + strVendor +'" onclick="CheckBoxOnclick(this)" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></label>';
}
let CoverImage=OneModel['cover'];
ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">'+OneModel['name']+'</div>'+ HtmlNozzel +'</div>';
}
//Append Vendor blocks in priority order
for(let n=0;n<VendorPriority.length;n++)
{
let strVendor=VendorPriority[n];
if(VendorHtmlArray.hasOwnProperty(strVendor))
{
$('#Content').append(VendorHtmlArray[strVendor]);
delete VendorHtmlArray[strVendor];
}
}
//Append remaining vendors
for(let key in VendorHtmlArray)
{
$('#Content').append(VendorHtmlArray[key]);
}
//Update Nozzel Html Append
for( let key in ModelHtml )
{
@@ -217,6 +237,7 @@ function FilterModelList(keyword) {
let nTotal = pModel.length;
let ModelHtml = {};
let VendorHtmlArray = {};
let kwSplit = keyword.toLowerCase().match(/\S+/g) || [];
$('#Content').empty();
@@ -230,7 +251,7 @@ function FilterModelList(keyword) {
continue;
//Add Vendor Html Node
if ($(".OneVendorBlock[vendor='" + strVendor + "']").length == 0) {
if (!VendorHtmlArray.hasOwnProperty(strVendor)) {
let sVV = strVendor;
if (sVV == "BBL")
sVV = "Bambu Lab";
@@ -251,7 +272,7 @@ function FilterModelList(keyword) {
'</div>' +
'</div>';
$('#Content').append(HtmlNewVendor);
VendorHtmlArray[strVendor] = HtmlNewVendor;
}
//Collect Html Node Nozzel Html
@@ -272,6 +293,20 @@ function FilterModelList(keyword) {
' <div class="PName">' + OneModel['name'] + '</div>' + HtmlNozzel + '</div>';
}
//Append Vendor blocks in priority order
for (let n = 0; n < VendorPriority.length; n++) {
let strVendor = VendorPriority[n];
if (VendorHtmlArray.hasOwnProperty(strVendor)) {
$('#Content').append(VendorHtmlArray[strVendor]);
delete VendorHtmlArray[strVendor];
}
}
//Append remaining vendors
for (let key in VendorHtmlArray) {
$('#Content').append(VendorHtmlArray[key]);
}
//Update Nozzel Html Append
for (let key in ModelHtml) {
let obj = $(".OneVendorBlock[vendor='" + key + "'] .PrinterArea");