diff --git a/js/main.js b/js/main.js
index 49bd139..5ef7cb7 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1000,7 +1000,9 @@ https://github.com/Tencent/APIJSON/issues
history: {name: '请求0'},
remotes: [],
locals: [],
+ chainPaths: [],
casePaths: [],
+ chainGroups: [],
caseGroups: [],
testCases: [],
randoms: [],
@@ -1034,6 +1036,7 @@ https://github.com/Tencent/APIJSON/issues
otherEnvCookieMap: {},
allSummary: {},
currentAccountIndex: 0,
+ currentChainGroupIndex: -1,
currentDocIndex: -1,
currentRandomIndex: -1,
currentRandomSubIndex: -1,
@@ -1068,7 +1071,9 @@ https://github.com/Tencent/APIJSON/issues
isLoginShow: false,
isConfigShow: false,
isDeleteShow: false,
+ groupShowType: 0,
caseShowType: 0,
+ chainShowType: 0,
statisticsShowType: 0,
currentHttpResponse: {},
currentDocItem: {},
@@ -1112,6 +1117,7 @@ https://github.com/Tencent/APIJSON/issues
isEncodeEnabled: true,
isEditResponse: false,
isLocalShow: false,
+ isChainShow: false,
uploadTotal: 0,
uploadDoneCount: 0,
uploadFailCount: 0,
@@ -1154,6 +1160,12 @@ https://github.com/Tencent/APIJSON/issues
page: 0,
count: 50,
search: '',
+ chainGroupPage: 0,
+ chainGroupPages: {},
+ chainGroupCount: 0,
+ chainGroupCounts: {},
+ chainGroupSearch: '',
+ chainGroupSearches: {},
caseGroupPage: 0,
caseGroupPages: {},
caseGroupCount: 0,
@@ -1587,6 +1599,11 @@ https://github.com/Tencent/APIJSON/issues
isClickSelectInput = false;
// vOption.focusout()
+ if (this.isChainShow) {
+ this.addCase2Chain(item.value)
+ return
+ }
+
if (isInputValue != true) {
App.showOptions(target, text, before + name + (isSingle ? "'" : '"') + ': ', after.substring(3), true);
}
@@ -4091,15 +4108,153 @@ https://github.com/Tencent/APIJSON/issues
}
},
+ onClickChainPath: function (index, path) {
+ var chainPaths = this.chainPaths
+ this.chainPaths = chainPaths.slice(0, index)
+ this.selectChainGroup(0, path)
+ },
+ isChainGroupShow: function () {
+ return this.chainShowType != 1 && (this.chainGroups.length > 0 || this.chainPaths.length <= 0)
+ },
+ isChainItemShow: function () {
+ return this.chainShowType != 2 || (this.chainGroups.length <= 0 && this.chainPaths.length > 0)
+ },
+ selectChainGroup: function (index, group) {
+ this.currentChainGroupIndex = index
+ this.isCaseGroupEditable = false
+
+ if (group == null) {
+ if (index == null) {
+ index = this.chainPaths.length - 1
+ group = this.chainPaths[index]
+ } else {
+ this.chainPaths = []
+ }
+ } else {
+ this.chainPaths.push(group)
+ }
+
+ var groupId = group == null ? 0 : group.groupId
+ if (group != null && groupId == 0) {
+ this.chainGroups = []
+ this.remotes = App.testCases = []
+ this.showTestCase(true, false, null)
+ return
+ }
+
+ var key = groupId + ''
+ var page = this.chainGroupPage = this.chainGroupPages[key] || 0
+ var count = this.chainGroupCount = this.chainGroupCounts[key] || 0
+ var search = this.chainGroupSearch = this.chainGroupSearches[key] || ''
+
+ search = StringUtil.isEmpty(search, true) ? null : '%' + StringUtil.trim(search).replaceAll('_', '\\_').replaceAll('%', '\\%') + '%'
+ var req = {
+ format: false,
+ 'Chain[]': {
+ 'count': count || 0,
+ 'page': page || 0,
+ 'Chain': {
+ 'toGroupId': groupId,
+ 'groupName$': search,
+ '@column': "groupId;any_value(groupName):groupName;count(*):count",
+ '@group': 'groupId',
+ '@order': 'groupId-',
+ }
+ },
+ '@role': IS_NODE ? null : 'LOGIN',
+ key: IS_NODE ? this.key : undefined // 突破常规查询数量限制
+ }
+
+ if (IS_BROWSER) {
+ this.onChange(false)
+ }
+
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/get', req, {}, function (url, res, err) {
+ App.onResponse(url, res, err)
+ var data = res.data
+ if (JSONResponse.isSuccess(data) == false) {
+ alert('获取场景用例分组失败！\n' + (err != null ? err.message : (data || '').msg))
+ if (IS_BROWSER) { // 解决一旦错了，就只能清缓存
+ App.chainGroupCount = 50
+ App.chainGroupPage = 0
+ App.chainGroupSearch = ''
+ App.chainGroupCounts = {}
+ App.chainGroupPages = {}
+ App.chainGroupSearches = {}
+
+ App.saveCache(App.server, 'chainGroupCount', App.chainGroupCount)
+ App.saveCache(App.server, 'chainGroupPage', App.chainGroupPage)
+ App.saveCache(App.server, 'chainGroupSearch', App.chainGroupSearch)
+ App.saveCache(App.server, 'chainGroupCounts', App.chainGroupCounts)
+ App.saveCache(App.server, 'chainGroupPages', App.chainGroupPages)
+ App.saveCache(App.server, 'chainGroupSearches', App.chainGroupSearches)
+ }
+ return
+ }
+
+ App.chainGroups = data['Chain[]'] || []
+ App.remotes = App.testCases = []
+ App.showTestCase(true, false, null)
+ })
+ },
+
+ addCase2Chain: function (item) {
+ var id = item == null ? null : item.id
+ if (id == null || id <= 0) {
+ alert('请选择有效的用例！')
+ return
+ }
+
+ var group = this.chainGroups[this.currentChainGroupIndex]
+ if (id == null || id <= 0) {
+ alert('请选择有效的场景串联用例分组！')
+ return
+ }
+
+ var isAdd = true
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/post', {
+ Chain: {
+ 'groupName': group.groupName,
+ 'groupId': group.groupId,
+ 'documentId': item.id
+ },
+ tag: 'Chain'
+ }, {}, function (url, res, err) {
+ App.onResponse(url, res, err)
+ var isOk = JSONResponse.isSuccess(res.data)
+
+ var msg = isOk ? '' : ('\nmsg: ' + StringUtil.get((res.data || {}).msg))
+ if (err != null) {
+ msg += '\nerr: ' + err.msg
+ }
+ alert((isAdd ? '新增' : '修改') + (isOk ? '成功' : '失败') + (isAdd ? '! \n' :'！\ngroupId: ' + groupId) + '\ngroupName: ' + groupName + '\n' + msg)
+
+ App.isCaseGroupEditable = ! isOk
+ })
+ },
+
onClickPath: function (index, path) {
- var casePaths = this.casePaths;
- this.casePaths = casePaths.slice(0, index)
+ if (this.isChainShow) {
+ this.onClickChainPath(index, path)
+ return
+ }
+
+ var paths = this.casePaths
+ this.casePaths = paths.slice(0, index)
this.selectCaseGroup(0, path)
},
isCaseGroupShow: function () {
+ if (this.isChainShow) {
+ return this.isChainGroupShow()
+ }
+
return this.caseShowType != 1 && (this.caseGroups.length > 0 || this.casePaths.length <= 0)
},
isCaseItemShow: function () {
+ if (this.isChainShow) {
+ return this.isChainItemShow()
+ }
+
return this.caseShowType != 2 || (this.caseGroups.length <= 0 && this.casePaths.length > 0)
},
getCaseGroupShowName: function(index, item) {
@@ -4114,6 +4269,11 @@ https://github.com/Tencent/APIJSON/issues
return item.groupUrl.substring(prev == null ? 1 : prev.length + 1)
},
selectCaseGroup: function (index, group) {
+ if (this.isChainShow) {
+ this.selectChainGroup(index, group)
+ return
+ }
+
this.isCaseGroupEditable = false
if (group == null) {
@@ -4214,6 +4374,14 @@ https://github.com/Tencent/APIJSON/issues
return
}
+ if (this.isChainShow) {
+ this.chainShowType = (this.chainShowType + 1)%3
+ if (this.chainShowType != 1 && this.chainPaths.length <= 0 && this.chainGroups.length <= 0) {
+ this.selectChainGroup(-1, null)
+ }
+ return
+ }
+
this.caseShowType = (this.caseShowType + 1)%3
if (this.caseShowType != 1 && this.casePaths.length <= 0 && this.caseGroups.length <= 0) {
this.selectCaseGroup(-1, null)
@@ -4221,9 +4389,27 @@ https://github.com/Tencent/APIJSON/issues
},
onClickPathRoot: function () {
- if (this.casePaths.length <= 0) {
- this.showTestCase(true, ! this.isLocalShow)
- } else {
+ var isChainShow = this.isChainShow
+ var paths = isChainShow ? this.chainPaths : this.casePaths
+ if (paths.length <= 0) {
+ var type = this.groupShowType = (this.groupShowType + 1)%3
+ this.isChainShow = type == 1
+ this.isLocalShow = type == 2
+ if (type == 1 && this.chainGroups.length <= 0) {
+ this.selectChainGroup(-1, null)
+ }
+ else if (type == 0 && this.caseGroups.length <= 0) {
+ this.selectCaseGroup(-1, null)
+ }
+ else {
+ this.testCases = this.remotes = []
+ this.showTestCase(true, this.isLocalShow)
+ }
+ }
+ else if (isChainShow) {
+ this.selectChainGroup(-1, null)
+ }
+ else {
this.selectCaseGroup(-1, null)
}
},
@@ -4263,17 +4449,22 @@ https://github.com/Tencent/APIJSON/issues
var methods = this.methods
var types = this.types
- var index = this.casePaths.length - 1
- var group = this.casePaths[index]
+ var isChainShow = this.isChainShow
+ var paths = isChainShow ? this.chainPaths : this.casePaths
+ var index = paths.length - 1
+ var group = paths[index]
+ var groupId = group == null ? 0 : (group.groupId || 0)
var groupUrl = group == null ? '' : (group.groupUrl || '')
+ var groupKey = isChainShow ? groupId + '' : groupUrl
- var page = this.testCasePage = this.testCasePages[groupUrl] || 0
- var count = this.testCaseCount = this.testCaseCounts[groupUrl] || 100
- var search = this.testCaseSearch = this.testCaseSearches[groupUrl] || ''
+ var page = this.testCasePage = this.testCasePages[groupKey] || 0
+ var count = this.testCaseCount = this.testCaseCounts[groupKey] || 100
+ var search = this.testCaseSearch = this.testCaseSearches[groupKey] || ''
search = StringUtil.isEmpty(search, true) ? null : '%' + StringUtil.trim(search).replaceAll('_', '\\_').replaceAll('%', '\\%') + '%'
var url = this.server + '/get'
+ var userId = this.User.id
this.coverage = {}
this.view = 'markdown'
@@ -4282,11 +4473,18 @@ https://github.com/Tencent/APIJSON/issues
'[]': {
'count': count || 100, //200 条测试直接卡死 0,
'page': page || 0,
- 'join': '@/TestRecord,@/Script:pre,@/Script:post',
+ 'join': isChainShow ? '@/Document,@/Random' : '@/TestRecord,@/Script:pre,@/Script:post',
+ 'Chain': isChainShow ? {
+ // TODO 后续再支持嵌套子组合 'toGroupId': groupId,
+ 'groupId': groupId,
+ '@column': "id,groupId,documentId,randomId",
+ '@order': 'id+',
+ } : null,
'Document': {
+ 'id@': isChainShow ? '/Chain/documentId' : null,
// '@column': 'id,userId,version,date,name,operation,method,type,url,request,apijson,standard', // ;substr(url,' + (StringUtil.length(groupUrl) + 2) + '):substr',
'@order': 'version-,date-',
- 'userId': this.User.id,
+ 'userId': userId,
'name$': search,
'operation$': search,
'url$': search,
@@ -4299,9 +4497,17 @@ https://github.com/Tencent/APIJSON/issues
'@null': 'sqlauto', //'sqlauto{}': '=null'
// '@having': StringUtil.isEmpty(groupUrl) ? null : "substring_index(substr,'/',1)<0"
},
+ 'Random': isChainShow ? {
+ 'id@': '/Chain/randomId',
+ 'toId': isChainShow ? 0 : null,
+// 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
+ 'documentId@': isChainShow ? null : '/Document/documentId',
+ 'userId': userId
+ }: null,
'TestRecord': {
+ 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
'documentId@': '/Document/id',
- 'userId': this.User.id,
+ 'userId': userId,
// 'testAccountId': this.getCurrentAccountId(),
'randomId': 0,
'reportId': reportId <= 0 ? null : reportId,
@@ -4313,12 +4519,14 @@ https://github.com/Tencent/APIJSON/issues
'Script:pre': {
'ahead': 1,
// 'testAccountId': 0,
+ 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
'documentId@': '/Document/id',
'@order': 'date-'
},
'Script:post': {
'ahead': 0,
// 'testAccountId': 0,
+ 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
'documentId@': '/Document/id',
'@order': 'date-'
}
@@ -5042,6 +5250,9 @@ https://github.com/Tencent/APIJSON/issues
App.onClickAccount(App.currentAccountIndex, item) //自动登录测试账号
if (user.id > 0) {
+ if (App.chainShowType != 1 && App.chainPaths.length <= 0 && App.chainGroups.length <= 0) {
+ App.selectChainGroup(-1, null)
+ }
if (App.caseShowType != 1 && App.casePaths.length <= 0 && App.caseGroups.length <= 0) {
App.selectCaseGroup(-1, null)
}
@@ -6488,6 +6699,115 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
return
}
+ if (type == 'chainGroupAdd' || type == 'chainGroup') {
+ var isAdd = type == 'chainGroupAdd'
+ var groupName = item == null ? null : item.groupName
+ if (StringUtil.isEmpty(groupName)) {
+ alert('请输入名称!')
+ return
+ }
+
+ var groupId = item == null ? null : item.groupId
+ if (groupId == null || groupId <= 0) {
+ if (! isAdd) {
+ alert('请选择有效的列表项!')
+ return
+ }
+
+ groupId = new Date().getTime()
+ }
+
+ //修改 Document
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + (isAdd ? '/post' : '/put'), {
+ Chain: {
+ 'groupName': groupName,
+ 'groupId': isAdd ? groupId : null,
+ 'groupId{}': isAdd ? null : [groupId]
+ },
+ tag: 'Chain-group'
+ }, {}, function (url, res, err) {
+ App.onResponse(url, res, err)
+ var isOk = JSONResponse.isSuccess(res.data)
+
+ var msg = isOk ? '' : ('\nmsg: ' + StringUtil.get((res.data || {}).msg))
+ if (err != null) {
+ msg += '\nerr: ' + err.msg
+ }
+ alert((isAdd ? '新增' : '修改') + (isOk ? '成功' : '失败') + (isAdd ? '! \n' :'！\ngroupId: ' + groupId) + '\ngroupName: ' + groupName + '\n' + msg)
+
+ App.isCaseGroupEditable = ! isOk
+ })
+
+ return
+ }
+
+ if (type == 'chainAdd') {
+ var groupName = item == null ? null : item.groupName
+ if (StringUtil.isEmpty(groupName)) {
+ alert('请输入名称!')
+ return
+ }
+
+ var search = StringUtil.isEmpty(groupName, true) ? null : '%' + StringUtil.trim(groupName).replaceAll('_', '\\_').replaceAll('%', '\\%') + '%'
+ var methods = this.methods
+ var types = this.types
+
+ //修改 Document
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/get', {
+ format: false,
+ 'Document[]': {
+ 'count': 100, //200 条测试直接卡死 0,
+ 'page': 0,
+ 'Document': {
+ '@column': 'id,userId,version,date,name,operation,method,type,url,request,apijson',
+ '@order': 'version-,date-',
+ 'userId': this.User.id,
+ 'name$': search,
+ 'operation$': search,
+ 'url$': search,
+ // 'group{}': group == null || StringUtil.isNotEmpty(groupUrl) ? null : 'length(group)<=0',
+ // 'group{}': group == null ? null : (group.groupName == null ? "=null" : [group.groupName]),
+ '@combine': search == null ? null : 'name$,operation$,url$',
+ 'method{}': methods == null || methods.length <= 0 ? null : methods,
+ 'type{}': types == null || types.length <= 0 ? null : types,
+ '@null': 'sqlauto', //'sqlauto{}': '=null'
+ // '@having': StringUtil.isEmpty(groupUrl) ? null : "substring_index(substr,'/',1)<0"
+ }
+ }
+ }, {}, function (url, res, err) {
+ App.onResponse(url, res, err)
+ var isOk = JSONResponse.isSuccess(res.data)
+
+ var msg = isOk ? '' : ('\nmsg: ' + StringUtil.get((res.data || {}).msg))
+ if (err != null) {
+ msg += '\nerr: ' + err.msg
+ }
+ if (! isOk) {
+ alert(isOk ? '选择右侧接口来添加' : '查询失败！\ngroupName: ' + groupName + '\n' + msg)
+ } else {
+ var list = res.data['Document[]'] || []
+ var options = []
+ for (var i = 0; i < list.length; i ++) {
+ var item = list[i] || {}
+ options.push({
+ name: '[' + item.method + '] [' + item.type + '] ' + item.name + ' ' + item.url,
+ // type: stringType,
+ value: item,
+ }
+ )
+ }
+
+ App.options = options
+ document.activeElement = vOption // vChainAdd.focusout()
+ vOption.focus()
+ // App.showOptions(target, text, before, after);
+ }
+
+ })
+
+ return
+ }
+
if (type == 'caseGroup') {
var groupUrl = item == null ? null : item.groupUrl
var rawName = item == null ? null : item.rawName
@@ -6643,15 +6963,34 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
},
onFilterChange: function(type) {
type = type || ''
- if (type == 'testCase' || type == 'caseGroup') {
- var index = this.casePaths.length - 1
- var group = this.casePaths[index]
+ if (type == 'testCase' || type == 'caseGroup' || type == 'chainGroup') {
+ var isChainShow = this.isChainShow
+ var paths = isChainShow ? this.chainPaths : this.casePaths
+ var index = paths.length - 1
+ var group = paths[index]
+ var groupId = group == null ? 0 : (group.groupId || 0)
var groupUrl = group == null ? '' : (group.groupUrl || '')
+ var groupKey = isChainShow ? groupId + '' : groupUrl
- if (type == 'caseGroup') {
- this.caseGroupPages[groupUrl] = this.caseGroupPage
- this.caseGroupCounts[groupUrl] = this.caseGroupCount
- this.caseGroupSearches[groupUrl] = this.caseGroupSearch
+ if (type == 'chainGroup') {
+ this.chainGroupPages[groupKey] = this.chainGroupPage
+ this.chainGroupCounts[groupKey] = this.chainGroupCount
+ this.chainGroupSearches[groupKey] = this.chainGroupSearch
+ if (index < 0) {
+ this.saveCache(this.server, 'chainGroupPage', this.chainGroupPage)
+ this.saveCache(this.server, 'chainGroupCount', this.chainGroupCount)
+ // this.saveCache(this.server, 'chainGroupSearch', this.chainGroupSearch)
+ }
+ this.saveCache(this.server, 'chainGroupPages', this.chainGroupPages)
+ this.saveCache(this.server, 'chainGroupCounts', this.chainGroupCounts)
+ // this.saveCache(this.server, 'chainGroupSearches', this.chainGroupSearches)
+
+ this.selectChainGroup()
+ }
+ else if (type == 'caseGroup') {
+ this.caseGroupPages[groupKey] = this.caseGroupPage
+ this.caseGroupCounts[groupKey] = this.caseGroupCount
+ this.caseGroupSearches[groupKey] = this.caseGroupSearch
if (index < 0) {
this.saveCache(this.server, 'caseGroupPage', this.caseGroupPage)
this.saveCache(this.server, 'caseGroupCount', this.caseGroupCount)
@@ -6664,9 +7003,9 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.selectCaseGroup()
}
else {
- this.testCasePages[groupUrl] = this.testCasePage
- this.testCaseCounts[groupUrl] = this.testCaseCount
- this.testCaseSearches[groupUrl] = this.testCaseSearch
+ this.testCasePages[groupKey] = this.testCasePage
+ this.testCaseCounts[groupKey] = this.testCaseCount
+ this.testCaseSearches[groupKey] = this.testCaseSearch
if (index < 0) {
this.saveCache(this.server, 'testCasePage', this.testCasePage)
@@ -11614,7 +11953,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
// alert(event.key) 小写字母 i 而不是 KeyI
var target = event.target;
- if (target == vSearch || target == vTestCaseSearch || target == vCaseGroupSearch) {
+ if (target == vSearch || target == vTestCaseSearch || target == vCaseGroupSearch || target == vChainGroupSearch || target == vChainGroupAdd || target == vChainAdd) {
return
}
From 0aab24df03cc62129c598a4de756eb72d03fff4b Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 27 Apr 2024 21:47:44 +0800
Subject: [PATCH 787/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=EF=BC=9A=E4=BC=98=E5=8C=96=E4=BA=A4=E4=BA=92?=
=?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AD=90=E7=94=A8=E4=BE=8B=E4=B8=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 2 +-
js/main.js | 72 ++++++++++++++++++++++++++++++++++--------------------
2 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/index.html b/index.html
index d0592fd..5779f69 100755
--- a/index.html
+++ b/index.html
@@ -221,7 +221,7 @@
diff --git a/js/main.js b/js/main.js
index 5ef7cb7..125c67d 100755
--- a/js/main.js
+++ b/js/main.js
@@ -4114,10 +4114,10 @@ https://github.com/Tencent/APIJSON/issues
this.selectChainGroup(0, path)
},
isChainGroupShow: function () {
- return this.chainShowType != 1 && (this.chainGroups.length > 0 || this.chainPaths.length <= 0)
+ return true // this.chainShowType != 1 && (this.chainGroups.length > 0) // || this.chainPaths.length <= 0)
},
isChainItemShow: function () {
- return this.chainShowType != 2 || (this.chainGroups.length <= 0 && this.chainPaths.length > 0)
+ return true // this.chainShowType != 2 || (this.chainGroups.length <= 0 && this.chainPaths.length > 0)
},
selectChainGroup: function (index, group) {
this.currentChainGroupIndex = index
@@ -4134,9 +4134,11 @@ https://github.com/Tencent/APIJSON/issues
this.chainPaths.push(group)
}
+// this.casePaths = this.chainPaths
+
var groupId = group == null ? 0 : group.groupId
- if (group != null && groupId == 0) {
- this.chainGroups = []
+ if (groupId != null && groupId > 0) { // group != null && groupId == 0) {
+// this.chainGroups = []
this.remotes = App.testCases = []
this.showTestCase(true, false, null)
return
@@ -4156,9 +4158,11 @@ https://github.com/Tencent/APIJSON/issues
'Chain': {
'toGroupId': groupId,
'groupName$': search,
+// '@raw': '@column',
'@column': "groupId;any_value(groupName):groupName;count(*):count",
'@group': 'groupId',
'@order': 'groupId-',
+// 'documentId>': 0
}
},
'@role': IS_NODE ? null : 'LOGIN',
@@ -4193,6 +4197,11 @@ https://github.com/Tencent/APIJSON/issues
}
App.chainGroups = data['Chain[]'] || []
+ if (App.chainGroups.length > 0) {
+ App.currentChainGroupIndex = 0
+ App.chainPaths.push(App.chainGroups[0])
+ }
+
App.remotes = App.testCases = []
App.showTestCase(true, false, null)
})
@@ -4206,16 +4215,23 @@ https://github.com/Tencent/APIJSON/issues
}
var group = this.chainGroups[this.currentChainGroupIndex]
- if (id == null || id <= 0) {
+ if (group == null) {
+ var index = this.chainPaths.length - 1
+ group = this.chainPaths[index]
+ }
+ var groupId = group == null ? 0 : group.groupId
+ if (groupId == null || groupId <= 0) {
alert('请选择有效的场景串联用例分组！')
return
}
+ var groupName = group.groupName
+
var isAdd = true
this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/post', {
Chain: {
- 'groupName': group.groupName,
- 'groupId': group.groupId,
+ 'groupName': groupName,
+ 'groupId': groupId,
'documentId': item.id
},
tag: 'Chain'
@@ -4390,7 +4406,8 @@ https://github.com/Tencent/APIJSON/issues
onClickPathRoot: function () {
var isChainShow = this.isChainShow
- var paths = isChainShow ? this.chainPaths : this.casePaths
+// var paths = isChainShow ? this.chainPaths : this.casePaths
+ var paths = isChainShow ? [] : this.casePaths
if (paths.length <= 0) {
var type = this.groupShowType = (this.groupShowType + 1)%3
this.isChainShow = type == 1
@@ -4473,12 +4490,13 @@ https://github.com/Tencent/APIJSON/issues
'[]': {
'count': count || 100, //200 条测试直接卡死 0,
'page': page || 0,
- 'join': isChainShow ? '@/Document,@/Random' : '@/TestRecord,@/Script:pre,@/Script:post',
+ 'join': isChainShow ? '&/Document,@/Random' : '@/TestRecord,@/Script:pre,@/Script:post',
'Chain': isChainShow ? {
// TODO 后续再支持嵌套子组合 'toGroupId': groupId,
'groupId': groupId,
'@column': "id,groupId,documentId,randomId",
'@order': 'id+',
+ 'documentId>': 0
} : null,
'Document': {
'id@': isChainShow ? '/Chain/documentId' : null,
@@ -6784,25 +6802,27 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
if (! isOk) {
alert(isOk ? '选择右侧接口来添加' : '查询失败！\ngroupName: ' + groupName + '\n' + msg)
- } else {
- var list = res.data['Document[]'] || []
- var options = []
- for (var i = 0; i < list.length; i ++) {
- var item = list[i] || {}
- options.push({
- name: '[' + item.method + '] [' + item.type + '] ' + item.name + ' ' + item.url,
- // type: stringType,
- value: item,
- }
- )
- }
+ return
+ }
- App.options = options
- document.activeElement = vOption // vChainAdd.focusout()
- vOption.focus()
- // App.showOptions(target, text, before, after);
+ var list = res.data['Document[]'] || []
+ var options = []
+ for (var i = 0; i < list.length; i ++) {
+ var item = list[i] || {}
+ options.push({
+ name: '[' + item.method + '][' + item.type + ']', // + item.name + ' ' + item.url,
+ type: item.name,
+ comment: item.url,
+ value: item
+ }
+ )
}
+ App.options = options
+ document.activeElement = vOption // vChainAdd.focusout()
+ vOption.focus()
+ // App.showOptions(target, text, before, after);
+
})
return
@@ -6985,7 +7005,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.saveCache(this.server, 'chainGroupCounts', this.chainGroupCounts)
// this.saveCache(this.server, 'chainGroupSearches', this.chainGroupSearches)
- this.selectChainGroup()
+ this.selectChainGroup(-1, null)
}
else if (type == 'caseGroup') {
this.caseGroupPages[groupKey] = this.caseGroupPage
From 6018a7f6c41e84f0e1522e35bac2e9e032fef614 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 28 Apr 2024 00:24:04 +0800
Subject: [PATCH 788/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B5=8B=E8=AF=95=EF=BC=8C=E6=AF=8F=E4=B8=AA?=
=?UTF-8?q?=E5=88=86=E7=BB=84=E5=86=85=E7=94=A8=E4=BE=8B=E9=83=BD=E5=85=88?=
=?UTF-8?q?=E5=90=8E=E4=B8=B2=E8=81=94=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 4 +-
js/main.js | 152 ++++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 129 insertions(+), 27 deletions(-)
diff --git a/index.html b/index.html
index 5779f69..f1ec99d 100755
--- a/index.html
+++ b/index.html
@@ -220,8 +220,8 @@
diff --git a/js/main.js b/js/main.js
index 125c67d..3bfd986 100755
--- a/js/main.js
+++ b/js/main.js
@@ -4139,11 +4139,14 @@ https://github.com/Tencent/APIJSON/issues
var groupId = group == null ? 0 : group.groupId
if (groupId != null && groupId > 0) { // group != null && groupId == 0) {
// this.chainGroups = []
- this.remotes = App.testCases = []
- this.showTestCase(true, false, null)
+ this.remotes = this.testCases = (this.chainGroups[index] || {})['[]'] || []
+// this.showTestCase(true, false, null)
return
}
+ var isMLEnabled = this.isMLEnabled
+ var userId = this.User.id
+
var key = groupId + ''
var page = this.chainGroupPage = this.chainGroupPages[key] || 0
var count = this.chainGroupCount = this.chainGroupCounts[key] || 0
@@ -4152,7 +4155,7 @@ https://github.com/Tencent/APIJSON/issues
search = StringUtil.isEmpty(search, true) ? null : '%' + StringUtil.trim(search).replaceAll('_', '\\_').replaceAll('%', '\\%') + '%'
var req = {
format: false,
- 'Chain[]': {
+ '[]': {
'count': count || 0,
'page': page || 0,
'Chain': {
@@ -4163,7 +4166,68 @@ https://github.com/Tencent/APIJSON/issues
'@group': 'groupId',
'@order': 'groupId-',
// 'documentId>': 0
- }
+ },
+ '[]': {
+ 'count': 0, //200 条测试直接卡死 0,
+ 'page': 0,
+ 'join': '&/Document,@/Random',
+ 'Chain': {
+ // TODO 后续再支持嵌套子组合 'toGroupId': groupId,
+ 'groupId@': '[]/Chain/groupId',
+ '@column': "id,groupId,documentId,randomId",
+ '@order': 'id+',
+ 'documentId>': 0
+ },
+ 'Document': {
+ 'id@': '/Chain/documentId',
+ // '@column': 'id,userId,version,date,name,operation,method,type,url,request,apijson,standard', // ;substr(url,' + (StringUtil.length(groupUrl) + 2) + '):substr',
+ '@order': 'version-,date-',
+ 'userId': userId,
+ 'name$': search,
+ 'operation$': search,
+ 'url$': search,
+ // 'group{}': group == null || StringUtil.isNotEmpty(groupUrl) ? null : 'length(group)<=0',
+ // 'group{}': group == null ? null : (group.groupName == null ? "=null" : [group.groupName]),
+ '@combine': search == null ? null : 'name$,operation$,url$',
+// 'method{}': methods == null || methods.length <= 0 ? null : methods,
+// 'type{}': types == null || types.length <= 0 ? null : types,
+ '@null': 'sqlauto', //'sqlauto{}': '=null'
+ // '@having': StringUtil.isEmpty(groupUrl) ? null : "substring_index(substr,'/',1)<0"
+ },
+ 'Random': {
+ 'id@': '/Chain/randomId',
+ 'toId': 0,
+// 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
+// 'documentId@': '/Document/documentId',
+ 'userId': userId
+ },
+ 'TestRecord': {
+ 'chainGroupId@': '/Chain/groupId',
+ 'documentId@': '/Document/id',
+ 'userId': userId,
+// 'testAccountId': this.getCurrentAccountId(),
+ 'randomId': 0,
+// 'reportId': reportId <= 0 ? null : reportId,
+// 'invalid': reportId == null ? 0 : null,
+ '@order': 'date-',
+ '@column': 'id,userId,documentId,testAccountId,reportId,duration,minDuration,maxDuration,response' + (this.isStatisticsEnabled ? ',compare' : '')+ (isMLEnabled ? ',standard' : ''),
+ 'standard{}': isMLEnabled ? (this.database == 'SQLSERVER' ? 'len(standard)>2' : 'length(standard)>2') : null //用 MySQL 5.6 '@having': this.isMLEnabled ? 'json_length(standard)>0' : null
+ },
+ 'Script:pre': {
+ 'ahead': 1,
+ // 'testAccountId': 0,
+ 'chainGroupId@': '/Chain/groupId',
+ 'documentId@': '/Document/id',
+ '@order': 'date-'
+ },
+ 'Script:post': {
+ 'ahead': 0,
+ // 'testAccountId': 0,
+ 'chainGroupId@': '/Chain/groupId',
+ 'documentId@': '/Document/id',
+ '@order': 'date-'
+ }
+ },
},
'@role': IS_NODE ? null : 'LOGIN',
key: IS_NODE ? this.key : undefined // 突破常规查询数量限制
@@ -4196,14 +4260,14 @@ https://github.com/Tencent/APIJSON/issues
return
}
- App.chainGroups = data['Chain[]'] || []
+ App.chainGroups = data['[]'] || []
if (App.chainGroups.length > 0) {
App.currentChainGroupIndex = 0
- App.chainPaths.push(App.chainGroups[0])
+ App.chainPaths.push((App.chainGroups[0] || {}).Chain)
}
- App.remotes = App.testCases = []
- App.showTestCase(true, false, null)
+ App.remotes = App.testCases = (App.chainGroups[0] || {})['[]'] || []
+// App.showTestCase(true, false, null)
})
},
@@ -4412,6 +4476,8 @@ https://github.com/Tencent/APIJSON/issues
var type = this.groupShowType = (this.groupShowType + 1)%3
this.isChainShow = type == 1
this.isLocalShow = type == 2
+
+ this.testCases = this.remotes = []
if (type == 1 && this.chainGroups.length <= 0) {
this.selectChainGroup(-1, null)
}
@@ -4419,7 +4485,6 @@ https://github.com/Tencent/APIJSON/issues
this.selectCaseGroup(-1, null)
}
else {
- this.testCases = this.remotes = []
this.showTestCase(true, this.isLocalShow)
}
}
@@ -4432,7 +4497,7 @@ https://github.com/Tencent/APIJSON/issues
},
//显示远程的测试用例文档
- showTestCase: function (show, isLocal, callback) {
+ showTestCase: function (show, isLocal, callback, group) {
this.isTestCaseShow = show
this.isLocalShow = isLocal
@@ -4469,7 +4534,7 @@ https://github.com/Tencent/APIJSON/issues
var isChainShow = this.isChainShow
var paths = isChainShow ? this.chainPaths : this.casePaths
var index = paths.length - 1
- var group = paths[index]
+ group = group != null ? group : paths[index]
var groupId = group == null ? 0 : (group.groupId || 0)
var groupUrl = group == null ? '' : (group.groupUrl || '')
var groupKey = isChainShow ? groupId + '' : groupUrl
@@ -9454,8 +9519,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
var accounts = this.accounts
var num = accounts == null ? 0 : accounts.length
- var remotes = this.remotes
- var total = remotes == null ? 0 : remotes.length
+ var cases = this.isChainShow ? this.chainGroups : this.remotes
+ var total = cases == null ? 0 : cases.length
var als = this.getAllSummary()
als = this.resetCount(als, false, false, num)
@@ -9553,8 +9618,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
// return
// }
- const list = (isRandom ? this.randoms : this.remotes) || []
- const allCount = list.length
+ const list = (isRandom ? this.randoms : (this.isChainShow ? this.chainGroups : this.remotes)) || []
+ var allCount = list.length
App.doneCount = 0
App.deepAllCount = 0
App.randomDoneCount = 0
@@ -9583,6 +9648,15 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
return
}
+ if (this.isChainShow) {
+ for (var i = 0; i < list.length; i++) {
+ var item = list[i]
+ var stepList = item['[]'] || []
+ var stepCount = stepList == null ? 0 : stepList.length
+ allCount += (stepCount - 1)
+ }
+ }
+
if (isCross) {
if (accountIndex < 0 && accounts[this.currentAccountIndex] != null) { //退出登录已登录的账号
accounts[this.currentAccountIndex].isLoggedIn = true
@@ -9603,6 +9677,16 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
},
+ startTestChain: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback) {
+ if (list == null || index == null || index >= list.length) {
+ return
+ }
+
+ this.startTestSingle(list, allCount, index, item, isRandom, accountIndex, isCross, function(url, res, err) {
+ App.startTestChain(list, allCount, index + 1, list[index + 1], isRandom, accountIndex, isCross, callback)
+ })
+ },
+
toTestDocIndexes: [],
startTest: function (list, allCount, isRandom, accountIndex, isCross, callback) {
@@ -9613,16 +9697,33 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.autoTestCallback(this.testProcess)
}
- const isMLEnabled = this.isMLEnabled
- const standardKey = isMLEnabled != true ? 'response' : 'standard'
+ var isChainShow = this.isChainShow
+
+ for (var i = 0; i < list.length; i++) {
+ const item = list[i]
+ if (isChainShow) {
+// this.showTestCase(true, false, function(url, res, err) {
+ var stepList = item['[]'] // res.data['[]']
+ var stepCount = stepList == null ? 0 : stepList.length
+ this.startTestChain(stepList, stepCount, 0, stepCount <= 0 ? null : stepList[0], isRandom, accountIndex, isCross, callback)
+// }, item)
+ continue
+ }
+
+ this.startTestSingle(list, allCount, i, item, isRandom, accountIndex, isCross, callback)
+ }
- const otherEnv = this.otherEnv;
- const otherBaseUrl = this.isEnvCompareEnabled && StringUtil.isNotEmpty(otherEnv, true) ? this.getBaseUrl(otherEnv) : null
- const isEnvCompare = StringUtil.isNotEmpty(otherBaseUrl, true) // 对比自己也行，看看前后两次是否幂等 && otherBaseUrl != baseUrl
+ },
- for (var i = 0; i < allCount; i++) {
+ startTestSingle: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback) {
try {
- const item = list[i]
+ const isMLEnabled = this.isMLEnabled
+ const standardKey = isMLEnabled != true ? 'response' : 'standard'
+
+ const otherEnv = this.otherEnv;
+ const otherBaseUrl = this.isEnvCompareEnabled && StringUtil.isNotEmpty(otherEnv, true) ? this.getBaseUrl(otherEnv) : null
+ const isEnvCompare = StringUtil.isNotEmpty(otherBaseUrl, true) // 对比自己也行，看看前后两次是否幂等 && otherBaseUrl != baseUrl
+
const document = item == null ? null : item.Document
if (document == null || document.name == null) {
if (isRandom) {
@@ -9630,7 +9731,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
} else {
App.doneCount ++
}
- continue
+
+ return
}
if (document.url == '/login' || document.url == '/logout') { //login会导致登录用户改变为默认的但UI上还显示原来的，单独测试OWNER权限时能通过很困惑
this.log('startTest document.url == "/login" || document.url == "/logout" >> continue')
@@ -9639,7 +9741,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
} else {
App.doneCount ++
}
- continue
+
+ return
}
if (DEBUG) {
@@ -9710,7 +9813,6 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
catch(e) {
this.compareResponse(null, allCount, list, index, item, null, isRandom, accountIndex, false, e, null, isCross, callback)
}
- }
},
From 4927ba0cabbfc12962b827b929a35a8ae3c884d1 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 2 May 2024 17:50:20 +0800
Subject: [PATCH 789/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E4=B8=B2=E8=81=94=E8=B0=83=E7=94=A8=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=96=AD=E8=A8=80=E7=BB=93=E6=9E=9C?=
=?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/js/main.js b/js/main.js
index 3bfd986..0681793 100755
--- a/js/main.js
+++ b/js/main.js
@@ -4114,10 +4114,10 @@ https://github.com/Tencent/APIJSON/issues
this.selectChainGroup(0, path)
},
isChainGroupShow: function () {
- return true // this.chainShowType != 1 && (this.chainGroups.length > 0) // || this.chainPaths.length <= 0)
+ return this.chainShowType != 1 && (this.chainGroups.length > 0) // || this.chainPaths.length <= 0)
},
isChainItemShow: function () {
- return true // this.chainShowType != 2 || (this.chainGroups.length <= 0 && this.chainPaths.length > 0)
+ return this.chainShowType != 2 || (this.chainGroups.length <= 0 && this.chainPaths.length > 0)
},
selectChainGroup: function (index, group) {
this.currentChainGroupIndex = index
@@ -4359,7 +4359,7 @@ https://github.com/Tencent/APIJSON/issues
if (group == null) {
if (index == null) {
index = this.casePaths.length - 1
- group = this.casePaths[index]
+ group = (this.casePaths[index] || {}).Chain
} else {
this.casePaths = []
}
@@ -9682,8 +9682,9 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
return
}
- this.startTestSingle(list, allCount, index, item, isRandom, accountIndex, isCross, function(url, res, err) {
- App.startTestChain(list, allCount, index + 1, list[index + 1], isRandom, accountIndex, isCross, callback)
+ this.startTestSingle(list, allCount, index, item, isRandom, accountIndex, isCross, callback
+ , function(res, allCount, list, index, response, cmp, isRandom, accountIndex, justRecoverTest, isCross) {
+ App.startTestChain(list, allCount, index + 1, list[index + 1], isRandom, accountIndex, isCross, callback)
})
},
@@ -9715,7 +9716,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
},
- startTestSingle: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback) {
+ startTestSingle: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback, singleCallback) {
try {
const isMLEnabled = this.isMLEnabled
const standardKey = isMLEnabled != true ? 'response' : 'standard'
@@ -9735,7 +9736,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
return
}
if (document.url == '/login' || document.url == '/logout') { //login会导致登录用户改变为默认的但UI上还显示原来的，单独测试OWNER权限时能通过很困惑
- this.log('startTest document.url == "/login" || document.url == "/logout" >> continue')
+ this.log('startTestSingle document.url == "/login" || document.url == "/logout" >> continue')
if (isRandom) {
App.randomDoneCount ++
} else {
@@ -9746,16 +9747,14 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
if (DEBUG) {
- this.log('test document = ' + JSON.stringify(document, null, ' '))
+ this.log('startTestSingle document = ' + JSON.stringify(document, null, ' '))
}
- const index = i
-
var hdr = null
try {
hdr = this.getHeader(document.header)
} catch (e) {
- this.log('test for ' + i + ' >> try { header = this.getHeader(document.header) } catch (e) { \n' + e.message)
+ this.log('startTestSingle try { header = this.getHeader(document.header) } catch (e) { \n' + e.message)
}
const header = hdr
@@ -9774,14 +9773,14 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
try {
App.onResponse(url, res, err)
if (DEBUG) {
- App.log('test App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
+ App.log('startTestSingle App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
}
} catch (e) {
- App.log('test App.request >> } catch (e) {\n' + e.message)
+ App.log('startTestSingle App.request >> } catch (e) {\n' + e.message)
}
if (isEnvCompare != true) {
- App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err, null, isCross, callback)
+ App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err, null, isCross, callback, singleCallback)
return
}
@@ -9799,24 +9798,24 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
try {
App.onResponse(url, res, err)
if (DEBUG) {
- App.log('test App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
+ App.log('startTestSingle App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
}
} catch (e) {
- App.log('test App.request >> } catch (e) {\n' + e.message)
+ App.log('startTestSingle App.request >> } catch (e) {\n' + e.message)
}
- App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err || otherErr, null, isCross, callback)
+ App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err || otherErr, null, isCross, callback, singleCallback)
}, caseScript)
}, caseScript)
}
catch(e) {
- this.compareResponse(null, allCount, list, index, item, null, isRandom, accountIndex, false, e, null, isCross, callback)
+ this.compareResponse(null, allCount, list, index, item, null, isRandom, accountIndex, false, e, null, isCross, callback, singleCallback)
}
},
- compareResponse: function (res, allCount, list, index, item, response, isRandom, accountIndex, justRecoverTest, err, ignoreTrend, isCross, callback) {
+ compareResponse: function (res, allCount, list, index, item, response, isRandom, accountIndex, justRecoverTest, err, ignoreTrend, isCross, callback, singleCallback) {
var it = item || {} //请求异步
var cri = this.currentRemoteItem || {} //请求异步
var d = (isRandom ? cri.Document : it.Document) || {} //请求异步
@@ -9871,10 +9870,10 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
tr.compare.duration = it.durationHint
}
- this.onTestResponse(res, allCount, list, index, it, d, r, tr, response, tr.compare || {}, isRandom, accountIndex, justRecoverTest, isCross, callback);
+ this.onTestResponse(res, allCount, list, index, it, d, r, tr, response, tr.compare || {}, isRandom, accountIndex, justRecoverTest, isCross, callback, singleCallback);
},
- onTestResponse: function(res, allCount, list, index, it, d, r, tr, response, cmp, isRandom, accountIndex, justRecoverTest, isCross, callback) {
+ onTestResponse: function(res, allCount, list, index, it, d, r, tr, response, cmp, isRandom, accountIndex, justRecoverTest, isCross, callback, singleCallback) {
tr = tr || {}
cmp = cmp || {}
tr.compare = cmp
@@ -9995,6 +9994,10 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
// this.showTestCase(true)
+ if (singleCallback != null && singleCallback(res, allCount, list, index, response, cmp, isRandom, accountIndex, justRecoverTest, isCross)) {
+ return
+ }
+
if (doneCount >= allCount) { // 导致不继续测试 App.doneCount == allCount) {
if (callback != null && callback(isRandom, allCount)) {
return
@@ -10004,7 +10007,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const deepAllCount = this.toTestDocIndexes == null ? 0 : this.toTestDocIndexes.length
App.deepAllCount = deepAllCount
- if (isRandom != true && deepAllCount > 0) { // 自动给非 红色 报错的接口跑参数注入
+ if (isRandom != true && deepAllCount > 0 && ! this.isChainShow) { // 自动给非 红色 报错的接口跑参数注入
App.deepDoneCount = 0;
this.startRandomTest4Doc(list, this.toTestDocIndexes, 0, deepAllCount, accountIndex, isCross)
} else if (isCross && doneCount == allCount && accountIndex <= this.accounts.length) {
From e5560513a0e1e0a9c2bfd95f3f74f6c88f629d0e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 2 May 2024 21:07:51 +0800
Subject: [PATCH 790/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8F=82=E6=95=B0=E6=B3=A8=E5=85=A5=EF=BC=9B?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B3=A8=E5=85=A5=EF=BC=9A=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=20id:=20PRE=5FDATA('[]/0/User/id')=20?=
=?UTF-8?q?=E6=8F=90=E5=8F=96=E4=B8=8A=E4=B8=AA=E6=8E=A5=E5=8F=A3=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONResponse.js | 48 +++++++
js/main.js | 294 +++++++++++++++++++++++++++++-----------
2 files changed, 261 insertions(+), 81 deletions(-)
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index 64e1910..7560963 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -1559,6 +1559,54 @@ var JSONResponse = {
return target;
},
+ /**根据 APIJSON 引用赋值路径精准地获取值
+ */
+ getValByPath: function(target, pathKeys) {
+ if (target == null) {
+ return null;
+ }
+
+ var tgt = target;
+ var depth = pathKeys == null ? 0 : pathKeys.length
+ if (depth <= 0) {
+ return target;
+ }
+
+ for (var i = 0; i < depth; i ++) {
+ if (tgt == null) {
+ return null;
+ }
+
+ var k = pathKeys[i];
+ if (k == null) {
+ return null;
+ }
+
+ if (tgt instanceof Object) {
+ if (k == '') {
+ if (tgt instanceof Array) {
+ k = 0;
+ } else {
+ ks = Object.keys(tgt);
+ k = ks == null ? null : ks[0];
+ if (k == null) {
+ return null;
+ }
+ }
+ }
+
+ tgt = tgt[k];
+
+ continue;
+ }
+
+ return null;
+ }
+
+ return tgt;
+ },
+
+
/**根据路径精准地更新测试标准中的键值对
*/
getStandardByPath: function(target, pathKeys) {
diff --git a/js/main.js b/js/main.js
index 0681793..93f0e99 100755
--- a/js/main.js
+++ b/js/main.js
@@ -610,6 +610,26 @@ https://github.com/Tencent/APIJSON/issues
, 'content-type', 'date', 'keep-alive', 'proxy-connection', 'set-cookie', 'vary', 'accept', 'cache-control', 'dnt'
, 'host', 'origin', 'pragma', 'referer', 'user-agent']
+ var PRE = 'PRE' // PRE()
+ var CUR = 'CUR' // CUR()
+ var NEXT = 'NEXT' // NEXT()
+
+ var PRE_REQ = 'PRE_REQ' // PRE_REQ('[]/page')
+ var PRE_ARG = 'PRE_ARG' // PRE_ARG('[]/page')
+ var PRE_RES = 'PRE_RES' // PRE_RES('[]/0/User/id')
+ var PRE_DATA = 'PRE_DATA' // PRE_DATA('[]/0/User/id')
+ var PRE_EXT = 'PRE_EXT' // PRE_EXT('key')
+ var CUR_REQ = 'CUR_REQ' // CUR_REQ('User/id')
+ var CUR_ARG = 'CUR_ARG' // CUR_REQ('User/id')
+ var CUR_PUT = 'CUR_PUT' // CUR_PUT('key', val)
+
+ function get4Path(obj, path) {
+ if (StringUtil.isEmpty(path, false)) {
+ return obj
+ }
+ return JSONResponse.getValByPath(obj, StringUtil.split(path, '/'), true)
+ }
+
var RANDOM_DB = 'RANDOM_DB'
var RANDOM_IN = 'RANDOM_IN'
var RANDOM_INT = 'RANDOM_INT'
@@ -2171,7 +2191,9 @@ https://github.com/Tencent/APIJSON/issues
var scripts = item.scripts
if (isRemote) {
- var orginItem = item
+ var originItem = item
+ item.random = (originItem.Random || {}).config
+
doc = item.Document || {}
docId = doc.id || 0
@@ -2207,7 +2229,7 @@ https://github.com/Tencent/APIJSON/issues
}
// var scripts = item.scripts || {}
- var scripts = orginItem.scripts || {}
+ var scripts = originItem.scripts || {}
// var ss = scripts.case
// if (ss == null) {
// scripts.case = ss = {}
@@ -2222,15 +2244,15 @@ https://github.com/Tencent/APIJSON/issues
var pre = rpObj['Script:pre']
if (pre != null && pre.script != null) {
- bs.pre = orginItem['Script:pre'] = rpObj['Script:pre']
+ bs.pre = originItem['Script:pre'] = rpObj['Script:pre']
}
var post = rpObj['Script:post']
if (post != null && post.script != null) {
- bs.post = orginItem['Script:post'] = rpObj['Script:post']
+ bs.post = originItem['Script:post'] = rpObj['Script:post']
}
- orginItem.scripts = scripts
+ originItem.scripts = scripts
App.changeScriptType(App.scriptType)
App.scripts.case[docId] = scripts
@@ -2446,9 +2468,12 @@ https://github.com/Tencent/APIJSON/issues
const isExportRandom = this.isExportRandom
const isExportScript = this.isExportScript
+ const cri = this.currentRemoteItem || {}
+ const chain = cri.Chain || {}
const currentAccountId = this.getCurrentAccountId()
- const doc = (this.currentRemoteItem || {}).Document || {}
- const tr = (this.currentRemoteItem || {}).TestRecord || {}
+ const doc = cri.Document || {}
+ const tr = cri.TestRecord || {}
+ const cgId = chain.groupId
const did = isExportRandom && btnIndex == 1 ? null : doc.id
if (isExportScript) {
@@ -2671,12 +2696,14 @@ https://github.com/Tencent/APIJSON/issues
format: false,
'Random': {
toId: 0,
+ chainGroupId: cgId,
documentId: did,
count: App.requestCount,
name: App.exTxt.name,
config: config
},
'TestRecord': {
+ 'chainGroupId': cgId,
'response': rawRspStr,
'standard': isML ? JSON.stringify(stddObj) : null
},
@@ -2686,6 +2713,7 @@ https://github.com/Tencent/APIJSON/issues
'Document': isEditResponse ? null : {
'id': did == null ? undefined : did,
// 'testAccountId': currentAccountId,
+// 'chainGroupId': cgId,
'operation': CodeUtil.getOperation(path, reqObj),
'name': extName,
'method': method,
@@ -2698,6 +2726,7 @@ https://github.com/Tencent/APIJSON/issues
'detail': App.getExtraComment() || ((App.currentRemoteItem || {}).Document || {}).detail,
},
'TestRecord': isEditResponse != true && did != null ? null : {
+// 'chainGroupId': cgId,
'documentId': isEditResponse ? did : undefined,
'randomId': 0,
'host': baseUrl,
@@ -4170,7 +4199,7 @@ https://github.com/Tencent/APIJSON/issues
'[]': {
'count': 0, //200 条测试直接卡死 0,
'page': 0,
- 'join': '&/Document,@/Random',
+ 'join': '&/Document',
'Chain': {
// TODO 后续再支持嵌套子组合 'toGroupId': groupId,
'groupId@': '[]/Chain/groupId',
@@ -4195,10 +4224,10 @@ https://github.com/Tencent/APIJSON/issues
// '@having': StringUtil.isEmpty(groupUrl) ? null : "substring_index(substr,'/',1)<0"
},
'Random': {
- 'id@': '/Chain/randomId',
+// 'id@': '/Chain/randomId',
'toId': 0,
-// 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
-// 'documentId@': '/Document/documentId',
+ 'chainGroupId@': '/Chain/groupId',
+ 'documentId@': '/Document/id',
'userId': userId
},
'TestRecord': {
@@ -9121,11 +9150,11 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
* @param show
* @param callback
*/
- parseRandom: function (json, config, randomId, generateJSON, generateConfig, generateName, callback, preScript) {
+ parseRandom: function (json, config, randomId, generateJSON, generateConfig, generateName, callback, preScript, ctx) {
var lines = config == null ? null : config.trim().split('\n')
if (lines == null || lines.length <= 0) {
// return null;
- callback(null, null, null);
+ callback('', '', json);
return
}
json = json || {};
@@ -9419,42 +9448,68 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
) + ', ' + value.substring(start + 1);
}
else { //随机函数
- fun = funWithOrder; //还原，其它函数不支持 升降序和跨步！
-
- if (fun == RANDOM_DB) {
- request4Db(JSONResponse.getTableName(pathKeys[pathKeys.length - 2]), which, p_k, pathKeys, key, lastKeyInPath, true); //'random()');
- continue;
- }
-
- if (fun == RANDOM_IN) {
- toEval = 'randomIn' + value.substring(start);
- }
- else if (fun == RANDOM_INT) {
- toEval = 'randomInt' + value.substring(start);
+ if (fun == PRE_REQ) {
+ toEval = 'get4Path(((ctx || {}).pre || {}).req, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_NUM) {
- toEval = 'randomNum' + value.substring(start);
+ else if (fun == PRE_ARG) {
+ toEval = 'get4Path(((ctx || {}).pre || {}).arg, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_STR) {
- toEval = 'randomStr' + value.substring(start);
+ else if (fun == PRE_RES) {
+ toEval = 'get4Path(((ctx || {}).pre || {}).res, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_BAD) {
- toEval = 'randomBad' + value.substring(start);
+ else if (fun == PRE_DATA) {
+ toEval = 'get4Path(((ctx || {}).pre || {}).data, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_BAD_BOOL) {
- toEval = 'randomBadBool' + value.substring(start);
+ else if (fun == PRE_EXT) {
+ toEval = 'get4Path(((ctx || {}).pre || {}).ext, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_BAD_NUM) {
- toEval = 'randomBadNum' + value.substring(start);
+ else if (fun == CUR_REQ) {
+ toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_BAD_STR) {
- toEval = 'randomBadStr' + value.substring(start);
+ else if (fun == CUR_ARG) {
+ toEval = 'get4Path(((ctx || {}).cur || {}).arg, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_BAD_ARR) {
- toEval = 'randomBadArr' + value.substring(start);
+ else if (fun == CUR_PUT) {
+ toEval = 'put4Path(((ctx || {}).cur || {}).ctx, ' + value.substring(start + 1);
}
- else if (fun == RANDOM_BAD_OBJ) {
- toEval = 'randomBadObj' + value.substring(start);
+ else {
+ fun = funWithOrder; //还原，其它函数不支持 升降序和跨步！
+
+ if (fun == RANDOM_DB) {
+ request4Db(JSONResponse.getTableName(pathKeys[pathKeys.length - 2]), which, p_k, pathKeys, key, lastKeyInPath, true); //'random()');
+ continue;
+ }
+
+ if (fun == RANDOM_IN) {
+ toEval = 'randomIn' + value.substring(start);
+ }
+ else if (fun == RANDOM_INT) {
+ toEval = 'randomInt' + value.substring(start);
+ }
+ else if (fun == RANDOM_NUM) {
+ toEval = 'randomNum' + value.substring(start);
+ }
+ else if (fun == RANDOM_STR) {
+ toEval = 'randomStr' + value.substring(start);
+ }
+ else if (fun == RANDOM_BAD) {
+ toEval = 'randomBad' + value.substring(start);
+ }
+ else if (fun == RANDOM_BAD_BOOL) {
+ toEval = 'randomBadBool' + value.substring(start);
+ }
+ else if (fun == RANDOM_BAD_NUM) {
+ toEval = 'randomBadNum' + value.substring(start);
+ }
+ else if (fun == RANDOM_BAD_STR) {
+ toEval = 'randomBadStr' + value.substring(start);
+ }
+ else if (fun == RANDOM_BAD_ARR) {
+ toEval = 'randomBadArr' + value.substring(start);
+ }
+ else if (fun == RANDOM_BAD_OBJ) {
+ toEval = 'randomBadObj' + value.substring(start);
+ }
}
}
@@ -9677,15 +9732,49 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
},
- startTestChain: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback) {
+ startTestChain: function (list, allCount, index, item, prev, ctx, isRandom, accountIndex, isCross, callback) {
if (list == null || index == null || index >= list.length) {
return
}
- this.startTestSingle(list, allCount, index, item, isRandom, accountIndex, isCross, callback
- , function(res, allCount, list, index, response, cmp, isRandom, accountIndex, justRecoverTest, isCross) {
- App.startTestChain(list, allCount, index + 1, list[index + 1], isRandom, accountIndex, isCross, callback)
- })
+ var cur = item = item || {}
+ cur.index = index
+// item.pre = pre // list[index - 1]
+
+ var doc = item.Document || {}
+ var method = cur.method = doc.method
+ var type = cur.type = doc.type
+ var url = cur.url = doc.url
+ var json = cur.arg = this.getRequest(doc.request, {})
+ var req = cur.req = {
+ method: method,
+ url: url,
+ header: doc.header,
+ data: json
+ }
+ var header = cur.header = doc.header
+//
+// this.parseRandom(json, rawConfig, random.id, true, false, function (randomName, constConfig, constJson) {
+ this.startTestSingle(list, allCount, index, item, isRandom, accountIndex, isCross, callback
+ , function(res, allCount, list, index, response, cmp, isRandom, accountIndex, justRecoverTest, isCross) {
+
+ res = res || {}
+ var config = res.config || {}
+ cur.arg = App.getRequest(config.data || config.params, {})
+ cur.req = {
+ method: method,
+ url: config.url,
+ header: config.header,
+ arg: cur.arg
+ }
+ cur.status = res.status
+ cur.statusText = res.statusText
+ cur.res = res
+ cur.data = res.data
+ App.startTestChain(list, allCount, index + 1, list[index + 1], item, ctx, isRandom, accountIndex, isCross, callback)
+ })
+ return true
+// })
},
toTestDocIndexes: [],
@@ -9706,7 +9795,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
// this.showTestCase(true, false, function(url, res, err) {
var stepList = item['[]'] // res.data['[]']
var stepCount = stepList == null ? 0 : stepList.length
- this.startTestChain(stepList, stepCount, 0, stepCount <= 0 ? null : stepList[0], isRandom, accountIndex, isCross, callback)
+ this.startTestChain(stepList, stepCount, 0, stepCount <= 0 ? null : stepList[0], null, { Chain: item }, isRandom, accountIndex, isCross, callback)
// }, item)
continue
}
@@ -9768,46 +9857,57 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const req = this.getRequest(document.request, null, true)
const otherEnvUrl = isEnvCompare ? (otherBaseUrl + document.url) : null
const curEnvUrl = baseUrl + document.url
+ const cur = item
+ const pre = list[index - 1] || {} // item.pre = item.pre || list[index - 1] || {}
+ const ctx = item.ctx = item.ctx || {}
- this.request(false, method, type, isEnvCompare ? otherEnvUrl : curEnvUrl, req, header, function (url, res, err) {
- try {
- App.onResponse(url, res, err)
- if (DEBUG) {
- App.log('startTestSingle App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
- }
- } catch (e) {
- App.log('startTestSingle App.request >> } catch (e) {\n' + e.message)
- }
-
- if (isEnvCompare != true) {
- App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err, null, isCross, callback, singleCallback)
- return
- }
+ var random = item.Random || {}
+ this.parseRandom(req, random.config, random.id, true, false, false, function(randomName, constConfig, constJson) {
+ App.request(false, method, type, isEnvCompare ? otherEnvUrl : curEnvUrl, constJson, header, function (url, res, err) {
+ try {
+ App.onResponse(url, res, err)
+ if (DEBUG) {
+ App.log('startTestSingle App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
+ }
+ } catch (e) {
+ App.log('startTestSingle App.request >> } catch (e) {\n' + e.message)
+ }
- const otherErr = err
- const rsp = App.removeDebugInfo(res.data)
- const rspStr = JSON.stringify(rsp)
- const tr = item.TestRecord || {}
- if (isMLEnabled) {
- tr.response = rspStr
- }
- tr[standardKey] = isMLEnabled ? JSON.stringify(JSONResponse.updateFullStandard({}, rsp, isMLEnabled)) : rspStr // res.data
- item.TestRecord = tr
+ if (isEnvCompare != true) {
+ App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err, null, isCross, callback, singleCallback)
+ return
+ }
- App.request(false, method, type, curEnvUrl, req, header, function (url, res, err) {
- try {
- App.onResponse(url, res, err)
- if (DEBUG) {
- App.log('startTestSingle App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
+ const otherErr = err
+ const rsp = App.removeDebugInfo(res.data)
+ const rspStr = JSON.stringify(rsp)
+ const tr = item.TestRecord || {}
+ if (isMLEnabled) {
+ tr.response = rspStr
}
- } catch (e) {
- App.log('startTestSingle App.request >> } catch (e) {\n' + e.message)
- }
+ tr[standardKey] = isMLEnabled ? JSON.stringify(JSONResponse.updateFullStandard({}, rsp, isMLEnabled)) : rspStr // res.data
+ item.TestRecord = tr
- App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err || otherErr, null, isCross, callback, singleCallback)
- }, caseScript)
+ App.request(false, method, type, curEnvUrl, constJson, header, function (url, res, err) {
+ try {
+ App.onResponse(url, res, err)
+ if (DEBUG) {
+ App.log('startTestSingle App.request >> res.data = ' + JSON.stringify(res.data, null, ' '))
+ }
+ } catch (e) {
+ App.log('startTestSingle App.request >> } catch (e) {\n' + e.message)
+ }
- }, caseScript)
+ App.compareResponse(res, allCount, list, index, item, res.data, isRandom, accountIndex, false, err || otherErr, null, isCross, callback, singleCallback)
+ }, caseScript)
+
+ }, caseScript)
+ }, caseScript.pre, {
+ index: index,
+ cur: cur,
+ pre: pre,
+ ctx: ctx
+ })
}
catch(e) {
this.compareResponse(null, allCount, list, index, item, null, isRandom, accountIndex, false, e, null, isCross, callback, singleCallback)
@@ -10616,6 +10716,9 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const isNewRandom = isRandom && random.id <= 0
const userId = this.User.id
+ const cri = this.currentRemoteItem || {}
+ const chain = cri.Chain || {}
+ const cgId = chain.groupId
//TODO 先检查是否有重复名称的！让用户确认！
// if (isML != true) {
@@ -10624,6 +10727,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
Random: isNewRandom != true ? null : {
toId: random.toId,
userId: userId,
+ chainGroupId: cgId,
documentId: random.documentId,
name: random.name,
count: random.count,
@@ -10635,12 +10739,14 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
host: this.getBaseUrl(),
userId: userId,
testAccountId: this.getCurrentAccountId(),
+ chainGroupId: cgId,
duration: item.duration,
minDuration: minDuration,
maxDuration: maxDuration,
compare: JSON.stringify(testRecord.compare || {}),
}) : {
userId: userId,
+ chainGroupId: cgId,
documentId: isNewRandom ? null : (isRandom ? random.documentId : document.id),
randomId: isRandom && ! isNewRandom ? random.id : null,
reportId: this.reportId,
@@ -11209,6 +11315,32 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
name: "Math.round(100*Math.random())", type: stringType, comment: '自定义代码'
}
]
+
+ if (App.isChainShow) {
+ App.options = [
+ {
+ name: "PRE_RES('[]/0/User/id')",
+ type: stringType,
+ comment: "从上个请求的返回结果中取值 function(path:String)"
+ }, {
+ name: "PRE_REQ('[]/page')",
+ type: stringType,
+ comment: "从上个请求的参数中取值 function(path:String)"
+ }, {
+ name: "PRE_EXT('isMale')",
+ type: stringType,
+ comment: "从上个请求的扩展对象中取值 function(path:String)"
+ }, {
+ name: "CUR_REQ('[]/count')",
+ type: stringType,
+ comment: "从当前请求的参数中取值 function(path:String)"
+ }, {
+ name: "CUR_PUT('isMale', true)",
+ type: stringType,
+ comment: "在当前请求的扩展对象中存放键值对 function(path:String, val:Any)"
+ }
+ ].concat(App.options || [])
+ }
}
else {
App.options.push({
From df4e8fbc44ee6463c873133fa8f3ae57a97a99e0 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 3 May 2024 01:51:35 +0800
Subject: [PATCH 791/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=EF=BC=9APRE=5FDATA=20=E7=AD=89=E6=8F=90?=
=?UTF-8?q?=E5=8F=96=E5=80=BC=E5=87=BD=E6=95=B0=E6=94=AF=E6=8C=81=E7=9C=81?=
=?UTF-8?q?=E7=95=A5=E8=B7=AF=E5=BE=84=EF=BC=8C=E5=85=B6=E4=B8=AD=E6=95=B0?=
=?UTF-8?q?=E7=BB=84=E4=B8=8B=E6=A0=87=E6=94=AF=E6=8C=81=20-1=20=E8=BF=99?=
=?UTF-8?q?=E7=A7=8D=E8=B4=9F=E6=95=B0=E6=9D=A5=E5=80=92=E5=BA=8F=E6=9F=A5?=
=?UTF-8?q?=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONResponse.js | 31 +++++++++++++++++++++++++------
js/main.js | 31 ++++++++++++++++---------------
2 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index 7560963..2493b0a 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -1581,6 +1581,7 @@ var JSONResponse = {
if (k == null) {
return null;
}
+ k = decodeURI(k)
if (tgt instanceof Object) {
if (k == '') {
@@ -1594,11 +1595,26 @@ var JSONResponse = {
}
}
}
+ else {
+ k = decodeURI(k)
+ if (tgt instanceof Array) {
+ try {
+ var n = Number.parseInt(k);
+ if (Number.isSafeInteger(n)) {
+ k = n > 0 ? n : n + tgt.length;
+ }
+ } catch (e) {
+ }
+ }
+ }
tgt = tgt[k];
continue;
}
+ else {
+ throw new Error('getValByPath 语法错误，' + k + ': value 中 value 类型应该是 Object 或 Array ！');
+ }
return null;
}
@@ -1638,12 +1654,15 @@ var JSONResponse = {
k = 0;
}
else {
- try {
- var n = Number.parseInt(k);
- if (Number.isSafeInteger(n)) {
- k = 0;
- }
- } catch (e) {
+ k = decodeURI(k)
+ if (tgt instanceof Array) {
+ try {
+ var n = Number.parseInt(k);
+ if (Number.isSafeInteger(n)) {
+ k = n > 0 ? n : n + tgt.length;
+ }
+ } catch (e) {
+ }
}
}
diff --git a/js/main.js b/js/main.js
index 93f0e99..977512a 100755
--- a/js/main.js
+++ b/js/main.js
@@ -623,11 +623,12 @@ https://github.com/Tencent/APIJSON/issues
var CUR_ARG = 'CUR_ARG' // CUR_REQ('User/id')
var CUR_PUT = 'CUR_PUT' // CUR_PUT('key', val)
- function get4Path(obj, path) {
- if (StringUtil.isEmpty(path, false)) {
- return obj
+ function get4Path(obj, path, nullable) {
+ var val = JSONResponse.getValByPath(obj, StringUtil.split(path, '/'), true)
+ if (val == null && nullable != true) {
+ throw new Error('找不到 ' + path + ' 对应在 obj 中的非 null 值！')
}
- return JSONResponse.getValByPath(obj, StringUtil.split(path, '/'), true)
+ return val
}
var RANDOM_DB = 'RANDOM_DB'
@@ -4307,7 +4308,7 @@ https://github.com/Tencent/APIJSON/issues
return
}
- var group = this.chainGroups[this.currentChainGroupIndex]
+ var group = (this.chainGroups[this.currentChainGroupIndex] || {}).Chain
if (group == null) {
var index = this.chainPaths.length - 1
group = this.chainPaths[index]
@@ -4388,7 +4389,7 @@ https://github.com/Tencent/APIJSON/issues
if (group == null) {
if (index == null) {
index = this.casePaths.length - 1
- group = (this.casePaths[index] || {}).Chain
+ group = this.casePaths[index]
} else {
this.casePaths = []
}
@@ -9194,7 +9195,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const index = line.indexOf(': '); //APIJSON Table:alias 前面不会有空格 //致后面就接 { 'a': 1} 报错 Unexpected token ':' lastIndexOf(': '); // indexOf(': '); 可能会有 Comment:to
const p_k = line.substring(0, index);
const bi = -1; //没必要支持，用 before: undefined, after: .. 同样支持替换，反而这样导致不兼容包含空格的 key p_k.indexOf(' ');
- const path = bi < 0 ? p_k : p_k.substring(0, bi); // User/id
+ const path = decodeURI(bi < 0 ? p_k : p_k.substring(0, bi)); // User/id
const pathKeys = path.split('/')
if (pathKeys == null || pathKeys.length <= 0) {
@@ -9449,28 +9450,28 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
else { //随机函数
if (fun == PRE_REQ) {
- toEval = 'get4Path(((ctx || {}).pre || {}).req, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).req, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_ARG) {
- toEval = 'get4Path(((ctx || {}).pre || {}).arg, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).arg, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_RES) {
- toEval = 'get4Path(((ctx || {}).pre || {}).res, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).res, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_DATA) {
- toEval = 'get4Path(((ctx || {}).pre || {}).data, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).data, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_EXT) {
- toEval = 'get4Path(((ctx || {}).pre || {}).ext, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).ext, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CUR_REQ) {
- toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CUR_ARG) {
- toEval = 'get4Path(((ctx || {}).cur || {}).arg, ' + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).cur || {}).arg, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CUR_PUT) {
- toEval = 'put4Path(((ctx || {}).cur || {}).ctx, ' + value.substring(start + 1);
+ toEval = 'put4Path(((ctx || {}).cur || {}).ctx, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else {
fun = funWithOrder; //还原，其它函数不支持 升降序和跨步！
From 6105e364aff0487fa9f0f7d341c4b48c896bf34e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 3 May 2024 01:58:15 +0800
Subject: [PATCH 792/818] =?UTF-8?q?=E9=9B=B6=E4=BB=A3=E7=A0=81=E5=9B=9E?=
=?UTF-8?q?=E5=BD=92=E6=B5=8B=E8=AF=95=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=9C=BA?=
=?UTF-8?q?=E6=99=AF=E4=B8=B2=E8=81=94=E7=94=A8=E4=BE=8B=E5=92=8C=E5=8D=95?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E7=9A=84=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E6=B3=A8=E5=85=A5=E9=85=8D=E7=BD=AE=E7=9B=B8=E4=BA=92=E5=B9=B2?=
=?UTF-8?q?=E6=89=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/js/main.js b/js/main.js
index 977512a..c9005b6 100755
--- a/js/main.js
+++ b/js/main.js
@@ -4856,12 +4856,17 @@ https://github.com/Tencent/APIJSON/issues
? null : '%' + StringUtil.trim(this.randomSearch) + '%')
var url = this.server + '/get'
+ const cri = this.currentRemoteItem || {}
+ const chain = cri.Chain || {}
+ const cgId = chain.groupId || 0
+
var req = {
'[]': {
'count': (isSub ? this.randomSubCount : this.randomCount) || 100,
'page': (isSub ? this.randomSubPage : this.randomPage) || 0,
'Random': {
'toId': isSub ? item.id : 0,
+ 'chainGroupId': cgId,
'documentId': isSub ? null : item.id,
'@order': "date-",
'name$': search
@@ -4877,6 +4882,7 @@ https://github.com/Tencent/APIJSON/issues
'page': this.randomSubPage || 0,
'Random': {
'toId@': '[]/Random/id',
+ 'chainGroupId': cgId,
'documentId': item.id,
'@order': "date-",
'name$': subSearch
@@ -10719,7 +10725,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const userId = this.User.id
const cri = this.currentRemoteItem || {}
const chain = cri.Chain || {}
- const cgId = chain.groupId
+ const cgId = chain.groupId || 0
//TODO 先检查是否有重复名称的！让用户确认！
// if (isML != true) {
From ff5177e37eb34f87da5e80aa03c52ab9404e7bf9 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 3 May 2024 16:24:53 +0800
Subject: [PATCH 793/818] =?UTF-8?q?=E9=9B=B6=E4=BB=A3=E7=A0=81=E5=9B=9E?=
=?UTF-8?q?=E5=BD=92=E6=B5=8B=E8=AF=95=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=9C=BA?=
=?UTF-8?q?=E6=99=AF=E4=B8=B2=E8=81=94=E7=94=A8=E4=BE=8B=E5=92=8C=E5=8D=95?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E7=9A=84=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9B=B8=E4=BA=92=E5=B9=B2=E6=89=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONResponse.js | 5 +++--
js/main.js | 21 +++++++++++++++++----
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index 2493b0a..c8519dc 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -1561,7 +1561,7 @@ var JSONResponse = {
/**根据 APIJSON 引用赋值路径精准地获取值
*/
- getValByPath: function(target, pathKeys) {
+ getValByPath: function(target, pathKeys, isTry) {
if (target == null) {
return null;
}
@@ -1612,7 +1612,8 @@ var JSONResponse = {
continue;
}
- else {
+
+ if (isTry != true) {
throw new Error('getValByPath 语法错误，' + k + ': value 中 value 类型应该是 Object 或 Array ！');
}
diff --git a/js/main.js b/js/main.js
index c9005b6..bbbabc0 100755
--- a/js/main.js
+++ b/js/main.js
@@ -624,7 +624,7 @@ https://github.com/Tencent/APIJSON/issues
var CUR_PUT = 'CUR_PUT' // CUR_PUT('key', val)
function get4Path(obj, path, nullable) {
- var val = JSONResponse.getValByPath(obj, StringUtil.split(path, '/'), true)
+ var val = JSONResponse.getValByPath(obj, StringUtil.split(path, '/'))
if (val == null && nullable != true) {
throw new Error('找不到 ' + path + ' 对应在 obj 中的非 null 值！')
}
@@ -2209,16 +2209,22 @@ https://github.com/Tencent/APIJSON/issues
var postId = post.id
if (docId > 0 && (preId == null || postId == null)) {
// var accountId = this.getCurrentAccountId();
+ const cri = this.currentRemoteItem || {}
+ const chain = cri.Chain || {}
+ const cgId = chain.groupId || 0
+
this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, '/get', {
'Script:pre': preId != null ? undefined : {
'ahead': 1,
// 'testAccountId': 0,
+ 'chainGroupId': cgId,
'documentId': docId,
'@order': 'date-'
},
'Script:post': postId != null ? undefined : {
'ahead': 0,
// 'testAccountId': 0,
+ 'chainGroupId': cgId,
'documentId': docId,
'@order': 'date-'
}
@@ -2474,7 +2480,7 @@ https://github.com/Tencent/APIJSON/issues
const currentAccountId = this.getCurrentAccountId()
const doc = cri.Document || {}
const tr = cri.TestRecord || {}
- const cgId = chain.groupId
+ const cgId = chain.groupId || 0
const did = isExportRandom && btnIndex == 1 ? null : doc.id
if (isExportScript) {
@@ -2489,6 +2495,7 @@ https://github.com/Tencent/APIJSON/issues
'id': sid == null ? undefined : sid,
'simple': 1,
'ahead': this.isPreScript ? 1 : 0,
+ 'chainGroupId': cgId,
'documentId': did == null || scriptType != 'case' ? 0 : did,
'testAccountId': scriptType != 'account' ? 0 : currentAccountId,
'name': extName,
@@ -4612,13 +4619,14 @@ https://github.com/Tencent/APIJSON/issues
},
'Random': isChainShow ? {
'id@': '/Chain/randomId',
- 'toId': isChainShow ? 0 : null,
+ 'toId': 0, // isChainShow ? 0 : null,
// 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
- 'documentId@': isChainShow ? null : '/Document/documentId',
+// 'documentId@': isChainShow ? null : '/Document/documentId',
'userId': userId
}: null,
'TestRecord': {
'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
+ 'chainGroupId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'userId': userId,
// 'testAccountId': this.getCurrentAccountId(),
@@ -4633,6 +4641,7 @@ https://github.com/Tencent/APIJSON/issues
'ahead': 1,
// 'testAccountId': 0,
'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
+ 'chainGroupId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'@order': 'date-'
},
@@ -4640,6 +4649,7 @@ https://github.com/Tencent/APIJSON/issues
'ahead': 0,
// 'testAccountId': 0,
'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
+ 'chainGroupId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'@order': 'date-'
}
@@ -7138,6 +7148,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.resetTestCount(this.currentAccountIndex)
+ this.isStatisticsEnabled = false
this.remotes = null
this.showTestCase(true, false)
}
@@ -9910,6 +9921,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}, caseScript)
}, caseScript.pre, {
+ list: list,
+ allCount: allCount,
index: index,
cur: cur,
pre: pre,
From e81c400034930af314845b310ff4c01c67077d7e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 3 May 2024 17:59:59 +0800
Subject: [PATCH 794/818] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=9A=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4=20URL=20=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E6=A1=86=E7=9A=84=20Base=20URL=20=E5=90=8E=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8=20Base=20URL=20=E7=9A=84=E5=85=A8?=
=?UTF-8?q?=E9=83=A8=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=8F=AF=E4=B8=80=E6=AC=A1?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8D=E5=90=8C=E6=9C=8D=E5=8A=A1=E5=99=A8?=
=?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=90=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 2 +-
js/main.js | 89 ++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/index.html b/index.html
index f1ec99d..a83ce0e 100755
--- a/index.html
+++ b/index.html
@@ -653,7 +653,7 @@
-
+
diff --git a/js/main.js b/js/main.js
index bbbabc0..b60b14d 100755
--- a/js/main.js
+++ b/js/main.js
@@ -793,7 +793,7 @@ https://github.com/Tencent/APIJSON/issues
// end = end || Number.MAX_SAFE_INTEGER
if (min == null) {
- min = Number.MIN_SAFE_INTEGER
+ min = 0 // Number.MIN_SAFE_INTEGER
}
if (max == null) {
max = Number.MAX_SAFE_INTEGER
@@ -844,7 +844,7 @@ https://github.com/Tencent/APIJSON/issues
function orderInt(desc, index, min, max) {
if (min == null) {
- min = Number.MIN_SAFE_INTEGER
+ min = 0 // Number.MIN_SAFE_INTEGER
}
if (max == null) {
max = Number.MAX_SAFE_INTEGER
@@ -1054,6 +1054,7 @@ https://github.com/Tencent/APIJSON/issues
'password': '123456'
}
],
+ otherEnvTokenMap: {},
otherEnvCookieMap: {},
allSummary: {},
currentAccountIndex: 0,
@@ -1377,6 +1378,30 @@ https://github.com/Tencent/APIJSON/issues
// var index = baseUrl.indexOf(':') //http://localhost:8080
// this.server = (index < 0 ? baseUrl : baseUrl.substring(0, baseUrl)) + ':9090'
+ var baseUrls = this.getCache('', 'baseUrls', [])
+ if (baseUrls.indexOf(bu) <= 0) {
+ baseUrls.push(bu)
+ this.saveCache('', 'baseUrls', baseUrls)
+ }
+
+ var accounts = []
+ if (StringUtil.isNotEmpty(bu, true)) {
+ accounts = this.getCache(bu, 'accounts', [])
+ }
+ else {
+ for (var i = 0; i < baseUrls.length; i ++) {
+ var bu2 = baseUrls[i]
+ var ats = this.getCache(bu2, 'accounts', [])
+// accounts.push({
+// baseUrl: bu2,
+// id: 0,
+// phone: 0,
+// name: ''
+// })
+ accounts = accounts.concat(ats)
+ }
+ }
+ this.accounts = accounts
}
},
getUrl: function () {
@@ -1385,10 +1410,17 @@ https://github.com/Tencent/APIJSON/issues
},
//获取基地址
getBaseUrl: function (url_) {
- var url = StringUtil.trim(url_ || vUrl.value)
+ var url = StringUtil.trim(url_ != undefined ? url_ : vUrl.value)
var length = this.getBaseUrlLength(url)
+ if (length <= 0 && url_ == null) {
+ var account = this.getCurrentAccount()
+ if (account != null) {
+ return account.baseUrl || ''
+ }
+ }
+
url = length <= 0 ? '' : url.substring(0, length)
- return url == '' ? URL_BASE : url
+ return url // == '' ? URL_BASE : url
},
//获取基地址长度，以://后的第一个/分割baseUrl和method
getBaseUrlLength: function (url_) {
@@ -3964,7 +3996,6 @@ https://github.com/Tencent/APIJSON/issues
-
onClickAccount: function (index, item, callback) {
var accounts = this.accounts
var num = accounts == null ? 0 : accounts.length
@@ -3976,8 +4007,9 @@ https://github.com/Tencent/APIJSON/issues
App.onResponse(url, res, err)
item.isLoggedIn = false
- App.saveCache(App.getBaseUrl(), 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(App.getBaseUrl(), 'accounts', App.accounts)
+ baseUrl = item.baseUrl || App.getBaseUrl()
+ App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
+ App.saveCache(baseUrl, 'accounts', App.accounts)
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -4038,16 +4070,19 @@ https://github.com/Tencent/APIJSON/issues
}
else {
var headers = res.headers || {}
+ baseUrl = item.baseUrl || App.getBaseUrl()
+ item.baseUrl = baseUrl
item.id = user.id
item.name = user.name
item.remember = data.remember
item.isLoggedIn = true
+ item.token = headers.token || headers.Token || data.token || data.Token || user.token || user.Token
item.cookie = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
App.accounts[App.currentAccountIndex] = item
- App.saveCache(App.getBaseUrl(), 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(App.getBaseUrl(), 'accounts', App.accounts)
+ App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
+ App.saveCache(baseUrl, 'accounts', App.accounts)
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -5261,11 +5296,13 @@ https://github.com/Tencent/APIJSON/issues
}
}
+ const baseUrl = this.getBaseUrl()
+
if (IS_BROWSER && callback == null) {
var item
for (var i in this.accounts) {
item = this.accounts[i]
- if (item != null && req.phone == item.phone) {
+ if (item != null && baseUrl == item.baseUrl && req.phone == item.phone) {
recover()
alert(req.phone + ' 已在测试账号中！')
// this.currentAccountIndex = i
@@ -5320,7 +5357,7 @@ https://github.com/Tencent/APIJSON/issues
this.scripts = newDefaultScript()
- this.request(isAdminOperation, loginMethod, loginType, this.getBaseUrl() + loginUrl, loginReq, loginHeader, function (url, res, err) {
+ this.request(isAdminOperation, loginMethod, loginType, baseUrl + loginUrl, loginReq, loginHeader, function (url, res, err) {
if (App.isEnvCompareEnabled != true) {
loginCallback(url, res, err, null, loginMethod, loginType, loginUrl, loginReq, loginHeader)
return
@@ -5332,7 +5369,9 @@ https://github.com/Tencent/APIJSON/issues
var user = JSONResponse.isSuccess(data) ? data.user : null
if (user != null) {
var headers = res.headers || {}
- App.otherEnvCookieMap[req.phone] = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
+ App.otherEnvTokenMap[req.phone + '@' + baseUrl] = headers.token || headers.Token || data.token || data.Token || user.token || user.Token
+ App.otherEnvCookieMap[req.phone + '@' + baseUrl] = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
+ App.saveCache(App.otherEnv, 'otherEnvTokenMap', App.otherEnvTokenMap)
App.saveCache(App.otherEnv, 'otherEnvCookieMap', App.otherEnvCookieMap)
}
@@ -5397,6 +5436,7 @@ https://github.com/Tencent/APIJSON/issues
var user = data.user || {}
App.accounts.push({
isLoggedIn: true,
+ baseUrl: App.getBaseUrl(),
id: user.id,
name: user.name,
phone: req.phone,
@@ -6064,7 +6104,8 @@ https://github.com/Tencent/APIJSON/issues
}
if (StringUtil.isEmpty(this.host, true)) {
- if (StringUtil.get(vUrl.value).startsWith('http://') != true && StringUtil.get(vUrl.value).startsWith('https://') != true) {
+ var url = StringUtil.get(vUrl.value)
+ if (url.startsWith('/') != true && url.startsWith('http://') != true && url.startsWith('https://') != true) {
alert('URL 缺少 http:// 或 https:// 前缀，可能不完整或不合法，\n可能使用同域的 Host，很可能访问出错！')
}
}
@@ -6242,9 +6283,9 @@ https://github.com/Tencent/APIJSON/issues
}
else {
// alert('request App.accounts[App.currentAccountIndex].isLoggedIn = false ')
-
- if (App.accounts[App.currentAccountIndex] != null) {
- App.accounts[App.currentAccountIndex].isLoggedIn = false
+ var account = App.accounts[App.currentAccountIndex]
+ if (account != null) {
+ account.isLoggedIn = false
}
}
}
@@ -6444,7 +6485,7 @@ https://github.com/Tencent/APIJSON/issues
}
// Node 环境内通过 headers 设置 Cookie 无效
- header.Cookie = isEnvCompare ? this.otherEnvCookieMap[curUser.phone] : curUser.cookie
+ header.Cookie = isEnvCompare ? this.otherEnvCookieMap[curUser.phone + '@' + baseUrl] : curUser.cookie
}
}
@@ -12028,13 +12069,23 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
'\n} catch (e) {\n' + e.message)
}
try { //这里是初始化，不能出错
- var otherEnvCookieMap = this.getCache(App.otherEnv, 'otherEnvCookieMap')
+ var otherEnvTokenMap = this.getCache(this.otherEnv, 'otherEnvTokenMap')
+ if (otherEnvTokenMap != null) {
+ this.otherEnvTokenMap = otherEnvTokenMap
+ }
+ } catch (e) {
+ console.log('created try { ' +
+ '\nvar otherEnvTokenMap = this.getCache(this.otherEnv, otherEnvTokenMap)' +
+ '\n} catch (e) {\n' + e.message)
+ }
+ try { //这里是初始化，不能出错
+ var otherEnvCookieMap = this.getCache(this.otherEnv, 'otherEnvCookieMap')
if (otherEnvCookieMap != null) {
this.otherEnvCookieMap = otherEnvCookieMap
}
} catch (e) {
console.log('created try { ' +
- '\nvar accounts = this.getCache(URL_BASE, accounts)' +
+ '\nvar otherEnvCookieMap = this.getCache(this.otherEnv, otherEnvCookieMap)' +
'\n} catch (e) {\n' + e.message)
}
From e2ee85ec3abe4d77ffe2c4485c9ee54a76b0815c Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 3 May 2024 23:28:40 +0800
Subject: [PATCH 795/818] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=9A=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E5=9C=A8=20URL=20=E8=BE=93=E5=85=A5=E6=A1=86=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=20Base=20URL=20=E5=90=8E=E8=87=AA=E5=8A=A8=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E5=A4=A7=E9=87=8F=E9=87=8D=E5=A4=8D=E8=B4=A6=E5=8F=B7?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8D=A1=E6=AD=BB=EF=BC=9B=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E6=9C=89=E6=97=B6=E7=82=B9=E8=B4=A6=E5=8F=B7=20tab=20=E4=BC=9A?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AF=E7=9A=84=E8=B4=A6=E5=8F=B7?=
=?UTF-8?q?=EF=BC=9B=E8=A7=A3=E5=86=B3=E7=82=B9=E8=B4=A6=E5=8F=B7=20tab=20?=
=?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=8F=88=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=B7=B2=E9=9A=90=E8=97=8F=E7=9A=84=20Base=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 120 ++++++++++++++++++++++++++++++++---------------------
1 file changed, 72 insertions(+), 48 deletions(-)
diff --git a/js/main.js b/js/main.js
index b60b14d..481377d 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1343,7 +1343,7 @@ https://github.com/Tencent/APIJSON/issues
showUrl: function (isAdminOperation, branchUrl) {
if (StringUtil.isEmpty(this.host, true)) { //显示(可编辑)URL Host
if (isAdminOperation != true) {
- baseUrl = this.getBaseUrl()
+ baseUrl = this.getBaseUrl(vUrl.value)
}
vUrl.value = (isAdminOperation ? this.server : baseUrl) + branchUrl
}
@@ -1378,17 +1378,12 @@ https://github.com/Tencent/APIJSON/issues
// var index = baseUrl.indexOf(':') //http://localhost:8080
// this.server = (index < 0 ? baseUrl : baseUrl.substring(0, baseUrl)) + ':9090'
- var baseUrls = this.getCache('', 'baseUrls', [])
- if (baseUrls.indexOf(bu) <= 0) {
- baseUrls.push(bu)
- this.saveCache('', 'baseUrls', baseUrls)
- }
-
var accounts = []
if (StringUtil.isNotEmpty(bu, true)) {
accounts = this.getCache(bu, 'accounts', [])
}
else {
+ var baseUrls = this.getCache('', 'baseUrls', [])
for (var i = 0; i < baseUrls.length; i ++) {
var bu2 = baseUrls[i]
var ats = this.getCache(bu2, 'accounts', [])
@@ -1401,7 +1396,10 @@ https://github.com/Tencent/APIJSON/issues
accounts = accounts.concat(ats)
}
}
- this.accounts = accounts
+
+ if (accounts.length >= 1) {
+ this.accounts = accounts
+ }
}
},
getUrl: function () {
@@ -4007,9 +4005,11 @@ https://github.com/Tencent/APIJSON/issues
App.onResponse(url, res, err)
item.isLoggedIn = false
- baseUrl = item.baseUrl || App.getBaseUrl()
- App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(baseUrl, 'accounts', App.accounts)
+ baseUrl = App.getBaseUrl(vUrl.value)
+ if (StringUtil.isNotEmpty(baseUrl, true)) {
+ App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
+ App.saveCache(baseUrl, 'accounts', App.accounts)
+ }
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -4044,8 +4044,11 @@ https://github.com/Tencent/APIJSON/issues
App.onResponse(url, res, err)
item.isLoggedIn = false
- App.saveCache(App.getBaseUrl(), 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(App.getBaseUrl(), 'accounts', App.accounts)
+ baseUrl = App.getBaseUrl(vUrl.value)
+ if (StringUtil.isNotEmpty(baseUrl, true)) {
+ App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
+ App.saveCache(baseUrl, 'accounts', App.accounts)
+ }
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -4070,9 +4073,9 @@ https://github.com/Tencent/APIJSON/issues
}
else {
var headers = res.headers || {}
- baseUrl = item.baseUrl || App.getBaseUrl()
+ baseUrl = App.getBaseUrl(vUrl.value)
- item.baseUrl = baseUrl
+ item.baseUrl = item.baseUrl || baseUrl
item.id = user.id
item.name = user.name
item.remember = data.remember
@@ -4081,8 +4084,12 @@ https://github.com/Tencent/APIJSON/issues
item.cookie = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
App.accounts[App.currentAccountIndex] = item
- App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(baseUrl, 'accounts', App.accounts)
+
+ if (StringUtil.isNotEmpty(baseUrl, true)) {
+ App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
+ App.saveCache(baseUrl, 'accounts', App.accounts)
+ }
+
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -4131,8 +4138,11 @@ https://github.com/Tencent/APIJSON/issues
this.currentAccountIndex = this.accounts.length - 1
}
- this.saveCache(this.getBaseUrl(), 'currentAccountIndex', this.currentAccountIndex)
- this.saveCache(this.getBaseUrl(), 'accounts', this.accounts)
+ baseUrl = this.getBaseUrl(vUrl.value)
+ if (StringUtil.isNotEmpty(baseUrl, true)) {
+ this.saveCache(baseUrl, 'currentAccountIndex', this.currentAccountIndex)
+ this.saveCache(baseUrl, 'accounts', this.accounts)
+ }
},
addAccountTab: function () {
this.showLogin(true, false)
@@ -5321,6 +5331,7 @@ https://github.com/Tencent/APIJSON/issues
const loginType = (isLoginShow ? this.type : curUser.loginType) || REQUEST_TYPE_JSON
const loginUrl = (isLoginShow ? this.getBranchUrl() : curUser.loginUrl) || '/login'
const loginReq = (isLoginShow ? this.getRequest(vInput.value) : curUser.loginReq) || req
+ const loginRandom = (isLoginShow ? vRandom.value : curUser.loginRandom) || ''
const loginHeader = (isLoginShow ? this.getHeader(vHeader.value) : curUser.loginHeader) || {}
function loginCallback(url, res, err, random) {
@@ -5328,7 +5339,7 @@ https://github.com/Tencent/APIJSON/issues
if (callback) {
callback(url, res, err)
} else {
- App.onLoginResponse(isAdminOperation, req, url, res, err, loginMethod, loginType, loginUrl, loginReq, loginHeader)
+ App.onLoginResponse(isAdminOperation, req, url, res, err, loginMethod, loginType, loginUrl, loginReq, loginRandom, loginHeader)
}
if (App.prevUrl != null) {
@@ -5357,37 +5368,39 @@ https://github.com/Tencent/APIJSON/issues
this.scripts = newDefaultScript()
- this.request(isAdminOperation, loginMethod, loginType, baseUrl + loginUrl, loginReq, loginHeader, function (url, res, err) {
- if (App.isEnvCompareEnabled != true) {
- loginCallback(url, res, err, null, loginMethod, loginType, loginUrl, loginReq, loginHeader)
- return
- }
+ this.parseRandom(loginReq, loginRandom, 0, true, false, false, function(randomName, constConfig, constJson) {
+ App.request(isAdminOperation, loginMethod, loginType, baseUrl + loginUrl, constJson, loginHeader, function (url, res, err) {
+ if (App.isEnvCompareEnabled != true) {
+ loginCallback(url, res, err, null, loginMethod, loginType, loginUrl, constJson, loginHeader)
+ return
+ }
- App.request(isAdminOperation, loginMethod, loginType, App.getBaseUrl(App.otherEnv) + loginUrl
- , loginReq, loginHeader, function(url_, res_, err_) {
- var data = res_.data
- var user = JSONResponse.isSuccess(data) ? data.user : null
- if (user != null) {
- var headers = res.headers || {}
- App.otherEnvTokenMap[req.phone + '@' + baseUrl] = headers.token || headers.Token || data.token || data.Token || user.token || user.Token
- App.otherEnvCookieMap[req.phone + '@' + baseUrl] = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
- App.saveCache(App.otherEnv, 'otherEnvTokenMap', App.otherEnvTokenMap)
- App.saveCache(App.otherEnv, 'otherEnvCookieMap', App.otherEnvCookieMap)
- }
+ App.request(isAdminOperation, loginMethod, loginType, App.getBaseUrl(App.otherEnv) + loginUrl
+ , loginReq, loginHeader, function(url_, res_, err_) {
+ var data = res_.data
+ var user = JSONResponse.isSuccess(data) ? data.user : null
+ if (user != null) {
+ var headers = res.headers || {}
+ App.otherEnvTokenMap[req.phone + '@' + baseUrl] = headers.token || headers.Token || data.token || data.Token || user.token || user.Token
+ App.otherEnvCookieMap[req.phone + '@' + baseUrl] = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
+ App.saveCache(App.otherEnv, 'otherEnvTokenMap', App.otherEnvTokenMap)
+ App.saveCache(App.otherEnv, 'otherEnvCookieMap', App.otherEnvCookieMap)
+ }
- if (callback) {
- callback(url, res, err)
- return
- }
+ if (callback) {
+ callback(url, res, err)
+ return
+ }
- App.onResponse(url_, res_, err_);
- App.onLoginResponse(isAdminOperation, req, url, res, err, loginMethod, loginType, loginUrl, loginReq, loginHeader)
- }, App.scripts)
+ App.onResponse(url_, res_, err_);
+ App.onLoginResponse(isAdminOperation, req, url, res, err, loginMethod, loginType, loginUrl, constJson, loginRandom, loginHeader)
+ }, App.scripts)
+ })
})
}
},
- onLoginResponse: function(isAdmin, req, url, res, err, loginMethod, loginType, loginUrl, loginReq, loginHeader) {
+ onLoginResponse: function(isAdmin, req, url, res, err, loginMethod, loginType, loginUrl, loginReq, loginRandom, loginHeader) {
res = res || {}
if (isAdmin) {
var rpObj = res.data || {}
@@ -5446,6 +5459,7 @@ https://github.com/Tencent/APIJSON/issues
loginType: loginType,
loginUrl: loginUrl,
loginReq: loginReq,
+ loginRandom: loginRandom,
loginHeader: loginHeader,
cookie: res.cookie || (res.headers || {}).cookie
})
@@ -5457,9 +5471,12 @@ https://github.com/Tencent/APIJSON/issues
App.currentAccountIndex = App.accounts.length - 1
- var key = App.getBaseUrl(loginUrl)
- App.saveCache(key, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(key, 'accounts', App.accounts)
+ baseUrl = App.getBaseUrl(vUrl.value)
+ if (StringUtil.isNotEmpty(baseUrl, true)) {
+// var key = App.getBaseUrl(loginUrl)
+ App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
+ App.saveCache(baseUrl, 'accounts', App.accounts)
+ }
App.listScript()
}
@@ -6151,9 +6168,16 @@ https://github.com/Tencent/APIJSON/issues
this.setBaseUrl()
this.request(isAdminOperation, method, this.type, url, req, isAdminOperation ? {} : header, callback, caseScript, accountScript_, globalScript_, ignorePreScript)
+ var baseUrls = this.getCache('', 'baseUrls', [])
+ var bu = this.getBaseUrl(url)
+ if (baseUrls.indexOf(bu) < 0) {
+ baseUrls.push(bu)
+ this.saveCache('', 'baseUrls', baseUrls)
+ }
+
this.locals = this.locals || []
if (this.locals.length >= 1000) { //最多1000条，太多会很卡
- this.locals.splice(999, this.locals.length - 999)
+ this.locals.splice(900, this.locals.length - 900)
}
var path = this.getMethod()
this.locals.unshift({
From 56b064f8133df8b04d2ad75dea20f4d091b9d4ee Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 4 May 2024 00:37:25 +0800
Subject: [PATCH 796/818] =?UTF-8?q?=E9=9B=B6=E4=BB=A3=E7=A0=81=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8=E5=A4=9A=E4=B8=AA=E8=B4=A6=E5=8F=B7=E5=AF=B9=E5=BA=94?=
=?UTF-8?q?=E7=9A=84=E5=A4=9A=E4=B8=AA=20Base=20URL=EF=BC=9B=E8=B4=A6?=
=?UTF-8?q?=E5=8F=B7=EF=BC=9A=E8=A7=A3=E5=86=B3=E6=9C=89=E6=97=B6=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E8=B4=A6=E5=8F=B7=E5=AF=B9=E5=BA=94=20Base=20URL=20?=
=?UTF-8?q?=E9=94=99=E4=B9=B1=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=88=87=E6=8D=A2?=
=?UTF-8?q?=20tab=20=E6=9C=89=E6=97=B6=E6=9C=AA=E9=80=89=E6=8B=A9=E7=9A=84?=
=?UTF-8?q?=E4=BB=8D=E7=84=B6=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 2 +-
js/main.js | 92 +++++++++++++++++++++++++++++++++---------------------
2 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/index.html b/index.html
index a83ce0e..647ed05 100755
--- a/index.html
+++ b/index.html
@@ -653,7 +653,7 @@
-
+
diff --git a/js/main.js b/js/main.js
index 481377d..e07055c 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1343,7 +1343,7 @@ https://github.com/Tencent/APIJSON/issues
showUrl: function (isAdminOperation, branchUrl) {
if (StringUtil.isEmpty(this.host, true)) { //显示(可编辑)URL Host
if (isAdminOperation != true) {
- baseUrl = this.getBaseUrl(vUrl.value)
+ baseUrl = this.getBaseUrl(vUrl.value, true)
}
vUrl.value = (isAdminOperation ? this.server : baseUrl) + branchUrl
}
@@ -1365,9 +1365,9 @@ https://github.com/Tencent/APIJSON/issues
return
}
// 重新拉取文档
- var bu = this.getBaseUrl()
+ var bu = this.getBaseUrl(vUrl.value, true)
if (baseUrl != bu) {
- baseUrl = bu;
+ baseUrl = bu
doc = null //这个是本地的数据库字典及非开放请求文档
this.saveCache('', 'URL_BASE', baseUrl)
@@ -1381,6 +1381,12 @@ https://github.com/Tencent/APIJSON/issues
var accounts = []
if (StringUtil.isNotEmpty(bu, true)) {
accounts = this.getCache(bu, 'accounts', [])
+// for (var i = 0; i < accounts.length; i ++) {
+// var ats = accounts[i]
+// if (ats == null || (StringUtil.isNotEmpty(ats.baseUrl, true) && ats.baseUrl != bu)) {
+//
+// }
+// }
}
else {
var baseUrls = this.getCache('', 'baseUrls', [])
@@ -1407,10 +1413,10 @@ https://github.com/Tencent/APIJSON/issues
return url.replaceAll(' ', '')
},
//获取基地址
- getBaseUrl: function (url_) {
+ getBaseUrl: function (url_, fixed) {
var url = StringUtil.trim(url_ != undefined ? url_ : vUrl.value)
var length = this.getBaseUrlLength(url)
- if (length <= 0 && url_ == null) {
+ if (length <= 0 && url_ == undefined) {
var account = this.getCurrentAccount()
if (account != null) {
return account.baseUrl || ''
@@ -1418,7 +1424,7 @@ https://github.com/Tencent/APIJSON/issues
}
url = length <= 0 ? '' : url.substring(0, length)
- return url // == '' ? URL_BASE : url
+ return url == '' ? (fixed != true ? URL_BASE : '') : url
},
//获取基地址长度，以://后的第一个/分割baseUrl和method
getBaseUrlLength: function (url_) {
@@ -3993,6 +3999,44 @@ https://github.com/Tencent/APIJSON/issues
},
+ saveAccounts: function() {
+ baseUrl = this.getBaseUrl()
+ this.saveCache(baseUrl, 'currentAccountIndex', this.currentAccountIndex)
+
+ var accounts = this.accounts || []
+ var accountMap = {}
+ for (var i = 0; i < accounts.length; i ++) {
+ var account = accounts[i]
+ if (account == null || account.phone == null) {
+ continue
+ }
+
+ var bu = account.baseUrl || baseUrl
+ var list = accountMap[bu] || []
+
+ var find = false
+ for (var j = 0; j < list.length; j ++) {
+ var act = list[j]
+ if (act == null) {
+ continue
+ }
+
+ if (act.baseUrl == bu && act.phone == account.phone) {
+ find = true
+ break
+ }
+ }
+
+ if (find != true) {
+ list.push(account)
+ accountMap[bu] = list
+ }
+ }
+
+ for (var k in accountMap) {
+ this.saveCache(k, 'accounts', accountMap[k])
+ }
+ },
onClickAccount: function (index, item, callback) {
var accounts = this.accounts
@@ -4005,11 +4049,8 @@ https://github.com/Tencent/APIJSON/issues
App.onResponse(url, res, err)
item.isLoggedIn = false
- baseUrl = App.getBaseUrl(vUrl.value)
- if (StringUtil.isNotEmpty(baseUrl, true)) {
- App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(baseUrl, 'accounts', App.accounts)
- }
+ App.saveAccounts()
+
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -4044,11 +4085,7 @@ https://github.com/Tencent/APIJSON/issues
App.onResponse(url, res, err)
item.isLoggedIn = false
- baseUrl = App.getBaseUrl(vUrl.value)
- if (StringUtil.isNotEmpty(baseUrl, true)) {
- App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(baseUrl, 'accounts', App.accounts)
- }
+ App.saveAccounts()
App.changeScriptType(App.scriptType)
if (callback != null) {
@@ -4084,11 +4121,7 @@ https://github.com/Tencent/APIJSON/issues
item.cookie = res.cookie || headers.cookie || headers.Cookie || headers['set-cookie'] || headers['Set-Cookie']
App.accounts[App.currentAccountIndex] = item
-
- if (StringUtil.isNotEmpty(baseUrl, true)) {
- App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(baseUrl, 'accounts', App.accounts)
- }
+ App.saveAccounts()
App.changeScriptType(App.scriptType)
@@ -4138,11 +4171,7 @@ https://github.com/Tencent/APIJSON/issues
this.currentAccountIndex = this.accounts.length - 1
}
- baseUrl = this.getBaseUrl(vUrl.value)
- if (StringUtil.isNotEmpty(baseUrl, true)) {
- this.saveCache(baseUrl, 'currentAccountIndex', this.currentAccountIndex)
- this.saveCache(baseUrl, 'accounts', this.accounts)
- }
+ this.saveAccounts()
},
addAccountTab: function () {
this.showLogin(true, false)
@@ -5470,14 +5499,7 @@ https://github.com/Tencent/APIJSON/issues
}
App.currentAccountIndex = App.accounts.length - 1
-
- baseUrl = App.getBaseUrl(vUrl.value)
- if (StringUtil.isNotEmpty(baseUrl, true)) {
-// var key = App.getBaseUrl(loginUrl)
- App.saveCache(baseUrl, 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(baseUrl, 'accounts', App.accounts)
- }
-
+ App.saveAccounts()
App.listScript()
}
}
@@ -9871,6 +9893,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
var isChainShow = this.isChainShow
+ baseUrl = StringUtil.trim(this.getBaseUrl())
for (var i = 0; i < list.length; i++) {
const item = list[i]
@@ -9885,7 +9908,6 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.startTestSingle(list, allCount, i, item, isRandom, accountIndex, isCross, callback)
}
-
},
startTestSingle: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback, singleCallback) {
From 6d0edc19338222870035eafea745ad39df55cb51 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 4 May 2024 01:38:34 +0800
Subject: [PATCH 797/818] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=20?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E7=BB=B4=E5=BA=A6=EF=BC=8C=E5=85=B3?=
=?UTF-8?q?=E8=81=94=20Base=20URL=E3=80=81=E8=B4=A6=E5=8F=B7=E3=80=81?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=20=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/main.css | 35 ++++++++++++++++++++++++++++++++++-
index.html | 17 ++++++++++++++---
js/main.js | 21 ++++++++++++++++++---
3 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/css/main.css b/css/main.css
index 352ee79..16693cf 100755
--- a/css/main.css
+++ b/css/main.css
@@ -555,7 +555,6 @@ table.diff thead th.texttitle {
background-color: #FFF;
}
-
.historys li {
display: block;
padding: 10px;
@@ -582,6 +581,40 @@ table.diff thead th.texttitle {
}
+.projects {
+ margin: 0;
+ padding: 0;
+ width: 200px;
+
+ background-color: #FFF;
+}
+
+.projects li {
+ display: block;
+ padding: 10px;
+ border-bottom: #DDD 1px solid;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ padding-right: 20px;
+ position: relative
+}
+
+.projects li a {
+ display: inline-block;
+ width: 100%;
+}
+
+.projects svg {
+ position: absolute;
+ display: inline-block;
+ cursor: pointer;
+ right: 5px;
+ width: 15px;
+ height: 15px;
+}
+
+
.pop-save {
padding: 10px;
width: 250px;
diff --git a/index.html b/index.html
index 647ed05..20477d0 100755
--- a/index.html
+++ b/index.html
@@ -69,8 +69,19 @@
- APIAuto: APIJSON.cn
-
+
APIAuto:
+
+ {{ project }}
+
+
2s
@@ -128,7 +139,7 @@
托管服务器地址 URL: {{ server || '点击设置' }}
导入第三方文档(平台名 URL):
{{ thirdParty || '点击设置' }}
-
+
diff --git a/js/main.js b/js/main.js
index e07055c..05ef467 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1177,6 +1177,12 @@ https://github.com/Tencent/APIJSON/issues
thirdParty: 'SWAGGER /v2/api-docs', //apijson.cn
// thirdParty: 'RAP /repository/joined /repository/get',
// thirdParty: 'YAPI /api/interface/list_menu /api/interface/get',
+ project: 'APIJSON.cn',
+ projects: [
+ {name: 'localhost', url: 'http://localhost:8080/'},
+ {name: 'APIJSON.cn', url: 'http://apijson.cn:8080/'},
+ {name: 'APIJSON.cn:9090', url: 'http://apijson.cn:9090/'}
+ ],
language: CodeUtil.LANGUAGE_KOTLIN,
header: {},
page: 0,
@@ -2166,8 +2172,14 @@ https://github.com/Tencent/APIJSON/issues
},
// 删除已保存的
- remove: function (item, index, isRemote, isRandom) {
+ remove: function (item, index, isRemote, isRandom, isProject) {
if (isRemote == null || isRemote == false) { //null != false
+ if (isProject) {
+ this.projects.splice(index, 1)
+ this.saveCache('', 'projects', this.projects)
+ return
+ }
+
localforage.removeItem(item.key, function () {
App.historys.splice(index, 1)
})
@@ -4182,15 +4194,18 @@ https://github.com/Tencent/APIJSON/issues
var allCount = testCases == null ? 0 : testCases.length
App.allCount = allCount
if (allCount > 0) {
+
var accountIndex = (this.accounts[this.currentAccountIndex] || {}).isLoggedIn ? this.currentAccountIndex : -1
this.currentAccountIndex = accountIndex //解决 onTestResponse 用 -1 存进去， handleTest 用 currentAccountIndex 取出来为空
+// var account = this.accounts[accountIndex]
+// baseUrl = this.getBaseUrl()
var reportId = this.reportId
if (reportId == null || Number.isNaN(reportId)) {
reportId = null
}
- var tests = this.tests[String(accountIndex)]
+ var tests = this.tests[String(accountIndex)] // FIXME account.phone + '@' + (account.baseUrl || baseUrl)]
if ((reportId != null && reportId >= 0) || (tests != null && JSONObject.isEmpty(tests) != true)) {
for (var i = 0; i < allCount; i++) {
var item = testCases[i]
@@ -6192,7 +6207,7 @@ https://github.com/Tencent/APIJSON/issues
var baseUrls = this.getCache('', 'baseUrls', [])
var bu = this.getBaseUrl(url)
- if (baseUrls.indexOf(bu) < 0) {
+ if (StringUtil.isNotEmpty(bu, true) && baseUrls.indexOf(bu) < 0) {
baseUrls.push(bu)
this.saveCache('', 'baseUrls', baseUrls)
}
From 05928867792da19a2c3009d5453e22ff90516d24 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 4 May 2024 02:08:53 +0800
Subject: [PATCH 798/818] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=9A=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E8=AF=BB=E5=86=99=E5=AD=98=E5=82=A8?=
=?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 10 +++++-----
js/main.js | 37 ++++++++++++++++++++++++++++++++++---
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/index.html b/index.html
index 20477d0..4cee5c7 100755
--- a/index.html
+++ b/index.html
@@ -71,12 +71,12 @@
APIAuto:
- {{ project }}
-
- -
- {{project.url + (StringUtil.isEmpty(project.name, true) ? '' : ' // ' + project.name)}}
+ {{ project.name }}
+
+ -
+ {{item.url + (StringUtil.isEmpty(item.name, true) ? '' : ' //')}}
-
diff --git a/js/main.js b/js/main.js
index 05ef467..b7de465 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1177,9 +1177,9 @@ https://github.com/Tencent/APIJSON/issues
thirdParty: 'SWAGGER /v2/api-docs', //apijson.cn
// thirdParty: 'RAP /repository/joined /repository/get',
// thirdParty: 'YAPI /api/interface/list_menu /api/interface/get',
- project: 'APIJSON.cn',
+ project: {name: 'APIJSON.cn', url: 'http://apijson.cn:8080/'},
projects: [
- {name: 'localhost', url: 'http://localhost:8080/'},
+ {name: 'Localhost', url: 'http://localhost:8080/'},
{name: 'APIJSON.cn', url: 'http://apijson.cn:8080/'},
{name: 'APIJSON.cn:9090', url: 'http://apijson.cn:9090/'}
],
@@ -6210,6 +6210,27 @@ https://github.com/Tencent/APIJSON/issues
if (StringUtil.isNotEmpty(bu, true) && baseUrls.indexOf(bu) < 0) {
baseUrls.push(bu)
this.saveCache('', 'baseUrls', baseUrls)
+ var projects = this.projects || []
+ var project = this.project || {}
+ var find = false
+ for (var j = 0; j < projects.length; j ++) {
+ var pjt = projects[j]
+ if (pjt == null || StringUtil.isEmpty(pjt.url, true)) {
+ continue
+ }
+
+ if (pjt.url == project.url) {
+ find = true
+ break
+ }
+ }
+
+ if (find != true) {
+ projects.push({name: bu, url: bu})
+ this.projects = projects
+ this.saveCache('', 'projects', projects)
+ }
+
}
this.locals = this.locals || []
@@ -12118,9 +12139,19 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
'\nvar url = this.getCache(, url) ...' +
'\n} catch (e) {\n' + e.message)
}
+ try { //这里是初始化，不能出错
+ var projects = this.getCache('', 'projects')
+ if (projects != null && projects.length >= 1) {
+ this.projects = projects
+ }
+ } catch (e) {
+ console.log('created try { ' +
+ '\nvar accounts = this.getCache(URL_BASE, accounts)' +
+ '\n} catch (e) {\n' + e.message)
+ }
try { //这里是初始化，不能出错
var accounts = this.getCache(URL_BASE, 'accounts')
- if (accounts != null) {
+ if (accounts != null && accounts.length >= 1) {
this.accounts = accounts
this.currentAccountIndex = this.getCache(URL_BASE, 'currentAccountIndex')
}
From b8ccdf1895e81c6907586cfe00cd03c485a8a1e5 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 4 May 2024 18:54:33 +0800
Subject: [PATCH 799/818] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=9A=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E5=90=8C=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E6=9F=A5=20Base=20URL=20=E5=8F=8A=E9=A1=B9=E7=9B=AE=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E3=80=81=E7=94=A8=E5=AE=83=E4=BB=AC=E7=AD=9B=E9=80=89?=
=?UTF-8?q?=E7=94=A8=E4=BE=8B=E3=80=81=E7=BC=96=E8=BE=91=E5=90=8E=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E7=94=A8=E4=BE=8B=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 25 +++---
js/main.js | 260 ++++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 214 insertions(+), 71 deletions(-)
diff --git a/index.html b/index.html
index 4cee5c7..74f1d6a 100755
--- a/index.html
+++ b/index.html
@@ -71,21 +71,26 @@
APIAuto:
- {{ project.name }}
-
2s
-
+
diff --git a/js/main.js b/js/main.js
index b7de465..8d9c7bd 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1173,15 +1173,14 @@ https://github.com/Tencent/APIJSON/issues
otherEnv: 'http://localhost:8080/', // 其它环境服务地址，用来对比当前的
server: 'http://apijson.cn:9090/', // 'http://localhost:8080/', // Chrome 90+ 跨域问题非常难搞，开发模式启动都不行了
// server: 'http://47.74.39.68:9090/', // apijson.org
- // project: 'http://apijson.cn:8080/', // apijson.cn
+ projectHost: {host: 'http://apijson.cn:8080/', project: 'APIJSON.cn'}, // apijson.cn
thirdParty: 'SWAGGER /v2/api-docs', //apijson.cn
// thirdParty: 'RAP /repository/joined /repository/get',
// thirdParty: 'YAPI /api/interface/list_menu /api/interface/get',
- project: {name: 'APIJSON.cn', url: 'http://apijson.cn:8080/'},
- projects: [
- {name: 'Localhost', url: 'http://localhost:8080/'},
- {name: 'APIJSON.cn', url: 'http://apijson.cn:8080/'},
- {name: 'APIJSON.cn:9090', url: 'http://apijson.cn:9090/'}
+ projectHosts: [
+ {host: 'http://localhost:8080/', project: 'Localhost'},
+ {host: 'http://apijson.cn:8080/', project: 'APIJSON.cn'},
+ {host: 'http://apijson.cn:9090/', project: 'APIJSON.cn:9090'}
],
language: CodeUtil.LANGUAGE_KOTLIN,
header: {},
@@ -2175,8 +2174,8 @@ https://github.com/Tencent/APIJSON/issues
remove: function (item, index, isRemote, isRandom, isProject) {
if (isRemote == null || isRemote == false) { //null != false
if (isProject) {
- this.projects.splice(index, 1)
- this.saveCache('', 'projects', this.projects)
+ this.projectHosts.splice(index, 1)
+ this.saveCache('', 'projectHosts', this.projectHosts)
return
}
@@ -2369,6 +2368,106 @@ https://github.com/Tencent/APIJSON/issues
// })
},
+ onClickHost: function(index, item) {
+ this.projectHost = item = item || {}
+ this.isTestCaseShow = false
+
+ this.host = ''
+ var bu = this.getBranchUrl()
+
+ vUrl.value = item.host + bu
+ this.showUrl(false, bu)
+ },
+
+ listProjectHost: function() {
+ var req = {
+ 'TestRecord[]': {
+ 'count': 0,
+ 'TestRecord': {
+ '@column': 'DISTINCT host,project',
+ '@from@': {
+ 'join': '&/Document',
+ 'TestRecord': {
+ '@column': 'host,documentId',
+ '@group': 'host,documentId',
+ 'host{}': 'length(host)>2'
+ },
+ 'Document': {
+ 'id@': '/TestRecord/documentId',
+ '@column': "ifnull(project,''):project",
+ '@group': 'project',
+// 'project{}': 'length(project)>0'
+ }
+ }
+ }
+ }
+ }
+
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/get', req, {}, function (url, res, err) {
+ var rpObj = res.data
+ if (JSONResponse.isSuccess(rpObj) != true) {
+ App.log(err != null ? err : (rpObj == null ? '' : rpObj.msg))
+ return
+ }
+
+ var projectHosts = App.getCache('', 'projectHosts', [])
+ var list = rpObj['TestRecord[]'] || []
+// var phs = []
+// for (var i = 0; i < list.length; i ++) {
+// var item = list[i] || {}
+// var host = (item.TestRecord || {}).host
+// if (StringUtil.isEmpty(host, true)) {
+// continue
+// }
+//
+// phs.push({ 'host': host, 'project': (item.Document || {}).project })
+// }
+
+ App.projectHosts = projectHosts.concat(list)
+ })
+ },
+
+ syncProjectHost: function(index, item) {
+ var rawProject = item == null ? null : item.rawProject
+ var project = item == null ? null : item.project
+
+ var list = this.testCases
+ var count = list == null ? 0 : list.length
+ if (count <= 0) {
+ alert('没有可操作的用例！请先查询用例，保证有至少一个显示！')
+ return
+ }
+
+ var ids = []
+ for (var i = 0; i < count; i ++) {
+ var item = list[i]
+ var doc = item == null ? null : item.Document
+ var id = doc == null ? null : doc.id
+ if (id == null || id <= 0) {
+ continue
+ }
+
+ ids.push(id)
+ }
+
+ var req = {
+ 'Document': {
+ 'id{}': ids,
+ 'project{}': [null, '', rawProject],
+ 'project': project || ''
+ },
+ 'tag': 'Document-project[]'
+ }
+
+ this.adminRequest('/put', req, {}, function (url, res, err) {
+ App.onResponse(url, res, err)
+ var rpObj = res.data
+ if (JSONResponse.isSuccess(rpObj)) {
+ App.listProjectHost()
+ }
+ })
+ },
+
// 获取所有保存的json
listHistory: function () {
localforage.iterate(function (value, key, iterationNumber) {
@@ -2520,6 +2619,8 @@ https://github.com/Tencent/APIJSON/issues
return
}
+ const project = (this.projectHost || {}).project
+
const isExportRandom = this.isExportRandom
const isExportScript = this.isExportScript
@@ -2759,6 +2860,7 @@ https://github.com/Tencent/APIJSON/issues
config: config
},
'TestRecord': {
+ 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
'chainGroupId': cgId,
'response': rawRspStr,
'standard': isML ? JSON.stringify(stddObj) : null
@@ -2768,6 +2870,7 @@ https://github.com/Tencent/APIJSON/issues
format: false,
'Document': isEditResponse ? null : {
'id': did == null ? undefined : did,
+ 'project': StringUtil.isEmpty(project, true) ? null : project,
// 'testAccountId': currentAccountId,
// 'chainGroupId': cgId,
'operation': CodeUtil.getOperation(path, reqObj),
@@ -2885,38 +2988,40 @@ https://github.com/Tencent/APIJSON/issues
}
},
newAndUploadRandomConfig: function(baseUrl, req, documentId, config, count, callback, isReleaseRESTful) {
- if (documentId == null) {
- return
- }
- const isGenerate = StringUtil.isEmpty(config, true);
- var configs = isGenerate ? [] : [config]
- if (isGenerate) {
- var config = StringUtil.trim(this.newRandomConfig(null, '', req, false))
- if (StringUtil.isEmpty(config, true)) {
- return;
- }
- configs.push(config)
- config2 = StringUtil.trim(this.newRandomConfig(null, '', req, true))
- if (StringUtil.isNotEmpty(config2, true)) {
- configs.push(config2)
- }
- }
- for (var i = 0; i < configs.length; i ++) {
- const config = configs[i]
- this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, (isReleaseRESTful ? baseUrl : this.server) + '/post', {
- format: false,
- Random: {
- documentId: documentId,
- count: count,
- name: '默认配置' + (isGenerate ? '(上传测试用例时自动生成)' : ''),
- config: config
- },
- TestRecord: {
- host: baseUrl,
- response: ''
- },
- tag: 'Random'
- }, {}, callback)
+ if (documentId == null) {
+ return
+ }
+ const isGenerate = StringUtil.isEmpty(config, true);
+ var configs = isGenerate ? [] : [config]
+ if (isGenerate) {
+ var config = StringUtil.trim(this.newRandomConfig(null, '', req, false))
+ if (StringUtil.isEmpty(config, true)) {
+ return;
+ }
+
+ configs.push(config)
+ config2 = StringUtil.trim(this.newRandomConfig(null, '', req, true))
+ if (StringUtil.isNotEmpty(config2, true)) {
+ configs.push(config2)
+ }
+ }
+
+ for (var i = 0; i < configs.length; i ++) {
+ const config = configs[i]
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, (isReleaseRESTful ? baseUrl : this.server) + '/post', {
+ format: false,
+ Random: {
+ documentId: documentId,
+ count: count,
+ name: '默认配置' + (isGenerate ? '(上传测试用例时自动生成)' : ''),
+ config: config
+ },
+ TestRecord: {
+ host: baseUrl,
+ response: ''
+ },
+ tag: 'Random'
+ }, {}, callback)
}
},
@@ -3917,7 +4022,7 @@ https://github.com/Tencent/APIJSON/issues
} : undefined,
'TestRecord': {
'randomId': 0,
- 'host': baseUrl,
+ 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
'testAccountId': currentAccountId,
'response': rspObj == null ? '' : JSON.stringify(rspObj, null, ' '),
'standard': standard == null ? '' : JSON.stringify(standard, null, ' '),
@@ -4272,6 +4377,8 @@ https://github.com/Tencent/APIJSON/issues
var isMLEnabled = this.isMLEnabled
var userId = this.User.id
+ var project = this.projectHost.project
+ baseUrl = this.getBaseUrl(vUrl.value, true)
var key = groupId + ''
var page = this.chainGroupPage = this.chainGroupPages[key] || 0
@@ -4309,6 +4416,7 @@ https://github.com/Tencent/APIJSON/issues
// '@column': 'id,userId,version,date,name,operation,method,type,url,request,apijson,standard', // ;substr(url,' + (StringUtil.length(groupUrl) + 2) + '):substr',
'@order': 'version-,date-',
'userId': userId,
+ 'project': StringUtil.isEmpty(project, true) ? null : project,
'name$': search,
'operation$': search,
'url$': search,
@@ -4331,6 +4439,7 @@ https://github.com/Tencent/APIJSON/issues
'chainGroupId@': '/Chain/groupId',
'documentId@': '/Document/id',
'userId': userId,
+ 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
// 'testAccountId': this.getCurrentAccountId(),
'randomId': 0,
// 'reportId': reportId <= 0 ? null : reportId,
@@ -4501,6 +4610,8 @@ https://github.com/Tencent/APIJSON/issues
return
}
+ var project = (this.projectHost || {}).project
+
var page = this.caseGroupPage = this.caseGroupPages[groupUrl] || 0
var count = this.caseGroupCount = this.caseGroupCounts[groupUrl] || 0
var search = this.caseGroupSearch = this.caseGroupSearches[groupUrl] || ''
@@ -4517,6 +4628,7 @@ https://github.com/Tencent/APIJSON/issues
'@raw': '@column',
'@column': "substr(url,1,length(url)-length(substring_index(url,'/',-1))-1):groupUrl;group:groupName", // (CASE WHEN length(`group`) > 0 THEN `group` ELSE '-' END):name",
'userId': this.User.id,
+ 'project': StringUtil.isEmpty(project, true) ? null : project,
'group$': search,
'url$': search,
// 'url&$': StringUtil.isEmpty(groupUrl) ? null : [groupUrl.replaceAll('_', '\\_').replaceAll('%', '\\%') + '/%'],
@@ -4651,6 +4763,8 @@ https://github.com/Tencent/APIJSON/issues
return;
}
+ var project = (this.projectHost || {}).project
+
// this.isTestCaseShow = false
var reportId = this.reportId
@@ -4694,6 +4808,7 @@ https://github.com/Tencent/APIJSON/issues
// '@column': 'id,userId,version,date,name,operation,method,type,url,request,apijson,standard', // ;substr(url,' + (StringUtil.length(groupUrl) + 2) + '):substr',
'@order': 'version-,date-',
'userId': userId,
+ 'project': StringUtil.isEmpty(project, true) ? null : project,
'name$': search,
'operation$': search,
'url$': search,
@@ -4718,6 +4833,7 @@ https://github.com/Tencent/APIJSON/issues
'chainGroupId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'userId': userId,
+ 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
// 'testAccountId': this.getCurrentAccountId(),
'randomId': 0,
'reportId': reportId <= 0 ? null : reportId,
@@ -4955,6 +5071,7 @@ https://github.com/Tencent/APIJSON/issues
? null : '%' + StringUtil.trim(this.randomSearch) + '%')
var url = this.server + '/get'
+ baseUrl = this.getBaseUrl(vUrl.value, true)
const cri = this.currentRemoteItem || {}
const chain = cri.Chain || {}
const cgId = chain.groupId || 0
@@ -4973,7 +5090,7 @@ https://github.com/Tencent/APIJSON/issues
'TestRecord': {
'randomId@': '/Random/id',
// 'testAccountId': this.getCurrentAccountId(),
- 'host': this.getBaseUrl(),
+ 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
'@order': 'date-'
},
'[]': isSub ? null : {
@@ -4989,7 +5106,7 @@ https://github.com/Tencent/APIJSON/issues
'TestRecord': {
'randomId@': '/Random/id',
// 'testAccountId': this.getCurrentAccountId(),
- 'host': this.getBaseUrl(),
+ 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
'@order': 'date-'
}
}
@@ -6210,25 +6327,25 @@ https://github.com/Tencent/APIJSON/issues
if (StringUtil.isNotEmpty(bu, true) && baseUrls.indexOf(bu) < 0) {
baseUrls.push(bu)
this.saveCache('', 'baseUrls', baseUrls)
- var projects = this.projects || []
- var project = this.project || {}
+ var projectHosts = this.projectHosts || []
+ var projectHost = this.projectHost || {}
var find = false
for (var j = 0; j < projects.length; j ++) {
- var pjt = projects[j]
- if (pjt == null || StringUtil.isEmpty(pjt.url, true)) {
+ var pjt = projectHosts[j]
+ if (pjt == null || StringUtil.isEmpty(pjt.host, true)) {
continue
}
- if (pjt.url == project.url) {
+ if (pjt.url == projectHost.host) {
find = true
break
}
}
if (find != true) {
- projects.push({name: bu, url: bu})
- this.projects = projects
- this.saveCache('', 'projects', projects)
+ projectHosts.push({host: bu, project: projectHost.project})
+ this.projectHosts = projectHosts
+ this.saveCache('', 'projectHosts', projects)
}
}
@@ -6241,6 +6358,7 @@ https://github.com/Tencent/APIJSON/issues
this.locals.unshift({
'Document': {
'userId': this.User.id,
+ 'project': (this.projectHost || {}).project,
'name': this.formatDateTime() + ' ' + (this.urlComment || StringUtil.trim(req.tag)),
'operation': CodeUtil.getOperation(path, req),
'method': method,
@@ -6254,6 +6372,10 @@ https://github.com/Tencent/APIJSON/issues
this.saveCache('', 'locals', this.locals)
},
+ adminRequest: function (url, req, header, callback) {
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, url, req, header, callback)
+ },
+
//请求
request: function (isAdminOperation, method, type, url, req, header, callback, caseScript_, accountScript_, globalScript_, ignorePreScript) {
this.loadingCount ++
@@ -6919,13 +7041,23 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
*/
doOnKeyUp: function (event, type, isFilter, item) {
var keyCode = event.keyCode ? event.keyCode : (event.which ? event.which : event.charCode);
+ var isEnter = keyCode == 13
if (type == 'option') {
- if (keyCode == 13) {
+ if (isEnter) {
this.selectInput(item);
}
return
}
+ if (type == 'project') {
+ if (isEnter || item.host == (this.projectHost || {}).host) {
+ this.projectHost = {project: item.project}
+ }
+ return
+ }
+
+ var project = (this.projectHost || {}).project
+
if (isFilter && type == 'caseGroup') {
this.isCaseGroupEditable = true
}
@@ -6937,7 +7069,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.currentRemoteItem = null
}
- if (keyCode == 13) { // enter
+ if (isEnter) { // enter
if (isFilter) {
this.onFilterChange(type)
return
@@ -7014,6 +7146,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
'@column': 'id,userId,version,date,name,operation,method,type,url,request,apijson',
'@order': 'version-,date-',
'userId': this.User.id,
+ 'project': StringUtil.isEmpty(project, true) ? null : project,
'name$': search,
'operation$': search,
'url$': search,
@@ -7073,6 +7206,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
//修改 Document
this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/put', {
Document: {
+ 'project': StringUtil.isEmpty(project, true) ? null : project,
'group': item.groupName,
'@raw': '@key',
'@key':"url:substr(url,1,length(url)-length(substring_index(url,'/',-1))-1)",
@@ -10858,6 +10992,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
const isNewRandom = isRandom && random.id <= 0
+ const baseUrl = this.getBaseUrl()
const userId = this.User.id
const cri = this.currentRemoteItem || {}
const chain = cri.Chain || {}
@@ -10879,7 +11014,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
TestRecord: isDuration ? Object.assign(testRecord, {
id: undefined,
reportId: this.reportId,
- host: this.getBaseUrl(),
+ host: baseUrl,
userId: userId,
testAccountId: this.getCurrentAccountId(),
chainGroupId: cgId,
@@ -10893,7 +11028,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
documentId: isNewRandom ? null : (isRandom ? random.documentId : document.id),
randomId: isRandom && ! isNewRandom ? random.id : null,
reportId: this.reportId,
- host: this.getBaseUrl(),
+ host: baseUrl,
testAccountId: this.getCurrentAccountId(),
compare: JSON.stringify(testRecord.compare || {}),
response: rawRspStr,
@@ -12140,13 +12275,13 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
'\n} catch (e) {\n' + e.message)
}
try { //这里是初始化，不能出错
- var projects = this.getCache('', 'projects')
- if (projects != null && projects.length >= 1) {
- this.projects = projects
+ var projectHosts = this.getCache('', 'projectHosts')
+ if (projectHosts != null && projectHosts.length >= 1) {
+ this.projectHosts = projectHosts
}
} catch (e) {
console.log('created try { ' +
- '\nvar accounts = this.getCache(URL_BASE, accounts)' +
+ '\nvar projectHosts = this.getCache("", projectHosts)' +
'\n} catch (e) {\n' + e.message)
}
try { //这里是初始化，不能出错
@@ -12241,9 +12376,12 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
var isLoggedIn = this.User != null && this.User.id != null && this.User.id > 0
+ if (isLoggedIn) {
+ this.listProjectHost()
- if (isLoggedIn && this.caseShowType != 1 && this.casePaths.length <= 0 && this.caseGroups.length <= 0) {
- this.selectCaseGroup(-1, null)
+ if (this.caseShowType != 1 && this.casePaths.length <= 0 && this.caseGroups.length <= 0) {
+ this.selectCaseGroup(-1, null)
+ }
}
var rawReq = getRequestFromURL()
From dfcb484c2055d5308d2c4697b634a189f70c07c5 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 4 May 2024 20:21:23 +0800
Subject: [PATCH 800/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E5=88=86=E7=BB=84=E5=92=8C=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 5 ++++-
js/main.js | 66 ++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/index.html b/index.html
index 74f1d6a..bcb547f 100755
--- a/index.html
+++ b/index.html
@@ -237,7 +237,10 @@
-
diff --git a/js/main.js b/js/main.js
index 8d9c7bd..f321c24 100755
--- a/js/main.js
+++ b/js/main.js
@@ -2063,10 +2063,11 @@ https://github.com/Tencent/APIJSON/issues
},
// 显示删除弹窗
- showDelete: function (show, item, index, isRandom) {
+ showDelete: function (show, item, index, isRandom, isChainGroup) {
this.isDeleteShow = show
this.isDeleteRandom = isRandom
- this.exTxt.name = '请输入' + (isRandom ? '随机配置' : '接口') + '名来确认'
+ this.isDeleteChainGroup = isChainGroup
+ this.exTxt.name = '请输入' + (isRandom ? '随机配置' : (isChainGroup ? '分组' : '接口')) + '名来确认'
if (isRandom) {
this.currentRandomItem = Object.assign(item, {
index: index
@@ -2082,15 +2083,16 @@ https://github.com/Tencent/APIJSON/issues
// 删除接口文档
deleteDoc: function () {
var isDeleteRandom = this.isDeleteRandom
+ var isDeleteChainGroup = this.isDeleteChainGroup
var item = (isDeleteRandom ? this.currentRandomItem : this.currentDocItem) || {}
- var doc = (isDeleteRandom ? item.Random : item.Document) || {}
+ var doc = (isDeleteRandom ? item.Random : (isDeleteChainGroup ? item.Chain : item.Document)) || {}
- var type = isDeleteRandom ? '随机配置' : '接口'
- if (doc.id == null) {
+ var type = isDeleteRandom ? '随机配置' : (isDeleteChainGroup ? '分组' : '接口')
+ if ((isDeleteChainGroup && doc.groupId == null) || (isDeleteChainGroup != true && doc.id == null)) {
alert('未选择' + type + '或' + type + '不存在！')
return
}
- if (doc.name != this.exTxt.name) {
+ if ((isDeleteChainGroup && doc.groupName != this.exTxt.name) || (isDeleteChainGroup != true && doc.name != this.exTxt.name)) {
alert('输入的' + type + '名和要删除的' + type + '名不匹配！')
return
}
@@ -2099,6 +2101,7 @@ https://github.com/Tencent/APIJSON/issues
this.isTestCaseShow = false
this.isRandomListShow = false
+ var isChainShow = this.isChainShow
var url = this.server + '/delete'
var req = isDeleteRandom ? {
@@ -2107,14 +2110,21 @@ https://github.com/Tencent/APIJSON/issues
'id': doc.id
},
'tag': 'Random'
+ } : (isDeleteChainGroup || isChainShow ? {
+ format: false,
+ 'Chain': {
+ 'id': isDeleteChainGroup ? null : doc.id,
+ 'groupId': isDeleteChainGroup ? doc.groupId : null
+ },
+ 'tag': isDeleteChainGroup ? 'Chain-group' : 'Chain'
} : {
format: false,
'Document': {
'id': doc.id
},
'tag': 'Document'
- }
- this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, url, req, {}, function (url, res, err) {
+ })
+ this.adminRequest(url, req, {}, function (url, res, err) {
App.onResponse(url, res, err)
var rpObj = res.data || {}
@@ -2129,7 +2139,12 @@ https://github.com/Tencent/APIJSON/issues
}
// App.showRandomList(true, App.currentRemoteItem)
}
- } else {
+ }
+ else if (isDeleteChainGroup) {
+ App.chainGroups.splice(item.index, 1)
+ App.selectChainGroup(App.currentChainGroupIndex, null)
+ }
+ else {
if (rpObj.Document != null && JSONResponse.isSuccess(rpObj.Document)) {
App.remotes.splice(item.index, 1)
App.showTestCase(true, App.isLocalShow)
@@ -2171,7 +2186,7 @@ https://github.com/Tencent/APIJSON/issues
},
// 删除已保存的
- remove: function (item, index, isRemote, isRandom, isProject) {
+ remove: function (item, index, isRemote, isRandom, isProject, isChainGroup) {
if (isRemote == null || isRemote == false) { //null != false
if (isProject) {
this.projectHosts.splice(index, 1)
@@ -2194,7 +2209,7 @@ https://github.com/Tencent/APIJSON/issues
return
}
- this.showDelete(true, item, index, isRandom)
+ this.showDelete(true, item, index, isRandom, isChainGroup)
}
},
@@ -4495,13 +4510,19 @@ https://github.com/Tencent/APIJSON/issues
return
}
- App.chainGroups = data['[]'] || []
- if (App.chainGroups.length > 0) {
- App.currentChainGroupIndex = 0
- App.chainPaths.push((App.chainGroups[0] || {}).Chain)
+ var chainGroups = App.chainGroups = data['[]'] || []
+ var count = chainGroups.length
+ var index = App.currentChainGroupIndex
+ if (index == null || index < 0 || index >= count) {
+ App.currentChainGroupIndex = index = 0
+ }
+
+ var item = chainGroups[index] || {}
+ if (item.Chain != null) {
+ App.chainPaths.push(item.Chain)
}
- App.remotes = App.testCases = (App.chainGroups[0] || {})['[]'] || []
+ App.remotes = App.testCases = item['[]'] || []
// App.showTestCase(true, false, null)
})
},
@@ -4545,6 +4566,11 @@ https://github.com/Tencent/APIJSON/issues
alert((isAdd ? '新增' : '修改') + (isOk ? '成功' : '失败') + (isAdd ? '! \n' :'！\ngroupId: ' + groupId) + '\ngroupName: ' + groupName + '\n' + msg)
App.isCaseGroupEditable = ! isOk
+ if (isOk) {
+// App.remotes = App.testCases = []
+// App.showTestCase(true, false, null)
+ App.selectChainGroup(App.currentChainGroupIndex, null)
+ }
})
},
@@ -4891,6 +4917,12 @@ https://github.com/Tencent/APIJSON/issues
this.isLocalShow = false
this.testCases = App.remotes = rpObj['[]']
this.getCurrentRandomSummary().summaryType = 'total' // App.onClickSummary('total', true)
+ if (this.isChainShow && this.currentChainGroupIndex >= 0) {
+ var chain = this.chainGroups[this.currentChainGroupIndex]
+ if (chain != null) {
+ chain['[]'] = this.testCases
+ }
+ }
if (IS_BROWSER) {
vOutput.value = show ? '' : (output || '')
@@ -7373,7 +7405,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
this.saveCache(this.server, 'chainGroupCounts', this.chainGroupCounts)
// this.saveCache(this.server, 'chainGroupSearches', this.chainGroupSearches)
- this.selectChainGroup(-1, null)
+ this.selectChainGroup(this.currentChainGroupIndex, null)
}
else if (type == 'caseGroup') {
this.caseGroupPages[groupKey] = this.caseGroupPage
From e6502c850d7b144cc4f8050ebf2b1c5bb9424f09 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 8 May 2024 00:11:41 +0800
Subject: [PATCH 801/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=EF=BC=9A=E9=9A=90=E8=97=8F=E5=88=86=E7=BB=84=E6=97=B6=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E5=8F=AA=E6=B5=8B=E5=BD=93=E5=89=8D=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E7=9A=84=EF=BC=8C=E8=A7=A3=E5=86=B3=20bug=EF=BC=8C=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=E5=92=8C=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 4 +-
apijson/JSONResponse.js | 28 +++++---
index.html | 2 +-
js/main.js | 156 ++++++++++++++++++++++++++--------------
4 files changed, 126 insertions(+), 64 deletions(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index 0f6d580..e3ae612 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -7007,7 +7007,7 @@ res_data = rep.json()
var verifyType = isSubquery != true && value != null;
if (onlyTableAndColumn) {
- key = new String(columnName);
+ key = StringUtil.get(columnName);
}
else {
//功能符 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -7172,7 +7172,7 @@ res_data = rep.json()
}
else {
fun = '';
- key = new String(columnName);
+ key = StringUtil.get(columnName);
}
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index c8519dc..174f45f 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -1162,18 +1162,30 @@ var JSONResponse = {
getType: function(o) { //typeof [] = 'object'
if (o == null) {
- return 'object';
+ return 'object'; // FIXME return null
}
+
if (o instanceof Array) {
return 'array';
}
- var t = typeof o;
- if (t == 'number' && Number.isInteger(o)) {
+ if (JSONResponse.isBoolean(o)) {
+ return 'boolean';
+ }
+
+ if (JSONResponse.isInteger(o)) {
return 'integer';
}
- return t;
+ if (JSONResponse.isNumber(o)) {
+ return 'number';
+ }
+
+ if (JSONResponse.isString(o)) {
+ return 'string';
+ }
+
+ return typeof o;
},
isObject: function(o) {
@@ -1184,16 +1196,16 @@ var JSONResponse = {
return o instanceof Array;
},
isString: function(o) {
- return typeof o == 'string';
+ return typeof o == 'string' || o instanceof String;
},
isNumber: function(o) {
- return typeof o == 'number';
+ return typeof o == 'number' || o instanceof Number;
},
isInteger: function(o) {
- return JSONResponse.getType(o) == 'integer';
+ return Number.isInteger(o);
},
isBoolean: function(o) {
- return typeof o == 'boolean';
+ return typeof o == 'boolean' || o instanceof Boolean;
},
diff --git a/index.html b/index.html
index bcb547f..20fde11 100755
--- a/index.html
+++ b/index.html
@@ -1038,7 +1038,7 @@
var vVerify = document.getElementById("vVerify");
var vRemember = document.getElementById("vRemember");
- vUrl.value = new String(URL_BASE + '/get'); //main.js里访问不到，可能是script引用顺序问题
+ vUrl.value = StringUtil.get(URL_BASE + '/get'); //main.js里访问不到，可能是script引用顺序问题
var vRequestMarkdown = document.getElementById('vRequestMarkdown');
var vMarkdown = document.getElementById('vMarkdown');
diff --git a/js/main.js b/js/main.js
index f321c24..db0171a 100755
--- a/js/main.js
+++ b/js/main.js
@@ -618,19 +618,28 @@ https://github.com/Tencent/APIJSON/issues
var PRE_ARG = 'PRE_ARG' // PRE_ARG('[]/page')
var PRE_RES = 'PRE_RES' // PRE_RES('[]/0/User/id')
var PRE_DATA = 'PRE_DATA' // PRE_DATA('[]/0/User/id')
- var PRE_EXT = 'PRE_EXT' // PRE_EXT('key')
+ var CTX_EXT = 'CTX_EXT' // CTX_EXT('key')
var CUR_REQ = 'CUR_REQ' // CUR_REQ('User/id')
var CUR_ARG = 'CUR_ARG' // CUR_REQ('User/id')
- var CUR_PUT = 'CUR_PUT' // CUR_PUT('key', val)
+ var CUR_RES = 'CUR_RES' // CUR_RES('[]/0/User/id')
+ var CUR_DATA = 'CUR_DATA' // CUR_DATA('[]/0/User/id')
+ var CTX_PUT = 'CTX_PUT' // CTX_PUT('key', val)
- function get4Path(obj, path, nullable) {
+ function get4Path(obj, path, defaultVal, msg) {
var val = JSONResponse.getValByPath(obj, StringUtil.split(path, '/'))
- if (val == null && nullable != true) {
- throw new Error('找不到 ' + path + ' 对应在 obj 中的非 null 值！')
+ if (val == null && defaultVal == undefined) {
+ throw new Error('找不到 ' + path + ' 对应在 obj 中的非 null 值！' + StringUtil.get(msg))
}
return val
}
+ function put4Path(obj, key, val, msg) {
+ if (obj == null) {
+ throw new Error('obj = null ！不能 put ' + key + ' ！' + StringUtil.get(msg))
+ }
+ obj[key] = val
+ }
+
var RANDOM_DB = 'RANDOM_DB'
var RANDOM_IN = 'RANDOM_IN'
var RANDOM_INT = 'RANDOM_INT'
@@ -1451,7 +1460,7 @@ https://github.com/Tencent/APIJSON/issues
},
//获取操作方法
getMethod: function (url, noQuery) {
- var url = new String(url == null ? vUrl.value : url).trim()
+ var url = StringUtil.get(url == null ? vUrl.value : url).trim()
var index = this.getBaseUrlLength(url)
url = index <= 0 ? url : url.substring(index)
index = noQuery ? url.indexOf("?") : -1
@@ -1461,7 +1470,7 @@ https://github.com/Tencent/APIJSON/issues
return url.startsWith('/') ? url.substring(1) : url
},
getBranchUrl: function (url) {
- var url = new String(url == null ? vUrl.value : url).trim()
+ var url = StringUtil.get(url == null ? vUrl.value : url).trim()
var index = this.getBaseUrlLength(url)
url = index <= 0 ? url : url.substring(index)
return url.startsWith('/') ? url : '/' + url
@@ -1478,6 +1487,9 @@ https://github.com/Tencent/APIJSON/issues
},
getRequest: function (json, defaultValue, isRaw) { // JSON5 兜底，减少修改范围 , isSingle) {
+ if (JSONResponse.isString(json) != true) {
+ return json == null ? defaultValue : json
+ }
var s = isRaw != true && isSingle ? this.switchQuote(json) : json; // this.toDoubleJSON(json, defaultValue);
if (StringUtil.isEmpty(s, true)) {
return defaultValue
@@ -1661,7 +1673,7 @@ https://github.com/Tencent/APIJSON/issues
isClickSelectInput = false;
// vOption.focusout()
- if (this.isChainShow) {
+ if (this.isChainShow && this.isTestCaseShow) {
this.addCase2Chain(item.value)
return
}
@@ -1942,7 +1954,7 @@ https://github.com/Tencent/APIJSON/issues
break
case 3:
this.host = this.getBaseUrl()
- this.showUrl(false, new String(vUrl.value).substring(this.host.length)) //没必要导致必须重新获取 Response，this.onChange(false)
+ this.showUrl(false, StringUtil.get(vUrl.value).substring(this.host.length)) //没必要导致必须重新获取 Response，this.onChange(false)
break
case 4:
this.isHeaderShow = show
@@ -2010,7 +2022,7 @@ https://github.com/Tencent/APIJSON/issues
}
else if (index == 3) {
var host = StringUtil.get(this.host)
- var branch = new String(vUrl.value)
+ var branch = StringUtil.get(vUrl.value)
this.host = ''
vUrl.value = host + branch //保证 showUrl 里拿到的 baseUrl = this.host (http://apijson.cn:8080/put /balance)
this.setBaseUrl() //保证自动化测试等拿到的 baseUrl 是最新的
@@ -2273,20 +2285,20 @@ https://github.com/Tencent/APIJSON/issues
// var accountId = this.getCurrentAccountId();
const cri = this.currentRemoteItem || {}
const chain = cri.Chain || {}
- const cgId = chain.groupId || 0
+ const cId = chain.id || 0
this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, '/get', {
'Script:pre': preId != null ? undefined : {
'ahead': 1,
// 'testAccountId': 0,
- 'chainGroupId': cgId,
+ 'chainId': cId,
'documentId': docId,
'@order': 'date-'
},
'Script:post': postId != null ? undefined : {
'ahead': 0,
// 'testAccountId': 0,
- 'chainGroupId': cgId,
+ 'chainId': cId,
'documentId': docId,
'@order': 'date-'
}
@@ -2344,7 +2356,7 @@ https://github.com/Tencent/APIJSON/issues
}
// localforage.getItem(item.key || '', function (err, value) {
- var branch = new String(item.url || '/get')
+ var branch = StringUtil.get(item.url || '/get')
if (branch.startsWith('/') == false) {
branch = '/' + branch
}
@@ -2645,6 +2657,7 @@ https://github.com/Tencent/APIJSON/issues
const doc = cri.Document || {}
const tr = cri.TestRecord || {}
const cgId = chain.groupId || 0
+ const cId = chain.id || 0
const did = isExportRandom && btnIndex == 1 ? null : doc.id
if (isExportScript) {
@@ -2660,6 +2673,7 @@ https://github.com/Tencent/APIJSON/issues
'simple': 1,
'ahead': this.isPreScript ? 1 : 0,
'chainGroupId': cgId,
+ 'chainId': cId,
'documentId': did == null || scriptType != 'case' ? 0 : did,
'testAccountId': scriptType != 'account' ? 0 : currentAccountId,
'name': extName,
@@ -2869,6 +2883,7 @@ https://github.com/Tencent/APIJSON/issues
'Random': {
toId: 0,
chainGroupId: cgId,
+ chainId: cId,
documentId: did,
count: App.requestCount,
name: App.exTxt.name,
@@ -2877,6 +2892,7 @@ https://github.com/Tencent/APIJSON/issues
'TestRecord': {
'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
'chainGroupId': cgId,
+ 'chainId': cId,
'response': rawRspStr,
'standard': isML ? JSON.stringify(stddObj) : null
},
@@ -4446,12 +4462,12 @@ https://github.com/Tencent/APIJSON/issues
'Random': {
// 'id@': '/Chain/randomId',
'toId': 0,
- 'chainGroupId@': '/Chain/groupId',
+ 'chainId@': '/Chain/id',
'documentId@': '/Document/id',
'userId': userId
},
'TestRecord': {
- 'chainGroupId@': '/Chain/groupId',
+ 'chainId@': '/Chain/id',
'documentId@': '/Document/id',
'userId': userId,
'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
@@ -4466,14 +4482,14 @@ https://github.com/Tencent/APIJSON/issues
'Script:pre': {
'ahead': 1,
// 'testAccountId': 0,
- 'chainGroupId@': '/Chain/groupId',
+ 'chainId@': '/Chain/id',
'documentId@': '/Document/id',
'@order': 'date-'
},
'Script:post': {
'ahead': 0,
// 'testAccountId': 0,
- 'chainGroupId@': '/Chain/groupId',
+ 'chainId@': '/Chain/id',
'documentId@': '/Document/id',
'@order': 'date-'
}
@@ -4521,8 +4537,8 @@ https://github.com/Tencent/APIJSON/issues
if (item.Chain != null) {
App.chainPaths.push(item.Chain)
}
-
App.remotes = App.testCases = item['[]'] || []
+ App.isTestCaseShow = true
// App.showTestCase(true, false, null)
})
},
@@ -4850,13 +4866,13 @@ https://github.com/Tencent/APIJSON/issues
'Random': isChainShow ? {
'id@': '/Chain/randomId',
'toId': 0, // isChainShow ? 0 : null,
-// 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
+// 'chainId@': isChainShow ? '/Chain/id' : null,
// 'documentId@': isChainShow ? null : '/Document/documentId',
'userId': userId
}: null,
'TestRecord': {
- 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
- 'chainGroupId': isChainShow ? null : 0,
+ 'chainId@': isChainShow ? '/Chain/id' : null,
+ 'chainId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'userId': userId,
'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
@@ -4871,16 +4887,16 @@ https://github.com/Tencent/APIJSON/issues
'Script:pre': {
'ahead': 1,
// 'testAccountId': 0,
- 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
- 'chainGroupId': isChainShow ? null : 0,
+ 'chainId@': isChainShow ? '/Chain/id' : null,
+ 'chainId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'@order': 'date-'
},
'Script:post': {
'ahead': 0,
// 'testAccountId': 0,
- 'chainGroupId@': isChainShow ? '/Chain/groupId' : null,
- 'chainGroupId': isChainShow ? null : 0,
+ 'chainId@': isChainShow ? '/Chain/id' : null,
+ 'chainId': isChainShow ? null : 0,
'documentId@': '/Document/id',
'@order': 'date-'
}
@@ -5106,7 +5122,7 @@ https://github.com/Tencent/APIJSON/issues
baseUrl = this.getBaseUrl(vUrl.value, true)
const cri = this.currentRemoteItem || {}
const chain = cri.Chain || {}
- const cgId = chain.groupId || 0
+ const cId = chain.id || 0
var req = {
'[]': {
@@ -5114,7 +5130,7 @@ https://github.com/Tencent/APIJSON/issues
'page': (isSub ? this.randomSubPage : this.randomPage) || 0,
'Random': {
'toId': isSub ? item.id : 0,
- 'chainGroupId': cgId,
+ 'chainId': cId,
'documentId': isSub ? null : item.id,
'@order': "date-",
'name$': search
@@ -5130,7 +5146,7 @@ https://github.com/Tencent/APIJSON/issues
'page': this.randomSubPage || 0,
'Random': {
'toId@': '[]/Random/id',
- 'chainGroupId': cgId,
+ 'chainId': cId,
'documentId': item.id,
'@order': "date-",
'name$': subSearch
@@ -6036,7 +6052,7 @@ https://github.com/Tencent/APIJSON/issues
return;
}
- inputted = new String(vInput.value);
+ inputted = StringUtil.get(vInput.value);
vComment.value = '';
vWarning.value = '';
// vUrlComment.value = '';
@@ -6281,7 +6297,7 @@ https://github.com/Tencent/APIJSON/issues
removeComment: function (json) {
var reg = /("([^\\\"]*(\\.)?)*")|('([^\\\']*(\\.)?)*')|(\/{2,}.*?(\r|\n))|(\/\*(\n|.)*?\*\/)/g // 正则表达式
try {
- return new String(json).replace(reg, function(word) { // 去除注释后的文本
+ return StringUtil.get(json).replace(reg, function(word) { // 去除注释后的文本
return /^\/{2,}/.test(word) || /^\/\*/.test(word) ? "" : word;
})
} catch (e) {
@@ -8659,7 +8675,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
if (typeof s != 'string') {
- return new String(s)
+ return StringUtil.get(s)
}
//无效
@@ -9756,28 +9772,34 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
else { //随机函数
if (fun == PRE_REQ) {
- toEval = 'get4Path(((ctx || {}).pre || {}).req, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).req, ' + (value == 'PRE_REQ()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_ARG) {
- toEval = 'get4Path(((ctx || {}).pre || {}).arg, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).arg, ' + (value == 'PRE_ARG()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_RES) {
- toEval = 'get4Path(((ctx || {}).pre || {}).res, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).res, ' + (value == 'PRE_RES()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == PRE_DATA) {
- toEval = 'get4Path(((ctx || {}).pre || {}).data, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).pre || {}).data, ' + (value == 'PRE_DATA()' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ }
+ else if (fun == CTX_GET) {
+ toEval = 'get4Path(((ctx || {}).pre || {}).ctx, ' + (value == 'CTX_GET()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
- else if (fun == PRE_EXT) {
- toEval = 'get4Path(((ctx || {}).pre || {}).ext, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ else if (fun == CTX_PUT) {
+ toEval = 'put4Path(((ctx || {}).cur || {}).ctx, ' + (value == 'CTX_PUT()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CUR_REQ) {
- toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + (value == 'CUR_REQ()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CUR_ARG) {
- toEval = 'get4Path(((ctx || {}).cur || {}).arg, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path(((ctx || {}).cur || {}).arg, ' + (value == 'CUR_ARG()' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ }
+ else if (fun == CUR_RES) {
+ toEval = 'get4Path(((ctx || {}).cur || {}).res, ' + (value == 'CUR_RES()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
- else if (fun == CUR_PUT) {
- toEval = 'put4Path(((ctx || {}).cur || {}).ctx, ' + (value == ')' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ else if (fun == CUR_DATA) {
+ toEval = 'get4Path(((ctx || {}).cur || {}).data, ' + (value == 'CUR_DATA()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else {
fun = funWithOrder; //还原，其它函数不支持 升降序和跨步！
@@ -9980,7 +10002,11 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
// return
// }
- const list = (isRandom ? this.randoms : (this.isChainShow ? this.chainGroups : this.remotes)) || []
+ const list = (isRandom ? this.randoms : (this.isChainShow ? (
+ this.isChainGroupShow() ? this.chainGroups : [this.chainGroups[0]]
+ ) : this.remotes)
+ ) || []
+
var allCount = list.length
App.doneCount = 0
App.deepAllCount = 0
@@ -11029,6 +11055,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const cri = this.currentRemoteItem || {}
const chain = cri.Chain || {}
const cgId = chain.groupId || 0
+ const cId = chain.id || 0
//TODO 先检查是否有重复名称的！让用户确认！
// if (isML != true) {
@@ -11038,6 +11065,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
toId: random.toId,
userId: userId,
chainGroupId: cgId,
+ chainId: cId,
documentId: random.documentId,
name: random.name,
count: random.count,
@@ -11050,6 +11078,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
userId: userId,
testAccountId: this.getCurrentAccountId(),
chainGroupId: cgId,
+ chainId: cId,
duration: item.duration,
minDuration: minDuration,
maxDuration: maxDuration,
@@ -11057,6 +11086,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}) : {
userId: userId,
chainGroupId: cgId,
+ chainId: cId,
documentId: isNewRandom ? null : (isRandom ? random.documentId : document.id),
randomId: isRandom && ! isNewRandom ? random.id : null,
reportId: this.reportId,
@@ -11629,25 +11659,45 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
if (App.isChainShow) {
App.options = [
{
- name: "PRE_RES('[]/0/User/id')",
+ name: "PRE_DATA('[]/0/User/id')",
+ type: stringType,
+ comment: "从上个请求的返回结果中取值 function(path:String?, defaultVal:Any?, msg:String?)"
+ }, {
+ name: "PRE_ARG('[]/page')",
type: stringType,
- comment: "从上个请求的返回结果中取值 function(path:String)"
+ comment: "从上个请求的参数中取值 function(path:String?, defaultVal:Any?, msg:String?)"
}, {
- name: "PRE_REQ('[]/page')",
+ name: "CTX_GET('userId')",
type: stringType,
- comment: "从上个请求的参数中取值 function(path:String)"
+ comment: "在上下文存放键值对 function(key:String?, defaultVal:Any?, msg:String?)"
}, {
- name: "PRE_EXT('isMale')",
+ name: "CTX_PUT('userId', 'User/id', 'CUR_DATA')",
type: stringType,
- comment: "从上个请求的扩展对象中取值 function(path:String)"
+ comment: "在上下文存放键值对 function(key:String, val:Any, from:String?, msg:String?)"
+ }, {
+ name: "PRE_RES('[]/page')",
+ type: stringType,
+ comment: "从上个请求的 Response 对象中取值 function(path:String, defaultVal:Any?, msg:String?)"
+ }, {
+ name: "PRE_REQ('isMale')",
+ type: stringType,
+ comment: "从上个请求 Request 对象中取值 function(path:String, defaultVal:Any?, msg:String?)"
+ }, {
+ name: "CUR_ARG('[]/count')",
+ type: stringType,
+ comment: "从当前请求的参数中取值 function(path:String, defaultVal:Any?, msg:String?)"
}, {
name: "CUR_REQ('[]/count')",
type: stringType,
- comment: "从当前请求的参数中取值 function(path:String)"
+ comment: "从当前请求的 Request 对象中取值 function(path:String, defaultVal:Any?, msg:String?)"
+ }, {
+ name: "CUR_DATA('[]/count')",
+ type: stringType,
+ comment: "从当前请求的返回结果中取值 function(path:String?, defaultVal:Any?, msg:String?)"
}, {
- name: "CUR_PUT('isMale', true)",
+ name: "CUR_RES('[]/count')",
type: stringType,
- comment: "在当前请求的扩展对象中存放键值对 function(path:String, val:Any)"
+ comment: "从当前请求的 Response 对象中取值 function(path:String, defaultVal:Any?, msg:String?)"
}
].concat(App.options || [])
}
@@ -11882,7 +11932,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
var isPage = key == 'page';
for (var i = 0; i < 100; i++) {
App.options.push({
- name: new String(i), // 直接用数字导致重复生成 JSON
+ name: StringUtil.get(i), // 直接用数字导致重复生成 JSON
type: intType,
comment: isPage ? '分页页码' : '每页数量'
});
From d67a85bc77349f944ecc798c35aebbbdda84bc2c Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 12 May 2024 12:41:01 +0800
Subject: [PATCH 802/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=B8=8A=E4=B8=8B=E6=96=87=E4=BC=A0?=
=?UTF-8?q?=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/js/main.js b/js/main.js
index db0171a..1d0aa83 100755
--- a/js/main.js
+++ b/js/main.js
@@ -618,7 +618,7 @@ https://github.com/Tencent/APIJSON/issues
var PRE_ARG = 'PRE_ARG' // PRE_ARG('[]/page')
var PRE_RES = 'PRE_RES' // PRE_RES('[]/0/User/id')
var PRE_DATA = 'PRE_DATA' // PRE_DATA('[]/0/User/id')
- var CTX_EXT = 'CTX_EXT' // CTX_EXT('key')
+ var CTX_GET = 'CTX_GET' // CTX_GET('key')
var CUR_REQ = 'CUR_REQ' // CUR_REQ('User/id')
var CUR_ARG = 'CUR_ARG' // CUR_REQ('User/id')
var CUR_RES = 'CUR_RES' // CUR_RES('[]/0/User/id')
@@ -9784,10 +9784,14 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
toEval = 'get4Path(((ctx || {}).pre || {}).data, ' + (value == 'PRE_DATA()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CTX_GET) {
- toEval = 'get4Path(((ctx || {}).pre || {}).ctx, ' + (value == 'CTX_GET()' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ toEval = 'get4Path((ctx || {}).ctx, ' + (value == 'CTX_GET()' ? JSON.stringify(path) : '') + value.substring(start + 1);
}
else if (fun == CTX_PUT) {
- toEval = 'put4Path(((ctx || {}).cur || {}).ctx, ' + (value == 'CTX_PUT()' ? JSON.stringify(path) : '') + value.substring(start + 1);
+ var as = StringUtil.split(value.substring(start + 1, end), ', ')
+ if (as.length >= 2) {
+ as[1] = 'get4Path((ctx || {}).ctx, ' + StringUtil.trim(as[1]) + ')'
+ }
+ toEval = 'put4Path((ctx || {}).ctx, ' + (value == 'CTX_PUT()' ? JSON.stringify(path) : '') + as.join(', ') + value.substring(end);
}
else if (fun == CUR_REQ) {
toEval = 'get4Path(((ctx || {}).cur || {}).req, ' + (value == 'CUR_REQ()' ? JSON.stringify(path) : '') + value.substring(start + 1);
@@ -10105,7 +10109,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
cur.res = res
cur.data = res.data
App.startTestChain(list, allCount, index + 1, list[index + 1], item, ctx, isRandom, accountIndex, isCross, callback)
- })
+ }, ctx)
return true
// })
},
@@ -10138,7 +10142,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
}
},
- startTestSingle: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback, singleCallback) {
+ startTestSingle: function (list, allCount, index, item, isRandom, accountIndex, isCross, callback, singleCallback, ctx) {
try {
const isMLEnabled = this.isMLEnabled
const standardKey = isMLEnabled != true ? 'response' : 'standard'
@@ -10192,7 +10196,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const curEnvUrl = baseUrl + document.url
const cur = item
const pre = list[index - 1] || {} // item.pre = item.pre || list[index - 1] || {}
- const ctx = item.ctx = item.ctx || {}
+// const ctx = item.ctx = item.ctx || {}
var random = item.Random || {}
this.parseRandom(req, random.config, random.id, true, false, false, function(randomName, constConfig, constJson) {
From 819180ce67f17b9df14ecbc8caddd19fe3d8aead Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 20 May 2024 23:51:57 +0800
Subject: [PATCH 803/818] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=20?=
=?UTF-8?q?App.wait=20=E5=BB=B6=E8=BF=9F=E8=AF=B7=E6=B1=82=E5=92=8C=20App.?=
=?UTF-8?q?timeout=20=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=EF=BC=9B=E8=A7=A3=E5=86=B3=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONResponse.js | 2 +-
js/main.js | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index 174f45f..0af3738 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -1613,7 +1613,7 @@ var JSONResponse = {
try {
var n = Number.parseInt(k);
if (Number.isSafeInteger(n)) {
- k = n > 0 ? n : n + tgt.length;
+ k = n >= 0 ? n : n + tgt.length;
}
} catch (e) {
}
diff --git a/js/main.js b/js/main.js
index 1d0aa83..51c2edc 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1081,6 +1081,8 @@ https://github.com/Tencent/APIJSON/issues
scriptType: 'case',
scriptBelongId: 0,
scripts: newDefaultScript(),
+ wait: 0, // 每个请求前的等待延迟
+ timeout: null, // 每个请求的超时时间
loadingCount: 0,
isPreScript: true,
isRandomTest: false,
@@ -6378,7 +6380,7 @@ https://github.com/Tencent/APIJSON/issues
var projectHosts = this.projectHosts || []
var projectHost = this.projectHost || {}
var find = false
- for (var j = 0; j < projects.length; j ++) {
+ for (var j = 0; j < projectHosts.length; j ++) {
var pjt = projectHosts[j]
if (pjt == null || StringUtil.isEmpty(pjt.host, true)) {
continue
@@ -6393,7 +6395,7 @@ https://github.com/Tencent/APIJSON/issues
if (find != true) {
projectHosts.push({host: bu, project: projectHost.project})
this.projectHosts = projectHosts
- this.saveCache('', 'projectHosts', projects)
+ this.saveCache('', 'projectHosts', projectHosts)
}
}
@@ -6425,7 +6427,7 @@ https://github.com/Tencent/APIJSON/issues
},
//请求
- request: function (isAdminOperation, method, type, url, req, header, callback, caseScript_, accountScript_, globalScript_, ignorePreScript) {
+ request: function (isAdminOperation, method, type, url, req, header, callback, caseScript_, accountScript_, globalScript_, ignorePreScript, timeout_, wait_) {
this.loadingCount ++
const isEnvCompare = this.isEnvCompareEnabled
@@ -6434,6 +6436,8 @@ https://github.com/Tencent/APIJSON/issues
const globalScript = (isAdminOperation ? null : (globalScript_ != null ? globalScript_ : (scripts.global || {})[0])) || {}
const accountScript = (isAdminOperation ? null : (accountScript_ != null ? accountScript_ : (scripts.account || {})[this.getCurrentAccountId() || 0])) || {}
const caseScript = (isAdminOperation ? null : caseScript_) || {}
+ const timeout = timeout_ != null ? timeout_ : this.timeout
+ const wait = wait_ != null ? wait_ : (this.wait || 0)
var evalPostScript = function () {}
@@ -6486,6 +6490,7 @@ https://github.com/Tencent/APIJSON/issues
headers: header, //Accept-Encoding（HTTP Header 大小写不敏感，SpringBoot 接收后自动转小写）可能导致 Response 乱码
withCredentials: true, //Cookie 必须要 type == REQUEST_TYPE_JSON
// crossDomain: true
+ timeout: timeout
})
.then(function (res) {
App.currentHttpResponse = res
@@ -6775,7 +6780,9 @@ https://github.com/Tencent/APIJSON/issues
return
}
- sendRequest(isAdminOperation, method, type, url, req, header, callback)
+ setTimeout(function () {
+ sendRequest(isAdminOperation, method, type, url, req, header, callback)
+ }, wait < 0 ? 0 : wait)
},
From 82b5a5e041da03908b756da275fc7e9c07cffd07 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 21 May 2024 00:18:34 +0800
Subject: [PATCH 804/818] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20App.retry=20?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0=EF=BC=8C?=
=?UTF-8?q?=E5=8F=AF=E5=9C=A8=20HTTP=20Status=20Code=20=3D=3D=20200=20?=
=?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E8=BF=94=E5=9B=9E=E5=90=8E=E9=80=9A?=
=?UTF-8?q?=E8=BF=87=E8=84=9A=E6=9C=AC=E6=8A=9B=E5=BC=82=E5=B8=B8=E6=9D=A5?=
=?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=9A=E5=8A=A1=E8=87=AA=E5=AE=9A=E4=B9=89?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/js/main.js b/js/main.js
index 51c2edc..2457404 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1081,6 +1081,7 @@ https://github.com/Tencent/APIJSON/issues
scriptType: 'case',
scriptBelongId: 0,
scripts: newDefaultScript(),
+ retry: 0, // 每个请求前的等待延迟
wait: 0, // 每个请求前的等待延迟
timeout: null, // 每个请求的超时时间
loadingCount: 0,
@@ -6427,7 +6428,7 @@ https://github.com/Tencent/APIJSON/issues
},
//请求
- request: function (isAdminOperation, method, type, url, req, header, callback, caseScript_, accountScript_, globalScript_, ignorePreScript, timeout_, wait_) {
+ request: function (isAdminOperation, method, type, url, req, header, callback, caseScript_, accountScript_, globalScript_, ignorePreScript, timeout_, wait_, retry_) {
this.loadingCount ++
const isEnvCompare = this.isEnvCompareEnabled
@@ -6438,6 +6439,24 @@ https://github.com/Tencent/APIJSON/issues
const caseScript = (isAdminOperation ? null : caseScript_) || {}
const timeout = timeout_ != null ? timeout_ : this.timeout
const wait = wait_ != null ? wait_ : (this.wait || 0)
+ var retry = retry_ != null ? retry_ : (this.retry || 0)
+ var retryReq = function () {
+ if (retry == null || retry <= 0) {
+ return false
+ }
+
+ retry --
+ try {
+ sendRequest(isAdminOperation, method, type, url, req, header, callback)
+ } catch (e) {
+ App.log('request retryReq retry = ' + retry + ' >> try {\n' +
+ ' sendRequest(isAdminOperation, method, type, url, req, header, callback)\n' +
+ ' } catch (e) = ' + e.message)
+ return retryReq()
+ }
+
+ return true
+ }
var evalPostScript = function () {}
@@ -6558,6 +6577,10 @@ https://github.com/Tencent/APIJSON/issues
App.onResponse(url, res, null)
})
.catch(function (err) {
+ if (retryReq()) {
+ return;
+ }
+
var errObj = err instanceof Array == false && err instanceof Object ? err : {}
var res = {status: errObj.status || (errObj.response || {}).status, request: {url: url, headers: header, data: req}, data: (errObj.response || {}).data}
App.currentHttpResponse = res
From 7f6c5d5bb2b1bee429d4fcadfe30fa95a338ccef Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 21 May 2024 00:33:27 +0800
Subject: [PATCH 805/818] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=89=E6=97=B6?=
=?UTF-8?q?=E9=87=8D=E8=AF=95=E8=BF=87=E7=A8=8B=E6=8A=A5=E9=94=99=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=20callback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 222 +++++++++++++++++++++++++++--------------------------
1 file changed, 114 insertions(+), 108 deletions(-)
diff --git a/js/main.js b/js/main.js
index 2457404..784f07e 100755
--- a/js/main.js
+++ b/js/main.js
@@ -6440,19 +6440,126 @@ https://github.com/Tencent/APIJSON/issues
const timeout = timeout_ != null ? timeout_ : this.timeout
const wait = wait_ != null ? wait_ : (this.wait || 0)
var retry = retry_ != null ? retry_ : (this.retry || 0)
- var retryReq = function () {
- if (retry == null || retry <= 0) {
+
+ const onHttpResponse = function (res) {
+ App.currentHttpResponse = res
+ clearTimeout(errHandler)
+ var postEvalResult = evalPostScript(url, res, null)
+ if (postEvalResult == BREAK_ALL) {
+ return
+ }
+
+ App.loadingCount --
+ res = res || {}
+
+ if (isDelegate) {
+ var hs = res.headers || {}
+ var delegateId = hs['Apijson-Delegate-Id'] || hs['apijson-delegate-id']
+
+ if (delegateId != null) {
+ if (isEnvCompare) {
+ if (delegateId != App.otherEnvDelegateId) {
+ App.otherEnvDelegateId = delegateId
+ App.saveCache(App.server, 'otherEnvDelegateId', delegateId)
+ }
+ } else {
+ if (delegateId != App.delegateId) {
+ App.delegateId = delegateId
+ App.saveCache(App.server, 'delegateId', delegateId)
+ }
+ }
+ }
+ }
+
+ //any one of then callback throw error will cause it calls then(null)
+ // if ((res.config || {}).method == 'options') {
+ // return
+ // }
+ if (DEBUG) {
+ log('send >> success:\n' + JSON.stringify(res.data, null, ' '))
+ }
+
+ //未登录，清空缓存
+ if (res.data != null && res.data.code == 407) {
+ // alert('request res.data != null && res.data.code == 407 >> isAdminOperation = ' + isAdminOperation)
+ if (isAdminOperation) {
+ // alert('request App.User = {} App.server = ' + App.server)
+
+ App.clearUser()
+ }
+ else {
+ // alert('request App.accounts[App.currentAccountIndex].isLoggedIn = false ')
+ var account = App.accounts[App.currentAccountIndex]
+ if (account != null) {
+ account.isLoggedIn = false
+ }
+ }
+ }
+
+ if (postEvalResult == BREAK_LAST) {
+ return
+ }
+
+ if (callback != null) {
+ callback(url, res, null)
+ return
+ }
+ App.onResponse(url, res, null)
+ }
+
+ const onHttpCatch = function (err) {
+ if (retry != null && retry > 0 && retryReq(err)) {
+ return;
+ }
+
+ var errObj = err instanceof Array == false && err instanceof Object ? err : {}
+ var res = {status: errObj.status || (errObj.response || {}).status, request: {url: url, headers: header, data: req}, data: (errObj.response || {}).data}
+ App.currentHttpResponse = res
+
+ var postEvalResult = evalPostScript(url, res, err)
+ if (postEvalResult == BREAK_ALL) {
+ return
+ }
+
+ App.loadingCount --
+
+ log('send >> error:\n' + err)
+ if (isAdminOperation) {
+ App.delegateId = null
+ }
+
+ if (postEvalResult == BREAK_LAST) {
+ return
+ }
+
+ if (callback != null) {
+ callback(url, res, err)
+ return
+ }
+
+ if (typeof App.autoTestCallback == 'function') {
+ App.autoTestCallback('Error when testing: ' + err + '.\nurl: ' + url + ' \nrequest: \n' + JSON.stringify(req, null, ' '), err)
+ }
+
+ App.onResponse(url, {request: {url: url, headers: header, data: req}}, err)
+ }
+
+ var retryReq = function (err) {
+ if (retry == null || retry < 0) {
+ onHttpCatch(err)
return false
}
retry --
try {
- sendRequest(isAdminOperation, method, type, url, req, header, callback)
+ setTimeout(function () {
+ sendRequest(isAdminOperation, method, type, url, req, header, callback)
+ }, wait < 0 ? 0 : wait)
} catch (e) {
App.log('request retryReq retry = ' + retry + ' >> try {\n' +
' sendRequest(isAdminOperation, method, type, url, req, header, callback)\n' +
' } catch (e) = ' + e.message)
- return retryReq()
+ return retryReq(err)
}
return true
@@ -6511,107 +6618,8 @@ https://github.com/Tencent/APIJSON/issues
// crossDomain: true
timeout: timeout
})
- .then(function (res) {
- App.currentHttpResponse = res
- clearTimeout(errHandler)
- var postEvalResult = evalPostScript(url, res, null)
- if (postEvalResult == BREAK_ALL) {
- return
- }
-
- App.loadingCount --
- res = res || {}
-
- if (isDelegate) {
- var hs = res.headers || {}
- var delegateId = hs['Apijson-Delegate-Id'] || hs['apijson-delegate-id']
-
- if (delegateId != null) {
- if (isEnvCompare) {
- if (delegateId != App.otherEnvDelegateId) {
- App.otherEnvDelegateId = delegateId
- App.saveCache(App.server, 'otherEnvDelegateId', delegateId)
- }
- } else {
- if (delegateId != App.delegateId) {
- App.delegateId = delegateId
- App.saveCache(App.server, 'delegateId', delegateId)
- }
- }
- }
- }
-
- //any one of then callback throw error will cause it calls then(null)
- // if ((res.config || {}).method == 'options') {
- // return
- // }
- if (DEBUG) {
- log('send >> success:\n' + JSON.stringify(res.data, null, ' '))
- }
-
- //未登录，清空缓存
- if (res.data != null && res.data.code == 407) {
- // alert('request res.data != null && res.data.code == 407 >> isAdminOperation = ' + isAdminOperation)
- if (isAdminOperation) {
- // alert('request App.User = {} App.server = ' + App.server)
-
- App.clearUser()
- }
- else {
- // alert('request App.accounts[App.currentAccountIndex].isLoggedIn = false ')
- var account = App.accounts[App.currentAccountIndex]
- if (account != null) {
- account.isLoggedIn = false
- }
- }
- }
-
- if (postEvalResult == BREAK_LAST) {
- return
- }
-
- if (callback != null) {
- callback(url, res, null)
- return
- }
- App.onResponse(url, res, null)
- })
- .catch(function (err) {
- if (retryReq()) {
- return;
- }
-
- var errObj = err instanceof Array == false && err instanceof Object ? err : {}
- var res = {status: errObj.status || (errObj.response || {}).status, request: {url: url, headers: header, data: req}, data: (errObj.response || {}).data}
- App.currentHttpResponse = res
-
- var postEvalResult = evalPostScript(url, res, err)
- if (postEvalResult == BREAK_ALL) {
- return
- }
-
- App.loadingCount --
-
- log('send >> error:\n' + err)
- if (isAdminOperation) {
- App.delegateId = null
- }
-
- if (postEvalResult == BREAK_LAST) {
- return
- }
-
- if (callback != null) {
- callback(url, res, err)
- return
- }
-
- if (typeof App.autoTestCallback == 'function') {
- App.autoTestCallback('Error when testing: ' + err + '.\nurl: ' + url + ' \nrequest: \n' + JSON.stringify(req, null, ' '), err)
- }
-
- App.onResponse(url, {request: {url: url, headers: header, data: req}}, err)
- })
+ .then(onHttpResponse)
+ .catch(onHttpCatch)
}
var evalScript = isAdminOperation || caseScript_ == null ? function () {} : function (isPre, code, res, err) {
@@ -6803,9 +6811,7 @@ https://github.com/Tencent/APIJSON/issues
return
}
- setTimeout(function () {
- sendRequest(isAdminOperation, method, type, url, req, header, callback)
- }, wait < 0 ? 0 : wait)
+ retryReq()
},
From 9090c485200860368f2be7e850015b765201c2bb Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 10 Jun 2024 22:21:05 +0800
Subject: [PATCH 806/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A6=E4=BE=A7?=
=?UTF-8?q?=20JSON=20=E9=94=AE=E5=80=BC=E5=AF=B9=20User:{}=20=E5=90=8E?=
=?UTF-8?q?=E9=9D=A2=20//=20apijson=5Fuser=3F,=20=E8=A1=A8=E7=A4=BA?=
=?UTF-8?q?=E5=AE=9E=E9=99=85=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=90=8D?=
=?UTF-8?q?=E4=B8=94=E5=8F=AF=E7=A9=BA=EF=BC=8Cgender:=200=20=E5=90=8E?=
=?UTF-8?q?=E9=9D=A2=20//=20sex!,=20=E8=A1=A8=E7=A4=BA=E5=AE=9E=E9=99=85?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=B8=94=E9=9D=9E=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 162 +++++++++++++++++++++++-----------------
apijson/JSONResponse.js | 24 +++++-
js/main.js | 9 ++-
3 files changed, 119 insertions(+), 76 deletions(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index e3ae612..078d2e6 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -2554,8 +2554,8 @@ res_data = rep.json()
}
}
- var notnull = target.notnull;
- log('parsePythonResponseByStandard notnull = target.notnull = ' + notnull + ' >>');
+ var notNull = target.notNull;
+ log('parsePythonResponseByStandard notNull = target.notNull = ' + notNull + ' >>');
var funName = 'is_' + (isRoot ? '' : name + '_') + varName;
var genFunDef = isSmart && funNames.indexOf(funName) < 0;
@@ -2572,9 +2572,9 @@ res_data = rep.json()
+ '\n if not is_' + type + '(' + varName + ', strict):'
+ '\n return false\n'
}
- s += prefix + funName + '(' + varName + ', ' + notnull + ')';
+ s += prefix + funName + '(' + varName + ', ' + notNull + ')';
} else {
- if (notnull) {
+ if (notNull) {
s += prefix + 'not_none(' + varName + ')';
}
s += prefix + 'is_' + type + '(' + varName + ')';
@@ -2682,7 +2682,7 @@ res_data = rep.json()
if (typeof format == 'string' && FORMAT_PRIORITIES[format] != null) {
var verifier = FORMAT_VERIFIERS[format];
if (typeof verifier == 'function') {
- fas = prefix2 + verifier.name + '(' + varName + ', ' + notnull + ')';
+ fas = prefix2 + verifier.name + '(' + varName + ', ' + notNull + ')';
}
}
else if (format instanceof Array == false && format instanceof Object) {
@@ -5254,8 +5254,8 @@ res_data = rep.json()
return StringUtil.firstCase(StringUtil.noBlank(columnName), false);
},
/**获取model方法名
- * @param prefix @NotNull 前缀，一般是get,set等
- * @param field @NotNull
+ * @param prefix @notNull 前缀，一般是get,set等
+ * @param field @notNull
* @return {*}
*/
getMethodName: function(prefix, field) {
@@ -6320,11 +6320,11 @@ res_data = rep.json()
}
var typeOfValue = CodeUtil.getType4Request(value);
- var valuesIsNotString = typeOfValue != 'string';
- var valuesIsNotInteger = typeOfValue != 'integer';
- // var valuesIsNotNumber = valuesIsNotInteger && typeOfValue != 'number';
- var valuesIsNotBoolean = typeOfValue != 'boolean';
- var isValueNotEmpty = valuesIsNotString ? (typeOfValue != 'array' ? value != null : value.length > 0) : StringUtil.isNotEmpty(value, true);
+ var isValueNotString = typeOfValue != 'string';
+ var isValueNotInteger = typeOfValue != 'integer';
+ // var isValueNotNumber = isValueNotInteger && typeOfValue != 'number';
+ var isValueNotBoolean = typeOfValue != 'boolean';
+ var isValueNotEmpty = isValueNotString ? (typeOfValue != 'array' ? value != null : value.length > 0) : StringUtil.isNotEmpty(value, true);
var extraComment = '';
if (isAPIJSONRouter) {
@@ -6412,7 +6412,7 @@ res_data = rep.json()
return ' ! 远程函数只能用于 GET,HEAD 请求！！';
}
- if (value != null && valuesIsNotString) {
+ if (value != null && isValueNotString) {
return ' ! 远程函数 value 必须是 String 类型！';
}
@@ -6566,9 +6566,9 @@ res_data = rep.json()
if (isRestful != true && (isInSubquery || JSONObject.isArrayKey(name))) {
switch (key) {
case 'count':
- return value != null && valuesIsNotInteger ? ' ! value必须是Integer类型！' : (isWarning ? '' : CodeUtil.getComment('每页数量' + (isValueNotEmpty ? '' : '，例如 5 10 20 等'), false, ' ')) + extraComment;
+ return value != null && isValueNotInteger ? ' ! value必须是Integer类型！' : (isWarning ? '' : CodeUtil.getComment('每页数量' + (isValueNotEmpty ? '' : '，例如 5 10 20 等'), false, ' ')) + extraComment;
case 'page':
- if (value != null && valuesIsNotInteger) {
+ if (value != null && isValueNotInteger) {
return ' ! value必须是Integer类型！';
}
return value != null && value < 0 ? ' ! 必须 >= 0 ！' : (isWarning ? '' : CodeUtil.getComment('分页页码' + (isValueNotEmpty ? '' : ': 例如 0 1 2 ...'), false, ' ')) + extraComment;
@@ -6576,7 +6576,7 @@ res_data = rep.json()
var query = CodeUtil.QUERY_TYPES[value];
return StringUtil.isEmpty(query) ? ' ! value必须是[' + CodeUtil.QUERY_TYPE_KEYS.join() + ']中的一种！' : (isWarning ? '' : CodeUtil.getComment('查询内容：0-对象 1-总数和分页详情 2-数据、总数和分页详情', false, ' ')) + extraComment;
case 'join':
- if (valuesIsNotString) {
+ if (isValueNotString) {
return ' ! value必须是String类型！';
}
@@ -6628,12 +6628,12 @@ res_data = rep.json()
if (isInSubquery) {
switch (key) {
case 'range':
- if (valuesIsNotString) {
+ if (isValueNotString) {
return ' ! value必须是String类型！';
}
return CodeUtil.SUBQUERY_RANGES.indexOf(value) < 0 ? ' ! value必须是[' + CodeUtil.SUBQUERY_RANGES.join() + ']中的一种！' : (isWarning ? '' : CodeUtil.getComment('比较范围：ANY-任意 ALL-全部', false, ' ')) + extraComment;
case 'from':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment('数据来源' + (isValueNotEmpty ? '，同一层级必须有 "' + value + '":{...}' : '，例如 "User"，同一层级必须有 "User":{...}'), false, ' ')) + extraComment;
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment('数据来源' + (isValueNotEmpty ? '，同一层级必须有 "' + value + '":{...}' : '，例如 "User"，同一层级必须有 "User":{...}'), false, ' ')) + extraComment;
}
}
break;
@@ -6648,47 +6648,47 @@ res_data = rep.json()
if (isRestful != true && JSONObject.isTableKey(objName)) {
switch (key) {
case '@column':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'返回字段' + (isValueNotEmpty ? '，可传 字段(:别名)、SQL 函数(:别名，用分号 ; 隔开)、表达式，以及部分 SQL 关键词'
: '：例如 "name" "toId:parentId" "id,userId;json_length(praiseUserIdList):praiseCount" 等'), false, ' ')) + extraComment;
case '@from@': //value 类型为 Object 时 到不了这里，已在上方处理
- return valuesIsNotString && typeOfValue != 'object' ? ' ! value必须是String或Object类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString && typeOfValue != 'object' ? ' ! value必须是String或Object类型！' : (isWarning ? '' : CodeUtil.getComment(
'数据来源：引用赋值 子查询 "' + value + '@":{...} ', false, ' ')) + extraComment;
case '@group':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'分组方式' + (isValueNotEmpty ? '' : '，例如 "userId" "momentId,toId" 等'), false, ' ')) + extraComment;
case '@having':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'聚合函数' + (isValueNotEmpty ? '，可传 SQL 函数(用分号 ; 隔开)、表达式，以及部分 SQL 关键词'
: '，例如 "max(id)>100" "length(phone)>0;sum(balance)<=10000" 等'), false, ' ')) + extraComment;
case '@order':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'排序方式：+升序，-降序' + (isValueNotEmpty ? '' : '，例如 "date-" "name+,id-" 等'), false, ' ')) + extraComment;
case '@combine': //TODO 解析 value 并直接给出条件组合结果
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'条件组合' + (isValueNotEmpty ? '，| 可省略。合并同类，外层按照 & | ! 顺序，内层按传参顺序组合成 (key0 & key1 & key6 & 其它key) & (key2 | key3 | key7) & !(key4 | key5)'
: '，例如 "name$,tag$" "!userId<,!toId" 等'), false, ' ')) + extraComment;
case '@raw':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'原始SQL片段' + (isValueNotEmpty ? '，由后端 RAW_MAP 代码配置指定 "key0,key1.." 中每个 key 对应 key:"SQL片段" 中的 SQL片段'
: '，例如 "@column" "id{},@having" 等'), false, ' ')) + extraComment;
case '@json':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'转为JSON' + (isValueNotEmpty ? '' : '，例如 "request" "gets,heads" 等'), false, ' ')) + extraComment;
case '@null':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'NULL值字段' + (isValueNotEmpty ? '' : '，例如 "tag" "content,praiseUserIdList" 等'), false, ' ')) + extraComment;
case '@cast':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'类型转换' + (isValueNotEmpty ? '' : '，例如 "date:DATETIME" "date>:DATETIME,id{}:JSON" 等'), false, ' ')) + extraComment;
case '@schema':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'集合空间(数据库名/模式)' + (isValueNotEmpty ? '' : '，例如 "sys" "apijson" "postgres" "dbo" 等'), false, ' ')) + extraComment;
case '@database':
return CodeUtil.DATABASE_KEYS.indexOf(value) < 0 ? ' ! value必须是[' + CodeUtil.DATABASE_KEYS.join() + ']中的一种！' : (isWarning ? '' : CodeUtil.getComment(
'数据库类型：例如 "MYSQL" "POSTGRESQL" "SQLSERVER" "ORACLE" "DB2" "CLICKHOUSE" 等', false, ' ')) + extraComment;
case '@datasource':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'跨数据源' + (isValueNotEmpty ? '' : '，例如 "DRUID" "HIKARICP" 等'), false, ' ')) + extraComment;
case '@role':
var role = CodeUtil.ROLES[value];
@@ -6699,12 +6699,12 @@ res_data = rep.json()
return StringUtil.isEmpty(cache) ? ' ! value必须是[' + CodeUtil.CACHE_TYPE_KEYS.join() + ']中的一种！' : (isWarning ? '' : CodeUtil.getComment(
'缓存方式：0-全部 1-磁盘 2-内存', false, ' ')) + extraComment;
case '@explain':
- return valuesIsNotBoolean ? ' ! value必须是Boolean类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotBoolean ? ' ! value必须是Boolean类型！' : (isWarning ? '' : CodeUtil.getComment(
'性能分析：true-开启 false-关闭，返回执行的 SQL 及查询计划', false, ' ')) + extraComment;
}
if (key.startsWith('@')) {
if (key.endsWith('()')) {
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'存储过程' + (isValueNotEmpty ? '，触发调用数据库存储过程' : '：例如 "getCommentByUserId(id,@limit,@offset)"'), false, ' ')) + extraComment;
}
return StringUtil.isEmpty(extraComment, true) ? '' : CodeUtil.getComment(extraComment.substring(3), false, ' ');
@@ -6721,21 +6721,21 @@ res_data = rep.json()
if (isRestful != true && StringUtil.isEmpty(name)) {
switch (key) {
case 'tag':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'请求标识' + (method == 'GET' || method == 'HEAD' ? '，GET,HEAD 请求不会自动解析，仅为后续迭代可能的手动优化而预留'
: (isValueNotEmpty ? '，用来区分不同请求并校验，由后端 Request 表中指定' : '，例如 "User" "Comment[]" "Privacy-CIRCLE" 等')), false, ' '));
case 'version':
- return valuesIsNotInteger ? ' ! value必须是Integer类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotInteger ? ' ! value必须是Integer类型！' : (isWarning ? '' : CodeUtil.getComment(
'版本号' + (method == 'GET' || method == 'HEAD' ? '，GET,HEAD 请求不会自动解析，仅为后续迭代可能的手动优化而预留'
: (isValueNotEmpty ? '，用来使用特定版本的校验规则，由后端 Request 表中指定' : '，例如 1 2 3 等')), false, ' '));
case 'format':
- return valuesIsNotBoolean ? ' ! value必须是Boolean类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotBoolean ? ' ! value必须是Boolean类型！' : (isWarning ? '' : CodeUtil.getComment(
'格式化: true-是 false-否，将 TableName 转为 tableName, TableName[] 转为 tableNameList, Table:alias 转为 alias 等小驼峰格式', false, ' '));
case '@schema':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'集合空间(数据库名/模式)' + (isValueNotEmpty ? '' : '，例如 "sys" "apijson" "postgres" "dbo" 等'), false, ' '));
case '@datasource':
- return valuesIsNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotString ? ' ! value必须是String类型！' : (isWarning ? '' : CodeUtil.getComment(
'跨数据源' + (isValueNotEmpty ? '' : '，例如 "DRUID" "HIKARICP" 等'), false, ' '));
case '@database':
return CodeUtil.DATABASE_KEYS.indexOf(value) < 0 ? ' ! value必须是[' + CodeUtil.DATABASE_KEYS.join() + ']中的一种！' : (isWarning ? '' : CodeUtil.getComment(
@@ -6749,7 +6749,7 @@ res_data = rep.json()
return StringUtil.isEmpty(cache) ? ' ! value必须是[' + CodeUtil.CACHE_TYPE_KEYS.join() + ']中的一种！' : (isWarning ? '' : CodeUtil.getComment(
'缓存方式：0-全部 1-磁盘 2-内存', false, ' '));
case '@explain':
- return valuesIsNotBoolean ? ' ! value必须是Boolean类型！' : (isWarning ? '' : CodeUtil.getComment(
+ return isValueNotBoolean ? ' ! value必须是Boolean类型！' : (isWarning ? '' : CodeUtil.getComment(
'性能分析：true-开启 false-关闭，返回执行的 SQL 及查询计划', false, ' '));
}
}
@@ -6767,16 +6767,25 @@ res_data = rep.json()
* @param onlyTableAndColumn
* @return {*}
*/
- getCommentFromDoc: function (tableList, tableName, columnName, method, database, language, onlyTableAndColumn, isReq, pathKeys, isRestful, value, ignoreError, standardObj, isSubquery, isWarning) {
+ getCommentFromDoc: function (tableList, tableName, columnName, method, database, language, onlyTableAndColumn
+ , isReq, pathKeys, isRestful, value, ignoreError, standardObj, isSubquery, isWarning) {
log('getCommentFromDoc tableName = ' + tableName + '; columnName = ' + columnName
+ '; method = ' + method + '; database = ' + database + '; language = ' + language
+ '; onlyTableAndColumn = ' + onlyTableAndColumn + '; tableList = \n' + JSON.stringify(tableList));
+ var typeOfValue = CodeUtil.getType4Request(value);
+ var isValueNotArray = typeOfValue != 'array';
+ var isValueNotObject = typeOfValue != 'object';
+
if (standardObj != null) {
- var targetObj = JSONResponse.getStandardByPath(standardObj, pathKeys);
+ var parentObj = pathKeys == null || pathKeys.length <= 0 ? null : JSONResponse.getStandardByPath(standardObj, pathKeys.slice(0, pathKeys.length - 1));
+ var targetValues = parentObj == null ? null : parentObj.values;
+ var targetObj = targetValues == null ? null : (targetValues[0] || {})[pathKeys[pathKeys.length - 1]]; // JSONResponse.getStandardByPath(standardObj, pathKeys);
+
var t = targetObj == null ? null : targetObj.type;
var targetComment = targetObj == null ? null : targetObj.comment;
- var c = targetObj == null ? null : CodeUtil.getType4Language(language, t, true) + (targetObj.notnull ? ', ' : '? ') + StringUtil.trim(targetComment);
+ var c = StringUtil.isEmpty(targetComment, true) ? null : CodeUtil.getType4Language(language, t, true)
+ + (targetObj.notEmpty ? '! ' : (targetObj.notNull ? ', ' : '? ')) + StringUtil.trim(targetComment);
if (CodeUtil.isTypeMatch(t, CodeUtil.getType4Request(value)) != true) {
c = ' ! value必须是' + CodeUtil.getType4Language(language, t) + '类型！' + (isWarning ? ' ' : CodeUtil.getComment(c, false, ' '));
if (ignoreError != true) {
@@ -6788,23 +6797,35 @@ res_data = rep.json()
}
}
- if (StringUtil.isEmpty(targetComment, true) == false) { // 如果这里没注释就从数据库/第三方平台取
+ if (StringUtil.isNotEmpty(targetComment, true)) { // 如果这里没注释就从数据库/第三方平台取
return c;
}
+
+ var parentName = parentObj == null || StringUtil.isEmpty(parentObj.name, true) ? null : parentObj.name;
+ var name = targetObj == null || StringUtil.isEmpty(targetObj.name, true) ? null : targetObj.name;
+ if (StringUtil.isNotEmpty(parentName, true) || StringUtil.isNotEmpty(name, true)) {
+ var pn = parentName || tableName;
+ var n = name || columnName;
+ var isValObj = isValueNotObject != true; // && StringUtil.isName(pn)
+
+ c = CodeUtil.getCommentFromDoc(tableList, isValObj ? n : pn, isValObj ? null : n
+ , method, database, language, onlyTableAndColumn, isReq, pathKeys, value, ignoreError, null, isSubquery, isWarning);
+ if (StringUtil.isNotEmpty(c, true)) {
+ return (isValObj && StringUtil.isNotEmpty(name, true) ? StringUtil.trim(name) : CodeUtil.getType4Language(language, t, true))
+ + (targetObj.notEmpty ? '! ' : (targetObj.notNull ? ', ' : '? ')) + StringUtil.trim(c);
+ }
+ }
}
- var typeOfValue = CodeUtil.getType4Request(value);
- var valuesIsNotString = typeOfValue != 'string';
- var valuesIsNotInteger = typeOfValue != 'integer';
- var valuesIsNotNumber = valuesIsNotInteger && typeOfValue != 'number';
- var valuesIsNotArray = typeOfValue != 'array';
- var valuesIsNotObject = typeOfValue != 'object';
- var valuesIsNotStringOrObject = valuesIsNotString && valuesIsNotObject;
- var valuesIsNotStringOrArray = valuesIsNotString && valuesIsNotArray;
- var valuesIsNotStringOrNumber = valuesIsNotString && valuesIsNotNumber;
- var valuesIsNotStringOrNumberOrObject = valuesIsNotStringOrNumber && valuesIsNotObject;
- var valuesIsNotStringOrArrayOrObject = valuesIsNotString && valuesIsNotArray && valuesIsNotObject;
- var isValueNotEmpty = valuesIsNotString ? (typeOfValue != 'array' ? value != null : value.length > 0) : StringUtil.isEmpty(value, true) != true;
+ var isValueNotString = typeOfValue != 'string';
+ var isValueNotInteger = typeOfValue != 'integer';
+ var isValueNotNumber = isValueNotInteger && typeOfValue != 'number';
+ var isValueNotStringOrObject = isValueNotString && isValueNotObject;
+ var isValueNotStringOrArray = isValueNotString && isValueNotArray;
+ var isValueNotStringOrNumber = isValueNotString && isValueNotNumber;
+ var isValueNotStringOrNumberOrObject = isValueNotStringOrNumber && isValueNotObject;
+ var isValueNotStringOrArrayOrObject = isValueNotString && isValueNotArray && isValueNotObject;
+ var isValueNotEmpty = isValueNotString ? (typeOfValue != 'array' ? value != null : value.length > 0) : StringUtil.isEmpty(value, true) != true;
if (isRestful == true && StringUtil.isEmpty(columnName, true) == false && StringUtil.isEmpty(CodeUtil.thirdParty, true) == false) { // } && CodeUtil.thirdParty == 'YAPI') {
var apiMap = CodeUtil.thirdPartyApiMap;
@@ -6935,7 +6956,7 @@ res_data = rep.json()
// return ' ! 远程函数只能用于 GET,HEAD 请求！！';
// }
//
- // if (value != null && valuesIsNotString) {
+ // if (value != null && isValueNotString) {
// return ' ! value必须是String类型！';
// }
// if (value != null) {
@@ -6971,6 +6992,10 @@ res_data = rep.json()
return isWarning ? ' ' : '...';
}
+ if (StringUtil.isEmpty(tableName, true)) {
+ return ' ';
+ }
+
var isTSQL = ['ORACLE', 'DAMENG'].indexOf(database) >= 0;
var item;
@@ -6983,7 +7008,8 @@ res_data = rep.json()
//Table
table = item == null ? null : (isTSQL ? item.AllTable : (database != 'SQLSERVER' ? item.Table : item.SysTable));
- if (table == null || tableName != CodeUtil.getModelName(table.table_name)) {
+ var table_name = table == null ? null : table.table_name;
+ if (table_name == null || table_name.replaceAll('_', '').toLowerCase().endsWith(tableName.replaceAll('_', '').toLowerCase()) != true) { // tableName != CodeUtil.getModelName(table.table_name)) {
continue;
}
log('getDoc [] for i=' + i + ': table = \n' + format(JSON.stringify(table)));
@@ -7017,7 +7043,7 @@ res_data = rep.json()
return ' ! 远程函数只能用于 GET,HEAD 请求！！';
}
- if (value != null && valuesIsNotString) {
+ if (value != null && isValueNotString) {
return ' ! value必须是String类型！';
}
if (value != null) {
@@ -7060,7 +7086,7 @@ res_data = rep.json()
at = '引用赋值' + (isValueNotEmpty ? (value.startsWith('/') ? '，从对象父级开始的相对(缺省)路径' : '，从最外层开始的绝对(完整)路径') : '，例如 "User/id" "[]/Moment/id" 等');
columnName = columnName.substring(0, columnName.length - 1);
- if (value != null && valuesIsNotStringOrObject) {
+ if (value != null && isValueNotStringOrObject) {
return ' ! value必须是String或Object类型！';
}
@@ -7068,7 +7094,7 @@ res_data = rep.json()
}
if (columnName.endsWith("$")) {//搜索，查询时处理
- if (verifyType && hasAt != true && valuesIsNotStringOrArray) {
+ if (verifyType && hasAt != true && isValueNotStringOrArray) {
return ' ! value必须是String或Array类型！';
}
@@ -7076,7 +7102,7 @@ res_data = rep.json()
key = columnName.substring(0, columnName.length - 1);
}
else if (columnName.endsWith("~")) {//匹配正则表达式，查询时处理
- if (verifyType && hasAt != true && valuesIsNotStringOrArray) {
+ if (verifyType && hasAt != true && isValueNotStringOrArray) {
return ' ! value必须是String或Array类型！';
}
@@ -7088,7 +7114,7 @@ res_data = rep.json()
}
}
else if (columnName.endsWith("%")) {//连续范围 BETWEEN AND，查询时处理
- if (verifyType && hasAt != true && valuesIsNotStringOrArray) {
+ if (verifyType && hasAt != true && isValueNotStringOrArray) {
return ' ! value必须是String或Array类型！';
}
@@ -7096,11 +7122,11 @@ res_data = rep.json()
key = columnName.substring(0, columnName.length - 1);
}
else if (columnName.endsWith("{}")) {//被包含，或者说key对应值处于value的范围内。查询时处理
- if (verifyType && hasAt != true && valuesIsNotStringOrArray) {
+ if (verifyType && hasAt != true && isValueNotStringOrArray) {
return ' ! value必须是String或Array类型！';
}
- fun = (valuesIsNotString ? '匹配选项' : '匹配条件') + (isValueNotEmpty ? '' : '，例如 ' + (valuesIsNotString ? '[1, 2, 3] ["%c%", "S%", "%end"] 等' : '">100" "%2=0;<=100000" 等'));
+ fun = (isValueNotString ? '匹配选项' : '匹配条件') + (isValueNotEmpty ? '' : '，例如 ' + (isValueNotString ? '[1, 2, 3] ["%c%", "S%", "%end"] 等' : '">100" "%2=0;<=100000" 等'));
key = columnName.substring(0, columnName.length - 2);
verifyType = false;
@@ -7115,7 +7141,7 @@ res_data = rep.json()
if (verifyType && hasAt != true && isSubquery != true) {
return ' ! key}{ 后面必须接 @，写成 key}{@:{} 格式！';
}
- if (verifyType && valuesIsNotObject) {
+ if (verifyType && isValueNotObject) {
return ' ! value必须是Object类型！';
}
@@ -7139,7 +7165,7 @@ res_data = rep.json()
key = columnName.substring(0, columnName.length - 1);
}
else if (columnName.endsWith(">=")) {//大于或等于
- if (verifyType && hasAt != true && valuesIsNotStringOrNumber) {
+ if (verifyType && hasAt != true && isValueNotStringOrNumber) {
return ' ! value必须是String或Number类型！';
}
@@ -7147,7 +7173,7 @@ res_data = rep.json()
key = columnName.substring(0, columnName.length - 2);
}
else if (columnName.endsWith("<=")) {//小于或等于
- if (verifyType && hasAt != true && valuesIsNotStringOrNumber) {
+ if (verifyType && hasAt != true && isValueNotStringOrNumber) {
return ' ! value必须是String或Number类型！';
}
@@ -7155,7 +7181,7 @@ res_data = rep.json()
key = columnName.substring(0, columnName.length - 2);
}
else if (columnName.endsWith(">")) {//大于
- if (verifyType && hasAt != true && valuesIsNotStringOrNumber) {
+ if (verifyType && hasAt != true && isValueNotStringOrNumber) {
return ' ! value必须是String或Number类型！';
}
@@ -7163,7 +7189,7 @@ res_data = rep.json()
key = columnName.substring(0, columnName.length - 1);
}
else if (columnName.endsWith("<")) {//小于
- if (verifyType && hasAt != true && valuesIsNotStringOrNumber) {
+ if (verifyType && hasAt != true && isValueNotStringOrNumber) {
return ' ! value必须是String或Number类型！';
}
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index 0af3738..b686d75 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -1764,10 +1764,26 @@ var JSONResponse = {
if (tgt == null) {
tgt = {};
}
- var startsWithQuestion = comment.startsWith('?')
- tgt.type = JSONResponse.getType(real);
- tgt.notNull = real != null && startsWithQuestion != true
- tgt.comment = startsWithQuestion ? comment.substring(1) : comment
+ var ind = comment.indexOf(', ')
+ if (ind < 0) {
+ ind = comment.indexOf(',')
+ }
+
+ var prefix = ind <= 0 ? '' : comment.substring(0, ind).trim()
+ comment = ind < 0 ? comment : comment.substring(ind + 1)
+ var nullable = prefix.endsWith('?')
+ var notEmpty = prefix.endsWith('!')
+ var name = nullable || notEmpty ? prefix.substring(0, prefix.length - 1) : prefix
+ if (StringUtil.isName(name)) {
+ tgt.name = name
+ } else {
+ nullable = notEmpty = null
+ }
+
+ tgt.type = JSONResponse.getType(real)
+ tgt.notNull = notEmpty == true || nullable == false || (nullable == null && real != null)
+ tgt.notEmpty = notEmpty == true || (notEmpty == null && StringUtil.isNotEmpty(real))
+ tgt.comment = comment
return target;
},
diff --git a/js/main.js b/js/main.js
index 784f07e..724b5da 100755
--- a/js/main.js
+++ b/js/main.js
@@ -4467,7 +4467,8 @@ https://github.com/Tencent/APIJSON/issues
'toId': 0,
'chainId@': '/Chain/id',
'documentId@': '/Document/id',
- 'userId': userId
+ 'userId': userId,
+ '@order': 'date-'
},
'TestRecord': {
'chainId@': '/Chain/id',
@@ -9825,7 +9826,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
else if (fun == CTX_PUT) {
var as = StringUtil.split(value.substring(start + 1, end), ', ')
if (as.length >= 2) {
- as[1] = 'get4Path((ctx || {}).ctx, ' + StringUtil.trim(as[1]) + ')'
+ as[1] = 'get4Path(((ctx || {}).pre || {}).data, ' + StringUtil.trim(as[1]) + ')'
}
toEval = 'put4Path((ctx || {}).ctx, ' + (value == 'CTX_PUT()' ? JSON.stringify(path) : '') + as.join(', ') + value.substring(end);
}
@@ -10043,7 +10044,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
// }
const list = (isRandom ? this.randoms : (this.isChainShow ? (
- this.isChainGroupShow() ? this.chainGroups : [this.chainGroups[0]]
+ this.isChainGroupShow() ? this.chainGroups : [this.chainGroups[this.currentChainGroupIndex]]
) : this.remotes)
) || []
@@ -10339,7 +10340,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
if (isRandom) {
stdd = stdd || ((this.currentRemoteItem || {}).TestRecord || {})[standardKey]
}
-
+
var standard = typeof stdd != 'string' ? stdd : (StringUtil.isEmpty(stdd, true) ? null : JSON.parse(stdd))
tr.compare = JSONResponse.compareResponse(res, standard, this.removeDebugInfo(response) || {}, '', isML, null, null, ignoreTrend) || {}
tr.compare.duration = it.durationHint
From d782ee46ff38c904129bcd8e5ce10cf9ecf8b4c2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 15 Jun 2024 22:42:39 +0800
Subject: [PATCH 807/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=88=86=E7=BB=84=E5=92=8C=E7=94=A8?=
=?UTF-8?q?=E4=BE=8B=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 48 ++++++++++++++++++++++++------------------------
js/main.js | 30 ++++++++++++++++++++++++++++--
2 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/index.html b/index.html
index 20fde11..2ea05c2 100755
--- a/index.html
+++ b/index.html
@@ -173,11 +173,11 @@
-
测试用例:{{ isLocalShow ? '本地历史' : (isChainShow ? '场景串联' : '远程在线') }}
-
-
-
-
+
diff --git a/js/main.js b/js/main.js
index 724b5da..735620c 100755
--- a/js/main.js
+++ b/js/main.js
@@ -4396,10 +4396,10 @@ https://github.com/Tencent/APIJSON/issues
this.chainPaths = []
}
} else {
- this.chainPaths.push(group)
+ this.chainPaths = [group] // .push(group)
}
-// this.casePaths = this.chainPaths
+ this.casePaths = this.chainPaths
var groupId = group == null ? 0 : group.groupId
if (groupId != null && groupId > 0) { // group != null && groupId == 0) {
@@ -4780,6 +4780,32 @@ https://github.com/Tencent/APIJSON/issues
}
},
+ getCaseCountStr: function() {
+ var isChainShow = this.isChainShow
+ var isCaseGroupShow = this.isCaseGroupShow()
+ var isLocalShow = this.isLocalShow
+ var caseShowType = this.caseShowType
+ var caseGroups = (isChainShow ? this.chainGroups : this.caseGroups) || []
+ var testCases = this.testCases || []
+
+ if (isLocalShow) {
+ return '(' + testCases.length + ')'
+ }
+
+ return '(' + (isCaseGroupShow ? caseGroups.length : '')
+ + (caseShowType == 0 && isCaseGroupShow ? '|' : '')
+ + (caseShowType == 2 && (isCaseGroupShow) ? '' : testCases.length) + ')';
+
+ // 以下代码不知道为啥结果显示不对
+ // var isCaseGroupShow = this.isCaseGroupShow()
+ // var isCaseItemShow = this.isCaseItemShow()
+ // var caseGroups = (this.isChainShow ? this.chainGroups : this.caseGroups) || []
+ //
+ // return '(' + (isCaseGroupShow ? caseGroups.length : '')
+ // + (isCaseGroupShow && isCaseItemShow ? '|' : '')
+ // + (isCaseItemShow ? '' : testCases.length) + ')';
+ },
+
//显示远程的测试用例文档
showTestCase: function (show, isLocal, callback, group) {
this.isTestCaseShow = show
From cf7cc26b2c374c81ca70c6d6c8fbae2d3b94d308 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 16 Jun 2024 00:32:23 +0800
Subject: [PATCH 808/818] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=B2=E8=81=94?=
=?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E6=AF=8F=E7=BB=84?=
=?UTF-8?q?=E6=8C=87=E5=AE=9A=E9=80=89=E4=B8=AD=E6=AD=A5=E9=AA=A4=E5=89=8D?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 120 +++++++++++++++++++++++++++++------------------------
1 file changed, 65 insertions(+), 55 deletions(-)
diff --git a/js/main.js b/js/main.js
index 735620c..efaa68c 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1670,9 +1670,13 @@ https://github.com/Tencent/APIJSON/issues
this.options = [];
target.focus();
- selectionStart = target.selectionStart = selectionEnd + (isClickSelectInput ? (name.length - (isValue ? 4 : 0)) : 0)
- + (isValue ? (after.startsWith(',') ? 1 : 0) : (target == vInput || target == vScript ? 3 : 2));
- selectionEnd = target.selectionEnd = selectionStart + (isValue ? 0 : 4)
+ try {
+ selectionStart = target.selectionStart = selectionEnd + (isClickSelectInput ? (name.length - (isValue ? 4 : 0)) : 0)
+ + (isValue ? (after.startsWith(',') ? 1 : 0) : (target == vInput || target == vScript ? 3 : 2));
+ selectionEnd = target.selectionEnd = selectionStart + (isValue ? 0 : 4)
+ } catch (e) {
+ console.log(e)
+ }
isClickSelectInput = false;
// vOption.focusout()
@@ -4125,7 +4129,7 @@ https://github.com/Tencent/APIJSON/issues
if (date == null) {
date = new Date()
}
- return this.fillZero(date.getHours()) + ':' + this.fillZero(date.getMinutes())
+ return this.fillZero(date.getHours()) + ':' + this.fillZero(date.getMinutes()) + ':' + this.fillZero(date.getSeconds())
},
formatDateTime: function (date) {
if (date == null) {
@@ -4386,6 +4390,7 @@ https://github.com/Tencent/APIJSON/issues
},
selectChainGroup: function (index, group) {
this.currentChainGroupIndex = index
+ this.currentDocIndex = -1
this.isCaseGroupEditable = false
if (group == null) {
@@ -4441,8 +4446,8 @@ https://github.com/Tencent/APIJSON/issues
'Chain': {
// TODO 后续再支持嵌套子组合 'toGroupId': groupId,
'groupId@': '[]/Chain/groupId',
- '@column': "id,groupId,documentId,randomId",
- '@order': 'id+',
+ '@column': "id,groupId,documentId,randomId,rank",
+ '@order': 'rank+,id+',
'documentId>': 0
},
'Document': {
@@ -4548,50 +4553,55 @@ https://github.com/Tencent/APIJSON/issues
},
addCase2Chain: function (item) {
- var id = item == null ? null : item.id
- if (id == null || id <= 0) {
- alert('请选择有效的用例！')
- return
- }
+ var id = item == null ? null : item.id
+ if (id == null || id <= 0) {
+ alert('请选择有效的用例！')
+ return
+ }
- var group = (this.chainGroups[this.currentChainGroupIndex] || {}).Chain
- if (group == null) {
- var index = this.chainPaths.length - 1
- group = this.chainPaths[index]
- }
- var groupId = group == null ? 0 : group.groupId
- if (groupId == null || groupId <= 0) {
- alert('请选择有效的场景串联用例分组！')
- return
- }
+ var group = (this.chainGroups[this.currentChainGroupIndex] || {}).Chain
+ if (group == null) {
+ var index = this.chainPaths.length - 1
+ group = this.chainPaths[index]
+ }
- var groupName = group.groupName
+ var groupId = group == null ? 0 : group.groupId
+ if (groupId == null || groupId <= 0) {
+ alert('请选择有效的场景串联用例分组！')
+ return
+ }
- var isAdd = true
- this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/post', {
- Chain: {
- 'groupName': groupName,
- 'groupId': groupId,
- 'documentId': item.id
- },
- tag: 'Chain'
- }, {}, function (url, res, err) {
- App.onResponse(url, res, err)
- var isOk = JSONResponse.isSuccess(res.data)
+ var nextIndex = this.currentDocIndex
+ var nextChain = nextIndex == null || nextIndex < 0 ? null : (this.testCases[nextIndex] || {}).Chain
+ var nextRank = nextChain == null ? null : nextChain.rank
- var msg = isOk ? '' : ('\nmsg: ' + StringUtil.get((res.data || {}).msg))
- if (err != null) {
- msg += '\nerr: ' + err.msg
- }
- alert((isAdd ? '新增' : '修改') + (isOk ? '成功' : '失败') + (isAdd ? '! \n' :'！\ngroupId: ' + groupId) + '\ngroupName: ' + groupName + '\n' + msg)
+ var groupName = group.groupName
+ var isAdd = true
+ this.request(true, REQUEST_TYPE_POST, REQUEST_TYPE_JSON, this.server + '/post', {
+ Chain: {
+ 'rank': this.formatDateTime(StringUtil.isEmpty(nextRank, true) ? null : new Date(new Date(nextRank).getTime() - 10)),
+ 'groupName': groupName,
+ 'groupId': groupId,
+ 'documentId': item.id
+ },
+ tag: 'Chain'
+ }, {}, function (url, res, err) {
+ App.onResponse(url, res, err)
+ var isOk = JSONResponse.isSuccess(res.data)
- App.isCaseGroupEditable = ! isOk
- if (isOk) {
-// App.remotes = App.testCases = []
-// App.showTestCase(true, false, null)
- App.selectChainGroup(App.currentChainGroupIndex, null)
- }
- })
+ var msg = isOk ? '' : ('\nmsg: ' + StringUtil.get((res.data || {}).msg))
+ if (err != null) {
+ msg += '\nerr: ' + err.msg
+ }
+ alert((isAdd ? '新增' : '修改') + (isOk ? '成功' : '失败') + (isAdd ? '! \n' :'！\ngroupId: ' + groupId) + '\ngroupName: ' + groupName + '\n' + msg)
+
+ App.isCaseGroupEditable = ! isOk
+ if (isOk) {
+// App.remotes = App.testCases = []
+// App.showTestCase(true, false, null)
+ App.selectChainGroup(App.currentChainGroupIndex, null)
+ }
+ })
},
onClickPath: function (index, path) {
@@ -4859,7 +4869,7 @@ https://github.com/Tencent/APIJSON/issues
var url = this.server + '/get'
var userId = this.User.id
-
+
this.coverage = {}
this.view = 'markdown'
var req = {
@@ -4871,8 +4881,8 @@ https://github.com/Tencent/APIJSON/issues
'Chain': isChainShow ? {
// TODO 后续再支持嵌套子组合 'toGroupId': groupId,
'groupId': groupId,
- '@column': "id,groupId,documentId,randomId",
- '@order': 'id+',
+ '@column': "id,groupId,documentId,randomId,documentName,randomName,rank", // ;unix_timestamp(rank):rank",
+ '@order': 'rank+,id+',
'documentId>': 0
} : null,
'Document': {
@@ -4893,7 +4903,7 @@ https://github.com/Tencent/APIJSON/issues
'@null': 'sqlauto', //'sqlauto{}': '=null'
// '@having': StringUtil.isEmpty(groupUrl) ? null : "substring_index(substr,'/',1)<0"
},
- 'Random': isChainShow ? {
+ 'Random': isChainShow ? {
'id@': '/Chain/randomId',
'toId': 0, // isChainShow ? 0 : null,
// 'chainId@': isChainShow ? '/Chain/id' : null,
@@ -5561,7 +5571,7 @@ https://github.com/Tencent/APIJSON/issues
}
}
}
-
+
this.scripts = newDefaultScript()
const isLoginShow = this.isLoginShow
@@ -5670,7 +5680,7 @@ https://github.com/Tencent/APIJSON/issues
App.onClickAccount(App.currentAccountIndex, item) //自动登录测试账号
if (user.id > 0) {
- if (App.chainShowType != 1 && App.chainPaths.length <= 0 && App.chainGroups.length <= 0) {
+ if (App.isChainShow && App.chainShowType != 1 && App.chainPaths.length <= 0 && App.chainGroups.length <= 0) {
App.selectChainGroup(-1, null)
}
if (App.caseShowType != 1 && App.casePaths.length <= 0 && App.caseGroups.length <= 0) {
@@ -9242,7 +9252,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const which = i;
var rawConfig = testSubList && i < existCount ? ((subs[i] || {}).Random || {}).config : random.config
-
+
var cb = function (url, res, err) {
if (callback != null) {
callback(url, res, err, random)
@@ -9251,7 +9261,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
App.onResponse(url, res, err)
}
};
-
+
try {
this.parseRandom(
JSON.parse(JSON.stringify(json)), rawConfig, random.id
@@ -10248,8 +10258,8 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
const header = hdr
const caseScript = {
- pre: item['Script:pre'],
- post: item['Script:post']
+ pre: (item['Script:pre'] || {}).script,
+ post: (item['Script:post'] || {}).script
}
const method = document.method
From cbf8cc5b8f93530d8a3d02f42c81034ff3eb4e6a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 8 Sep 2024 23:10:30 +0800
Subject: [PATCH 809/818] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=20APIAuto:=20=E6=9C=80=E5=85=88=E8=BF=9B?=
=?UTF-8?q?=E7=9A=84HTTP=E6=8E=A5=E5=8F=A3=E5=B7=A5=E5=85=B7=EF=BC=8C?=
=?UTF-8?q?=E6=84=9F=E8=B0=A2=E5=8D=9A=E4=B8=BB=E7=9A=84=E8=B4=A1=E7=8C=AE?=
=?UTF-8?q?~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
点赞、收藏 支持下博主吧 ^_^
https://blog.csdn.net/Nifc666/article/details/141966487
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 530f2d6..6dd704b 100755
--- a/README.md
+++ b/README.md
@@ -116,6 +116,8 @@ Bilibili：https://search.bilibili.com/all?keyword=APIAuto
### 相关推荐
[别再生成测试代码了！](https://mp.weixin.qq.com/s/G1GVNhhFbSX5GoyRU6GURg)
+[APIAuto: 最先进的HTTP接口工具](https://blog.csdn.net/Nifc666/article/details/141966487)
+
### 百度、搜狗、抖音公网接口调用演示
因为这些接口不支持 CORS 跨域，所以需要开启托管服务代理。
From 19336d4d151e6aaa3e8df5ecb6094ab9e472ad67 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 8 Sep 2024 23:13:01 +0800
Subject: [PATCH 810/818] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=20APIAuto:=20=E6=9C=80=E5=85=88=E8=BF=9B?=
=?UTF-8?q?=E7=9A=84HTTP=E6=8E=A5=E5=8F=A3=E5=B7=A5=E5=85=B7=EF=BC=8C?=
=?UTF-8?q?=E6=84=9F=E8=B0=A2=E5=8D=9A=E4=B8=BB=E7=9A=84=E8=B4=A1=E7=8C=AE?=
=?UTF-8?q?~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
点赞、收藏 支持下博主吧 ^_^
https://blog.csdn.net/Nifc666/article/details/141966487
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6dd704b..f0c7221 100755
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Bilibili：https://search.bilibili.com/all?keyword=APIAuto
### 相关推荐
-[别再生成测试代码了！](https://mp.weixin.qq.com/s/G1GVNhhFbSX5GoyRU6GURg)
+[别再生成测试代码了！](https://mp.weixin.qq.com/s/G1GVNhhFbSX5GoyRU6GURg)
[APIAuto: 最先进的HTTP接口工具](https://blog.csdn.net/Nifc666/article/details/141966487)
From 64178a65f4ae74cabc8de6bc9e7dd36ab7d4d52c Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 19 Sep 2024 00:40:15 +0800
Subject: [PATCH 811/818] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20Roadmap=20?=
=?UTF-8?q?=E8=B7=AF=E7=BA=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
https://github.com/TommyLemon/APIAuto/edit/master/README.md#Roadmap%20%E8%B7%AF%E7%BA%BF%E5%9B%BE
---
README.md | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/README.md b/README.md
index f0c7221..8f32dda 100755
--- a/README.md
+++ b/README.md
@@ -254,6 +254,24 @@ https://github.com/TommyLemon/APIAuto/issues
+### Roadmap 路线图
+1.Translate document to English/Italian/Franch/Spanish...
+
+2.新增功能
+1) 断言结果 新增按钮 变-\{原因}，点击后右侧展示 JSON diff view；
+2) 右下角列表展示具体每个断言有问题的字段，点击后 JSON view 只显示该字段对应值
+其他待补充...
+
+3.完善自动断言，支持更多格式的匹配
+
+4.解决 bug
+
+5.提升性能
+
+6.其他待补充...
+
+
+
### 感谢开源
* jsonon
* editor.md
From 8f6c2d982f045f86e4409eb814a81a412ec79b56 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Oct 2024 19:43:19 +0800
Subject: [PATCH 812/818] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E5=9C=A8=E5=8F=B3=E4=BE=A7=20Response=20JSON=20key=20=E5=90=8E?=
=?UTF-8?q?=E5=8A=A0=20=E6=96=AD=E8=A8=80=E7=BB=93=E6=9E=9C=E5=8F=8A?=
=?UTF-8?q?=E7=BA=A0=E9=94=99=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONResponse.js | 127 +++++++++++++++
index.html | 52 +++---
js/main.js | 340 ++++++++++++++++++++++++++++++++--------
3 files changed, 428 insertions(+), 91 deletions(-)
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index b686d75..96a9ea4 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -476,6 +476,54 @@ var JSONResponse = {
COMPARE_CODE_CHANGE: 11,
COMPARE_THROW_CHANGE: 12,
+ getCompareShowObj: function(cmp, status, response) {
+ var it = cmp;
+ var p = cmp.path
+ it.compareType = cmp.code;
+ it.compareMessage = (StringUtil.isEmpty(p, true) ? '' : p + ' ') + (cmp.msg || '查看结果')
+ switch (it.code) {
+ case JSONResponse.COMPARE_ERROR:
+ it.compareColor = 'red'
+ it.hintMessage = (status != null && status != 200 ? status + ' ' : '') + '请求出错！'
+ break;
+ case JSONResponse.COMPARE_NO_STANDARD:
+ it.compareColor = 'green'
+ it.hintMessage = '确认正确后点击[对的，纠正]'
+ break;
+ case JSONResponse.COMPARE_KEY_MORE:
+ case JSONResponse.COMPARE_VALUE_MORE:
+ case JSONResponse.COMPARE_EQUAL_EXCEPTION:
+ it.compareColor = 'green'
+ it.hintMessage = '新增字段/新增值 等'
+ break;
+ case JSONResponse.COMPARE_LENGTH_CHANGE:
+ case JSONResponse.COMPARE_VALUE_CHANGE:
+ it.compareColor = 'blue'
+ it.hintMessage = '值改变 等'
+ break;
+ case JSONResponse.COMPARE_VALUE_EMPTY:
+ case JSONResponse.COMPARE_KEY_LESS:
+ it.compareColor = 'orange'
+ it.hintMessage = '缺少字段/整数变小数 等'
+ break;
+ case JSONResponse.COMPARE_FORMAT_CHANGE:
+ case JSONResponse.COMPARE_NUMBER_TYPE_CHANGE:
+ case JSONResponse.COMPARE_TYPE_CHANGE:
+ case JSONResponse.COMPARE_CODE_CHANGE:
+ case JSONResponse.COMPARE_THROW_CHANGE:
+ var code = response == null ? null : response[JSONResponse.KEY_CODE]
+ it.compareColor = 'red'
+ it.hintMessage = (code != null && code != JSONResponse.CODE_SUCCESS
+ ? code + ' ' : (status != null && status != 200 ? status + ' ' : '')) + '状态码/异常/值类型 改变等'
+ break;
+ default:
+ it.compareColor = 'white'
+ it.hintMessage = '结果正确'
+ break;
+ }
+ return it;
+ },
+
/**测试compare: 对比 新的请求与上次请求的结果
0-相同，无颜色；
1-对象新增字段或数组新增值，绿色；
@@ -1635,6 +1683,85 @@ var JSONResponse = {
return tgt;
},
+ /**根据 APIJSON 引用赋值路径精准地修改值
+ */
+ setValByPath: function(target, pathKeys, val, isTry) {
+ var depth = pathKeys == null ? 0 : pathKeys.length
+ if (depth <= 0) {
+ return target;
+ }
+
+ var tgt = target;
+ var parent = target;
+ for (var i = 0; i < depth - 1; i ++) {
+ var k = pathKeys[i];
+ if (k == null) {
+ return null;
+ }
+ k = decodeURI(k);
+
+ if (tgt instanceof Object) {
+ if (k == '') {
+ if (tgt instanceof Array) {
+ k = 0;
+ } else {
+ ks = Object.keys(tgt);
+ k = ks == null ? null : ks[0];
+ if (k == null) {
+ return null;
+ }
+ }
+ }
+ else {
+ if (tgt instanceof Array) {
+ try {
+ var n = Number.parseInt(k);
+ if (Number.isSafeInteger(n)) {
+ k = n >= 0 ? n : n + tgt.length;
+ }
+ } catch (e) {
+ }
+ }
+ }
+
+ parent = tgt;
+ tgt = tgt[k];
+ continue;
+ }
+
+ if (tgt == null) {
+ try {
+ var n = Number.parseInt(k);
+ if (Number.isSafeInteger(n)) {
+ k = n >= 0 ? n : n + tgt.length;
+ }
+ } catch (e) {
+ }
+
+ tgt = Number.isInteger(k) ? [] : {};
+ if (i == 0 && parent == null) {
+ parent = target = tgt;
+ } else {
+ parent[k] = tgt;
+ }
+
+ parent = tgt;
+ tgt = tgt[k];
+
+ continue;
+ }
+
+ if (isTry != true) {
+ throw new Error('setValByPath 语法错误，' + k + ': value 中 value 类型应该是 Object 或 Array ！');
+ }
+
+ return null;
+ }
+
+ tgt[pathKeys[pathKeys.length - 1]] = val;
+
+ return target;
+ },
/**根据路径精准地更新测试标准中的键值对
*/
diff --git a/index.html b/index.html
index 2ea05c2..ec7e64c 100755
--- a/index.html
+++ b/index.html
@@ -274,7 +274,7 @@
-
+
+
+
退出
From 905fdd3c4c3728751f557d37260c2c4bcd27977a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 26 Jan 2019 23:07:42 +0800
Subject: [PATCH 021/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=96=87=E6=A1=A3:=E6=9D=83=E9=99=90Access=E6=96=B0=E5=A2=9Esc?=
=?UTF-8?q?hema=E6=98=BE=E7=A4=BA=E5=B9=B6=E5=9C=A8=E5=8F=B3=E4=BE=A7?=
=?UTF-8?q?=E5=AF=B9=E7=A7=B0=E6=96=B0=E5=A2=9E=20=E8=A1=A8=E5=90=8D(Schem?=
=?UTF-8?q?a)=20=E6=96=B9=E4=BE=BF=E9=98=85=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/js/main.js b/js/main.js
index bb2f18e..9885e6f 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1422,7 +1422,7 @@
'Access[]': {
'count': 0,
'Access': {
- '@column': 'name,alias,get,head,gets,heads,post,put,delete',
+ '@column': 'schema,name,alias,get,head,gets,heads,post,put,delete',
'@order': 'date-,name+',
'name()': 'getWithDefault(alias,name)',
'r0()': 'removeKey(alias)'
@@ -1523,8 +1523,8 @@
log('getDoc Access[] = \n' + format(JSON.stringify(list)));
doc += '\n\n\n\n\n\n\n\n\n### 访问权限'
- + ' \n 表名 | 允许 get 的角色 | 允许 head 的角色 | 允许 gets 的角色 | 允许 heads 的角色 | 允许 post 的角色 | 允许 put 的角色 | 允许 delete 的角色'
- + ' \n -------- | -------------- | -------------- | -------------- | -------------- | -------------- | -------------- | -------------- ';
+ + ' \n 表名(Schema) | 允许 get 的角色 | 允许 head 的角色 | 允许 gets 的角色 | 允许 heads 的角色 | 允许 post 的角色 | 允许 put 的角色 | 允许 delete 的角色 | 表名(Schema)'
+ + ' \n -------- | --------- | --------- | --------- | --------- | --------- | --------- | --------- | -------- ';
for (var i = 0; i < list.length; i++) {
item = list[i];
@@ -1534,14 +1534,15 @@
log('getDoc Access[] for i=' + i + ': item = \n' + format(JSON.stringify(item)));
- doc += '\n' + item.name
+ doc += '\n' + (item.name + '(' + item.schema + ')')
+ ' | ' + JSONResponse.getShowString(JSON.parse(item.get))
+ ' | ' + JSONResponse.getShowString(JSON.parse(item.head))
+ ' | ' + JSONResponse.getShowString(JSON.parse(item.gets))
+ ' | ' + JSONResponse.getShowString(JSON.parse(item.heads))
+ ' | ' + JSONResponse.getShowString(JSON.parse(item.post))
+ ' | ' + JSONResponse.getShowString(JSON.parse(item.put))
- + ' | ' + JSONResponse.getShowString(JSON.parse(item.delete));
+ + ' | ' + JSONResponse.getShowString(JSON.parse(item.delete))
+ + ' | ' + (item.name + '(' + item.schema + ')');
}
doc += '\n' //避免没数据时表格显示没有网格
From 00622b5a8acee4a545e2bb9c66c3db63eddcbdae Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Jan 2019 00:28:07 +0800
Subject: [PATCH 022/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A:=E6=96=B0=E5=A2=9E=E5=AD=90=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E7=9A=84=E6=B3=A8=E9=87=8A=EF=BC=9B=E5=8A=A0=E5=BC=BA?=
=?UTF-8?q?@role=EF=BC=8C@database=E5=80=BC=E7=9A=84=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=EF=BC=8C=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F=E6=84=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 51 +++++++++++++++++++++++++++++++++++++--------
1 file changed, 42 insertions(+), 9 deletions(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index 344e4ff..a172304 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -36,6 +36,7 @@ var CodeUtil = {
var depth = 0;
var names = [];
+ var isInSubquery = false;
var index;
var key;
@@ -55,14 +56,19 @@ var CodeUtil = {
line = line.trim();
if (line.endsWith('{')) { //对象，判断是不是Table，再加对应的注释
+ isInSubquery = key.endsWith('@');
+
depth ++;
names[depth] = key;
- comment = CodeUtil.getComment4Request(tableList, null, key, null, method);
+
+ comment = CodeUtil.getComment4Request(tableList, names[depth - 1], key, null, method, false);
}
else {
if (line.endsWith('}')) {
+ isInSubquery = false;
+
if (line.endsWith('{}')) { //对象，判断是不是Table，再加对应的注释
- comment = CodeUtil.getComment4Request(tableList, null, key, null, method);
+ comment = CodeUtil.getComment4Request(tableList, names[depth], key, null, method, false);
}
else {
depth --;
@@ -76,7 +82,7 @@ var CodeUtil = {
var isArray = line.endsWith('['); // [] 不影响
// alert('depth = ' + depth + '; line = ' + line + '; isArray = ' + isArray);
comment = value == 'null' ? ' ! null无效' : CodeUtil.getComment4Request(tableList, names[depth], key
- , isArray ? '' : line.substring(index + 2).trim(), method);
+ , isArray ? '' : line.substring(index + 2).trim(), method, isInSubquery);
}
}
@@ -830,6 +836,7 @@ var CodeUtil = {
QUERY_TYPES: ['数据', '数量', '全部'],
+ SUBQUERY_RANGES: ['ANY', 'ALL'],
QUERY_TYPE_KEYS: [0, 1, 2],
QUERY_TYPE_CONSTS: ["JSONRequest.QUERY_TABLE", "JSONRequest.QUERY_TOTAL", "JSONRequest.QUERY_ALL"],
REQUEST_ROLE_KEYS: ['UNKNOWN', 'LOGIN', 'CONTACT', 'CIRCLE', 'OWNER', 'ADMIN'],
@@ -848,16 +855,29 @@ var CodeUtil = {
* @param name
* @param key
* @param value
+ * @param isInSubquery
*/
- getComment4Request: function (tableList, name, key, value, method) {
+ getComment4Request: function (tableList, name, key, value, method, isInSubquery) {
// alert('name = ' + name + '; key = ' + key + '; value = ' + value + '; method = ' + method);
if (key == null) {
return '';
}
+ // if (value == null) {
+ // return ' ! key:value 中 key 或 value 任何一个为 null 时，该 key:value 都无效！'
+ // }
if (value == null || value instanceof Object) {
+ if (key.endsWith('@')) {
+ var aliaIndex = name == null ? -1 : name.indexOf(':');
+ var objName = aliaIndex < 0 ? name : name.substring(0, aliaIndex);
+ // if (JSONObject.isTableKey(objName)) {
+ return CodeUtil.getComment('子查询 < ' + CodeUtil.getCommentFromDoc(tableList, objName, key.substring(0, key.length - 1), method), false, ' ');
+ // }
+ // return CodeUtil.getComment('子查询 ' + StringUtil.get(name), false, ' ');
+ }
+
if (JSONObject.isArrayKey(key)) {
if (method != 'GET') {
return ' ! key[]:{}只支持GET方法！';
@@ -887,7 +907,7 @@ var CodeUtil = {
return '';
}
- if (JSONObject.isArrayKey(name)) {
+ if (isInSubquery || JSONObject.isArrayKey(name)) {
switch (key) {
case 'count':
return CodeUtil.getType4Request(value) != 'number' ? ' ! value必须是Number类型！' : CodeUtil.getComment('最多数量: 例如 5 10 20 ...', false, ' ');
@@ -901,6 +921,19 @@ var CodeUtil = {
return StringUtil.isEmpty(query) ? ' ! value必须是[' + CodeUtil.QUERY_TYPE_KEYS.join() + ']中的一种！' : CodeUtil.getComment('查询内容：0-数据 1-总数 2-全部', false, ' ');
case 'join':
return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('多表连接：例如 &/User/id@,
Date: Sun, 27 Jan 2019 00:31:54 +0800
Subject: [PATCH 023/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A:=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=88=A4=E6=96=AD=20key}{=20=E7=9A=84?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index a172304..52dd856 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -1081,6 +1081,10 @@ var CodeUtil = {
fun = '包含选项';
key = columnName.substring(0, columnName.length - 2);
}
+ else if (columnName.endsWith("}{")) {//存在，EXISTS。查询时处理
+ fun = '是否存在';
+ key = columnName.substring(0, columnName.length - 2);
+ }
else if (columnName.endsWith("+")) {//延长，PUT查询时处理
if (method != 'PUT') {//不为PUT就抛异常
return ' ! 功能符 + - 只能用于PUT请求！';
From 5c580f30fcac064090536fcd77daca04e78b4a21 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Jan 2019 00:37:53 +0800
Subject: [PATCH 024/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81:=E5=AD=90=E6=9F=A5=E8=AF=A2=20"key@":{}=20?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E5=8F=98=E9=87=8F=E5=90=8D=E5=8E=BB?=
=?UTF-8?q?=E6=8E=89=E5=90=8E=E9=9D=A2=E7=9A=84@,=20=E7=94=B1=20key@=20?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONResponse.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
index 8621488..33b8162 100644
--- a/apijson/JSONResponse.js
+++ b/apijson/JSONResponse.js
@@ -221,7 +221,8 @@ var JSONResponse = {
* @return
*/
formatAt(key) {
- return key.startsWith("@") ? key.substring(1) : key;
+ var k = key.startsWith("@") ? key.substring(1) : key;
+ return k.endsWith("@") ? k.substring(0, k.length - 1) : k;
},
/**key:alias => alias
* @param key
From 30539083370ce5f8937194d9e624ee116109734f Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Jan 2019 01:08:29 +0800
Subject: [PATCH 025/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A:=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index 52dd856..96c1395 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -60,7 +60,7 @@ var CodeUtil = {
depth ++;
names[depth] = key;
-
+
comment = CodeUtil.getComment4Request(tableList, names[depth - 1], key, null, method, false);
}
else {
@@ -870,12 +870,16 @@ var CodeUtil = {
if (value == null || value instanceof Object) {
if (key.endsWith('@')) {
+ if (key == '@from@') {
+ return CodeUtil.getComment('数据来源：匿名子查询，例如 {"from":"Table", "Table":{}}', false, ' ');
+ }
+
var aliaIndex = name == null ? -1 : name.indexOf(':');
var objName = aliaIndex < 0 ? name : name.substring(0, aliaIndex);
- // if (JSONObject.isTableKey(objName)) {
+ if (JSONObject.isTableKey(objName)) {
return CodeUtil.getComment('子查询 < ' + CodeUtil.getCommentFromDoc(tableList, objName, key.substring(0, key.length - 1), method), false, ' ');
- // }
- // return CodeUtil.getComment('子查询 ' + StringUtil.get(name), false, ' ');
+ }
+ return CodeUtil.getComment('子查询 ' + StringUtil.get(name) + "，需要被下面的表字段相关 key 引用赋值", false, ' ');
}
if (JSONObject.isArrayKey(key)) {
@@ -945,6 +949,8 @@ var CodeUtil = {
switch (key) {
case '@column':
return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('返回字段：例如 id,name;json_length(contactIdList):contactCount;...', false, ' ');
+ case '@from@': //value 类型为 Object 时 到不了这里，已在上方处理
+ return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String或Object类型！' : CodeUtil.getComment('数据来源：引用赋值 子查询 "' + value.substring(1, value.length - 1) + '@":{...} ', false, ' ');
case '@group':
return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('分组方式：例如 userId,momentId,...', false, ' ');
case '@having':
From 00a9efc04c9579030158cd009add19546209d4c1 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Jan 2019 01:14:19 +0800
Subject: [PATCH 026/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A:=E4=BC=98=E5=8C=96=E5=AD=90=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=85=B3=E9=94=AE=E8=AF=8D=20from=20=E7=9A=84?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index 96c1395..147b812 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -934,7 +934,7 @@ var CodeUtil = {
}
return CodeUtil.SUBQUERY_RANGES.indexOf(value.substring(1, value.length - 1)) <= 0 ? ' ! value必须是[' + CodeUtil.SUBQUERY_RANGES.join() + ']中的一种！' : CodeUtil.getComment('比较范围：ANY-任意 ALL-全部', false, ' ');
case 'from':
- return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('主表名称：例如 User Comment:to，同一层级必须有对应的 "User": {...}, "Comment:to": {...}', false, ' ');
+ return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('数据来源：例如 User，同一层级必须有对应的 "User": {...}', false, ' ');
}
}
break;
From 04b4ff58dec59c8bbc5a3d017d73736e21d0ebce Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 Feb 2019 18:11:51 +0800
Subject: [PATCH 027/818] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A:=E8=A7=A3=E5=86=B3=E5=AF=B9=E5=AD=90?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2range=E6=A0=A1=E9=AA=8CANY=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index 147b812..faf27b1 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -932,7 +932,7 @@ var CodeUtil = {
if (CodeUtil.getType4Request(value) != 'string') {
return ' ! value必须是String类型！';
}
- return CodeUtil.SUBQUERY_RANGES.indexOf(value.substring(1, value.length - 1)) <= 0 ? ' ! value必须是[' + CodeUtil.SUBQUERY_RANGES.join() + ']中的一种！' : CodeUtil.getComment('比较范围：ANY-任意 ALL-全部', false, ' ');
+ return CodeUtil.SUBQUERY_RANGES.indexOf(value.substring(1, value.length - 1)) < 0 ? ' ! value必须是[' + CodeUtil.SUBQUERY_RANGES.join() + ']中的一种！' : CodeUtil.getComment('比较范围：ANY-任意 ALL-全部', false, ' ');
case 'from':
return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('数据来源：例如 User，同一层级必须有对应的 "User": {...}', false, ' ');
}
From b55636e1b5e3458cfb7aa0b9153378224e2f86fe Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 11 Feb 2019 18:35:14 +0800
Subject: [PATCH 028/818] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E5=AF=B9=E8=AF=B7=E6=B1=82=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 80 ++++++++++++++++++++++++++++++++++--------------------
1 file changed, 50 insertions(+), 30 deletions(-)
diff --git a/js/main.js b/js/main.js
index 9885e6f..bf99163 100755
--- a/js/main.js
+++ b/js/main.js
@@ -323,15 +323,27 @@
},
//获取请求的tag
getTag: function () {
- var req = null
+ var req = null;
try {
- req = JSON.parse(new String(vInput.value))
+ req = this.getRequest(vInput.value);
} catch (e) {
- log('main.getTag', 'try { req = JSON.parse(new String(vInput.value)) \n } catch (e) {\n' + e.message)
+ log('main.getTag', 'try { req = this.getRequest(vInput.value); \n } catch (e) {\n' + e.message)
}
return req == null ? null : req.tag
},
+ getRequest: function (json) {
+ var s = App.toDoubleJSON(json);
+ try {
+ return jsonlint.parse(s);
+ }
+ catch (e) {
+ log('main.getRequest', 'try { return jsonlint.parse(s); \n } catch (e) {\n' + e.message)
+ log('main.getRequest', 'return jsonlint.parse(App.removeComment(s));')
+ return jsonlint.parse(App.removeComment(s));
+ }
+ },
+
// 显示保存弹窗
showSave: function (show) {
if (show) {
@@ -1134,14 +1146,21 @@
before = App.toDoubleJSON(before);
log('onHandle before = \n' + before);
- before = jsonlint.parse(before);
-
- before = JSON.stringify(before, null, " "); //用format不能catch！
+ var after;
+ try {
+ after = JSON.stringify(jsonlint.parse(before), null, " ");
+ before = after;
+ }
+ catch (e) {
+ log('main.onHandle', 'try { return jsonlint.parse(before); \n } catch (e) {\n' + e.message)
+ log('main.onHandle', 'return jsonlint.parse(App.removeComment(before));')
+ after = JSON.stringify(jsonlint.parse(App.removeComment(before)), null, " ");
+ }
//关键词let在IE和Safari上不兼容
var code = '';
try {
- code = this.getCode(before); //必须在before还是用 " 时使用，后面用会因为解析 ' 导致失败
+ code = this.getCode(after); //必须在before还是用 " 时使用，后面用会因为解析 ' 导致失败
} catch(e) {
code = '\n\n\n建议:\n使用其它浏览器，例如 谷歌Chrome、火狐FireFox 或者 微软Edge， 因为这样能自动生成请求代码.'
+ '\nError:\n' + e.message + '\n\n\n';
@@ -1166,7 +1185,7 @@
App.showDoc()
try {
- vComment.value = isSingle ? '' : CodeUtil.parseComment(before, docObj == null ? null : docObj['[]'], App.getMethod())
+ vComment.value = isSingle ? '' : CodeUtil.parseComment(after, docObj == null ? null : docObj['[]'], App.getMethod())
onScrollChanged()
} catch (e) {
@@ -1209,25 +1228,30 @@
// 删除注释 <<<<<<<<<<<<<<<<<<<<<
- var input = new String(vInput.value);
+ var input = this.removeComment(vInput.value);
+ if (vInput.value != input) {
+ vInput.value = input
+ }
+ // 删除注释 >>>>>>>>>>>>>>>>>>>>>
+
+
+ this.onChange();
+ },
+
+ /**
+ * 删除注释
+ */
+ removeComment: function (json) {
var reg = /("([^\\\"]*(\\.)?)*")|('([^\\\']*(\\.)?)*')|(\/{2,}.*?(\r|\n))|(\/\*(\n|.)*?\*\/)/g // 正则表达式
try {
- input = input.replace(reg, function(word) { // 去除注释后的文本
+ return new String(json).replace(reg, function(word) { // 去除注释后的文本
return /^\/{2,}/.test(word) || /^\/\*/.test(word) ? "" : word;
})
-
- if (vInput.value != input) {
- vInput.value = input
- }
} catch (e) {
- log('transfer delete comment in json >> catch \n' + e.message)
+ log('transfer delete comment in json >> catch \n' + e.message);
}
-
- // 删除注释 >>>>>>>>>>>>>>>>>>>>>
-
-
- this.onChange();
+ return json;
},
showAndSend: function (url, req, isAdminOperation, callback) {
@@ -1249,11 +1273,7 @@
clearTimeout(handler);
- var real = new String(vInput.value);
- if (real.indexOf("'") >= 0) {
- real = real.replace(/'/g, "\"");
- }
- var req = JSON.parse(real);
+ var req = this.getRequest(vInput.value);
var url = new String(vUrl.value)
url = url.replace(/ /g, '')
@@ -1274,7 +1294,7 @@
'userId': App.User.id,
'name': App.formatDateTime() + (StringUtil.isEmpty(req.tag, true) ? '' : ' ' + req.tag),
'url': '/' + method,
- 'request': real
+ 'request': JSON.stringify(req, null, ' ')
}
})
App.saveCache('', 'locals', this.locals)
@@ -1746,7 +1766,7 @@
continue
}
doc += '\n\n#### ' + (item.version > 0 ? 'V' + item.version : 'V*') + ' ' + item.name + ' ' + item.url
- doc += '\n```json\n' + JSON.stringify(JSON.parse(item.request), null, ' ') + '\n```\n'
+ doc += '\n```json\n' + item.request + '\n```\n'
}
return doc
},
@@ -1815,7 +1835,7 @@
// App.restore(item)
// App.onChange(false)
- App.request(false, baseUrl + document.url, JSON.parse(document.request), function (url, res, err) {
+ App.request(false, baseUrl + document.url, App.getRequest(document.request), function (url, res, err) {
try {
App.onResponse(url, res, err)
@@ -2000,7 +2020,7 @@
else {
url = App.server + '/post/testrecord/ml'
req = {
- documentId: document.id
+ documentId: document.id
}
}
@@ -2032,7 +2052,7 @@
setRequestHint(index, item) {
var d = item == null ? null : item.Document;
var r = d == null ? null : d.request;
- this.$refs.testCaseTexts[index].setAttribute('data-hint', r == null ? '' : JSON.stringify(JSON.parse(r), null, ' '));
+ this.$refs.testCaseTexts[index].setAttribute('data-hint', r == null ? '' : JSON.stringify(this.getRequest(r), null, ' '));
},
//显示详细信息, :data-hint :data, :hint 都报错，只能这样
setTestHint(index, item) {
From 2e187c6140da0fd21b05738c7870eab5d096c4a0 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 17 Feb 2019 10:56:17 +0800
Subject: [PATCH 029/818] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=8E=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=88=87=E6=8D=A2=E4=B8=BA=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E6=A1=86=E5=90=8E=E6=9C=AA=E6=98=BE=E7=A4=BA=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/main.js b/js/main.js
index bf99163..993ef54 100755
--- a/js/main.js
+++ b/js/main.js
@@ -1179,7 +1179,7 @@
vInput.value = before;
vSend.disabled = false;
- vOutput.value = 'OK，请点击 [发送请求] 按钮来测试。[点击这里查看视频教程](http://i.youku.com/apijson)' + code;
+ vOutput.value = output = 'OK，请点击 [发送请求] 按钮来测试。[点击这里查看视频教程](http://i.youku.com/apijson)' + code;
App.showDoc()
From 05c864cceb8efcbf8e64993ef3d91c3b132b721e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 17 Feb 2019 18:30:43 +0800
Subject: [PATCH 030/818] =?UTF-8?q?=E8=A1=A8=E5=92=8C=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=B1=9E=E6=80=A7key=E5=85=A8=E5=B0=8F=E5=86=99=EF=BC=8C?=
=?UTF-8?q?=E5=87=86=E5=A4=87=E5=85=BC=E5=AE=B9PostgreSQL=EF=BC=9B?=
=?UTF-8?q?=E5=8A=A0=E5=AE=BD=E6=9C=AC=E5=9C=B0=E4=BF=9D=E5=AD=98=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/CodeUtil.js | 22 +++++++++++-----------
index.html | 2 +-
js/main.js | 26 +++++++++++++-------------
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
index faf27b1..294b810 100644
--- a/apijson/CodeUtil.js
+++ b/apijson/CodeUtil.js
@@ -502,7 +502,7 @@ var CodeUtil = {
//Table
table = item == null ? null : item.Table;
- model = CodeUtil.getModelName(table == null ? null : table.TABLE_NAME);
+ model = CodeUtil.getModelName(table == null ? null : table.table_name);
if (model != clazz) {
continue;
}
@@ -515,7 +515,7 @@ var CodeUtil = {
+ '\n\n使用方法\n1.修改包名package \n2.import需要引入的类，可使用快捷键Ctrl+Shift+O '
+ '\n*/\n'
+ '\npackage apijson.demo.server.model;\n\n\n'
- + CodeUtil.getComment(table.TABLE_COMMENT, true)
+ + CodeUtil.getComment(table.table_comment, true)
+ '\n@MethodAccess'
+ '\npublic class ' + model + ' implements Serializable {'
+ '\n private static final long serialVersionUID = 1L;\n';
@@ -532,16 +532,16 @@ var CodeUtil = {
for (var j = 0; j < columnList.length; j++) {
column = columnList[j];
- name = CodeUtil.getFieldName(column == null ? null : column.COLUMN_NAME);
+ name = CodeUtil.getFieldName(column == null ? null : column.column_name);
if (name == '') {
continue;
}
- type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.COLUMN_TYPE, false);
+ type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.column_type, false);
console.log('parseJavaBean [] for j=' + j + ': column = \n' + format(JSON.stringify(column)));
- doc += '\n private ' + type + ' ' + name + '; ' + CodeUtil.getComment(column.COLUMN_COMMENT, false);
+ doc += '\n private ' + type + ' ' + name + '; ' + CodeUtil.getComment(column.column_comment, false);
}
@@ -559,11 +559,11 @@ var CodeUtil = {
for (var j = 0; j < columnList.length; j++) {
column = columnList[j];
- name = CodeUtil.getFieldName(column == null ? null : column.COLUMN_NAME);
+ name = CodeUtil.getFieldName(column == null ? null : column.column_name);
if (name == '') {
continue;
}
- type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.COLUMN_TYPE);
+ type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.column_type);
console.log('parseJavaBean [] for j=' + j + ': column = \n' + format(JSON.stringify(column)));
@@ -1038,13 +1038,13 @@ var CodeUtil = {
//Table
table = item == null ? null : item.Table;
- if (table == null || tableName != CodeUtil.getModelName(table.TABLE_NAME)) {
+ if (table == null || tableName != CodeUtil.getModelName(table.table_name)) {
continue;
}
log('getDoc [] for i=' + i + ': table = \n' + format(JSON.stringify(table)));
if (StringUtil.isEmpty(columnName)) {
- return table.TABLE_COMMENT;
+ return table.table_comment;
}
@@ -1155,7 +1155,7 @@ var CodeUtil = {
var name;
for (var j = 0; j < columnList.length; j++) {
column = columnList[j];
- name = column == null ? null : column.COLUMN_NAME;
+ name = column == null ? null : column.column_name;
if (name == null || key != name) {
continue;
}
@@ -1163,7 +1163,7 @@ var CodeUtil = {
var p = (at.length <= 0 ? '' : at + ' < ')
+ (fun.length <= 0 ? '' : fun + ' < ')
+ (logic.length <= 0 ? '' : logic + ' < ');
- return (p.length <= 0 ? '' : p + key + ': ') + CodeUtil.getJavaType(column.COLUMN_TYPE, true) + ', ' + column.COLUMN_COMMENT;
+ return (p.length <= 0 ? '' : p + key + ': ') + CodeUtil.getJavaType(column.column_type, true) + ', ' + column.column_comment;
}
break;
diff --git a/index.html b/index.html
index e6c160a..32ce1dd 100755
--- a/index.html
+++ b/index.html
@@ -207,7 +207,7 @@
- 
+ 
diff --git a/js/main.js b/js/main.js
index ae6c1b9..1d37789 100755
--- a/js/main.js
+++ b/js/main.js
@@ -592,13 +592,13 @@
balance: null //点击更新提示需要判空 0.00
},
type: REQUEST_TYPE_JSON,
- types: [ REQUEST_TYPE_PARAM, REQUEST_TYPE_JSON, REQUEST_TYPE_FORM, REQUEST_TYPE_DATA, REQUEST_TYPE_GRPC ], //默认展示
+ types: [ REQUEST_TYPE_PARAM, REQUEST_TYPE_JSON], // 很多人喜欢用 GET 接口测试，默认的 JSON 看不懂 , REQUEST_TYPE_FORM, REQUEST_TYPE_DATA, REQUEST_TYPE_GRPC ], //默认展示
host: '',
database: 'MYSQL', // 查文档必须，除非后端提供默认配置接口 // 用后端默认的，避免用户总是没有配置就问为什么没有生成文档和注释 'MYSQL',// 'POSTGRESQL',
schema: 'sys', // 查文档必须，除非后端提供默认配置接口 // 用后端默认的，避免用户总是没有配置就问为什么没有生成文档和注释 'sys',
- server: 'http://apijson.cn:9090/', // Chrome 90+ 跨域问题非常难搞，开发模式启动都不行了 'http://apijson.org:9090/', //apijson.org:8000
+ server: 'http://apijson.cn:9090/', // Chrome 90+ 跨域问题非常难搞，开发模式启动都不行了 'http://apijson.org:9090/', //apijson.cn
// server: 'http://47.74.39.68:9090/', // apijson.org
- thirdParty: 'SWAGGER /v2/api-docs', //apijson.org:8000
+ thirdParty: 'SWAGGER /v2/api-docs', //apijson.cn
// thirdParty: 'RAP /repository/joined /repository/get',
// thirdParty: 'YAPI /api/interface/list_menu /api/interface/get',
language: CodeUtil.LANGUAGE_KOTLIN,
@@ -1052,7 +1052,7 @@
response: api.res_body == null ? null : JSON.parse(api.res_body),
detail: name
+ '\n' + (api.up_time == null ? '' : (typeof api.up_time != 'number' ? api.up_time : new Date(1000*api.up_time).toLocaleString()))
- + '\nhttp://apijson.org/yapi/project/1/interface/api/' + api._id
+ + '\nhttp://apijson.cn/yapi/project/1/interface/api/' + api._id
+ '\n\n' + (StringUtil.isEmpty(api.markdown, true) ? StringUtil.trim(api.description) : api.markdown.trim().replace(/\\_/g, '_'))
}
}
@@ -2230,7 +2230,7 @@
typeAndParam.type, api.title, api.path, typeAndParam.param, header
, (StringUtil.trim(api.username) + ': ' + StringUtil.trim(api.title)
+ '\n' + (api.up_time == null ? '' : (typeof api.up_time != 'number' ? api.up_time : new Date(1000*api.up_time).toLocaleString()))
- + '\nhttp://apijson.org/yapi/project/1/interface/api/' + api._id
+ + '\nhttp://apijson.cn/yapi/project/1/interface/api/' + api._id
+ '\n\n' + (StringUtil.isEmpty(api.markdown, true) ? StringUtil.trim(api.description) : api.markdown.trim().replace(/\\_/g, '_')))
, api.username
)
@@ -4317,10 +4317,10 @@
// alert('请把URL改成你自己的！\n例如 http://localhost:8080')
// return
// }
- if (baseUrl.indexOf('/apijson.org') >= 0) {
- alert('请把URL改成 http://apijson.cn:8080 或 你自己的！\n例如 http://localhost:8080')
- return
- }
+ // if (baseUrl.indexOf('/apijson.org') >= 0) {
+ // alert('请把URL改成 http://apijson.cn:8080 或 你自己的！\n例如 http://localhost:8080')
+ // return
+ // }
const list = (testSubList ? this.randomSubs : this.randoms) || []
var allCount = list.length
@@ -4865,10 +4865,10 @@
// alert('请把URL改成你自己的！\n例如 http://localhost:8080')
// return
// }
- if (baseUrl.indexOf('/apijson.org') >= 0) {
- alert('请把URL改成 http://apijson.cn:8080 或 你自己的！\n例如 http://localhost:8080')
- return
- }
+ // if (baseUrl.indexOf('/apijson.org') >= 0) {
+ // alert('请把URL改成 http://apijson.cn:8080 或 你自己的！\n例如 http://localhost:8080')
+ // return
+ // }
const list = App.remotes || []
const allCount = list.length
From dfaa8c56af0fcb497f9e8864d84c55b5a48a8d9c Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 29 Sep 2021 18:57:10 +0800
Subject: [PATCH 493/818] =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=9A=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E7=BD=91=E9=A1=B5=20URL=20=E4=BC=A0=E5=8F=82=E8=BD=AC?=
=?UTF-8?q?=E5=8F=91=E5=88=B0=E6=B5=8F=E8=A7=88=E5=99=A8=E6=96=B0=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE=E7=9A=84=E8=A7=A3=E7=A0=81=EF=BC=8C=E5=85=BC=E5=AE=B9?=
=?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=9C=BA=E6=99=AF=E4=B8=94=E6=9B=B4=E6=B8=85?=
=?UTF-8?q?=E6=99=B0=E5=8F=AF=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 2 +-
js/main.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index 4e0aba5..6ef4aeb 100755
--- a/index.html
+++ b/index.html
@@ -806,7 +806,7 @@
}
- function getRequest() {
+ function getRequestFromURL() {
var url = window.location.search;
var index = url == null ? -1 : url.indexOf("?")
diff --git a/js/main.js b/js/main.js
index 1d37789..99aa174 100755
--- a/js/main.js
+++ b/js/main.js
@@ -5639,7 +5639,7 @@
this.transfer()
setTimeout(function () {
- var rawReq = getRequest()
+ var rawReq = getRequestFromURL()
if (rawReq != null && StringUtil.isEmpty(rawReq.json, true) == false) {
vUrlComment.value = ""
vComment.value = ""
@@ -5660,7 +5660,7 @@
var url = vUrl.value
if (rawReq.jump == "true" || (rawReq.jump != "false" && (url.endsWith("/get") || url.endsWith("/head")) ) ) {
setTimeout(function () {
- window.open(vUrl.value + "/" + encodeURIComponent(vInput.value))
+ window.open(vUrl.value + "/" + encodeURIComponent(JSON.stringify(encode(JSON.parse(vInput.value)))))
}, 1000)
}
}
From 0e441f4f4bfd6fe8e708e4827fbd938e51e2e24a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 29 Sep 2021 20:04:21 +0800
Subject: [PATCH 494/818] =?UTF-8?q?=E5=88=86=E4=BA=AB=EF=BC=9A=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E5=88=86=E4=BA=AB=20APIAuto=20?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BC=80=E5=8F=91?=
=?UTF-8?q?=E5=8D=8F=E4=BD=9C=E5=92=8C=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?=
=?UTF-8?q?=E7=9A=84=20APIAuto=20=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/js/main.js b/js/main.js
index 99aa174..823f37c 100755
--- a/js/main.js
+++ b/js/main.js
@@ -895,6 +895,25 @@
alert('请先输入请求内容！')
return
}
+
+ setTimeout(function () {
+ var href = window.location.href || 'http://apijson.cn/api'
+ var ind = href == null ? -1 : href.indexOf('?') // url 后带参数只能 encodeURIComponent
+ var reqStr
+ try {
+ reqStr = JSON.stringify(encode(JSON.parse(vInput.value)))
+ } catch (e){ // 可能包含注释
+ reqStr = encode(StringUtil.trim(vInput.value))
+ }
+
+ window.open((ind < 0 ? href : href.substring(0, ind))
+ + "?type=" + StringUtil.trim(App.type)
+ + "&url=" + encodeURIComponent(StringUtil.trim(vUrl.value))
+ + (StringUtil.isEmpty(vHeader.value, true) ? '' : "&header=" + encodeURIComponent(StringUtil.trim(vHeader.value)))
+ + "&json=" + reqStr
+ + (StringUtil.isEmpty(vRandom.value, true) ? '' : "&random=" + encodeURIComponent(StringUtil.trim(vRandom.value))))
+ }, 1000)
+
if (App.view == 'error') { // App.view != 'code') {
alert('发现错误，请输入正确的内容！') // alert('请先测试请求，确保是正确可用的！')
return
@@ -5644,20 +5663,34 @@
vUrlComment.value = ""
vComment.value = ""
- if (StringUtil.isEmpty(rawReq.url, true) == false) {
- vType.value = StringUtil.toUpperCase(rawReq.type, true)
+ if (StringUtil.isEmpty(rawReq.type, true) == false) {
+ App.type = StringUtil.toUpperCase(rawReq.type, true)
+ if (App.types != null && App.types.indexOf(App.type) < 0) {
+ App.types.push(App.type)
+ }
}
if (StringUtil.isEmpty(rawReq.url, true) == false) {
vUrl.value = StringUtil.trim(rawReq.url)
}
+ if (StringUtil.isEmpty(rawReq.header, true) == false) {
+ vHeader.value = StringUtil.trim(rawReq.header, true)
+ App.isHeaderShow = true
+ }
+
+ if (StringUtil.isEmpty(rawReq.random, true) == false) {
+ vRandom.value = StringUtil.trim(rawReq.random, true)
+ App.isRandomShow = true
+ App.isRandomListShow = false
+ }
+
vInput.value = StringUtil.trim(rawReq.json)
App.onChange(false)
App.send(false)
- var url = vUrl.value
+ var url = vUrl.value || ''
if (rawReq.jump == "true" || (rawReq.jump != "false" && (url.endsWith("/get") || url.endsWith("/head")) ) ) {
setTimeout(function () {
window.open(vUrl.value + "/" + encodeURIComponent(JSON.stringify(encode(JSON.parse(vInput.value)))))
From a61edfaeb90778818db0d8eb06bc190982329134 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 30 Sep 2021 01:06:42 +0800
Subject: [PATCH 495/818] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=9A=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E5=88=86=E4=BA=AB=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?(=E9=85=8D=E7=BD=AE)=E5=B9=B6=E9=80=9A=E8=BF=87=E7=BD=91?=
=?UTF-8?q?=E9=A1=B5=20URL=20=E5=8F=82=E6=95=B0=20save=3Dtrue=20=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E4=BF=9D=E5=AD=98=E8=AE=BE=E7=BD=AE(=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apijson/JSONRequest.js | 29 +++++++++
index.html | 2 +-
js/main.js | 129 +++++++++++++++++++++++++++++++----------
3 files changed, 128 insertions(+), 32 deletions(-)
diff --git a/apijson/JSONRequest.js b/apijson/JSONRequest.js
index 13aad57..eac0474 100644
--- a/apijson/JSONRequest.js
+++ b/apijson/JSONRequest.js
@@ -151,6 +151,35 @@ function encode(json) {
return json;
}
+/**解码JSON，反转义所有String
+ * @param json 任意类型
+ */
+function decode(json) {
+ // alertOfDebug("decode before:\n" + format(JSON.stringify(json)));
+
+ if (typeof json == "string") { //json instanceof String) {
+ json = decodeURIComponent(json);
+ }
+ else if (json instanceof Array) {
+ // alertOfDebug("decode json instanceof Array");
+
+ for (var i = 0; i < json.length; i ++) {
+ // alertOfDebug("json[" + i + "] = " + format(JSON.stringify(json[i])));
+ json[i] = decode(json[i]);
+ }
+ }
+ else if (json instanceof Object) {
+ // alertOfDebug("decode json instanceof Object");
+ for (var key in json) {
+ // alertOfDebug("decode json[" + key + "] = " + format(JSON.stringify(json[key])));
+ json[key] = decode(json[key]);
+ }
+ }
+ // alertOfDebug("decode after:\n" + format(JSON.stringify(json)));
+
+ return json;
+}
+
/**编码JSON，转义所有String
* @param data 任意类型
*/
diff --git a/index.html b/index.html
index 6ef4aeb..82c18f5 100755
--- a/index.html
+++ b/index.html
@@ -116,7 +116,7 @@
生成代码(封装,解析) : {{ language || '例如 Java' }}
数据库类型 Database: {{ database || '例如 MYSQL' }}
数据库名/模式 Schema: {{ schema || '例如 sys' }}
- 使用的请求类型: {{ types == null || types.length <= 0 ? '点击设置' : types.join() }}
+ 使用的请求类型: {{ types == null || types.length <= 0 ? '点击设置' : (types instanceof Array ? types.join() : types) }}
托管服务器地址 URL: {{ server || '点击设置' }}
导入第三方文档(平台名 URL): 
@@ -814,7 +814,7 @@
return null;
}
- var theRequest = {};
+ var theRequest = null;
var str = url.substring(index + 1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
var arr = str.split("&"); //截除“&”生成一个数组
@@ -826,6 +826,9 @@
continue
}
+ if (theRequest == null) {
+ theRequest = {};
+ }
theRequest[part.substring(0, ind)] = decodeURIComponent(part.substring(ind+1));
}
diff --git a/js/main.js b/js/main.js
index 1e13482..001ace1 100755
--- a/js/main.js
+++ b/js/main.js
@@ -528,6 +528,7 @@
testRandomCount: 1,
testRandomProcess: '',
compareColor: '#0000',
+ isRandomTest: false,
isDelayShow: false,
isSaveShow: false,
isExportShow: false,
@@ -872,6 +873,73 @@
return header
},
+ // 分享 APIAuto 特有链接，打开即可还原分享人的 JSON 参数、设置项、搜索关键词、分页数量及页码等配置
+ shareLink: function (isRandom) {
+ var jsonStr = null
+ if (App.isTestCaseShow != true) {
+ try {
+ jsonStr = JSON.stringify(encode(JSON.parse(vInput.value)))
+ } catch (e) { // 可能包含注释
+ log(e)
+ jsonStr = encode(StringUtil.trim(vInput.value))
+ }
+ }
+
+ // URL 太长导致打不开标签
+ var settingStr = null
+ try {
+ settingStr = JSON.stringify({
+ requestVersion: App.requestVersion,
+ requestCount: App.requestCount,
+ isTestCaseShow: App.isTestCaseShow,
+ // isHeaderShow: App.isHeaderShow,
+ // isRandomShow: App.isRandomShow,
+ isRandomListShow: App.isRandomShow ? App.isRandomListShow : undefined,
+ isRandomSubListShow: App.isRandomListShow ? App.isRandomSubListShow : undefined,
+ // isRandomEditable: App.isRandomEditable,
+ isCrossEnabled: App.isCrossEnabled,
+ isMLEnabled: App.isMLEnabled,
+ isDelegateEnabled: App.isDelegateEnabled,
+ isPreviewEnabled: App.isPreviewEnabled,
+ isEncodeEnabled: App.isEncodeEnabled,
+ isEditResponse: App.isEditResponse,
+ isLocalShow: App.isTestCaseShow ? App.isLocalShow : undefined,
+ page: App.page,
+ count: App.count,
+ testCasePage: App.testCasePage,
+ testCaseCount: App.testCaseCount,
+ randomPage: App.randomPage,
+ randomCount: App.randomCount,
+ randomSubPage: App.randomSubPage,
+ randomSubCount: App.randomSubCount,
+ host: StringUtil.isEmpty(App.host, true) ? undefined : encodeURIComponent(App.host),
+ search: StringUtil.isEmpty(App.search, true) ? undefined : encodeURIComponent(App.search),
+ testCaseSearch: StringUtil.isEmpty(App.testCaseSearch, true) ? undefined : App.testCaseSearch,
+ randomSearch: StringUtil.isEmpty(App.randomSearch, true) ? undefined : encodeURIComponent(App.randomSearch),
+ randomSubSearch: StringUtil.isEmpty(App.randomSubSearch, true) ? undefined : encodeURIComponent(App.randomSubSearch)
+ })
+ } catch (e){
+ log(e)
+ }
+
+ var headerStr = App.isTestCaseShow || StringUtil.isEmpty(vHeader.value, true) ? null : encodeURIComponent(StringUtil.trim(vHeader.value))
+ var randomStr = App.isTestCaseShow || StringUtil.isEmpty(vRandom.value, true) ? null : encodeURIComponent(StringUtil.trim(vRandom.value))
+
+ var href = window.location.href || 'http://apijson.cn/api'
+ var ind = href == null ? -1 : href.indexOf('?') // url 后带参数只能 encodeURIComponent
+
+ // 实测 561059 长度的 URL 都支持，只是输入框显示长度约为 2000
+ window.open((ind < 0 ? href : href.substring(0, ind))
+ + (App.view != 'code' ? "?send=false" : (isRandom ? "?send=random" : "?send=true"))
+ + "&type=" + StringUtil.trim(App.type)
+ + "&url=" + encodeURIComponent(StringUtil.trim(vUrl.value))
+ + (StringUtil.isEmpty(jsonStr, true) ? '' : "&json=" + jsonStr)
+ + (StringUtil.isEmpty(headerStr, true) ? '' : "&header=" + headerStr)
+ + (StringUtil.isEmpty(randomStr, true) ? '' : "&random=" + randomStr)
+ + (StringUtil.isEmpty(settingStr, true) ? '' : "&setting=" + settingStr)
+ )
+ },
+
// 显示保存弹窗
showSave: function (show) {
if (show) {
@@ -891,71 +959,18 @@
if (show) {
if (isRemote) { //共享测试用例
App.isExportRandom = isRandom
+
+ if (isRandom != true) {
+ setTimeout(function () {
+ App.shareLink(App.isRandomTest)
+ }, 1000)
+ }
+
if (App.isTestCaseShow) {
alert('请先输入请求内容！')
return
}
- setTimeout(function () {
- var href = window.location.href || 'http://apijson.cn/api'
- var ind = href == null ? -1 : href.indexOf('?') // url 后带参数只能 encodeURIComponent
- var reqStr
- try {
- reqStr = JSON.stringify(encode(JSON.parse(vInput.value)))
- } catch (e){ // 可能包含注释
- log(e)
- reqStr = encode(StringUtil.trim(vInput.value))
- }
-
- // URL 太长导致打不开标签
- var settingStr = null
- try {
- settingStr = JSON.stringify({
- requestVersion: App.requestVersion,
- requestCount: App.requestCount,
- isTestCaseShow: App.isTestCaseShow,
- // isHeaderShow: App.isHeaderShow,
- // isRandomShow: App.isRandomShow,
- isRandomListShow: App.isRandomShow ? App.isRandomListShow : undefined,
- isRandomSubListShow: App.isRandomListShow ? App.isRandomSubListShow : undefined,
- // isRandomEditable: App.isRandomEditable,
- isCrossEnabled: App.isCrossEnabled,
- isMLEnabled: App.isMLEnabled,
- isDelegateEnabled: App.isDelegateEnabled,
- isPreviewEnabled: App.isPreviewEnabled,
- isEncodeEnabled: App.isEncodeEnabled,
- isEditResponse: App.isEditResponse,
- isLocalShow: App.isTestCaseShow ? App.isLocalShow : undefined,
- page: App.page,
- count: App.count,
- testCasePage: App.testCasePage,
- testCaseCount: App.testCaseCount,
- randomPage: App.randomPage,
- randomCount: App.randomCount,
- randomSubPage: App.randomSubPage,
- randomSubCount: App.randomSubCount,
- host: StringUtil.isEmpty(App.host, true) ? undefined : encodeURIComponent(App.host),
- search: StringUtil.isEmpty(App.search, true) ? undefined : encodeURIComponent(App.search),
- testCaseSearch: StringUtil.isEmpty(App.testCaseSearch, true) ? undefined : App.testCaseSearch,
- randomSearch: StringUtil.isEmpty(App.randomSearch, true) ? undefined : encodeURIComponent(App.randomSearch),
- randomSubSearch: StringUtil.isEmpty(App.randomSubSearch, true) ? undefined : encodeURIComponent(App.randomSubSearch)
- })
- } catch (e){
- log(e)
- }
-
- // 实测 561059 长度的 URL 都支持，只是输入框显示长度约为 2000
- window.open((ind < 0 ? href : href.substring(0, ind))
- + (App.view == 'code' ? "?send=true" : "?send=false")
- + "&type=" + StringUtil.trim(App.type)
- + "&url=" + encodeURIComponent(StringUtil.trim(vUrl.value))
- + "&json=" + reqStr
- + (StringUtil.isEmpty(vHeader.value, true) ? '' : "&header=" + encodeURIComponent(StringUtil.trim(vHeader.value)))
- + (StringUtil.isEmpty(vRandom.value, true) ? '' : "&random=" + encodeURIComponent(StringUtil.trim(vRandom.value)))
- + (StringUtil.isEmpty(settingStr, true) ? '' : "&setting=" + settingStr)
- )
- }, 1000)
-
if (App.view == 'error') { // App.view != 'code') {
alert('发现错误，请输入正确的内容！') // alert('请先测试请求，确保是正确可用的！')
return
@@ -4360,6 +4375,7 @@
* @param show
*/
onClickTestRandom: function () {
+ this.isRandomTest = true
this.testRandom(! this.isRandomListShow && ! this.isRandomSubListShow, this.isRandomListShow, this.isRandomSubListShow)
},
testRandom: function (show, testList, testSubList, limit) {
@@ -4886,7 +4902,14 @@
},
-
+ onClickSend: function () {
+ this.isRandomTest = false
+ this.send(false)
+ },
+ onClickTest: function () {
+ this.isRandomTest = false
+ this.test(false, this.isCrossEnabled ? -1 : currentAccountIndex)
+ },
/**回归测试
* 原理：
1.遍历所有上传过的测试用例（URL+请求JSON）
@@ -5702,7 +5725,7 @@
setTimeout(function () {
var rawReq = getRequestFromURL()
- if (rawReq != null && StringUtil.isEmpty(rawReq.json, true) == false) {
+ if (rawReq != null) {
vUrlComment.value = ""
vComment.value = ""
@@ -5717,6 +5740,10 @@
vUrl.value = StringUtil.trim(rawReq.url)
}
+ if (StringUtil.isEmpty(rawReq.json, true) == false) {
+ vInput.value = StringUtil.trim(rawReq.json)
+ }
+
if (StringUtil.isEmpty(rawReq.header, true) == false) {
vHeader.value = StringUtil.trim(rawReq.header, true)
App.isHeaderShow = true
@@ -5728,8 +5755,6 @@
App.isRandomListShow = false
}
- vInput.value = StringUtil.trim(rawReq.json)
-
// URL 太长导致截断和乱码
if (StringUtil.isEmpty(rawReq.setting, true) == false) {
@@ -5753,11 +5778,18 @@
}
App.onChange(false)
- if (rawReq.send != "false") {
- App.send(false)
+
+ if (rawReq.send != "false" && rawReq.send != "null") {
+ if (rawReq.send == 'random') {
+ App.onClickTestRandom()
+ } else if (App.isTestCaseShow) {
+ App.onClickTest()
+ } else {
+ App.send(false)
+ }
var url = vUrl.value || ''
- if (rawReq.jump == "true" || (rawReq.jump != "false" && (url.endsWith("/get") || url.endsWith("/head")) )) {
+ if (rawReq.jump == "true" || rawReq.jump == "null" || (rawReq.jump != "false" && (url.endsWith("/get") || url.endsWith("/head")) )) {
setTimeout(function () {
window.open(vUrl.value + "/" + encodeURIComponent(JSON.stringify(encode(JSON.parse(vInput.value)))))
}, 1000)
From a1a92c3b94b161a1915be609e1aafef2a32e54e4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 30 Sep 2021 02:53:34 +0800
Subject: [PATCH 497/818] =?UTF-8?q?=E5=88=86=E4=BA=AB=EF=BC=9A=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E5=88=86=E4=BA=AB=E9=93=BE=E6=8E=A5=E6=9C=AA=E5=B8=A6?=
=?UTF-8?q?=E4=B8=8A=E9=9A=8F=E6=9C=BA=E6=B5=8B=E8=AF=95=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/main.js b/js/main.js
index 001ace1..4353956 100755
--- a/js/main.js
+++ b/js/main.js
@@ -908,6 +908,7 @@
count: App.count,
testCasePage: App.testCasePage,
testCaseCount: App.testCaseCount,
+ testRandomCount: App.testRandomCount,
randomPage: App.randomPage,
randomCount: App.randomCount,
randomSubPage: App.randomSubPage,
From 41af903bf3812c6d92fc015cfe144a77a48fba60 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 30 Sep 2021 03:22:32 +0800
Subject: [PATCH 498/818] =?UTF-8?q?=E5=88=86=E4=BA=AB=EF=BC=9A=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E5=88=86=E4=BA=AB=E9=93=BE=E6=8E=A5=E4=B8=AD=20WebSto?=
=?UTF-8?q?rm=20=E5=8A=A0=E7=9A=84=E9=9D=9E=20APIAuto=20=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=20APIAuto=20=E8=87=AA=E5=8A=A8=E8=BF=98?=
=?UTF-8?q?=E5=8E=9F=E5=92=8C=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/js/main.js b/js/main.js
index 4353956..bfe09a4 100755
--- a/js/main.js
+++ b/js/main.js
@@ -961,7 +961,7 @@
if (isRemote) { //共享测试用例
App.isExportRandom = isRandom
- if (isRandom != true) {
+ if (isRandom != true) { // 分享搜索关键词和分页信息也挺好 } && App.isTestCaseShow != true) { // 没有拿到列表，没用
setTimeout(function () {
App.shareLink(App.isRandomTest)
}, 1000)
@@ -4909,7 +4909,7 @@
},
onClickTest: function () {
this.isRandomTest = false
- this.test(false, this.isCrossEnabled ? -1 : currentAccountIndex)
+ this.test(false, this.isCrossEnabled ? -1 : this.currentAccountIndex)
},
/**回归测试
* 原理：
@@ -5727,10 +5727,10 @@
setTimeout(function () {
var rawReq = getRequestFromURL()
if (rawReq != null) {
- vUrlComment.value = ""
- vComment.value = ""
+ var hasTestArg = false // 避免 http://localhost:63342/APIAuto/index.html?_ijt=fh8di51h7qip2d1s3r3bqn73nt 这种无意义参数
if (StringUtil.isEmpty(rawReq.type, true) == false) {
+ hasTestArg = true
App.type = StringUtil.toUpperCase(rawReq.type, true)
if (App.types != null && App.types.indexOf(App.type) < 0) {
App.types.push(App.type)
@@ -5738,19 +5738,23 @@
}
if (StringUtil.isEmpty(rawReq.url, true) == false) {
+ hasTestArg = true
vUrl.value = StringUtil.trim(rawReq.url)
}
if (StringUtil.isEmpty(rawReq.json, true) == false) {
+ hasTestArg = true
vInput.value = StringUtil.trim(rawReq.json)
}
if (StringUtil.isEmpty(rawReq.header, true) == false) {
+ hasTestArg = true
vHeader.value = StringUtil.trim(rawReq.header, true)
App.isHeaderShow = true
}
if (StringUtil.isEmpty(rawReq.random, true) == false) {
+ hasTestArg = true
vRandom.value = StringUtil.trim(rawReq.random, true)
App.isRandomShow = true
App.isRandomListShow = false
@@ -5778,9 +5782,14 @@
}
}
+ if (hasTestArg) {
+ vUrlComment.value = ""
+ vComment.value = ""
+ }
+
App.onChange(false)
- if (rawReq.send != "false" && rawReq.send != "null") {
+ if (hasTestArg && rawReq.send != "false" && rawReq.send != "null") {
if (rawReq.send == 'random') {
App.onClickTestRandom()
} else if (App.isTestCaseShow) {
@@ -5793,7 +5802,7 @@
if (rawReq.jump == "true" || rawReq.jump == "null" || (rawReq.jump != "false" && (url.endsWith("/get") || url.endsWith("/head")) )) {
setTimeout(function () {
window.open(vUrl.value + "/" + encodeURIComponent(JSON.stringify(encode(JSON.parse(vInput.value)))))
- }, 1000)
+ }, App.isTestCaseShow || rawReq.send == 'random' ? 5000 : 2000)
}
}
}
From 823ca0e04ffdbf7c62db2fe92079fbba80f30b6e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 30 Sep 2021 05:04:55 +0800
Subject: [PATCH 499/818] =?UTF-8?q?=E5=88=86=E4=BA=AB=EF=BC=9A=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E4=B8=8D=E8=83=BD=E6=88=90=E5=8A=9F=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=9B=9E=E5=BD=92=E6=B5=8B=E8=AF=95=E5=92=8C=E9=9A=8F?=
=?UTF-8?q?=E6=9C=BA=E5=88=97=E8=A1=A8=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 29 --------------
js/main.js | 112 ++++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 86 insertions(+), 55 deletions(-)
diff --git a/index.html b/index.html
index 86f5628..72bcb61 100755
--- a/index.html
+++ b/index.html
@@ -806,35 +806,6 @@
}
- function getRequestFromURL() {
- var url = window.location.search;
-
- var index = url == null ? -1 : url.indexOf("?")
- if(index < 0) { //判断是否有参数
- return null;
- }
-
- var theRequest = null;
- var str = url.substring(index + 1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
- var arr = str.split("&"); //截除“&”生成一个数组
-
- var len = arr == null ? 0 : arr.length;
- for(var i = 0; i < len; i++) {
- var part = arr[i];
- var ind = part == null ? -1 : part.indexOf("=");
- if (ind <= 0) {
- continue
- }
-
- if (theRequest == null) {
- theRequest = {};
- }
- theRequest[part.substring(0, ind)] = decodeURIComponent(part.substring(ind+1));
- }
-
- return theRequest;
- }
-
diff --git a/js/main.js b/js/main.js
index bfe09a4..373c171 100755
--- a/js/main.js
+++ b/js/main.js
@@ -363,6 +363,36 @@
// APIJSON <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+ function getRequestFromURL() {
+ var url = window.location.search;
+
+ var index = url == null ? -1 : url.indexOf("?")
+ if(index < 0) { //判断是否有参数
+ return null;
+ }
+
+ var theRequest = null;
+ var str = url.substring(index + 1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
+ var arr = str.split("&"); //截除“&”生成一个数组
+
+ var len = arr == null ? 0 : arr.length;
+ for(var i = 0; i < len; i++) {
+ var part = arr[i];
+ var ind = part == null ? -1 : part.indexOf("=");
+ if (ind <= 0) {
+ continue
+ }
+
+ if (theRequest == null) {
+ theRequest = {};
+ }
+ theRequest[part.substring(0, ind)] = decodeURIComponent(part.substring(ind+1));
+ }
+
+ return theRequest;
+ }
+
var PLATFORM_POSTMAN = 'POSTMAN'
var PLATFORM_SWAGGER = 'SWAGGER'
var PLATFORM_YAPI = 'YAPI'
@@ -3887,7 +3917,7 @@
var page = this.page || 0
var search = StringUtil.isEmpty(this.search, true) ? null : '%' + StringUtil.trim(this.search) + '%'
- App.request(false, REQUEST_TYPE_JSON, this.getBaseUrl() + '/get', {
+ this.request(false, REQUEST_TYPE_JSON, this.getBaseUrl() + '/get', {
format: false,
'@database': StringUtil.isEmpty(App.database, true) ? undefined : App.database,
// '@schema': StringUtil.isEmpty(App.schema, true) ? undefined : App.schema,
@@ -5719,14 +5749,21 @@
'\n} catch (e) {\n' + e.message)
}
-
//无效，只能在index里设置 vUrl.value = this.getCache('', 'URL_BASE')
+
this.listHistory()
- this.transfer()
- setTimeout(function () {
- var rawReq = getRequestFromURL()
- if (rawReq != null) {
+ var rawReq = getRequestFromURL()
+ if (rawReq == null || StringUtil.isEmpty(rawReq.type, true)) {
+ this.transfer()
+
+ if (this.User != null && this.User.id != null && this.User.id > 0) {
+ this.showTestCase(true, false) // 本地历史仍然要求登录 App.User == null || App.User.id == null)
+ }
+ }
+ else {
+ setTimeout(function () {
+ isSingle = ! isSingle
var hasTestArg = false // 避免 http://localhost:63342/APIAuto/index.html?_ijt=fh8di51h7qip2d1s3r3bqn73nt 这种无意义参数
if (StringUtil.isEmpty(rawReq.type, true) == false) {
@@ -5760,12 +5797,30 @@
App.isRandomListShow = false
}
-
// URL 太长导致截断和乱码
if (StringUtil.isEmpty(rawReq.setting, true) == false) {
var save = rawReq.save == 'true'
try {
- var setting = JSON.parse(StringUtil.trim(rawReq.setting, true))
+ var setting = JSON.parse(StringUtil.trim(rawReq.setting, true)) || {}
+
+ var delayTime = 0
+ if (setting.count != App.count || setting.page != App.page || setting.search != App.search) {
+ delayTime += 2000
+ App.getDoc(function (d) {
+ App.setDoc(d);
+ })
+ }
+
+ if (setting.isRandomShow && setting.isRandomListShow) {
+ delayTime += 2000
+ App.showRandomList(true, setting.isRandomSubListShow ? App.currentRandomItem : null, setting.isRandomSubListShow)
+ }
+
+ if (setting.isTestCaseShow) {
+ delayTime += 2000
+ App.showTestCase(true, setting.isLocalShow)
+ }
+
for (var k in setting) {
var v = k == null ? null : setting[k]
if (v == null) {
@@ -5790,26 +5845,31 @@
App.onChange(false)
if (hasTestArg && rawReq.send != "false" && rawReq.send != "null") {
- if (rawReq.send == 'random') {
- App.onClickTestRandom()
- } else if (App.isTestCaseShow) {
- App.onClickTest()
- } else {
- App.send(false)
- }
+ setTimeout(function () {
+ if (rawReq.send == 'random') {
+ App.onClickTestRandom()
+ } else if (App.isTestCaseShow) {
+ App.onClickTest()
+ } else {
+ App.send(false)
+ }
- var url = vUrl.value || ''
- if (rawReq.jump == "true" || rawReq.jump == "null" || (rawReq.jump != "false" && (url.endsWith("/get") || url.endsWith("/head")) )) {
- setTimeout(function () {
- window.open(vUrl.value + "/" + encodeURIComponent(JSON.stringify(encode(JSON.parse(vInput.value)))))
- }, App.isTestCaseShow || rawReq.send == 'random' ? 5000 : 2000)
- }
+ var url = vUrl.value || ''
+ if (rawReq.jump == "true" || rawReq.jump == "null"
+ || (rawReq.jump != "false" && App.isTestCaseShow != true && rawReq.send != 'random'
+ && (url.endsWith("/get") || url.endsWith("/head"))
+ )
+ ) {
+ setTimeout(function () {
+ window.open(vUrl.value + "/" + encodeURIComponent(JSON.stringify(encode(JSON.parse(vInput.value)))))
+ }, 2000)
+ }
+ }, delayTime)
}
- }
- else if (App.User != null && App.User.id != null && App.User.id > 0) {
- App.showTestCase(true, false) // 本地历史仍然要求登录 App.User == null || App.User.id == null)
- }
- }, 1000)
+ }, 1000)
+
+ }
+
}
})
})()
From 49b6764d2487d8de7ed44e226e16655cfa7feb72 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 30 Sep 2021 05:15:26 +0800
Subject: [PATCH 500/818] =?UTF-8?q?=E5=88=86=E4=BA=AB=EF=BC=9A=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E8=87=AA=E5=8A=A8=E6=9F=A5=E6=B5=8B=E8=AF=95=E7=94=A8?=
=?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E6=9C=AA=E4=BD=BF=E7=94=A8=20URL=20?=
=?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/js/main.js b/js/main.js
index 373c171..df4f5e0 100755
--- a/js/main.js
+++ b/js/main.js
@@ -5811,16 +5811,6 @@
})
}
- if (setting.isRandomShow && setting.isRandomListShow) {
- delayTime += 2000
- App.showRandomList(true, setting.isRandomSubListShow ? App.currentRandomItem : null, setting.isRandomSubListShow)
- }
-
- if (setting.isTestCaseShow) {
- delayTime += 2000
- App.showTestCase(true, setting.isLocalShow)
- }
-
for (var k in setting) {
var v = k == null ? null : setting[k]
if (v == null) {
@@ -5832,6 +5822,16 @@
App.saveCache('', k, v)
}
}
+
+ if (setting.isRandomShow && setting.isRandomListShow) {
+ delayTime += 2000
+ App.showRandomList(true, setting.isRandomSubListShow ? App.currentRandomItem : null, setting.isRandomSubListShow)
+ }
+
+ if (setting.isTestCaseShow) {
+ delayTime += 2000
+ App.showTestCase(true, setting.isLocalShow)
+ }
} catch (e) {
log(e)
}
From 8f11feec60abc016ef86e76babf217096f968806 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 7 Oct 2021 01:20:09 +0800
Subject: [PATCH 501/818] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=90=E4=BA=9B?=
=?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=93=E5=BC=80=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=EF=BC=9B=E5=88=86=E4=BA=AB=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=9C=A8?=
=?UTF-8?q?=20APIJSON=20GitHub=20=E6=96=87=E6=A1=A3=E4=B8=AD=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E8=BF=87=E6=9D=A5=E5=8F=AF=E8=83=BD=E5=9C=A8=E8=AF=B7?=
=?UTF-8?q?=E6=B1=82=E6=88=90=E5=8A=9F=E5=90=8E=E5=86=8D=E6=81=A2=E5=A4=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/js/main.js b/js/main.js
index df4f5e0..68f0534 100755
--- a/js/main.js
+++ b/js/main.js
@@ -3919,8 +3919,8 @@
var search = StringUtil.isEmpty(this.search, true) ? null : '%' + StringUtil.trim(this.search) + '%'
this.request(false, REQUEST_TYPE_JSON, this.getBaseUrl() + '/get', {
format: false,
- '@database': StringUtil.isEmpty(App.database, true) ? undefined : App.database,
- // '@schema': StringUtil.isEmpty(App.schema, true) ? undefined : App.schema,
+ '@database': StringUtil.isEmpty(this.database, true) ? undefined : this.database,
+ // '@schema': StringUtil.isEmpty(this.schema, true) ? undefined : this.schema,
'sql@': {
'from': 'Access',
'Access': {
@@ -5866,7 +5866,7 @@
}
}, delayTime)
}
- }, 1000)
+ }, 2000)
}
From 0faa92a2d18afe07c1cb5941c17a876e58ed56a2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 7 Oct 2021 03:24:57 +0800
Subject: [PATCH 502/818] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=89=E6=97=B6?=
=?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/main.js | 232 +++++++++++++++++++++++++++--------------------------
1 file changed, 119 insertions(+), 113 deletions(-)
diff --git a/js/main.js b/js/main.js
index 68f0534..12252af 100755
--- a/js/main.js
+++ b/js/main.js
@@ -989,44 +989,44 @@
showExport: function (show, isRemote, isRandom) {
if (show) {
if (isRemote) { //共享测试用例
- App.isExportRandom = isRandom
+ this.isExportRandom = isRandom
if (isRandom != true) { // 分享搜索关键词和分页信息也挺好 } && App.isTestCaseShow != true) { // 没有拿到列表，没用
setTimeout(function () {
App.shareLink(App.isRandomTest)
}, 1000)
}
-
- if (App.isTestCaseShow) {
+
+ if (this.isTestCaseShow) {
alert('请先输入请求内容！')
return
}
- if (App.view == 'error') { // App.view != 'code') {
+ if (this.view == 'error') { // this.view != 'code') {
alert('发现错误，请输入正确的内容！') // alert('请先测试请求，确保是正确可用的！')
return
}
if (isRandom) {
- App.exTxt.name = '随机配置 ' + App.formatDateTime()
+ this.exTxt.name = '随机配置 ' + this.formatDateTime()
}
else {
- if (App.isEditResponse) {
- App.isExportRemote = isRemote
- App.exportTxt()
+ if (this.isEditResponse) {
+ this.isExportRemote = isRemote
+ this.exportTxt()
return
}
// var tag = App.getTag()
- App.exTxt.name = App.urlComment || '' // 避免偷懒不输入名称 App.getMethod() + (StringUtil.isEmpty(tag, true) ? '' : ' ' + tag)
+ this.exTxt.name = this.urlComment || '' // 避免偷懒不输入名称 App.getMethod() + (StringUtil.isEmpty(tag, true) ? '' : ' ' + tag)
}
}
else { //下载到本地
- if (App.isTestCaseShow) { //文档
- App.exTxt.name = 'APIJSON自动化文档 ' + App.formatDateTime()
+ if (this.isTestCaseShow) { //文档
+ this.exTxt.name = 'APIJSON自动化文档 ' + App.formatDateTime()
}
- else if (App.view == 'markdown' || App.view == 'output') {
+ else if (this.view == 'markdown' || this.view == 'output') {
var suffix
- switch (App.language) {
+ switch (this.language) {
case CodeUtil.LANGUAGE_KOTLIN:
suffix = '.kt';
break;
@@ -1069,32 +1069,32 @@
break;
}
- App.exTxt.name = 'User' + suffix
+ this.exTxt.name = 'User' + suffix
alert('自动生成模型代码，可填类名后缀:\n'
+ 'Kotlin.kt, Java.java, Swift.swift, Objective-C.m, C#.cs, Go.go,'
+ '\nTypeScript.ts, JavaScript.js, PHP.php, Python.py, C++.cpp');
}
else {
- App.exTxt.name = 'APIJSON测试 ' + App.getMethod() + ' ' + App.formatDateTime()
+ this.exTxt.name = 'APIJSON测试 ' + this.getMethod() + ' ' + this.formatDateTime()
}
}
}
- App.isExportShow = show
- App.isExportRemote = isRemote
+ this.isExportShow = show
+ this.isExportRemote = isRemote
},
// 显示配置弹窗
showConfig: function (show, index) {
- App.isConfigShow = false
- if (App.isTestCaseShow) {
+ this.isConfigShow = false
+ if (this.isTestCaseShow) {
if (index == 3 || index == 4 || index == 5 || index == 10) {
- App.showTestCase(false, false)
+ this.showTestCase(false, false)
}
}
if (show) {
- App.exTxt.button = index == 8 ? '上传' : '切换'
- App.exTxt.index = index
+ this.exTxt.button = index == 8 ? '上传' : '切换'
+ this.exTxt.index = index
switch (index) {
case 0:
case 1:
@@ -1102,9 +1102,9 @@
case 6:
case 7:
case 8:
- App.exTxt.name = index == 0 ? App.database : (index == 1 ? App.schema : (index == 2
- ? App.language : (index == 6 ? App.server : (index == 8 ? App.thirdParty : (App.types || []).join()))))
- App.isConfigShow = true
+ this.exTxt.name = index == 0 ? this.database : (index == 1 ? this.schema : (index == 2
+ ? this.language : (index == 6 ? this.server : (index == 8 ? this.thirdParty : (this.types || []).join()))))
+ this.isConfigShow = true
if (index == 0) {
alert('可填数据库:\nMYSQL,POSTGRESQL,SQLSERVER,ORACLE,DB2,SQLITE')
@@ -1116,12 +1116,12 @@
alert('多个类型用 , 隔开，可填类型:\nPARAM(GET ?a=1&b=c&key=value),\nJSON(POST application/json),\nFORM(POST x-www-form-urlencoded),\nDATA(POST form-data),\nGRPC(POST application/json 需要 GRPC 服务开启反射)')
}
else if (index == 8) {
- App.isHeaderShow = true
+ this.isHeaderShow = true
alert('例如：\nSWAGGER http://apijson.cn:8080/v2/api-docs\nSWAGGER /v2/api-docs // 省略 Host\nSWAGGER / // 省略 Host 和 分支 URL\nRAP /repository/joined /repository/get\nYAPI /api/interface/list_menu /api/interface/get')
try {
- App.getThirdPartyApiList(this.thirdParty, function (platform, docUrl, listUrl, itemUrl, url_, res, err) {
+ this.getThirdPartyApiList(this.thirdParty, function (platform, docUrl, listUrl, itemUrl, url_, res, err) {
CodeUtil.thirdParty = platform
if (err != null || ((res || {}).data || {}).errCode != 0) {
App.isHeaderShow = true
@@ -1182,89 +1182,89 @@
}
break
case 3:
- App.host = App.getBaseUrl()
- App.showUrl(false, new String(vUrl.value).substring(App.host.length)) //没必要导致必须重新获取 Response，App.onChange(false)
+ this.host = this.getBaseUrl()
+ this.showUrl(false, new String(vUrl.value).substring(this.host.length)) //没必要导致必须重新获取 Response，App.onChange(false)
break
case 4:
- App.isHeaderShow = show
- App.saveCache('', 'isHeaderShow', show)
+ this.isHeaderShow = show
+ this.saveCache('', 'isHeaderShow', show)
break
case 5:
- App.isRandomShow = show
- App.saveCache('', 'isRandomShow', show)
+ this.isRandomShow = show
+ this.saveCache('', 'isRandomShow', show)
break
case 9:
- App.isDelegateEnabled = show
- App.saveCache('', 'isDelegateEnabled', show)
+ this.isDelegateEnabled = show
+ this.saveCache('', 'isDelegateEnabled', show)
break
case 10:
- App.isPreviewEnabled = show
- App.saveCache('', 'isPreviewEnabled', show)
+ this.isPreviewEnabled = show
+ this.saveCache('', 'isPreviewEnabled', show)
- App.onChange(false)
+ this.onChange(false)
break
case 12:
- App.isEncodeEnabled = show
- App.saveCache('', 'isEncodeEnabled', show)
+ this.isEncodeEnabled = show
+ this.saveCache('', 'isEncodeEnabled', show)
break
case 11:
- var did = ((App.currentRemoteItem || {}).Document || {}).id
+ var did = ((this.currentRemoteItem || {}).Document || {}).id
if (did == null) {
alert('请先选择一个已上传的用例！')
return
}
- App.isEditResponse = show
+ this.isEditResponse = show
// App.saveCache('', 'isEditResponse', show)
- vInput.value = ((App.view != 'code' || StringUtil.isEmpty(App.jsoncon, true) ? null : App.jsoncon)
- || (App.currentRemoteItem.TestRecord || {}).response) || ''
+ vInput.value = ((this.view != 'code' || StringUtil.isEmpty(this.jsoncon, true) ? null : this.jsoncon)
+ || (this.currentRemoteItem.TestRecord || {}).response) || ''
- vHeader.value = (App.currentRemoteItem.TestRecord || {}).header || ''
+ vHeader.value = (this.currentRemoteItem.TestRecord || {}).header || ''
- App.isTestCaseShow = false
- App.onChange(false)
+ this.isTestCaseShow = false
+ this.onChange(false)
break
}
}
else if (index == 3) {
- var host = StringUtil.get(App.host)
+ var host = StringUtil.get(this.host)
var branch = new String(vUrl.value)
- App.host = ''
+ this.host = ''
vUrl.value = host + branch //保证 showUrl 里拿到的 baseUrl = App.host (http://apijson.cn:8080/put /balance)
- App.setBaseUrl() //保证自动化测试等拿到的 baseUrl 是最新的
- App.showUrl(false, branch) //没必要导致必须重新获取 Response，App.onChange(false)
+ this.setBaseUrl() //保证自动化测试等拿到的 baseUrl 是最新的
+ this.showUrl(false, branch) //没必要导致必须重新获取 Response，App.onChange(false)
}
else if (index == 4) {
- App.isHeaderShow = show
- App.saveCache('', 'isHeaderShow', show)
+ this.isHeaderShow = show
+ this.saveCache('', 'isHeaderShow', show)
}
else if (index == 5) {
- App.isRandomShow = show
- App.saveCache('', 'isRandomShow', show)
+ this.isRandomShow = show
+ this.saveCache('', 'isRandomShow', show)
}
else if (index == 9) {
- App.isDelegateEnabled = show
- App.saveCache('', 'isDelegateEnabled', show)
+ this.isDelegateEnabled = show
+ this.saveCache('', 'isDelegateEnabled', show)
}
else if (index == 10) {
- App.isPreviewEnabled = show
- App.saveCache('', 'isPreviewEnabled', show)
+ this.isPreviewEnabled = show
+ this.saveCache('', 'isPreviewEnabled', show)
// vRequestMarkdown.innerHTML = ''
}
else if (index == 12) {
- App.isEncodeEnabled = show
- App.saveCache('', 'isEncodeEnabled', show)
+ this.isEncodeEnabled = show
+ this.saveCache('', 'isEncodeEnabled', show)
}
else if (index == 11) {
- App.isEditResponse = show
+ this.isEditResponse = show
// App.saveCache('', 'isEditResponse', show)
- vInput.value = (App.currentRemoteItem.Document || {}).request || ''
- vHeader.value = (App.currentRemoteItem.Document || {}).header || ''
+ vInput.value = (this.currentRemoteItem.Document || {}).request || ''
+ vHeader.value = (this.currentRemoteItem.Document || {}).header || ''
- App.isTestCaseShow = false
- App.onChange(false)
+ this.isTestCaseShow = false
+ this.onChange(false)
}
},
@@ -2560,7 +2560,7 @@
onClickAccount: function (index, item, callback) {
- App.isTestCaseShow = false
+ this.isTestCaseShow = false
if (this.currentAccountIndex == index) {
if (item == null) {
@@ -2643,21 +2643,21 @@
},
removeAccountTab: function () {
- if (App.accounts.length <= 1) {
+ if (this.accounts.length <= 1) {
alert('至少要 1 个测试账号！')
return
}
- App.accounts.splice(App.currentAccountIndex, 1)
- if (App.currentAccountIndex >= App.accounts.length) {
- App.currentAccountIndex = App.accounts.length - 1
+ this.accounts.splice(this.currentAccountIndex, 1)
+ if (this.currentAccountIndex >= this.accounts.length) {
+ this.currentAccountIndex = this.accounts.length - 1
}
- App.saveCache(App.getBaseUrl(), 'currentAccountIndex', App.currentAccountIndex)
- App.saveCache(App.getBaseUrl(), 'accounts', App.accounts)
+ this.saveCache(this.getBaseUrl(), 'currentAccountIndex', this.currentAccountIndex)
+ this.saveCache(this.getBaseUrl(), 'accounts', this.accounts)
},
addAccountTab: function () {
- App.showLogin(true, false)
+ this.showLogin(true, false)
},
@@ -2698,7 +2698,7 @@
this.isTestCaseShow = false
- var types = App.types
+ var types = this.types
var search = StringUtil.isEmpty(this.testCaseSearch, true) ? null : '%' + StringUtil.trim(this.testCaseSearch) + '%'
var url = this.server + '/get'
var req = {
@@ -2708,7 +2708,7 @@
'page': this.testCasePage || 0,
'Document': {
'@order': 'version-,date-',
- 'userId': App.User.id,
+ 'userId': this.User.id,
'name$': search,
'url$': search,
'@combine': search == null ? null : 'name$,url$',
@@ -2716,19 +2716,19 @@
},
'TestRecord': {
'documentId@': '/Document/id',
- 'userId': App.User.id,
- 'testAccountId': App.getCurrentAccountId(),
+ 'userId': this.User.id,
+ 'testAccountId': this.getCurrentAccountId(),
'randomId': 0,
'@order': 'date-',
- '@column': 'id,userId,documentId,duration,minDuration,maxDuration,response' + (App.isMLEnabled ? ',standard' : ''),
- '@having': App.isMLEnabled ? 'length(standard)>2' : null //用 MySQL 5.6 '@having': App.isMLEnabled ? 'json_length(standard)>0' : null
+ '@column': 'id,userId,documentId,duration,minDuration,maxDuration,response' + (this.isMLEnabled ? ',standard' : ''),
+ '@having': this.isMLEnabled ? 'length(standard)>2' : null //用 MySQL 5.6 '@having': this.isMLEnabled ? 'json_length(standard)>0' : null
}
},
'@role': 'LOGIN'
}
- App.onChange(false)
- App.request(true, REQUEST_TYPE_JSON, url, req, {}, function (url, res, err) {
+ this.onChange(false)
+ this.request(true, REQUEST_TYPE_JSON, url, req, {}, function (url, res, err) {
App.onResponse(url, res, err)
var rpObj = res.data
@@ -3169,7 +3169,7 @@
return;
}
- App.view = 'output';
+ this.view = 'output';
vComment.value = '';
// vUrlComment.value = '';
vOutput.value = 'resolving...';
@@ -3184,7 +3184,7 @@
throw new Error(e2.message)
}
- before = App.toDoubleJSON(StringUtil.trim(before));
+ before = this.toDoubleJSON(StringUtil.trim(before));
log('onHandle before = \n' + before);
var afterObj;
@@ -3199,7 +3199,7 @@
log('main.onHandle', 'return jsonlint.parse(App.removeComment(before));')
try {
- afterObj = jsonlint.parse(App.removeComment(before));
+ afterObj = jsonlint.parse(this.removeComment(before));
after = JSON.stringify(afterObj, null, " ");
} catch (e2) {
throw new Error('请求 JSON 格式错误！请检查并编辑请求！\n\n如果JSON中有注释，请 手动删除 或 点击左边的 \'/" 按钮 来去掉。\n\n' + e2.message)
@@ -3208,7 +3208,7 @@
//关键词let在IE和Safari上不兼容
var code = '';
- if (App.isEditResponse != true) {
+ if (this.isEditResponse != true) {
try {
code = this.getCode(after); //必须在before还是用 " 时使用，后面用会因为解析 ' 导致失败
} catch (e) {
@@ -3233,22 +3233,22 @@
+ ' \n'; //解决遮挡
vSend.disabled = false;
- if (App.isEditResponse != true) {
+ if (this.isEditResponse != true) {
vOutput.value = output = 'OK，请点击 [发送请求] 按钮来测试。[点击这里查看视频教程](https://i.youku.com/i/UNTg1NzI1MjQ4MA==/videos?spm=a2hzp.8244740.0.0)' + code;
- App.showDoc()
+ this.showDoc()
}
try {
var standardObj = null;
try {
- standardObj = JSON.parse(((App.currentRemoteItem || {})[App.isEditResponse ? 'TestRecord' : 'Document'] || {}).standard);
+ standardObj = JSON.parse(((this.currentRemoteItem || {})[this.isEditResponse ? 'TestRecord' : 'Document'] || {}).standard);
} catch (e3) {
log(e3)
}
- var m = App.getMethod();
- var c = isSingle ? '' : StringUtil.trim(CodeUtil.parseComment(after, docObj == null ? null : docObj['[]'], m, App.database, App.language, App.isEditResponse != true, standardObj))
+ var m = this.getMethod();
+ var c = isSingle ? '' : StringUtil.trim(CodeUtil.parseComment(after, docObj == null ? null : docObj['[]'], m, this.database, this.language, this.isEditResponse != true, standardObj))
+ '\n '
+ ' \n'; //解决遮挡
//TODO 统计行数，补全到一致 vInput.value.lineNumbers
@@ -3260,12 +3260,12 @@
}
}
vComment.value = c
- vUrlComment.value = isSingle || StringUtil.isEmpty(App.urlComment, true)
- ? '' : vUrl.value + CodeUtil.getComment(App.urlComment, false, ' ')
- + ' - ' + (App.requestVersion > 0 ? 'V' + App.requestVersion : 'V*');
+ vUrlComment.value = isSingle || StringUtil.isEmpty(this.urlComment, true)
+ ? '' : vUrl.value + CodeUtil.getComment(this.urlComment, false, ' ')
+ + ' - ' + (this.requestVersion > 0 ? 'V' + this.requestVersion : 'V*');
if (! isSingle) {
- var method = App.getMethod(); // m 已经 toUpperCase 了
+ var method = this.getMethod(); // m 已经 toUpperCase 了
var isRestful = ! JSONObject.isAPIJSONPath(method);
if (isRestful != true) {
method = method.toUpperCase();
@@ -3274,8 +3274,8 @@
var api = apiMap == null ? null : apiMap['/' + method];
var name = api == null ? null : api.name;
if (StringUtil.isEmpty(name, true) == false) {
- App.urlComment = name;
- vUrlComment.value = vUrl.value + CodeUtil.getComment(App.urlComment, false, ' ')
+ this.urlComment = name;
+ vUrlComment.value = vUrl.value + CodeUtil.getComment(this.urlComment, false, ' ')
}
}
@@ -3300,17 +3300,17 @@
log(e3)
}
- if (App.isEditResponse) {
- App.view = 'code';
- App.jsoncon = after
+ if (this.isEditResponse) {
+ this.view = 'code';
+ this.jsoncon = after
}
} catch(e) {
log(e)
vSend.disabled = true
- App.view = 'error'
- App.error = {
+ this.view = 'error'
+ this.error = {
msg: e.message
}
}
@@ -3329,9 +3329,13 @@
this.isDelayShow = delay;
- handler = setTimeout(function () {
- App.onHandle(inputted);
- }, delay ? 2*1000 : 0);
+ if (delay) {
+ handler = setTimeout(function () {
+ App.onHandle(inputted);
+ }, 2000);
+ } else {
+ this.onHandle(inputted);
+ }
},
/**单双引号切换
@@ -3517,7 +3521,7 @@
axios({
method: (type == REQUEST_TYPE_PARAM ? 'get' : 'post'),
url: (isAdminOperation == false && this.isDelegateEnabled ? (this.server + '/delegate?' + (type == REQUEST_TYPE_GRPC ? '$_type=GRPC&' : '') + '$_delegate_url=') : '' )
- + (App.isEncodeEnabled ? encodeURI(StringUtil.noBlank(url)) : StringUtil.noBlank(url)),
+ + (this.isEncodeEnabled ? encodeURI(StringUtil.noBlank(url)) : StringUtil.noBlank(url)),
params: (type == REQUEST_TYPE_PARAM || type == REQUEST_TYPE_FORM ? req : null),
data: (type == REQUEST_TYPE_JSON || type == REQUEST_TYPE_GRPC ? req : (type == REQUEST_TYPE_DATA ? toFormData(req) : null)),
headers: header, //Accept-Encoding（HTTP Header 大小写不敏感，SpringBoot 接收后自动转小写）可能导致 Response 乱码
@@ -3902,7 +3906,7 @@
+ '
+
+