mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-17 04:25:46 +00:00
Compare commits
58 Commits
pr@dev@k8s
...
v3.8.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
549ae52fa5 | ||
|
|
ce91ed9cbc | ||
|
|
c3d7a9997d | ||
|
|
7298eb3204 | ||
|
|
e7772c9bba | ||
|
|
f1e3c2e238 | ||
|
|
10c974dec0 | ||
|
|
afd9749559 | ||
|
|
984f0b7db0 | ||
|
|
6eaa72aca6 | ||
|
|
2eee735747 | ||
|
|
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 |
@@ -53,13 +53,27 @@ export const matchAlphanumericUnderscore = {
|
|||||||
trigger: ['blur', 'change']
|
trigger: ['blur', 'change']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 不能包含()
|
||||||
|
export const MatchExcludeParenthesis = {
|
||||||
|
validator: (rule, value, callback) => {
|
||||||
|
value = value?.trim()
|
||||||
|
if (!/^[^()]*$/.test(value)) {
|
||||||
|
callback(new Error(i18n.t('common.notParenthesis')))
|
||||||
|
} else {
|
||||||
|
callback()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
trigger: ['blur', 'change']
|
||||||
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
IpCheck,
|
IpCheck,
|
||||||
Required,
|
Required,
|
||||||
RequiredChange,
|
RequiredChange,
|
||||||
EmailCheck,
|
EmailCheck,
|
||||||
specialEmojiCheck,
|
specialEmojiCheck,
|
||||||
matchAlphanumericUnderscore
|
matchAlphanumericUnderscore,
|
||||||
|
MatchExcludeParenthesis
|
||||||
}
|
}
|
||||||
|
|
||||||
export const JsonRequired = {
|
export const JsonRequired = {
|
||||||
|
|||||||
@@ -215,6 +215,13 @@ export default {
|
|||||||
handler(newValue, oldValue) {
|
handler(newValue, oldValue) {
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
|
},
|
||||||
|
iOptions(val) {
|
||||||
|
if (val.length === 0) {
|
||||||
|
this.remote = false
|
||||||
|
} else {
|
||||||
|
this.remote = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async mounted() {
|
async mounted() {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
:placeholder="this.$t('common.EnterToContinue')"
|
:placeholder="this.$t('common.EnterToContinue')"
|
||||||
class="search-input"
|
class="search-input"
|
||||||
@blur="focus = false"
|
@blur="focus = false"
|
||||||
@change="handleConfirm"
|
|
||||||
@focus="focus = true"
|
@focus="focus = true"
|
||||||
@select="handleSelect"
|
@select="handleSelect"
|
||||||
@keyup.enter.native="handleConfirm"
|
@keyup.enter.native="handleConfirm"
|
||||||
|
|||||||
@@ -867,6 +867,7 @@
|
|||||||
"SecretKey": "Secret Key",
|
"SecretKey": "Secret Key",
|
||||||
"NotSpecialEmoji": "No special emoji allowed",
|
"NotSpecialEmoji": "No special emoji allowed",
|
||||||
"notAlphanumericUnderscore": "Only numbers, letters and underscores can be entered",
|
"notAlphanumericUnderscore": "Only numbers, letters and underscores can be entered",
|
||||||
|
"notParenthesis": "Not contain ( )",
|
||||||
"Task": "Task",
|
"Task": "Task",
|
||||||
"Cas": "CAS",
|
"Cas": "CAS",
|
||||||
"Invalid": "Invalid",
|
"Invalid": "Invalid",
|
||||||
|
|||||||
@@ -804,6 +804,7 @@
|
|||||||
"FormatError": "フォーマットエラー",
|
"FormatError": "フォーマットエラー",
|
||||||
"NotSpecialEmoji": "特殊な表情記号の入力は許可されていません",
|
"NotSpecialEmoji": "特殊な表情記号の入力は許可されていません",
|
||||||
"notAlphanumericUnderscore": "数字、文字、アンダースコアのみ入力可能",
|
"notAlphanumericUnderscore": "数字、文字、アンダースコアのみ入力可能",
|
||||||
|
"notParenthesis": "含まない ( )",
|
||||||
"WeekCronSelect": {
|
"WeekCronSelect": {
|
||||||
"Monday": "月曜日",
|
"Monday": "月曜日",
|
||||||
"Tuesday": "火曜日",
|
"Tuesday": "火曜日",
|
||||||
|
|||||||
@@ -838,6 +838,7 @@
|
|||||||
"FormatError": "格式错误",
|
"FormatError": "格式错误",
|
||||||
"NotSpecialEmoji": "不允许输入特殊表情符号",
|
"NotSpecialEmoji": "不允许输入特殊表情符号",
|
||||||
"notAlphanumericUnderscore": "只能输入字母、数字、下划线",
|
"notAlphanumericUnderscore": "只能输入字母、数字、下划线",
|
||||||
|
"notParenthesis": "不能包含 ( )",
|
||||||
"WeekCronSelect": {
|
"WeekCronSelect": {
|
||||||
"Monday": "星期一",
|
"Monday": "星期一",
|
||||||
"Tuesday": "星期二",
|
"Tuesday": "星期二",
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
config: {
|
config: {
|
||||||
activeMenu: 'VirtualAccountList',
|
activeMenu: 'AccountList',
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
title: this.$t('accounts.GeneralAccounts'),
|
title: this.$t('accounts.GeneralAccounts'),
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ export default {
|
|||||||
title: vm.$t('xpack.Execute'),
|
title: vm.$t('xpack.Execute'),
|
||||||
name: 'execute',
|
name: 'execute',
|
||||||
can: ({ row }) => {
|
can: ({ row }) => {
|
||||||
return row.is_active && vm.$hasPerm('accounts.add_changesecretexection')
|
return row.is_active && vm.$hasPerm('accounts.add_changesecretexecution')
|
||||||
},
|
},
|
||||||
type: 'info',
|
type: 'info',
|
||||||
disabled: ({ row }) => !row.is_active,
|
disabled: ({ row }) => !row.is_active,
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export default {
|
|||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: routeName,
|
name: routeName,
|
||||||
params: { id: id },
|
params: { id: id },
|
||||||
query: { provider: vm.Account.provider }
|
query: { provider: vm.Account.provider.value }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ export default {
|
|||||||
if (status) {
|
if (status) {
|
||||||
data['id'] = value
|
data['id'] = value
|
||||||
this.tableConfig.totalData.push(data)
|
this.tableConfig.totalData.push(data)
|
||||||
|
this.$emit('change', this.tableConfig.totalData)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCreate() {
|
handleCreate() {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
:title="$tc('profile.CreateAccessKey')"
|
:title="$tc('profile.CreateAccessKey')"
|
||||||
:visible.sync="visible"
|
:visible.sync="visible"
|
||||||
width="700px"
|
width="700px"
|
||||||
|
@close="onClose"
|
||||||
@confirm="visible = false"
|
@confirm="visible = false"
|
||||||
>
|
>
|
||||||
<el-alert type="warning">
|
<el-alert type="warning">
|
||||||
@@ -135,6 +136,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
onClose() {
|
||||||
|
this.getRefsListTable.reloadTable()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import BaseAssetCreateUpdate from '@/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate'
|
import BaseAssetCreateUpdate from '@/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate'
|
||||||
|
import { Required, MatchExcludeParenthesis } from '@/components/Form/DataForm/rules'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
@@ -19,6 +20,9 @@ export default {
|
|||||||
[this.$t('assets.Account'), ['auto_create_accounts', 'accounts_create_amount']]
|
[this.$t('assets.Account'), ['auto_create_accounts', 'accounts_create_amount']]
|
||||||
],
|
],
|
||||||
addFieldsMeta: {
|
addFieldsMeta: {
|
||||||
|
name: {
|
||||||
|
rules: [Required, MatchExcludeParenthesis]
|
||||||
|
},
|
||||||
accounts_create_amount: {
|
accounts_create_amount: {
|
||||||
hidden: (formValue) => !formValue['auto_create_accounts']
|
hidden: (formValue) => !formValue['auto_create_accounts']
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -176,6 +176,9 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
importLdapUser(data).then(res => {
|
importLdapUser(data).then(res => {
|
||||||
this.$message.success(res.msg)
|
this.$message.success(res.msg)
|
||||||
|
}).catch(error => {
|
||||||
|
const errorMessage = getErrorResponseMsg(error) || this.$t('common.imExport.ImportFail')
|
||||||
|
this.$message.error(errorMessage)
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.dialogLdapUserImportAllLoginStatus = false
|
this.dialogLdapUserImportAllLoginStatus = false
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user