mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-08 02:18:44 +00:00
Compare commits
49 Commits
pr@dev@per
...
v3.5.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7aa40de518 | ||
|
|
17fd374e0a | ||
|
|
df5d15c1e5 | ||
|
|
b58c21a79f | ||
|
|
3d81f92667 | ||
|
|
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 |
2
.github/workflows/release-drafter.yml
vendored
2
.github/workflows/release-drafter.yml
vendored
@@ -42,7 +42,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Build it and upload
|
||||
uses: jumpserver/action-build-upload-assets@node10
|
||||
uses: jumpserver/action-build-upload-assets@node14.16
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
|
||||
@@ -49,7 +49,7 @@ export default {
|
||||
},
|
||||
columns: [
|
||||
'expandCol', 'input', 'risk_level', 'user', 'remote_addr',
|
||||
'asset', 'session', 'timestamp'
|
||||
'asset', 'account', 'session', 'timestamp'
|
||||
],
|
||||
extraQuery: {
|
||||
date_to: dateTo,
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
<Dialog
|
||||
ref="myDialog"
|
||||
:destroy-on-close="true"
|
||||
width="790px"
|
||||
height="720px"
|
||||
v-bind="$attrs"
|
||||
width="790px"
|
||||
@confirm="submit"
|
||||
v-on="$listeners"
|
||||
>
|
||||
<krryPaging ref="pageTransfer" v-bind="pagingTransfer" class="transfer" />
|
||||
<krryPaging ref="pageTransfer" class="transfer" v-bind="pagingTransfer" />
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
import Dialog from '@/components/Dialog'
|
||||
import { krryPaging } from 'krry-transfer'
|
||||
import { getUserList } from '@/api/users'
|
||||
|
||||
export default {
|
||||
name: 'ListSelect',
|
||||
components: {
|
||||
@@ -47,7 +48,7 @@ export default {
|
||||
}
|
||||
const data = await getUserList(params)
|
||||
const results = data['results'].map(item => {
|
||||
return { id: item.id, label: `${item.name}(${item.username})` }
|
||||
return { id: item.id, label: _.escape(`${item.name}(${item.username})`) }
|
||||
})
|
||||
return results
|
||||
},
|
||||
@@ -62,7 +63,7 @@ export default {
|
||||
}
|
||||
const data = await getUserList(params)
|
||||
const results = data['results'].map(item => {
|
||||
return { id: item.id, label: `${item.name}(${item.username})` }
|
||||
return { id: item.id, label: _.escape(`${item.name}(${item.username})`) }
|
||||
})
|
||||
return results
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user