viberadar 0.3.221 → 0.3.222
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +2 -1
- package/dist/server/index.js.map +1 -1
- package/dist/ui/dashboard.html +24 -16
- package/package.json +1 -1
package/dist/ui/dashboard.html
CHANGED
|
@@ -7914,8 +7914,15 @@ function applyLoadConfigToFields(cfg) {
|
|
|
7914
7914
|
loadDurationDraft = cfg.duration || loadDurationDraft;
|
|
7915
7915
|
loadDataDirDraft = cfg.dataDir || loadDataDirDraft;
|
|
7916
7916
|
loadResultDirDraft = cfg.resultDir || loadResultDirDraft;
|
|
7917
|
-
if (cfg
|
|
7918
|
-
|
|
7917
|
+
if (Object.prototype.hasOwnProperty.call(cfg, 'accountsJson')) {
|
|
7918
|
+
loadAccountsJsonDraft = cfg.accountsJson || '';
|
|
7919
|
+
} else if (Object.prototype.hasOwnProperty.call(cfg, 'accounts')) {
|
|
7920
|
+
loadAccountsJsonDraft = cfg.accounts ? (typeof cfg.accounts === 'string' ? cfg.accounts : JSON.stringify(cfg.accounts, null, 2)) : '';
|
|
7921
|
+
}
|
|
7922
|
+
if (cfg.envVars && typeof cfg.envVars === 'object' && !Array.isArray(cfg.envVars)) {
|
|
7923
|
+
const values = Object.values(cfg.envVars);
|
|
7924
|
+
if (!values.some(v => v === '***')) loadImportedEnvVarsDraft = { ...cfg.envVars };
|
|
7925
|
+
}
|
|
7919
7926
|
const baseEl = document.getElementById('loadBaseUrl');
|
|
7920
7927
|
const vusEl = document.getElementById('loadVus');
|
|
7921
7928
|
const durEl = document.getElementById('loadDuration');
|
|
@@ -8368,11 +8375,7 @@ function loadOpenScript(name) {
|
|
|
8368
8375
|
loadScriptDraft = s.script;
|
|
8369
8376
|
loadScriptNameDraft = s.name;
|
|
8370
8377
|
loadImportedEnvVarsDraft = {};
|
|
8371
|
-
|
|
8372
|
-
if (s.vus) loadVusDraft = s.vus;
|
|
8373
|
-
if (s.duration) loadDurationDraft = s.duration;
|
|
8374
|
-
loadDataDirDraft = s.dataDir || loadDataDirDraft;
|
|
8375
|
-
loadResultDirDraft = s.resultDir || loadResultDirDraft;
|
|
8378
|
+
applyLoadConfigToFields(s);
|
|
8376
8379
|
loadView = 'editor';
|
|
8377
8380
|
renderContent();
|
|
8378
8381
|
}
|
|
@@ -8660,7 +8663,17 @@ async function loadSaveScript() {
|
|
|
8660
8663
|
const r = await fetch('/api/load/scripts', {
|
|
8661
8664
|
method: 'POST',
|
|
8662
8665
|
headers: { 'Content-Type': 'application/json' },
|
|
8663
|
-
body: JSON.stringify({
|
|
8666
|
+
body: JSON.stringify({
|
|
8667
|
+
name,
|
|
8668
|
+
script,
|
|
8669
|
+
baseUrl,
|
|
8670
|
+
vus,
|
|
8671
|
+
duration,
|
|
8672
|
+
dataDir,
|
|
8673
|
+
resultDir,
|
|
8674
|
+
accountsJson: accountsInfo.text,
|
|
8675
|
+
envVars: loadImportedEnvVarsDraft || {},
|
|
8676
|
+
}),
|
|
8664
8677
|
});
|
|
8665
8678
|
if (!r.ok) { const d = await r.json().catch(() => ({})); alert('Ошибка: ' + (d.error || r.status)); return; }
|
|
8666
8679
|
await loadRefreshScripts();
|
|
@@ -8671,21 +8684,16 @@ async function loadSaveScript() {
|
|
|
8671
8684
|
}
|
|
8672
8685
|
|
|
8673
8686
|
async function loadLoadScript(name) {
|
|
8674
|
-
const s = loadSavedScripts.find(x => x.name === name);
|
|
8675
|
-
if (!s) return;
|
|
8687
|
+
const s = loadSavedScripts.find(x => x.name === name);
|
|
8688
|
+
if (!s) return;
|
|
8676
8689
|
loadScriptDraft = s.script;
|
|
8677
8690
|
loadScriptNameDraft = s.name;
|
|
8678
8691
|
loadImportedEnvVarsDraft = {};
|
|
8679
|
-
|
|
8680
|
-
if (s.vus) loadVusDraft = s.vus;
|
|
8681
|
-
if (s.duration) loadDurationDraft = s.duration;
|
|
8682
|
-
loadDataDirDraft = s.dataDir || loadDataDirDraft;
|
|
8683
|
-
loadResultDirDraft = s.resultDir || loadResultDirDraft;
|
|
8692
|
+
applyLoadConfigToFields(s);
|
|
8684
8693
|
const ta = document.getElementById('loadScriptEditor');
|
|
8685
8694
|
if (ta) { ta.value = s.script; ta.style.borderColor = 'var(--blue)'; setTimeout(() => { ta.style.borderColor = ''; }, 1500); }
|
|
8686
8695
|
const nameEl = document.getElementById('loadScriptName');
|
|
8687
8696
|
if (nameEl) nameEl.value = s.name;
|
|
8688
|
-
applyLoadConfigToFields(s);
|
|
8689
8697
|
}
|
|
8690
8698
|
|
|
8691
8699
|
async function loadDeleteScript(name) {
|