3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "选择打印机增加关键字搜索 (#2376) (#2392)"

Browse source 
This reverts commit caaa969ba1.
Revert "选择打印机增加关键字搜索 (#2392)"

This reverts commit a178b967dc.
This commit is contained in:
SoftFever 2023-10-15 16:56:12 +08:00
parent 1c26ec9e23
commit 25c9b43d62
3 changed files with 203 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resources/web/guide/24/24.css
View file

@ -147,31 +147,3 @@
display: flex; display: flex;
justify-content:space-around; justify-content:space-around;
} }
.search {
width: 100%;
position: relative;
display: flex;
}
.searchTerm {
width: 100%;
border: 3px solid #009688;
/*border-right: none;*/
padding: 5px;
height: 20px;
border-radius: 5px 5px 5px 5px;
outline: none;
color: #9DBFAF;
}
.searchTerm:focus{
color: #009688;
}
/*Resize the wrap to see the search bar change!*/
.wrap{
width: 30%;
padding-bottom: 5px;
padding-left: 42px;
}

419
resources/web/guide/24/24.js
View file

@ -1,129 +1,142 @@
function OnInit() { function OnInit()
{
//let strInput=JSON.stringify(cData); //let strInput=JSON.stringify(cData);
//HandleModelList(cData); //HandleStudio(strInput);
TranslatePage(); TranslatePage();
RequestProfile(); RequestProfile();
} }
function RequestProfile() { function RequestProfile()
var tSend = {}; {
tSend['sequence_id'] = Math.round(new Date() / 1000); var tSend={};
tSend['command'] = "request_userguide_profile"; tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="request_userguide_profile";
SendWXMessage(JSON.stringify(tSend));
SendWXMessage( JSON.stringify(tSend) );
} }
function HandleStudio(pVal) { function HandleStudio( pVal )
// alert(strInput); {
// alert(JSON.stringify(strInput)); // alert(strInput);
// // alert(JSON.stringify(strInput));
// let pVal=IsJson(strInput); //
// if(pVal==null) // let pVal=IsJson(strInput);
// { // if(pVal==null)
// alert("Msg Format Error is not Json"); // {
// return; // alert("Msg Format Error is not Json");
// } // return;
// }
let strCmd = pVal['command'];
let strCmd=pVal['command'];
//alert(strCmd); //alert(strCmd);
if (strCmd == 'response_userguide_profile') { if(strCmd=='response_userguide_profile')
{
HandleModelList(pVal['response']); HandleModelList(pVal['response']);
} }
} }
function ShowPrinterThumb(pItem, strImg) { function ShowPrinterThumb(pItem, strImg)
$(pItem).attr('src', strImg); {
$(pItem).attr('onerror', null); $(pItem).attr('src',strImg);
$(pItem).attr('onerror',null);
} }
function HandleModelList(pVal) { function HandleModelList( pVal )
if (!pVal.hasOwnProperty("model")) {
if( !pVal.hasOwnProperty("model") )
return; return;
pModel = pVal['model']; let pModel=pVal['model'];
let nTotal = pModel.length; let nTotal=pModel.length;
let ModelHtml = {}; let ModelHtml={};
for (let n = 0; n < nTotal; n++) { for(let n=0;n<nTotal;n++)
let OneModel = pModel[n]; {
let OneModel=pModel[n];
let strVendor = OneModel['vendor']; let strVendor=OneModel['vendor'];
//Add Vendor Html Node //Add Vendor Html Node
if ($(".OneVendorBlock[vendor='" + strVendor + "']").length == 0) { if($(".OneVendorBlock[vendor='"+strVendor+"']").length==0)
let sVV = strVendor; {
if (sVV == "BBL") let sVV=strVendor;
sVV = "Bambu Lab"; if( sVV=="BBL" )
if (sVV == "Custom") sVV="Bambu Lab";
sVV = "Custom Printer"; if( sVV=="Custom")
if (sVV == "Other") sVV="Custom Printer";
sVV = "Orca colosseum"; if( sVV=="Other")
sVV="Orca colosseum";
let HtmlNewVendor = '<div class="OneVendorBlock" Vendor="' + strVendor + '">' +
'<div class="BlockBanner">' +
' <div class="BannerBtns">' +
' <div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
' <div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
' </div>' +
' <a>' + sVV + '</a>' +
'</div>' +
'<div class="PrinterArea"> ' +
'</div>' +
'</div>';
let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
'<div class="BlockBanner">'+
' <div class="BannerBtns">'+
' <div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
' <div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
' </div>'+
' <a>'+sVV+'</a>'+
'</div>'+
'<div class="PrinterArea"> '+
'</div>'+
'</div>';
$('#Content').append(HtmlNewVendor); $('#Content').append(HtmlNewVendor);
} }
let ModelName = OneModel['model']; let ModelName=OneModel['model'];
//Collect Html Node Nozzel Html //Collect Html Node Nozzel Html
if (!ModelHtml.hasOwnProperty(strVendor)) if( !ModelHtml.hasOwnProperty(strVendor))
ModelHtml[strVendor] = ''; ModelHtml[strVendor]='';
let NozzleArray = OneModel['nozzle_diameter'].split(';'); let NozzleArray=OneModel['nozzle_diameter'].split(';');
let HtmlNozzel = ''; let HtmlNozzel='';
for (let m = 0; m < NozzleArray.length; m++) { for(let m=0;m<NozzleArray.length;m++)
let nNozzel = NozzleArray[m]; {
HtmlNozzel += '<div class="pNozzel TextS2"><input type="checkbox" model="' + OneModel['model'] + '" nozzel="' + nNozzel + '" vendor="' + strVendor + '" /><span>' + nNozzel + '</span><span class="trans" tid="t13">mm nozzle</span></div>'; let nNozzel=NozzleArray[m];
HtmlNozzel+='<div class="pNozzel TextS2"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
} }
let CoverImage = OneModel['cover']; let CoverImage=OneModel['cover'];
ModelHtml[strVendor] += '<div class="PrinterBlock">' + ModelHtml[strVendor]+='<div class="PrinterBlock">'+
' <div class="PImg"><img src="' + CoverImage + '" /></div>' + ' <div class="PImg"><img src="'+CoverImage+'" /></div>'+
' <div class="PName">' + OneModel['model'] + '</div>' + HtmlNozzel + '</div>'; ' <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
} }
//Update Nozzel Html Append //Update Nozzel Html Append
for (let key in ModelHtml) { for( let key in ModelHtml )
$(".OneVendorBlock[vendor='" + key + "'] .PrinterArea").append(ModelHtml[key]); {
$(".OneVendorBlock[vendor='"+key+"'] .PrinterArea").append( ModelHtml[key] );
} }
//Update Checkbox //Update Checkbox
$('input').prop("checked", false); $('input').prop("checked", false);
for (let m = 0; m < nTotal; m++) { for(let m=0;m<nTotal;m++)
let OneModel = pModel[m]; {
let OneModel=pModel[m];
let SelectList = OneModel['nozzle_selected'];
if (SelectList != '') { let SelectList=OneModel['nozzle_selected'];
SelectList = OneModel['nozzle_selected'].split(';'); if(SelectList!='')
let nLen = SelectList.length; {
SelectList=OneModel['nozzle_selected'].split(';');
for (let a = 0; a < nLen; a++) { let nLen=SelectList.length;
let nNozzel = SelectList[a];
$("input[vendor='" + OneModel['vendor'] + "'][model='" + OneModel['model'] + "'][nozzel='" + nNozzel + "']").prop("checked", true); for(let a=0;a<nLen;a++)
} {
let nNozzel=SelectList[a];
$("input[vendor='"+OneModel['vendor']+"'][model='"+OneModel['model']+"'][nozzel='"+nNozzel+"']").prop("checked", true);
}
} }
else { else
$("input[vendor='" + OneModel['vendor'] + "'][model='" + OneModel['model'] + "']").prop("checked", false); {
$("input[vendor='"+OneModel['vendor']+"'][model='"+OneModel['model']+"']").prop("checked", false);
} }
} }
// let AlreadySelect=$("input:checked"); // let AlreadySelect=$("input:checked");
// let nSelect=AlreadySelect.length; // let nSelect=AlreadySelect.length;
@ -131,102 +144,10 @@ function HandleModelList(pVal) {
// { // {
// $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true); // $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
// } // }
TranslatePage(); TranslatePage();
} }
function FilterModelList(keyword) {
let nTotal = pModel.length;
let ModelHtml = {};
$('#Content').empty();
for (let n = 0; n < nTotal; n++) {
let OneModel = pModel[n];
let strVendor = OneModel['vendor'];
let ModelName = OneModel['model'];
if (ModelName.toLowerCase().indexOf(keyword.toLowerCase()) == -1)
continue;
//Add Vendor Html Node
if ($(".OneVendorBlock[vendor='" + strVendor + "']").length == 0) {
let sVV = strVendor;
if (sVV == "BBL")
sVV = "Bambu Lab";
if (sVV == "Custom")
sVV = "Custom Printer";
if (sVV == "Other")
sVV = "Orca colosseum";
let HtmlNewVendor = '<div class="OneVendorBlock" Vendor="' + strVendor + '">' +
'<div class="BlockBanner">' +
' <div class="BannerBtns">' +
' <div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll(' + "\'" + strVendor + "\'" + ')">all</div>' +
' <div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone(' + "\'" + strVendor + "\'" + ')">none</div>' +
' </div>' +
' <a>' + sVV + '</a>' +
'</div>' +
'<div class="PrinterArea"> ' +
'</div>' +
'</div>';
$('#Content').append(HtmlNewVendor);
}
//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++) {
let nNozzel = NozzleArray[m];
HtmlNozzel += '<div class="pNozzel TextS2"><input type="checkbox" model="' + OneModel['model'] + '" nozzel="' + nNozzel + '" vendor="' + strVendor + '" /><span>' + nNozzel + '</span><span class="trans" tid="t13">mm nozzle</span></div>';
}
let CoverImage = OneModel['cover'];
ModelHtml[strVendor] += '<div class="PrinterBlock">' +
' <div class="PImg"><img src="' + CoverImage + '" /></div>' +
' <div class="PName">' + OneModel['model'] + '</div>' + HtmlNozzel + '</div>';
}
//Update Nozzel Html Append
for (let key in ModelHtml) {
let obj = $(".OneVendorBlock[vendor='" + key + "'] .PrinterArea");
obj.empty();
obj.append(ModelHtml[key]);
}
//Update Checkbox
$('input').prop("checked", false);
for (let m = 0; m < nTotal; m++) {
let OneModel = pModel[m];
let SelectList = OneModel['nozzle_selected'];
if (SelectList != '') {
SelectList = OneModel['nozzle_selected'].split(';');
let nLen = SelectList.length;
for (let a = 0; a < nLen; a++) {
let nNozzel = SelectList[a];
$("input[vendor='" + OneModel['vendor'] + "'][model='" + OneModel['model'] + "'][nozzel='" + nNozzel + "']").prop("checked", true);
}
}
else {
$("input[vendor='" + OneModel['vendor'] + "'][model='" + OneModel['model'] + "']").prop("checked", false);
}
}
// let AlreadySelect=$("input:checked");
// let nSelect=AlreadySelect.length;
// if(nSelect==0)
// {
// $("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
// }
TranslatePage();
}
function SelectPrinterAll( sVendor ) function SelectPrinterAll( sVendor )
{ {
@ -234,94 +155,100 @@ function SelectPrinterAll( sVendor )
} }
function SelectPrinterAll(sVendor) { function SelectPrinterNone( sVendor )
$("input[vendor='" + sVendor + "']").prop("checked", true); {
} $("input[vendor='"+sVendor+"']").prop("checked", false);
function SelectPrinterNone(sVendor) {
$("input[vendor='" + sVendor + "']").prop("checked", false);
} }
// //
function OnExit() { function OnExit()
let ModelAll = {}; {
let ModelAll={};
let ModelSelect=$("input:checked");
let nTotal=ModelSelect.length;
let ModelSelect = $("input:checked"); if( nTotal==0 )
let nTotal = ModelSelect.length; {
if (nTotal == 0) {
ShowNotice(1); ShowNotice(1);
return 0; return 0;
} }
for (let n = 0; n < nTotal; n++) { for(let n=0;n<nTotal;n++)
let OneItem = ModelSelect[n]; {
let OneItem=ModelSelect[n];
let strModel = OneItem.getAttribute("model");
let strVendor = OneItem.getAttribute("vendor"); let strModel=OneItem.getAttribute("model");
let strNozzel = OneItem.getAttribute("nozzel"); let strVendor=OneItem.getAttribute("vendor");
let strNozzel=OneItem.getAttribute("nozzel");
//alert(strModel+strVendor+strNozzel); //alert(strModel+strVendor+strNozzel);
if (!ModelAll.hasOwnProperty(strModel)) { if(!ModelAll.hasOwnProperty(strModel))
{
//alert("ADD: "+strModel); //alert("ADD: "+strModel);
ModelAll[strModel] = {}; ModelAll[strModel]={};
ModelAll[strModel]["model"] = strModel; ModelAll[strModel]["model"]=strModel;
ModelAll[strModel]["nozzle_diameter"] = ''; ModelAll[strModel]["nozzle_diameter"]='';
ModelAll[strModel]["vendor"] = strVendor; ModelAll[strModel]["vendor"]=strVendor;
} }
ModelAll[strModel]["nozzle_diameter"] += ModelAll[strModel]["nozzle_diameter"] == '' ? strNozzel : ';' + strNozzel; ModelAll[strModel]["nozzle_diameter"]+=ModelAll[strModel]["nozzle_diameter"]==''?strNozzel:';'+strNozzel;
} }
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="save_userguide_models";
tSend['data']=ModelAll;
SendWXMessage( JSON.stringify(tSend) );
var tSend = {}; return nTotal;
tSend['sequence_id'] = Math.round(new Date() / 1000);
tSend['command'] = "save_userguide_models";
tSend['data'] = ModelAll;
SendWXMessage(JSON.stringify(tSend));
return nTotal;
} }
function ShowNotice(nShow) { function ShowNotice( nShow )
if (nShow == 0) { {
if(nShow==0)
{
$("#NoticeMask").hide(); $("#NoticeMask").hide();
$("#NoticeBody").hide(); $("#NoticeBody").hide();
} }
else { else
{
$("#NoticeMask").show(); $("#NoticeMask").show();
$("#NoticeBody").show(); $("#NoticeBody").show();
} }
} }
function CancelSelect() { function CancelSelect()
var tSend = {}; {
tSend['sequence_id'] = Math.round(new Date() / 1000); var tSend={};
tSend['command'] = "user_guide_cancel"; tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['data'] = {}; tSend['command']="user_guide_cancel";
tSend['data']={};
SendWXMessage(JSON.stringify(tSend));
SendWXMessage( JSON.stringify(tSend) );
} }
function ConfirmSelect() { function ConfirmSelect()
let nChoose = OnExit(); {
let nChoose=OnExit();
if (nChoose > 0) {
var tSend = {}; if(nChoose>0)
tSend['sequence_id'] = Math.round(new Date() / 1000); {
tSend['command'] = "user_guide_finish"; var tSend={};
tSend['data'] = {}; tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['data']['action'] = "finish"; tSend['command']="user_guide_finish";
tSend['data']={};
SendWXMessage(JSON.stringify(tSend)); tSend['data']['action']="finish";
SendWXMessage( JSON.stringify(tSend) );
} }
} }

