GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +2 -4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4c037a7205 - Show all commits

6
packages/basic.gblib/services/KeywordsExpressions.ts
View file

@ -149,7 +149,7 @@ export class KeywordsExpressions {
$1 = $1.trim(); $1 = $1.trim();
if ($1.substr(0, 1) === '#') { if ($1.substr(0, 1) === '#') {
let sessionName = $1.substr(1, $1.indexOf(',') - 1); sessionName = $1.substr(1, $1.indexOf(',') - 1);
$1 = $1.replace(/\; \"\,\"/gi, ''); $1 = $1.replace(/\; \"\,\"/gi, '');
$1 = $1.substr($1.indexOf(',') + 1); $1 = $1.substr($1.indexOf(',') + 1);
@ -182,8 +182,6 @@ export class KeywordsExpressions {
$1 = $1.replace('FOR APPEND', ''); $1 = $1.replace('FOR APPEND', '');
$1 = $1.replace('FOR OUTPUT', ''); $1 = $1.replace('FOR OUTPUT', '');
if ((pos = $1.match(/\s*AS\s*\#/gi))) { if ((pos = $1.match(/\s*AS\s*\#/gi))) {
kind = 'AS'; kind = 'AS';
} else if ((pos = $1.match(/\s*WITH\s*\#/gi))) { } else if ((pos = $1.match(/\s*WITH\s*\#/gi))) {
@ -215,7 +213,7 @@ export class KeywordsExpressions {
`; `;
return code; return code;
} else { } else {
sessionName = `"${sessionName}"`; sessionName = sessionName?`"${sessionName}"`:null;
kind = `"${kind}"`; kind = `"${kind}"`;
return `page = await wa.openPage({pid: pid, handle: page, sessionKind: ${kind}, sessionName: ${sessionName}, ${params}})`; return `page = await wa.openPage({pid: pid, handle: page, sessionKind: ${kind}, sessionName: ${sessionName}, ${params}})`;
} }