mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Network Plugin And Makerlab Click 

JIRA: none

Change-Id: I3f2b1f2d79fc3b7d6a6a6ffcf437b06666e9422d
This commit is contained in:
zorro.zhang 2024-03-19 14:07:04 +08:00 committed by Lane.Wei
parent 947b776dab
commit 24a15d36ea
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/web/homepage2/js/left.js
View File

@ -24,6 +24,20 @@ function HandleStudio( pVal )
{
SetUserOffline();
}
else if( strCmd=="network_plugin_installtip" )
{
let nShow=pVal["show"]*1;
if(nShow==1)
{
$("#NoPluginTip").show();
$("#NoPluginTip").css("display","flex");
}
else
{
$("#NoPluginTip").hide();
}
}
else if(strCmd=='homepage_leftmenu_clicked')
{
let NewMenu=pVal['menu'];
@ -52,7 +66,7 @@ function GotoMenu( strMenu )
{
ShowMenuNewTag(strMenu,0);
if(NowMenu==strMenu)
if(NowMenu==strMenu && strMenu!='makerlab')
return;
NowMenu=strMenu;
@ -184,6 +198,14 @@ function SendMsg_CheckNewTag()
SendWXMessage( JSON.stringify(tSend) );
}
function BeginDownloadNetworkPlugin()
{
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="begin_network_plugin_download";
SendWXMessage( JSON.stringify(tSend) );
}
//---------------Global-----------------
window.postMessage = HandleStudio;

2
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -661,7 +661,7 @@ void WebViewPanel::ShowNetpluginTip()
wxString strJS = wxString::Format("window.postMessage(%s)", m_Res.dump(-1, ' ', false, json::error_handler_t::ignore));
RunScript(strJS);
RunScriptLeft(strJS);
}
void WebViewPanel::get_design_staffpick(int offset, int limit, std::function<void(std::string)> callback)