diff --git a/resources/web/data/text.js b/resources/web/data/text.js index 9dc76cb738..d18dba702c 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -81,7 +81,9 @@ var LangText={ "t86":"Close", "t87":"User Manual", "t88":"Remove", - "t89":"Open Containing Folder" + "t89":"Open Containing Folder", + "t90":"3D Model", + "t91":"Download 3D Models" }, "zh_CN":{ "t1":"欢迎使用Bambu Studio", @@ -166,6 +168,8 @@ var LangText={ "t87":"使用引导", "t88":"移除", "t89":"打开所在的文件夹", + "t90":"3D 模型", + "t91":"下载3D模型", "wk1":"快速入门指南", "wk2":"本文介绍了Bambu Studio的最基本用法。它指导用户配置软件,创建项目,并逐步完成第一个打印任务。", "wk3":"基于项目的工作流", diff --git a/resources/web/guide/22/22.js b/resources/web/guide/22/22.js index 8a11540ab2..a335e75734 100644 --- a/resources/web/guide/22/22.js +++ b/resources/web/guide/22/22.js @@ -116,6 +116,8 @@ function SortUI() { let OneFila=m_ProfileItem['filament'][key]; + //alert(JSON.stringify(OneFila)); + let fWholeName=OneFila['name'].trim(); let fShortName=GetFilamentShortname( OneFila['name'] ); let fVendor=OneFila['vendor']; @@ -123,6 +125,8 @@ function SortUI() let fSelect=OneFila['selected']; let fModel=OneFila['models'] + //alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel ); + // if(OneFila['name'].indexOf("Bambu PA-CF")>=0) // { // alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel ) @@ -188,15 +192,6 @@ function SortUI() let HtmlFila='
'+fShortName+'
'; $("#ItemBlockArea").append(HtmlFila); - - if(fSelect==1) - { - $("#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); } else { @@ -206,8 +201,18 @@ function SortUI() 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; diff --git a/resources/web/guide/23/23.js b/resources/web/guide/23/23.js index eb7b73fa7c..68719a93bd 100644 --- a/resources/web/guide/23/23.js +++ b/resources/web/guide/23/23.js @@ -113,12 +113,17 @@ function SortUI() { let OneFila=m_ProfileItem['filament'][key]; + //alert(JSON.stringify(OneFila)); + + let fWholeName=OneFila['name'].trim(); let fShortName=GetFilamentShortname( OneFila['name'] ); let fVendor=OneFila['vendor']; let fType=OneFila['type']; let fSelect=OneFila['selected']; let fModel=OneFila['models'] + //alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel ); + // if(OneFila['name'].indexOf("Bambu PA-CF")>=0) // { // alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel ) @@ -149,9 +154,9 @@ function SortUI() { let nowModel= OneName+"++"+NozzleArray[b]; if(fModel.indexOf(nowModel)>=0) - { - bFind=true; - break; + { + bFind=true; + break; } } } @@ -173,7 +178,7 @@ function SortUI() if(!VendorHtmlArray.hasOwnProperty(lowVendor)) { let HtmlVendor='
'+fVendor+'
'; - + VendorHtmlArray[lowVendor]=HtmlVendor; } @@ -181,27 +186,30 @@ function SortUI() let pFila=$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']"); if(pFila.length==0) { - let HtmlFila='
'+fShortName+'
'; + let HtmlFila='
'+fShortName+'
'; $("#ItemBlockArea").append(HtmlFila); - - if(fSelect==1) - { - $("#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); } - else + 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; diff --git a/resources/web/homepage/img/i6.png b/resources/web/homepage/img/i6.png new file mode 100644 index 0000000000..8d4cbaba0d Binary files /dev/null and b/resources/web/homepage/img/i6.png differ diff --git a/resources/web/homepage/img/project_based_workflow.png b/resources/web/homepage/img/project_based_workflow.png index 30febabd58..3991564ae9 100644 Binary files a/resources/web/homepage/img/project_based_workflow.png and b/resources/web/homepage/img/project_based_workflow.png differ diff --git a/resources/web/homepage/index.html b/resources/web/homepage/index.html index 26ae6fdd4c..f2e9653441 100644 --- a/resources/web/homepage/index.html +++ b/resources/web/homepage/index.html @@ -50,6 +50,13 @@