select target in manager after spooling to bambu printer
This commit is contained in:
parent
f1e5ccae1a
commit
a193784fce
2 changed files with 14 additions and 6 deletions
5
app.js
5
app.js
|
|
@ -85,7 +85,7 @@ function init(mod) {
|
||||||
logger = mod.log;
|
logger = mod.log;
|
||||||
debug = ENV.debug || mod.meta.debug;
|
debug = ENV.debug || mod.meta.debug;
|
||||||
oversion = ENV.over || mod.meta.over;
|
oversion = ENV.over || mod.meta.over;
|
||||||
crossOrigin = ENV.xorigin || mod.meta.xorigin || false;
|
crossOrigin = ENV.xorigin || mod.meta.xorigin || debug;
|
||||||
serviceWorker = (ENV.service || mod.meta.service) !== false;
|
serviceWorker = (ENV.service || mod.meta.service) !== false;
|
||||||
http = mod.http;
|
http = mod.http;
|
||||||
util = mod.util;
|
util = mod.util;
|
||||||
|
|
@ -828,6 +828,9 @@ function addCorsHeaders(req, res) {
|
||||||
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
||||||
res.setHeader('Access-Control-Allow-Headers', 'X-Moto-Ajax, Content-Type');
|
res.setHeader('Access-Control-Allow-Headers', 'X-Moto-Ajax, Content-Type');
|
||||||
res.setHeader('Access-Control-Allow-Origin', req.headers['origin'] || '*');
|
res.setHeader('Access-Control-Allow-Origin', req.headers['origin'] || '*');
|
||||||
|
if (req.headers['access-control-request-private-network'] === 'true') {
|
||||||
|
res.setHeader('Access-Control-Allow-Private-Network', 'true');
|
||||||
|
}
|
||||||
if (!crossOrigin) {
|
if (!crossOrigin) {
|
||||||
res.setHeader("Cross-Origin-Opener-Policy", 'same-origin');
|
res.setHeader("Cross-Origin-Opener-Policy", 'same-origin');
|
||||||
res.setHeader("Cross-Origin-Embedder-Policy", 'require-corp');
|
res.setHeader("Cross-Origin-Embedder-Policy", 'require-corp');
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ self.kiri.load(api => {
|
||||||
let status = {};
|
let status = {};
|
||||||
let monitors = [];
|
let monitors = [];
|
||||||
let video_on = false;
|
let video_on = false;
|
||||||
let bound, device, printers, select, selected, conn_alert;
|
let bound, device, printers, select, selected, conn_alert, export_select;
|
||||||
let btn_del, in_host, in_code, in_serial, filelist;
|
let btn_del, in_host, in_code, in_serial, filelist;
|
||||||
let host, password, serial, amsmap, socket = {
|
let host, password, serial, amsmap, socket = {
|
||||||
open: false,
|
open: false,
|
||||||
|
|
@ -303,13 +303,17 @@ self.kiri.load(api => {
|
||||||
function render_list(to) {
|
function render_list(to) {
|
||||||
let list = Object.keys(printers).map(name => {
|
let list = Object.keys(printers).map(name => {
|
||||||
return selected?.name === name ?
|
return selected?.name === name ?
|
||||||
h.option({ _: name, value: name, _selected: true }) :
|
h.option({ _: name, value: name, _selected: !export_select }) :
|
||||||
h.option({ _: name, value: name });
|
h.option({ _: name, value: name, _selected: export_select === name });
|
||||||
});
|
});
|
||||||
list = [
|
list = [
|
||||||
h.option({ _: '', value: '' }),
|
h.option({ _: '', value: '' }),
|
||||||
...list
|
...list
|
||||||
]
|
];
|
||||||
|
if (export_select) {
|
||||||
|
printer_select(export_select);
|
||||||
|
export_select = undefined;
|
||||||
|
}
|
||||||
h.bind(to || select, list);
|
h.bind(to || select, list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -620,7 +624,7 @@ self.kiri.load(api => {
|
||||||
} })
|
} })
|
||||||
]),
|
]),
|
||||||
h.div({ class: "var-row" }, [
|
h.div({ class: "var-row" }, [
|
||||||
h.label('tray select'),
|
h.label('spool select'),
|
||||||
h.select({ id: "bbl_ams_tray", onchange() {
|
h.select({ id: "bbl_ams_tray", onchange() {
|
||||||
let new_tray = $('bbl_ams_tray').value
|
let new_tray = $('bbl_ams_tray').value
|
||||||
api.alerts.show(`select tray ${new_tray}`,2);
|
api.alerts.show(`select tray ${new_tray}`,2);
|
||||||
|
|
@ -817,6 +821,7 @@ self.kiri.load(api => {
|
||||||
host = info.host;
|
host = info.host;
|
||||||
serial = info.serial;
|
serial = info.serial;
|
||||||
password = info.code;
|
password = info.code;
|
||||||
|
export_select = devlist.value;
|
||||||
$('print-bambu-1').disabled =
|
$('print-bambu-1').disabled =
|
||||||
$('print-bambu-2').disabled =
|
$('print-bambu-2').disabled =
|
||||||
(host && serial && password) ? false : true;
|
(host && serial && password) ? false : true;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue