new(all): Vm isolated working with IPC BASIC 3.0;
This commit is contained in:
parent
6c072fb070
commit
2e073ce5a9
2 changed files with 7 additions and 10 deletions
|
@ -347,19 +347,15 @@ export class GBVMService extends GBService {
|
||||||
const items = text.match(/(".*?"|[^",\s]+)(?=\s*,|\s*$)/g);
|
const items = text.match(/(".*?"|[^",\s]+)(?=\s*,|\s*$)/g);
|
||||||
|
|
||||||
let i = 0;
|
let i = 0;
|
||||||
|
let json = '{';
|
||||||
names.forEach(name => {
|
names.forEach(name => {
|
||||||
let value = items[i];
|
let value = items[i];
|
||||||
|
|
||||||
// Add string to JSON without quotes.
|
|
||||||
|
|
||||||
if (value && (value.charAt(0) === '"' || value.charAt(0) === '\'')) {
|
|
||||||
value = value.substr(1, value.length - 2);
|
|
||||||
}
|
|
||||||
ret[name] = value;
|
|
||||||
i++;
|
i++;
|
||||||
|
json = `${json} "${name}": ${value} ${names.length == i ? '' : ','}`;
|
||||||
});
|
});
|
||||||
|
json = `${json}}`
|
||||||
|
|
||||||
return JSON.stringify(ret);
|
return json;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Keywords from General Bots BASIC.
|
// Keywords from General Bots BASIC.
|
||||||
|
@ -665,6 +661,7 @@ export class GBVMService extends GBService {
|
||||||
});
|
});
|
||||||
|
|
||||||
code = code.replace(/(click)(\s*)(.*)/gi, ($0, $1, $2, $3) => {
|
code = code.replace(/(click)(\s*)(.*)/gi, ($0, $1, $2, $3) => {
|
||||||
|
// TODO: page is not string.
|
||||||
const params = getParams('page,' + $3, ['handle', 'frameOrSelector', 'selector']);
|
const params = getParams('page,' + $3, ['handle', 'frameOrSelector', 'selector']);
|
||||||
return `await wa.click (${params})\n`;
|
return `await wa.click (${params})\n`;
|
||||||
});
|
});
|
||||||
|
|
|
@ -781,7 +781,7 @@ export class SystemKeywords {
|
||||||
.get();
|
.get();
|
||||||
|
|
||||||
results = await client
|
results = await client
|
||||||
.api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:Z${maxLines}')`)
|
.api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:CZ${maxLines}')`)
|
||||||
.get();
|
.get();
|
||||||
|
|
||||||
header = results.text[0];
|
header = results.text[0];
|
||||||
|
@ -1513,7 +1513,7 @@ export class SystemKeywords {
|
||||||
.get();
|
.get();
|
||||||
|
|
||||||
results = await client
|
results = await client
|
||||||
.api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:Z${maxLines}')`)
|
.api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:CZ${maxLines}')`)
|
||||||
.get();
|
.get();
|
||||||
|
|
||||||
header = results.text[0];
|
header = results.text[0];
|
||||||
|
|
Loading…
Add table
Reference in a new issue