mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-07 18:08:50 +00:00
Compare commits
68 Commits
pr@dev@ass
...
v3.10.11-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
93ea7f034a | ||
|
|
0a3dc30c85 | ||
|
|
51d24bc8e5 | ||
|
|
1b15a4d043 | ||
|
|
7d3f818242 | ||
|
|
4e26f18d77 | ||
|
|
b22613617a | ||
|
|
e971cbf4a8 | ||
|
|
4672abae35 | ||
|
|
ba36d72602 | ||
|
|
4bfbbba4c5 | ||
|
|
ea038ce43a | ||
|
|
e16b19666c | ||
|
|
c7f5409eb6 | ||
|
|
fdbd7d2222 | ||
|
|
ddbaeeafea | ||
|
|
efb0e9dacb | ||
|
|
f6f8301ad5 | ||
|
|
9a63ae63d4 | ||
|
|
1e007ccda3 | ||
|
|
d1d0b06b53 | ||
|
|
5fb70d2f24 | ||
|
|
b54a95430f | ||
|
|
4d8b4c45af | ||
|
|
a6d642df60 | ||
|
|
2e74f1522f | ||
|
|
fe615e0314 | ||
|
|
09f734e6fc | ||
|
|
3117046342 | ||
|
|
b68aecb5cc | ||
|
|
1c9b155d97 | ||
|
|
75b1be9864 | ||
|
|
615c3c1cf4 | ||
|
|
4d82231af4 | ||
|
|
c6cf6571b6 | ||
|
|
8ea990d070 | ||
|
|
f4a32170d5 | ||
|
|
073508675e | ||
|
|
1d6ca0a93a | ||
|
|
36aea652d6 | ||
|
|
1a42ce90ab | ||
|
|
31a401b55d | ||
|
|
582a84178d | ||
|
|
9b9f7c936c | ||
|
|
2a6100957f | ||
|
|
16606d6a27 | ||
|
|
0a612f50e6 | ||
|
|
fe36fa9390 | ||
|
|
ba109900ec | ||
|
|
ec7768267f | ||
|
|
cc58b374ab | ||
|
|
04ffbb8fd6 | ||
|
|
49880f6739 | ||
|
|
e6f98d58c4 | ||
|
|
fd1f16d43c | ||
|
|
968b2415b1 | ||
|
|
776090d6ba | ||
|
|
3a37952288 | ||
|
|
62b8fc0e3b | ||
|
|
b2028869cb | ||
|
|
5277a725f8 | ||
|
|
f137788c1a | ||
|
|
f7d17c8de7 | ||
|
|
feea70b0be | ||
|
|
04696ef3d6 | ||
|
|
1731f4f788 | ||
|
|
6f25d93909 | ||
|
|
46461ec324 |
@@ -126,7 +126,6 @@ export default {
|
|||||||
filterTags: {
|
filterTags: {
|
||||||
handler() {
|
handler() {
|
||||||
this.$emit('tag-search', this.filterMaps)
|
this.$emit('tag-search', this.filterMaps)
|
||||||
this.$eventBus.$emit('TagSearch', this.filterMaps)
|
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
},
|
},
|
||||||
@@ -214,10 +213,12 @@ export default {
|
|||||||
delete routeFilter.search
|
delete routeFilter.search
|
||||||
}
|
}
|
||||||
const asFilterTags = _.cloneDeep(this.filterTags)
|
const asFilterTags = _.cloneDeep(this.filterTags)
|
||||||
this.filterTags = {
|
setTimeout(() => {
|
||||||
...asFilterTags,
|
this.filterTags = {
|
||||||
...routeFilter
|
...asFilterTags,
|
||||||
}
|
...routeFilter
|
||||||
|
}
|
||||||
|
}, 100)
|
||||||
},
|
},
|
||||||
getValueLabel(key, value) {
|
getValueLabel(key, value) {
|
||||||
for (const field of this.options) {
|
for (const field of this.options) {
|
||||||
|
|||||||
@@ -201,9 +201,6 @@ export default {
|
|||||||
return Object.assign({}, this.defaultTicketActions, this.extraTicketAction)
|
return Object.assign({}, this.defaultTicketActions, this.extraTicketAction)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
this.$eventBus.$on('TagSearch', this.handleTagSearchEvent)
|
|
||||||
},
|
|
||||||
mounted() {
|
mounted() {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
@@ -212,14 +209,6 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
reloadTable() {
|
reloadTable() {
|
||||||
this.$refs.ListPage.$refs.ListTable.$refs.ListTable.reloadTable()
|
this.$refs.ListPage.$refs.ListTable.$refs.ListTable.reloadTable()
|
||||||
},
|
|
||||||
handleTagSearchEvent(tags) {
|
|
||||||
if (tags.hasOwnProperty('state')) {
|
|
||||||
const delimiter = this.url.indexOf('?') === -1 ? '?' : '&'
|
|
||||||
this.ticketTableConfig.url = `${this.url}${delimiter}state=${tags.state}`
|
|
||||||
} else {
|
|
||||||
this.ticketTableConfig.url = this.url
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user