From 98991af6efeef5570b4e709f54d7a44d2b5dfed6 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 16 Jun 2020 14:32:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8DTree=E5=8F=B3?= =?UTF-8?q?=E9=94=AE=E5=88=A0=E9=99=A42=E6=9D=A1=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=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/AutoDataZTree/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue index 140ea396b..7a9265429 100644 --- a/src/components/AutoDataZTree/index.vue +++ b/src/components/AutoDataZTree/index.vue @@ -119,8 +119,8 @@ export default { ).then(() => { this.$message.success(this.$t('common.deleteSuccessMsg')) this.zTree.removeNode(currentNode) - }).catch(error => { - this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error)) + }).catch(() => { + // this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error)) }) }, onRename: function(event, treeId, treeNode, isCancel) { From ca8c06fc9b28e27d13f450fc0a451bbcb167170c Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Jun 2020 14:58:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0label=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/Asset/AssetList.vue | 5 +++++ src/views/audits/CommandExecutionList.vue | 3 +-- .../User/UserDetail/UserAssetPermissionRules.vue | 11 ----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue index 0d202d056..c976fb1a6 100644 --- a/src/views/assets/Asset/AssetList.vue +++ b/src/views/assets/Asset/AssetList.vue @@ -143,6 +143,11 @@ export default { name: 'AssetCreate', query: this.$route.query }, + searchConfig: { + options: [ + { label: this.$t('assets.Label'), value: 'label' } + ] + }, extraMoreActions: [ { name: 'DeactiveSelected', diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue index d044efd18..a95ba0005 100644 --- a/src/views/audits/CommandExecutionList.vue +++ b/src/views/audits/CommandExecutionList.vue @@ -83,8 +83,7 @@ export default { headerActions: { hasLeftActions: false, hasImport: false, - hasExport: false, - tagSearch: [] + hasExport: false } }, headerActions: { diff --git a/src/views/users/User/UserDetail/UserAssetPermissionRules.vue b/src/views/users/User/UserDetail/UserAssetPermissionRules.vue index 7267dbf3e..fec43b17c 100644 --- a/src/views/users/User/UserDetail/UserAssetPermissionRules.vue +++ b/src/views/users/User/UserDetail/UserAssetPermissionRules.vue @@ -22,17 +22,6 @@ export default { url: `/api/v1/perms/asset-permissions/?user_id=${this.object.id}`, hasSelection: false, hasTree: true, - tagSearch: [ - { label: this.$t('common.Name'), key: 'name' }, - { label: this.$t('common.isValid'), key: 'is_valid' }, - { label: this.$t('users.Username'), key: 'username' }, - { label: this.$t('users.UserGroups'), key: 'user_group' }, - { label: this.$t('assets.IP'), key: 'ip' }, - { label: this.$t('assets.Hostname'), key: 'hostname' }, - { label: this.$t('assets.Node'), key: 'node' }, - { label: this.$t('assets.SystemUser'), key: 'system_user' }, - { label: '继承(先占位)', key: 'all=0' } - ], columns: [ 'name', 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', 'is_active', 'actions' From 9d0562e11a54f344d7671bf8d7db17e1b965e5ee Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Jun 2020 15:05:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LabelCard/index.vue | 4 ++-- src/layout/components/GenericDetailPage/index.vue | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/LabelCard/index.vue b/src/components/LabelCard/index.vue index eee89c46c..02473eae5 100644 --- a/src/components/LabelCard/index.vue +++ b/src/components/LabelCard/index.vue @@ -2,7 +2,7 @@

{{ $t('common.Nothing') }}

- {{ i }} + {{ i.name }}: {{ i.value }}
@@ -40,7 +40,7 @@ export default { } for (const i in res) { if (this.labels.indexOf(res[i].id) > -1) { - this.iTag.push(res[i].name) + this.iTag.push(res[i]) } } }) diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue index ff040a3f6..a85565e12 100644 --- a/src/layout/components/GenericDetailPage/index.vue +++ b/src/layout/components/GenericDetailPage/index.vue @@ -65,7 +65,11 @@ export default { .replace('详情', '') this.$log.debug('Object is: ', obj) const objectName = this.getObjectName(obj) - return `${objectType}: ${objectName}` + let title = `${objectType}: ${objectName}` + if (title.length > 80) { + title = title.slice(0, 80) + '...' + } + return title } }, goBack: { From efaa11660565763878a33007c4b70d1112b74adc Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Jun 2020 15:19:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9detail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/Asset/AssetDetail/Detail.vue | 2 +- .../Asset/AssetDetail/components/LabelCard.vue} | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) rename src/{components/LabelCard/index.vue => views/assets/Asset/AssetDetail/components/LabelCard.vue} (72%) diff --git a/src/views/assets/Asset/AssetDetail/Detail.vue b/src/views/assets/Asset/AssetDetail/Detail.vue index 5f0fbfb20..89f9d6037 100644 --- a/src/views/assets/Asset/AssetDetail/Detail.vue +++ b/src/views/assets/Asset/AssetDetail/Detail.vue @@ -15,7 +15,7 @@ import DetailCard from '@/components/DetailCard' import RelationCard from '@/components/RelationCard' import QuickActions from '@/components/QuickActions' -import LabelCard from '@/components/LabelCard' +import LabelCard from './components/LabelCard' import { toSafeLocalDateStr } from '@/utils/common' export default { diff --git a/src/components/LabelCard/index.vue b/src/views/assets/Asset/AssetDetail/components/LabelCard.vue similarity index 72% rename from src/components/LabelCard/index.vue rename to src/views/assets/Asset/AssetDetail/components/LabelCard.vue index 02473eae5..1a659f453 100644 --- a/src/components/LabelCard/index.vue +++ b/src/views/assets/Asset/AssetDetail/components/LabelCard.vue @@ -1,8 +1,8 @@ @@ -30,17 +30,14 @@ export default { }, data() { return { - iTag: [] + iLabels: [] } }, mounted() { this.$axios.get(`/api/v1/assets/labels/`).then(res => { - if (this.labels === []) { - return - } for (const i in res) { if (this.labels.indexOf(res[i].id) > -1) { - this.iTag.push(res[i]) + this.iLabels.push(res[i]) } } })