Compare commits

...

8 Commits

Author SHA1 Message Date
fit2bot
71b5684e43 feat: Update v3.8.1 2023-10-25 17:49:20 +08:00
“huailei000”
e7772c9bba perf: 优化创建api key后关闭弹窗列表不刷新问题 2023-10-25 10:47:31 +08:00
“huailei000”
f1e3c2e238 perf: 远程应用名称不能包含() 2023-10-24 19:30:26 +08:00
feng626
10c974dec0 Merge pull request #3463 from jumpserver/pr@v3.8@account_change_secret
fix: 修改账号改密执行权限
2023-10-24 10:51:56 +08:00
feng
afd9749559 fix: 修改账号改密执行权限 2023-10-24 10:50:46 +08:00
“huailei000”
984f0b7db0 perf: 优化LDAP用户列表导入全部用户失败后没有提示信息问题 2023-10-20 16:10:29 +08:00
“huailei000”
6eaa72aca6 perf: 调整账号列表页面默认激活的tab 2023-10-20 11:22:31 +08:00
jiangweidong
2eee735747 fix: 新创建的云同步任务策略为空的问题 2023-10-19 04:10:48 -05:00
12 changed files with 1656 additions and 1626 deletions

1
GITSHA Normal file
View File

@@ -0,0 +1 @@
e7772c9bbaf882d8c807ae7a037257af3b24cbad

View File

@@ -53,13 +53,27 @@ export const matchAlphanumericUnderscore = {
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 {
IpCheck,
Required,
RequiredChange,
EmailCheck,
specialEmojiCheck,
matchAlphanumericUnderscore
matchAlphanumericUnderscore,
MatchExcludeParenthesis
}
export const JsonRequired = {

View File

@@ -867,6 +867,7 @@
"SecretKey": "Secret Key",
"NotSpecialEmoji": "No special emoji allowed",
"notAlphanumericUnderscore": "Only numbers, letters and underscores can be entered",
"notParenthesis": "Not contain ( )",
"Task": "Task",
"Cas": "CAS",
"Invalid": "Invalid",

View File

@@ -804,6 +804,7 @@
"FormatError": "フォーマットエラー",
"NotSpecialEmoji": "特殊な表情記号の入力は許可されていません",
"notAlphanumericUnderscore": "数字、文字、アンダースコアのみ入力可能",
"notParenthesis": "含まない ( )",
"WeekCronSelect": {
"Monday": "月曜日",
"Tuesday": "火曜日",

View File

@@ -838,6 +838,7 @@
"FormatError": "格式错误",
"NotSpecialEmoji": "不允许输入特殊表情符号",
"notAlphanumericUnderscore": "只能输入字母、数字、下划线",
"notParenthesis": "不能包含 ( )",
"WeekCronSelect": {
"Monday": "星期一",
"Tuesday": "星期二",

View File

@@ -13,7 +13,7 @@ export default {
data() {
return {
config: {
activeMenu: 'VirtualAccountList',
activeMenu: 'AccountList',
submenu: [
{
title: this.$t('accounts.GeneralAccounts'),

View File

@@ -93,7 +93,7 @@ export default {
title: vm.$t('xpack.Execute'),
name: 'execute',
can: ({ row }) => {
return row.is_active && vm.$hasPerm('accounts.add_changesecretexection')
return row.is_active && vm.$hasPerm('accounts.add_changesecretexecution')
},
type: 'info',
disabled: ({ row }) => !row.is_active,

View File

@@ -101,6 +101,7 @@ export default {
if (status) {
data['id'] = value
this.tableConfig.totalData.push(data)
this.$emit('change', this.tableConfig.totalData)
}
},
handleCreate() {

View File

@@ -11,6 +11,7 @@
:title="$tc('profile.CreateAccessKey')"
:visible.sync="visible"
width="700px"
@close="onClose"
@confirm="visible = false"
>
<el-alert type="warning">
@@ -135,6 +136,9 @@ export default {
}
},
methods: {
onClose() {
this.getRefsListTable.reloadTable()
}
}
}
</script>

View File

@@ -4,6 +4,7 @@
<script>
import BaseAssetCreateUpdate from '@/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate'
import { Required, MatchExcludeParenthesis } from '@/components/Form/DataForm/rules'
export default {
components: {
@@ -19,6 +20,9 @@ export default {
[this.$t('assets.Account'), ['auto_create_accounts', 'accounts_create_amount']]
],
addFieldsMeta: {
name: {
rules: [Required, MatchExcludeParenthesis]
},
accounts_create_amount: {
hidden: (formValue) => !formValue['auto_create_accounts']
},

View File

@@ -176,6 +176,9 @@ export default {
} else {
importLdapUser(data).then(res => {
this.$message.success(res.msg)
}).catch(error => {
const errorMessage = getErrorResponseMsg(error) || this.$t('common.imExport.ImportFail')
this.$message.error(errorMessage)
}).finally(() => {
this.dialogLdapUserImportAllLoginStatus = false
})

3246
yarn.lock

File diff suppressed because it is too large Load Diff