diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js index daba88f19..9992adcd3 100644 --- a/web_src/js/features/cloudbrainShow.js +++ b/web_src/js/features/cloudbrainShow.js @@ -166,6 +166,10 @@ export default async function initCloudrainSow() { } } ).fail(function (err) { + $(`#log${version_name} .ui.inverted.active.dimmer`).css( + "display", + "none" + ); console.log(err); }); scrollAnimation( @@ -174,7 +178,13 @@ export default async function initCloudrainSow() { logContentDom.scrollHeight - logContentDom.clientHeight ); } - ); + ).fail((err) => { + $(`#log${version_name} .ui.inverted.active.dimmer`).css( + "display", + "none" + ); + throw err; + }); }); function loadLog(version_name) { diff --git a/web_src/js/standalone/cloudbrainNew.js b/web_src/js/standalone/cloudbrainNew.js index cec5b00b6..170344f7a 100644 --- a/web_src/js/standalone/cloudbrainNew.js +++ b/web_src/js/standalone/cloudbrainNew.js @@ -33,7 +33,7 @@ value += ``; } else { value += - ''; } @@ -43,7 +43,7 @@ value += ``; } else { value += - ''; } @@ -133,14 +133,30 @@ function send_run_para() { var run_parameters = []; var msg = {}; + let paraFlag = true; $(".dynamic.field .two.fields").each(function () { var para_name = $(this).find("input.shipping_first-name").val(); var para_value = $(this).find("input.shipping_last-name").val(); + if (!para_name) { + $(this).find("input.shipping_first-name").parent().addClass("error"); + paraFlag = false; + return; + } else { + $(this).find("input.shipping_first-name").parent().removeClass("error"); + } + if (!para_value) { + $(this).find("input.shipping_last-name").parent().addClass("error"); + paraFlag = false; + return; + } else { + $(this).find("input.shipping_last-name").parent().removeClass("error"); + } run_parameters.push({ label: para_name, value: para_value }); }); msg["parameter"] = run_parameters; msg = JSON.stringify(msg); $("#store_run_para").val(msg); + return paraFlag; } function get_name() { let name1 = $("#engine_name .text").text(); @@ -152,7 +168,10 @@ validate(); $(".ui.create_train_job.green.button").click(function (e) { get_name(); - send_run_para(); + let paramNotValue = send_run_para(); + if (!paramNotValue) { + return false; + } validate(); }); })();