fix some bug

This commit is contained in:
wjyLearn
2025-10-24 17:20:44 +08:00
parent 81ea36fdd8
commit 82268132e9
352 changed files with 33179 additions and 13515 deletions

View File

@@ -6,8 +6,30 @@ var VendorPriority=new Array("qidi","generic");
function OnInit()
{
$("#printerBtn").on("click", function(){
$("#MachineList").slideToggle(300);
$(this).find(".CArrow").toggleClass("active");
});
$("#filatypeBtn").on("click", function(){
$("#FilatypeList").slideToggle(300);
$(this).find(".CArrow").toggleClass("active");
});
$("#vendorBtn").on("click", function(){
$("#VendorList").slideToggle(300);
$(this).find(".CArrow").toggleClass("active");
});
$('#SelectAllCheckbox').change(function() {
if ($(this).is(':checked')) {
SelectAllFilament(1);
} else {
SelectAllFilament(0);
}
});
TranslatePage();
OnSelectMenu(1);
OnSelectMenu(1);
RequestProfile();
@@ -79,30 +101,6 @@ function SortUI()
ModelList.push(OneMode);
}
//machine
// let HtmlMachine='';
//
// let nMachine=m_ProfileItem['machine'].length;
// for(let n=0;n<nMachine;n++)
// {
// let OneMachine=m_ProfileItem['machine'][n];
//
// let sName=OneMachine['name'];
// let sModel=OneMachine['model'];
//
// if( ModelList.in_array(sModel) )
// {
// HtmlMachine+='<div><input type="checkbox" mode="'+sModel+'" onChange="MachineClick()" />'+sName+'</div>';
// }
// }
//
// $('#MachineList .CValues').append(HtmlMachine);
// $('#MachineList .CValues input').prop("checked",true);
// if(nMachine<=1)
// {
// $('#MachineList').hide();
// }
//model
let HtmlMode='';
nMode=ModelList.length;
@@ -110,11 +108,11 @@ function SortUI()
{
let sModel=ModelList[n];
HtmlMode+='<div><input type="checkbox" mode="'+sModel['model']+'" nozzle="'+sModel['nozzle_selected']+'" onChange="MachineClick()" />'+sModel['model']+'</div>';
HtmlMode+='<div class="checkboxText"><input class="inputIndent" type="checkbox" mode="'+sModel['model']+'" nozzle="'+sModel['nozzle_selected']+'" onChange="MachineClick()" />'+sModel['model']+'</div>';
}
$('#MachineList .CValues').append(HtmlMode);
$('#MachineList .CValues input').prop("checked",true);
$('#MachineList').append(HtmlMode);
$('#MachineList input').prop("checked",true);
if(nMode<=1)
{
$('#MachineList').hide();
@@ -126,7 +124,23 @@ function SortUI()
var TypeHtmlArray={};
var VendorHtmlArray={};
for( let key in m_ProfileItem['filament'] )
//y73
var sortedFilamentKeys = Object.keys(m_ProfileItem['filament']).sort((a, b) => {
let vendorA = m_ProfileItem['filament'][a]['vendor'].toLowerCase();
let vendorB = m_ProfileItem['filament'][b]['vendor'].toLowerCase();
let indexA = VendorPriority.indexOf(vendorA);
let indexB = VendorPriority.indexOf(vendorB);
if(indexA === -1) indexA = Number.MAX_SAFE_INTEGER;
if(indexB === -1) indexB = Number.MAX_SAFE_INTEGER;
return indexA - indexB;
});
//alert(sortedFilamentKeys);
for( let key of sortedFilamentKeys)
{
let OneFila=m_ProfileItem['filament'][key];
@@ -135,9 +149,6 @@ function SortUI()
let fWholeName=OneFila['name'].trim();
let fShortName=GetFilamentShortname( OneFila['name'] );
let fVendor = OneFila['vendor'];
//w22
if (fVendor != "QIDI")
continue;
let fType=OneFila['type'];
let fSelect=OneFila['selected'];
let fModel=OneFila['models']
@@ -188,7 +199,7 @@ function SortUI()
let LowType=fType.toLowerCase();
if(!TypeHtmlArray.hasOwnProperty(LowType))
{
let HtmlType='<div><input type="checkbox" filatype="'+fType+'" onChange="FilaClick()" />'+fType+'</div>';
let HtmlType='<div class="checkboxText"><input class="inputIndent" type="checkbox" filatype="'+fType+'" onChange="FilaClick()" />'+fType+'</div>';
TypeHtmlArray[LowType]=HtmlType;
}
@@ -197,7 +208,7 @@ function SortUI()
let lowVendor=fVendor.toLowerCase();
if(!VendorHtmlArray.hasOwnProperty(lowVendor))
{
let HtmlVendor='<div><input type="checkbox" vendor="'+fVendor+'" onChange="VendorClick()" />'+fVendor+'</div>';
let HtmlVendor='<div class="checkboxText"><input class="inputIndent" type="checkbox" vendor="'+fVendor+'" onChange="VendorClick()" />'+fVendor+'</div>';
VendorHtmlArray[lowVendor]=HtmlVendor;
}
@@ -206,7 +217,7 @@ function SortUI()
let pFila=$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']");
if(pFila.length==0)
{
let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" filalist="'+fWholeName+';'+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
let HtmlFila='<div><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" filalist="'+fWholeName+';'+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
$("#ItemBlockArea").append(HtmlFila);
}
@@ -231,99 +242,6 @@ function SortUI()
}
}
//w22
for (let key in m_ProfileItem['filament']) {
let OneFila = m_ProfileItem['filament'][key];
//alert(JSON.stringify(OneFila));
let fWholeName = OneFila['name'].trim();
let fShortName = GetFilamentShortname(OneFila['name']);
let fVendor = OneFila['vendor'];
if (fVendor == "QIDI")
continue;
let fType = OneFila['type'];
let fSelect = OneFila['selected'];
let fModel = OneFila['models']
//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
// if(OneFila['name'].indexOf("QIDI PA-CF")>=0)
// {
// alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel )
//
// let b=1+2;
// }
let bFind = false;
//let bCheck=$("#MachineList input:first").prop("checked");
if (fModel == '') {
bFind = true;
}
else {
//check in modellist
let nModelAll = ModelList.length;
for (let m = 0; m < nModelAll; m++) {
let sOne = ModelList[m];
let OneName = sOne['model'];
let NozzleArray = sOne["nozzle_selected"].split(';');
let nNozzle = NozzleArray.length;
for (let b = 0; b < nNozzle; b++) {
let nowModel = OneName + "++" + NozzleArray[b];
if (fModel.indexOf(nowModel) >= 0) {
bFind = true;
break;
}
}
}
}
if (bFind) {
//Type
let LowType = fType.toLowerCase();
if (!TypeHtmlArray.hasOwnProperty(LowType)) {
let HtmlType = '<div><input type="checkbox" filatype="' + fType + '" onChange="FilaClick()" />' + fType + '</div>';
TypeHtmlArray[LowType] = HtmlType;
}
//Vendor
let lowVendor = fVendor.toLowerCase();
if (!VendorHtmlArray.hasOwnProperty(lowVendor)) {
let HtmlVendor = '<div><input type="checkbox" vendor="' + fVendor + '" onChange="VendorClick()" />' + fVendor + '</div>';
VendorHtmlArray[lowVendor] = HtmlVendor;
}
//Filament
let pFila = $("#ItemBlockArea input[vendor='" + fVendor + "'][filatype='" + fType + "'][name='" + fShortName + "']");
if (pFila.length == 0) {
let HtmlFila = '<div class="MItem"><input type="checkbox" vendor="' + fVendor + '" filatype="' + fType + '" filalist="' + fWholeName + ';' + '" model="' + fModel + '" name="' + fShortName + '" />' + fShortName + '</div>';
$("#ItemBlockArea").append(HtmlFila);
}
else {
let strModel = pFila.attr("model");
let strFilalist = pFila.attr("filalist");
pFila.attr("model", strModel + fModel);
pFila.attr("filalist", strFilalist + fWholeName + ';');
}
if (fSelect * 1 == 1) {
//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
$("#ItemBlockArea input[vendor='" + fVendor + "'][filatype='" + fType + "'][name='" + fShortName + "']").prop("checked", true);
SelectNumber++;
}
// else
// $("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
}
}
//Sort TypeArray
let TypeAdvNum=FilamentPriority.length;
for( let n=0;n<TypeAdvNum;n++ )
@@ -332,15 +250,15 @@ function SortUI()
if( TypeHtmlArray.hasOwnProperty( strType ) )
{
$("#FilatypeList .CValues").append( TypeHtmlArray[strType] );
$("#FilatypeList").append( TypeHtmlArray[strType] );
delete( TypeHtmlArray[strType] );
}
}
for(let key in TypeHtmlArray )
{
$("#FilatypeList .CValues").append( TypeHtmlArray[key] );
$("#FilatypeList").append( TypeHtmlArray[key] );
}
$("#FilatypeList .CValues input").prop("checked",true);
$("#FilatypeList input").prop("checked",true);
//Sort VendorArray
let VendorAdvNum=VendorPriority.length;
@@ -350,15 +268,15 @@ function SortUI()
if( VendorHtmlArray.hasOwnProperty( strVendor ) )
{
$("#VendorList .CValues").append( VendorHtmlArray[strVendor] );
$("#VendorList").append( VendorHtmlArray[strVendor] );
delete( VendorHtmlArray[strVendor] );
}
}
for(let key in VendorHtmlArray )
{
$("#VendorList .CValues").append( VendorHtmlArray[key] );
$("#VendorList").append( VendorHtmlArray[key] );
}
$("#VendorList .CValues input").prop("checked",true);
$("#VendorList input").prop("checked",true);
//------
if(SelectNumber==0)
@@ -446,7 +364,7 @@ function VendorClick()
function SortFilament()
{
let FilaNodes=$("#ItemBlockArea .MItem");
let FilaNodes=$("#ItemBlockArea div");
let nFilament=FilaNodes.length;
//$("#ItemBlockArea .MItem").hide();
@@ -587,6 +505,68 @@ function SelectAllFilament( nShow )
}
}
function ChooseDefaultFilament()
{
//ModelList
let pModel=$("#MachineList input:gt(0)");
let nModel=pModel.length;
let ModelList=new Array();
for(let n=0;n<nModel;n++)
{
let OneModel=pModel[n];
ModelList.push( OneModel.getAttribute("mode") );
}
//DefaultMaterialList
let DefaultMaterialString=new Array();
let nMode=m_ProfileItem["model"].length;
for(let n=0;n<nMode;n++)
{
let OneMode=m_ProfileItem["model"][n];
let ModeName=OneMode['model'];
let DefaultM=OneMode['materials'];
if( ModelList.indexOf(ModeName)>-1 )
{
DefaultMaterialString+=OneMode['materials']+';';
}
}
let DefaultMaterialArray=DefaultMaterialString.split(';');
//alert(DefaultMaterialString);
//Filament
let FilaNodes=$("#ItemBlockArea input");
let nFilament=FilaNodes.length;
for(let m=0;m<nFilament;m++)
{
let OneFF=FilaNodes[m];
$(OneFF).prop("checked",false);
let filamentList=OneFF.getAttribute("filalist");
//alert(filamentList);
let filamentArray=filamentList.split(';')
let HasModel=false;
let NowFilaLength=filamentArray.length;
for(let p=0;p<NowFilaLength;p++)
{
let NowFila=filamentArray[p];
if( NowFila!='' && DefaultMaterialArray.indexOf(NowFila)>-1)
{
HasModel=true;
break;
}
}
if(HasModel)
$(OneFF).prop("checked",true);
}
ShowNotice(0);
}
function ShowNotice( nShow )
{
if(nShow==0)