juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 19:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scope plugin config overrides per preset type

Browse Source 
Replace the shared plugin_config_overrides key with print/printer/filament
scoped keys so merging presets into one full config cannot clobber an edited
override, letting a slicing plugin config change invalidate the slice step.
This commit is contained in:
SoftFever
2026-07-25 15:28:14 +08:00
parent b5430b53e7
commit 6e1a6cc678
15 changed files with 138 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/web/dialog/PluginsConfigDialog/index.js
+11 -13
View File
@@ -9,10 +9,12 @@ let selectedCapabilityType = "";
let selectedHasPresetOverride = false;
let selectedReadOnly = false;
// Identity of the capability whose custom UI is currently loaded in the frame. Saving re-sends the
// whole capability_config payload, and rebuilding the frame from it would reload the plugin's page
// under the user's cursor; when this still matches, the new values are posted in instead.
let customFrameKey = "";
// Whether the frame holds the selected capability's custom UI. Payloads are gated by
// IsCurrentCapability and every selection change clears the view, so a loaded frame is always the
// selected capability's. Saving re-sends the whole capability_config payload, and rebuilding the
// frame from it would reload the plugin's page under the user's cursor; while the frame is loaded,
// the new values are posted in instead.
let customFrameLoaded = false;
function SafeJsonParse(text) {
try {
@@ -173,10 +175,6 @@ function IsCurrentCapability(payload) {
&& String(payload?.capability_type || "") === selectedCapabilityType;
}
function CapabilityKey(payload) {
return JSON.stringify([payload?.plugin_key, payload?.capability_name, payload?.capability_type]);
}
function RequestCapabilityConfig() {
if (!selectedPluginKey || !selectedCapabilityName)
return;
@@ -202,7 +200,7 @@ function ClearCapabilityConfigView() {
if (custom) {
custom.hidden = true;
custom.removeAttribute("srcdoc");
customFrameKey = "";
customFrameLoaded = false;
}
if (text)
text.value = "";
@@ -260,10 +258,10 @@ function ApplyCapabilityConfig(payload) {
if (custom) {
const context = OrcaConfigContext(payload, "preset");
custom.hidden = false;
if (customFrameKey === CapabilityKey(payload) && custom.contentWindow) {
if (customFrameLoaded && custom.contentWindow) {
custom.contentWindow.postMessage({ __orca: "config", config: config, context: context }, "*");
} else {
customFrameKey = CapabilityKey(payload);
customFrameLoaded = true;
custom.srcdoc = BuildCustomConfigDocument(html, config, context);
}
}
@@ -276,7 +274,7 @@ function ApplyCapabilityConfig(payload) {
if (custom) {
custom.hidden = true;
custom.removeAttribute("srcdoc");
customFrameKey = "";
customFrameLoaded = false;
}
if (editor)
editor.hidden = false;
@@ -416,7 +414,7 @@ document.addEventListener("DOMContentLoaded", () => {
// OnCustomConfigMessage matches on the frame's contentWindow, not the origin ("null" when
// sandboxed), and ignores anything else.
window.addEventListener("message", OnCustomConfigMessage);
OrcaWatchThemeForFrame(() => document.getElementById("configCustom"));
OrcaWatchThemeForFrame("configCustom");
SendMessage("request_capabilities");
});