From bc400913e27f4d81d3957f5630513a1753c091f6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 9 Jun 2020 17:27:39 +0800 Subject: [PATCH 01/17] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3select2=E4=BD=9C?= =?UTF-8?q?=E4=B8=BAcomponent=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Select2/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Select2/index.vue b/src/components/Select2/index.vue index 58f66b228..ee7eea5ce 100644 --- a/src/components/Select2/index.vue +++ b/src/components/Select2/index.vue @@ -158,6 +158,9 @@ export default { this.initialSelect() this.initialized = true } + this.$nextTick(() => { + this.$refs.select.elFormItem.clearValidate() + }) }, methods: { async loadMore(load) { From 747602e7bfcb4be2c8d1693605c2f34b28e1ecbb Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 9 Jun 2020 18:12:07 +0800 Subject: [PATCH 02/17] =?UTF-8?q?[Update]=20=E5=88=9B=E5=BB=BA/=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8E=88=E6=9D=83=E8=A7=84=E5=88=99=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0DateStart=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/cn.json | 1 + .../perms/AssetPermission/AssetPermissionCreateUpdate.vue | 5 ++++- .../DatabaseAppPermissionCreateUpdate.vue | 8 +++++++- .../RemoteAppPermissionCreateUpdate.vue | 8 +++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index 5adeb7862..694e292ce 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -224,6 +224,7 @@ "createSuccessMsg": "创建成功", "createdBy": "创建人", "dateCreated": "创建日期", + "dateStart": "开始日期", "dateExpired": "失效日期", "deleteErrorMsg": "删除失败", "deleteSelected": "删除所选", diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue index ea35d9481..7503ee24f 100644 --- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue @@ -32,7 +32,7 @@ export default { [this.$t('perms.User'), ['users', 'user_groups']], [this.$t('perms.Asset'), ['assets', 'nodes', 'system_users']], [this.$t('common.action'), ['actions']], - [this.$t('common.Other'), ['is_active', 'date_expired', 'comment']] + [this.$t('common.Other'), ['is_active', 'date_start', 'date_expired', 'comment']] ], url: '/api/v1/perms/asset-permissions/', fieldsMeta: { @@ -97,6 +97,9 @@ export default { { label: 'download_file', value: this.$t('perms.downloadFile') } ] }, + date_start: { + label: this.$t('common.dateStart') + }, date_expired: { label: this.$t('common.dateExpired') }, diff --git a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate.vue index 315614caa..9804213f9 100644 --- a/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate.vue +++ b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate.vue @@ -18,7 +18,7 @@ export default { [this.$t('perms.' + 'Basic'), ['name']], [this.$t('perms.' + 'USER'), ['users', 'user_groups']], [this.$t('perms.' + 'databaseApp'), ['database_apps', 'system_users']], - [this.$t('common.Other'), ['is_active', 'date_expired', 'comment']] + [this.$t('common.Other'), ['is_active', 'date_start', 'date_expired', 'comment']] ], url: '/api/v1/perms/database-app-permissions/', fieldsMeta: { @@ -61,6 +61,12 @@ export default { } } }, + date_start: { + label: this.$t('common.dateStart') + }, + date_expired: { + label: this.$t('common.dateExpired') + }, actions: { label: this.$t('perms.Actions') }, diff --git a/src/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate.vue index df4af998e..de5a6ccce 100644 --- a/src/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate.vue +++ b/src/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate.vue @@ -18,7 +18,7 @@ export default { [this.$t('perms.Basic'), ['name']], [this.$t('perms.User'), ['users', 'user_groups']], [this.$t('perms.remoteApp'), ['remote_apps', 'system_users']], - [this.$t('common.Other'), ['is_active', 'date_expired', 'comment']] + [this.$t('common.Other'), ['is_active', 'date_start', 'date_expired', 'comment']] ], url: '/api/v1/perms/remote-app-permissions/', fieldsMeta: { @@ -61,6 +61,12 @@ export default { } } }, + date_start: { + label: this.$t('common.dateStart') + }, + date_expired: { + label: this.$t('common.dateExpired') + }, actions: { label: this.$t('perms.Actions') }, From 1a84cb96368ea1ca191b6f0056287a1869e88030 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 9 Jun 2020 18:17:39 +0800 Subject: [PATCH 03/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83=E8=A7=84=E5=88=99is=5Fvalid?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perms/AssetPermission/AssetPermissionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue index 99b490a0a..3bbd45d89 100644 --- a/src/views/perms/AssetPermission/AssetPermissionList.vue +++ b/src/views/perms/AssetPermission/AssetPermissionList.vue @@ -24,7 +24,7 @@ export default { url: '/api/v1/perms/asset-permissions/', hasSelection: false, hasTree: true, - columns: ['name', 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', 'is_active', 'actions'], + columns: ['name', 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', 'is_valid', 'actions'], columnsMeta: { name: { formatterArgs: { From de12c20854d40e84886afcf0863c9bfc9013d6b3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 9 Jun 2020 18:19:30 +0800 Subject: [PATCH 04/17] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index 5adeb7862..66f6e28d7 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -414,7 +414,7 @@ "CreateReplayStorage": "创建录像存储", "Dashboard": "仪表盘", "DatabaseApp": "数据库应用", - "DatabaseAppCreate": "", + "DatabaseAppCreate": "创建数据库应用", "DatabaseAppDetail": "数据库详情", "DatabaseAppPermission": "数据库授权", "DatabaseAppPermissionCreate": "创建数据库授权规则", From cb29943e8b26cfae9e3cbd94a917243f20ab629d Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 9 Jun 2020 18:25:10 +0800 Subject: [PATCH 05/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E8=A7=84=E5=88=99=E8=AF=A6=E6=83=85=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetPermissionDetail/AssetPermissionDetail.vue | 5 +---- .../perms/AssetPermission/AssetPermissionDetail/index.vue | 2 +- .../DatabaseAppPermissionDetail.vue | 5 +---- .../DatabaseAppPermissionDetail/index.vue | 2 +- .../RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue | 5 +---- .../RemoteAppPermission/RemoteAppPermissionDetail/index.vue | 2 +- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue index 15610983c..467784699 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue @@ -1,7 +1,7 @@