Compare commits

...

57 Commits

Author SHA1 Message Date
“huailei000”
ce91ed9cbc perf: 优化创建账号-指定账号组件重复选择问题;优化创建工单-制定账号重复选择问题 2023-11-10 14:33:08 +08:00
“huailei000”
c3d7a9997d perf: 优化select2组件远程搜索结果为空时是否开启远程搜索状态没有动态更新问题;创建工单搜索资产时不显示问题 2023-11-08 10:20:38 +08:00
jiangweidong
7298eb3204 fix: 云账号详情页面更新报错 2023-10-30 10:29:33 +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
Bryan
5fb70d2f24 Merge pull request #3450 from jumpserver/dev
v3.8.0
2023-10-19 03:33:53 -05:00
Bryan
b54a95430f Merge pull request #3404 from jumpserver/dev
v3.7.0
2023-09-21 17:04:42 +08:00
Bryan
4d8b4c45af Merge pull request #3355 from jumpserver/dev
v3.6.0
2023-08-17 14:00:33 +05:00
Bryan
a6d642df60 Merge pull request #3283 from jumpserver/dev
v3.5.0
2023-07-20 19:04:29 +08:00
Jiangjie.Bai
2e74f1522f Merge pull request #3222 from jumpserver/dev
v3.4.0
2023-06-15 14:51:36 +08:00
Jiangjie.Bai
fe615e0314 Merge pull request #3219 from jumpserver/dev
v3.4.0
2023-06-15 14:17:46 +08:00
Jiangjie.Bai
09f734e6fc Merge pull request #3135 from jumpserver/dev
v3.3.0
2023-05-18 19:18:11 +08:00
Jiangjie.Bai
3117046342 Merge pull request #3061 from jumpserver/dev
v3.2.0
2023-04-20 18:40:08 +08:00
Bai
b68aecb5cc fix: 批量更新资产平台help-text 2023-04-20 18:39:22 +08:00
Jiangjie.Bai
1c9b155d97 Merge pull request #3057 from jumpserver/dev
v3.2.0
2023-04-20 18:22:46 +08:00
Jiangjie.Bai
75b1be9864 Merge pull request #3019 from jumpserver/dev
v3.2.0 rc2
2023-04-14 19:01:37 +08:00
Jiangjie.Bai
615c3c1cf4 Merge pull request #3014 from jumpserver/dev
v3.2.0 rc1
2023-04-13 20:02:38 +08:00
Jiangjie.Bai
4d82231af4 Merge pull request #3012 from jumpserver/dev
v3.2.0 rc1
2023-04-13 19:22:38 +08:00
“huailei000”
c6cf6571b6 perf: ldap导入用户列表-组织下拉框设置最大宽度 2023-03-16 16:44:36 +08:00
Bai
8ea990d070 fix: 修复创建资产添加账号模版报错问题 2023-03-16 16:44:36 +08:00
“huailei000”
f4a32170d5 perf: message 2023-03-16 16:44:36 +08:00
ibuler
073508675e perf: 添加默认的信息 2023-03-16 16:44:36 +08:00
Jiangjie.Bai
1d6ca0a93a Merge pull request #2924 from jumpserver/dev
v3.1.0 rc4
2023-03-15 19:46:31 +08:00
Jiangjie.Bai
36aea652d6 Merge pull request #2788 from jumpserver/dev
v3.0.0
2023-02-23 20:16:41 +08:00
Jiangjie.Bai
1a42ce90ab Merge pull request #2760 from jumpserver/dev
v3.0.0-rc-latest
2023-02-22 22:21:54 +08:00
Jiangjie.Bai
31a401b55d Merge pull request #2463 from jumpserver/dev
v3.0.0-rc4
2023-01-31 18:55:34 +08:00
Jiangjie.Bai
582a84178d Merge pull request #2187 from jumpserver/dev
v2.28.0
2022-11-17 17:44:19 +08:00
Jiangjie.Bai
9b9f7c936c Merge pull request #2184 from jumpserver/dev
v2.28.0-rc5
2022-11-17 14:18:15 +08:00
Jiangjie.Bai
2a6100957f Merge pull request #2182 from jumpserver/dev
v2.28.0-rc4
2022-11-16 21:08:55 +08:00
Jiangjie.Bai
16606d6a27 Merge pull request #2176 from jumpserver/dev
v2.28.0-rc2
2022-11-14 10:01:05 +08:00
Jiangjie.Bai
0a612f50e6 Merge pull request #2164 from jumpserver/dev
v2.28.0-rc1
2022-11-10 17:45:47 +08:00
Jiangjie.Bai
fe36fa9390 Merge pull request #2117 from jumpserver/dev
v2.27.0-rc4
2022-10-18 21:02:10 +08:00
Jiangjie.Bai
ba109900ec Merge pull request #2113 from jumpserver/dev
v2.27.0-rc3
2022-10-18 11:20:57 +08:00
Jiangjie.Bai
ec7768267f Merge pull request #2105 from jumpserver/dev
v2.27.0-rc2
2022-10-14 11:01:32 +08:00
Jiangjie.Bai
cc58b374ab Merge pull request #2101 from jumpserver/dev
v2.27.0-rc1
2022-10-13 17:44:53 +08:00
Jiangjie.Bai
04ffbb8fd6 Merge pull request #2097 from jumpserver/dev
v2.27.0-rc1
2022-10-13 15:14:40 +08:00
Jiangjie.Bai
49880f6739 Merge pull request #2059 from jumpserver/dev
v2.26.0
2022-09-15 17:49:44 +08:00
Jiangjie.Bai
e6f98d58c4 Merge pull request #2057 from jumpserver/dev
v2.26.0-rc4
2022-09-15 16:18:03 +08:00
Jiangjie.Bai
fd1f16d43c Merge pull request #2050 from jumpserver/dev
v2.26.0-rc2
2022-09-13 17:41:39 +08:00
Jiangjie.Bai
968b2415b1 Merge pull request #2043 from jumpserver/dev
v2.26.0-rc1
2022-09-08 15:46:44 +08:00
Jiangjie.Bai
776090d6ba Merge pull request #2001 from jumpserver/dev
v2.25.0
2022-08-18 16:12:45 +08:00
Jiangjie.Bai
3a37952288 Merge pull request #1996 from jumpserver/dev
v2.25.0-rc4
2022-08-17 16:53:23 +08:00
Jiangjie.Bai
62b8fc0e3b Merge pull request #1994 from jumpserver/dev
v2.25.0-rc3
2022-08-16 19:08:23 +08:00
Jiangjie.Bai
b2028869cb Merge pull request #1986 from jumpserver/dev
v2.25.0-rc2
2022-08-12 18:06:56 +08:00
Jiangjie.Bai
5277a725f8 Merge pull request #1973 from jumpserver/dev
v2.25.0-rc1
2022-08-11 14:11:59 +08:00
Jiangjie.Bai
f137788c1a Merge pull request #1957 from jumpserver/dev
v2.24.0-rc5
2022-07-20 19:06:03 +08:00
Jiangjie.Bai
f7d17c8de7 Merge pull request #1954 from jumpserver/dev
v2.24.0-rc4
2022-07-19 16:18:13 +08:00
Jiangjie.Bai
feea70b0be Merge pull request #1944 from jumpserver/dev
v2.24.0-rc3
2022-07-18 12:05:42 +08:00
Jiangjie.Bai
04696ef3d6 Merge pull request #1940 from jumpserver/dev
v2.24.0-rc2
2022-07-15 18:07:37 +08:00
Jiangjie.Bai
1731f4f788 Merge pull request #1934 from jumpserver/dev
v2.24.0-rc1
2022-07-14 18:27:51 +08:00
Jiangjie.Bai
6f25d93909 Merge pull request #1931 from jumpserver/dev
v2.24.0-rc1
2022-07-14 17:51:58 +08:00
Jiangjie.Bai
46461ec324 Merge pull request #1925 from jumpserver/dev
v2.24.0-rc1
2022-07-14 15:12:15 +08:00
13 changed files with 40 additions and 5 deletions

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

@@ -215,6 +215,13 @@ export default {
handler(newValue, oldValue) {
},
deep: true
},
iOptions(val) {
if (val.length === 0) {
this.remote = false
} else {
this.remote = true
}
}
},
async mounted() {

View File

@@ -21,7 +21,6 @@
:placeholder="this.$t('common.EnterToContinue')"
class="search-input"
@blur="focus = false"
@change="handleConfirm"
@focus="focus = true"
@select="handleSelect"
@keyup.enter.native="handleConfirm"

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

@@ -39,7 +39,7 @@ export default {
this.$router.push({
name: routeName,
params: { id: id },
query: { provider: vm.Account.provider }
query: { provider: vm.Account.provider.value }
})
}
}

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
})