51
resources/web/guide/24/index.html
View file

@ -1,6 +1,5 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="Cache-Control" content="max-age=7200" /> <meta http-equiv="Cache-Control" content="max-age=7200" />
@ -8,27 +7,21 @@
<link rel="stylesheet" type="text/css" href="../css/common.css" /> <link rel="stylesheet" type="text/css" href="../css/common.css" />
<link rel="stylesheet" type="text/css" href="24.css" /> <link rel="stylesheet" type="text/css" href="24.css" />
<link rel="stylesheet" type="text/css" href="../css/dark.css" /> <link rel="stylesheet" type="text/css" href="../css/dark.css" />
<!-- <script type="text/javascript" src="test.js"></script> --> <script type="text/javascript" src="test.js"></script>
<script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script> <script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
<script type="text/javascript" src="../js/json2.js"></script> <script type="text/javascript" src="../js/json2.js"></script>
<script type="text/javascript" src="../../data/text.js"></script> <script type="text/javascript" src="../../data/text.js"></script>
<script type="text/javascript" src="../js/globalapi.js"></script> <script type="text/javascript" src="../js/globalapi.js"></script>
<!-- <script type="text/javascript" src="../js/common.js"></script> --> <script type="text/javascript" src="../js/common.js"></script>
<script type="text/javascript" src="24.js"></script> <script type="text/javascript" src="24.js"></script>
</head> </head>
<body onLoad="OnInit()"> <body onLoad="OnInit()">
<div id="Title"> <div id="Title">
<div class="trans" tid="t10">Printer Selection</div> <div class="trans" tid="t10">Printer Selection</div>
</div> </div>
<div class="wrap"> <div id="Content" class="ZScrol"s>
<div class="search">
<input type="text" class="searchTerm" placeholder="Device keyword" oninput="textInput(this)">
</div>
</div>
<div id="Content" class="ZScrol" s>
<!--<div class="OneVendorBlock" Vendor="BBL"> <!--<div class="OneVendorBlock" Vendor="BBL">
<div class="BlockBanner"> <div class="BlockBanner">
<div class="BannerBtns"> <div class="BannerBtns">
<div class="SmallBtn_Green" onClick="SelectPrinterAll('BBL')">所有</div> <div class="SmallBtn_Green" onClick="SelectPrinterAll('BBL')">所有</div>
@ -87,21 +80,37 @@
</div> </div>
</div>--> </div>-->
</div>
<div id="AcceptArea">
<div class="NormalBtn trans" tid="t39" id="AcceptBtn" onclick="ConfirmSelect()">Confirm</div>
<div class="GrayBtn trans" tid="t38" id="PreBtn" onclick="CancelSelect()">Cancel</div>
</div>
<div id="NoticeMask"></div>
<div id="NoticeBody">
<div id="NoticeBar" class="trans" tid="t18">error</div>
<div id="NoticeContent">
<div id="NoticeText" class="trans" tid="t37">At least one printer must be selected.</div>
<div id="NoticeBtns">
<div class="SmallBtn trans" tid="t36" onClick="ShowNotice(0)">ok</div>
</div> </div>
<div id="AcceptArea">
<div class="NormalBtn trans" tid="t39" id="AcceptBtn" onclick="ConfirmSelect()">Confirm</div>
<div class="GrayBtn trans" tid="t38" id="PreBtn" onclick="CancelSelect()">Cancel</div>
</div> </div>
</div> </div>
</body> </body>
<script> <script>
let pModel; document.onkeydown = function (event) {
function textInput(obj) { var e = event || window.event || arguments.callee.caller.arguments[0];
FilterModelList(obj.value);
}
</script>
</html> if (e.keyCode == 27)
ClosePage();
if (window.event) {
try { e.keyCode = 0; } catch (e) { }
e.returnValue = false;
}
};
</script>
</html>