@@ -1222,7 +1222,7 @@ https://github.com/Tencent/APIJSON/issues
12221222 history: {name: '请求0'},
12231223 remotes: [],
12241224 locals: [],
1225- chainTags: [{name: 'Home', selected: true }, {name: 'Category', selected: false }, {name: 'Search', selected: true }, {name: 'Moment'}, {name: 'Chat'}, {name: 'Tommy'}, {name: 'Lemon'}],
1225+ chainTags: [{name: 'Home', selected: false }, {name: 'Category'}, {name: 'Search'}, {name: 'Moment'}, {name: 'Chat'}, {name: 'Tommy'}, {name: 'Lemon'}],
12261226 chainPaths: [],
12271227 casePaths: [],
12281228 chainGroups: [],
@@ -4883,22 +4883,23 @@ https://github.com/Tencent/APIJSON/issues
48834883 var tagList = chain.tagList || []
48844884 var chainTags = this.chainTags || []
48854885 for (var j = 0; j < chainTags.length; j ++) {
4886- var tag = chainTags[i ] || {}
4886+ var tag = chainTags[j ] || {}
48874887 tag.selected = false
48884888 }
48894889
48904890 for (var i = 0; i < tagList.length; i ++) {
48914891 var name = tagList[i]
4892- if (StringUtil.isEmpty(name)) {
4892+ if (StringUtil.isEmpty(name, true )) {
48934893 continue
48944894 }
48954895
48964896 var find = false
48974897 for (var j = 0; j < chainTags.length; j ++) {
4898- var tag = chainTags[i ] || {}
4898+ var tag = chainTags[j ] || {}
48994899 if (tag.name == name) {
49004900 tag.selected = true
49014901 find = true
4902+ break
49024903 }
49034904 }
49044905
@@ -5085,6 +5086,14 @@ https://github.com/Tencent/APIJSON/issues
50855086 }
50865087 },
50875088 },
5089+ 'Chain-tagList[]': {
5090+ 'count': 0,
5091+ 'Chain': {
5092+ 'userId': userId,
5093+ '@column': "groupId;any_value(tagList):tagList",
5094+ '@group': 'groupId'
5095+ }
5096+ },
50885097 '@role': IS_NODE ? null : 'LOGIN',
50895098 key: IS_NODE ? this.key : undefined // 突破常规查询数量限制
50905099 }
@@ -5128,6 +5137,34 @@ https://github.com/Tencent/APIJSON/issues
51285137 App.chainPaths.push(item.Chain)
51295138 }
51305139 App.remotes = App.testCases = item['[]'] || []
5140+
5141+ var tagLists = data['Chain-tagList[]'] || []
5142+ var chainTags = App.chainTags || []
5143+ for (var i = 0; i < tagLists.length; i ++) {
5144+ var tagList = tagLists[i] || []
5145+ for (var j = 0; j < tagList.length; j ++) {
5146+ var name = tagList[i]
5147+ if (StringUtil.isEmpty(name, true)) {
5148+ continue
5149+ }
5150+
5151+ var find = false
5152+ for (var k = 0; k < chainTags.length; k ++) {
5153+ var tag = chainTags[k] || {}
5154+ if (tag.name == name) {
5155+ find = true
5156+ break
5157+ }
5158+ }
5159+
5160+ if (! find) {
5161+ chainTags.push({name: name})
5162+ }
5163+ }
5164+ }
5165+
5166+ App.chainTags = chainTags
5167+
51315168 App.isTestCaseShow = true
51325169// App.showTestCase(true, false, null)
51335170 })
@@ -8077,7 +8114,27 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
80778114 return
80788115 }
80798116
8080- if (type == 'chainGroupAdd' || type == 'chainGroup') {
8117+ if (type == 'chainTagAdd') {
8118+ var name = StringUtil.trim(item.name)
8119+ if (StringUtil.isEmpty(name)) {
8120+ alert('请输入有效标签名！')
8121+ return
8122+ }
8123+
8124+ var chainTags = this.chainTags = this.chainTags || []
8125+ for (var j = 0; j < chainTags.length; j ++) {
8126+ var tag = chainTags[j] || {}
8127+ if (tag.name == name) {
8128+ if (find) {
8129+ alert(name + ' 已存在，请勿重复添加！')
8130+ return
8131+ }
8132+ }
8133+ }
8134+
8135+ chainTags.push({name: name})
8136+ }
8137+ else if (type == 'chainGroupAdd' || type == 'chainGroup') {
80818138 var isAdd = type == 'chainGroupAdd'
80828139 var groupName = item == null ? null : item.groupName
80838140 if (StringUtil.isEmpty(groupName)) {
@@ -13732,8 +13789,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
1373213789 // alert(event.key) 小写字母 i 而不是 KeyI
1373313790
1373413791 var>
13735- if (target == vAskAI || vSearch || vTestCaseSearch || vCaseGroupSearch
13736- || vChainGroupSearch || vChainGroupAdd || vChainAdd) {
13792+ if ([vInput, vRandom, vHeader, vScript].indexOf(target) < 0) {
1373713793 return
1373813794 }
1373913795
0 commit comments