Skip to content

Commit 893e1fb

Browse files
committed
APIAuto:完善并优化场景用例 CTX_PUT 传参,查询场景子项列表用最新的参数注入配置,解决上传参数配置报错 documentId is undefined
1 parent 7db7986 commit 893e1fb

File tree

1 file changed

+39
-12
lines changed
  • APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js

1 file changed

+39
-12
lines changed

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3275,7 +3275,7 @@ https://github.com/Tencent/APIJSON/issues
32753275
},
32763276
'TestRecord': {
32773277
'userId': userId,
3278-
'documentId': documentId,
3278+
'documentId': did,
32793279
'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
32803280
'chainGroupId': cgId,
32813281
'chainId': cId,
@@ -5388,11 +5388,12 @@ https://github.com/Tencent/APIJSON/issues
53885388
// '@having': StringUtil.isEmpty(groupUrl) ? null : "substring_index(substr,'/',1)<0"
53895389
},
53905390
'Random': isChainShow ? {
5391-
'id@': '/Chain/randomId',
5392-
'toId': 0, // isChainShow ? 0 : null,
5393-
// 'chainId@': isChainShow ? '/Chain/id' : null,
5394-
// 'documentId@': isChainShow ? null : '/Document/documentId',
5395-
'userId': userId
5391+
// 'id@': '/Chain/randomId',
5392+
'toId': 0, // null,
5393+
'chainId@': '/Chain/id',
5394+
// 'documentId@': '/Document/documentId',
5395+
'userId': userId,
5396+
'@order': 'date-'
53965397
}: null,
53975398
'TestRecord': {
53985399
'chainId@': isChainShow ? '/Chain/id' : null,
@@ -10541,7 +10542,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
1054110542
}
1054210543

1054310544
// reqCount ++;
10544-
App.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, baseUrl + '/get', req, {}, function (url, res, err) {
10545+
App.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, '/get', req, {}, function (url, res, err) {
1054510546
// respCount ++;
1054610547
try {
1054710548
App.onResponse(url, res, err)
@@ -10656,10 +10657,36 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
1065610657
}
1065710658
else if (fun == CTX_PUT) {
1065810659
var as = StringUtil.split(value.substring(start + 1, end), ', ') || []
10659-
if (as.length >= 2) {
10660-
as[1] = 'get4Path(((ctx || {}).pre || {}).data, ' + StringUtil.trim(as[1]) + ')'
10660+
if (StringUtil.isEmpty(as[1], true) || as[1] == 'PRE_DATA') {
10661+
as[1] = '((ctx || {}).pre || {}).data'
10662+
}
10663+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'PRE_REQ') {
10664+
as[1] = '((ctx || {}).pre || {}).req'
10665+
}
10666+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'PRE_ARG') {
10667+
as[1] = '((ctx || {}).pre || {}).arg'
10668+
}
10669+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'PRE_RES') {
10670+
as[1] = '((ctx || {}).pre || {}).res'
10671+
}
10672+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'CUR_DATA') {
10673+
as[1] = '((ctx || {}).cur || {}).data'
10674+
}
10675+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'CUR_REQ') {
10676+
as[1] = '((ctx || {}).cur || {}).req'
10677+
}
10678+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'CUR_ARG') {
10679+
as[1] = '((ctx || {}).cur || {}).arg'
10680+
}
10681+
else if (StringUtil.isEmpty(as[1], true) || as[1] == 'CUR_RES') {
10682+
as[1] = '((ctx || {}).cur || {}).res'
10683+
}
10684+
10685+
if (as.length >= 1) {
10686+
as[0] = 'get4Path(' + as[1] + ', ' + StringUtil.trim(as[0]) + ')'
10687+
as.splice(1, 1)
1066110688
}
10662-
toEval = 'put4Path((ctx || {}).ctx, ' + (value == 'CTX_PUT()' ? JSON.stringify(path) : '') + as.join(', ') + value.substring(end);
10689+
toEval = 'put4Path((ctx || {}).ctx, ' + JSON.stringify(path) + ', ' + as.join(', ') + value.substring(end);
1066310690
}
1066410691
else if (fun == CUR_REQ) {
1066510692
toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + (value == 'CUR_REQ()' ? JSON.stringify(path) : '') + value.substring(start + 1);
@@ -12665,9 +12692,9 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
1266512692
type: stringType,
1266612693
comment: "在上下文存放键值对 function(key:String?, defaultVal:Any?, msg:String?)"
1266712694
}, {
12668-
name: "CTX_PUT('userId', 'User/id', 'CUR_DATA')",
12695+
name: "CTX_PUT('User/id', 'PRE_DATA')",
1266912696
type: stringType,
12670-
comment: "在上下文存放键值对 function(key:String, val:Any, from:String?, msg:String?)"
12697+
comment: "在上下文存放键值对 function(path:String, from:String|Object?, msg:String?)"
1267112698
}, {
1267212699
name: "PRE_RES('[]/page')",
1267312700
type: stringType,

0 commit comments

Comments
 (0)