From 6e3ca56e984f12cc723f5b9df21a146c7fc1427e Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Thu, 9 Dec 2021 19:45:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=91=BD=E4=BB=A4=E8=BF=87=E6=BB=A4=E5=99=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommandFilterDetail/Detail.vue | 8 ---- .../CommonUser/database.vue | 4 +- .../CommonUser/index.vue | 8 ++-- .../SystemUserCreateUpdate/CommonUser/k8s.vue | 4 ++ .../CommonUser/telnet.vue | 48 +++++++++++++++++++ .../CommonUser/{vncAndTelnet.vue => vnc.vue} | 0 .../SystemUserCreateUpdate/fields.js | 1 + 7 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/telnet.vue rename src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/{vncAndTelnet.vue => vnc.vue} (100%) diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue index ba8cb5882..c08db6fdf 100644 --- a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue +++ b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue @@ -36,14 +36,6 @@ export default { const username = item.username || '*' return { label: item.name + '(' + username + ')', value: item.id } } - // processResults: (data) => { - // let results = data.results - // results = results.filter((item) => item.protocol === 'ssh' || item.protocol === 'telnet').map((item) => { - // return { label: item.name + '(' + item.username + ')', value: item.id } - // }) - // const more = !!data.next - // return { results: results, pagination: more, total: data.count } - // } }, hasObjectsId: this.object.system_users, performAdd: (items) => { diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue index f3e6b58d6..b63947a76 100644 --- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue +++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue @@ -27,6 +27,7 @@ export default { fields: [ [this.$t('common.Basic'), ['name', 'login_mode', 'username', 'priority', 'protocol']], [this.$t('common.Auth'), ['password']], + [this.$t('common.Command filter'), ['cmd_filters']], [this.$t('common.Other'), ['comment']] ], fieldsMeta: { @@ -34,7 +35,8 @@ export default { username: fields.username, private_key: fields.private_key, protocol: fields.protocol, - password: fields.password + password: fields.password, + cmd_filters: fields.cmd_filters }, url: '/api/v1/assets/system-users/' } diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue index d951601ed..985a407cd 100644 --- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue +++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue @@ -5,13 +5,14 @@ + + diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/vncAndTelnet.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/vnc.vue similarity index 100% rename from src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/vncAndTelnet.vue rename to src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/vnc.vue diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js index 78f09cbb0..7443dbc19 100644 --- a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js +++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js @@ -104,6 +104,7 @@ function getFields() { } const cmd_filters = { + label: this.$t('assets.CmdFilter'), component: Select2, el: { multiple: true,