From 3523933616b05b179fc1fd5c87a291af9d2c39a3 Mon Sep 17 00:00:00 2001 From: yaojn Date: Fri, 10 Nov 2023 16:01:47 +0800 Subject: [PATCH] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97-=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=9D=A1=E4=BB=B6=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E5=A4=84=E5=A2=9E=E5=8A=A03=E9=A1=B9=E4=B8=AA=E6=80=A7?= =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2=20=20=20-=20[=E5=85=B3=E8=81=94]#[1?= =?UTF-8?q?001415667843072]=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E8=B5=84=E4=BA=A7=E6=B8=85=E5=8D=95-=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=A3=80=E7=B4=A2=E5=A4=84=E5=A2=9E=E5=8A=A03?= =?UTF-8?q?=E9=A1=B9=E4=B8=AA=E6=80=A7=E5=8C=96=E6=9F=A5=E8=AF=A2=20http:/?= =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?= =?UTF-8?q?939050947543042/1001415667843072?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CombineSearcher/CombineSearcher.vue | 13 +- .../common/addTarget/add-filters.vue | 8 +- .../components/common/addTarget/add-node.vue | 13 + .../common/executionMode/filters.vue | 10 +- .../components/common/filter-search.vue | 265 ++++++++-- .../asset/advanced-mode-search.vue} | 446 +++++------------ src/views/pages/cmdb/asset/asset-manage.vue | 459 ++++++++++++------ 7 files changed, 669 insertions(+), 545 deletions(-) rename src/views/pages/{autoexec/components/common/complex-search.vue => cmdb/asset/advanced-mode-search.vue} (78%) diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue index 95b7fd648..0ff463ab4 100644 --- a/src/resources/components/CombineSearcher/CombineSearcher.vue +++ b/src/resources/components/CombineSearcher/CombineSearcher.vue @@ -119,7 +119,10 @@ -
  • +
  • +
    + {{ $t('page.advancedmode') }} +
    @@ -219,6 +222,11 @@ export default { searchMode: { type: String, // 搜索模式可选:实时搜索(realtimeSearch),非实时搜索(clickBtnSearch) default: 'realtimeSearch' // 默认实时搜索 + }, + isShowAdvanceMode: { + // 底部是否显示高级模式文案 + type: Boolean, + default: false } }, data() { @@ -270,6 +278,9 @@ export default { this.isCloseAutomaticSearch = true; // 关闭实时搜索 } }, + switchMode() { + this.$emit('switchMode'); + }, initWidth() { this.$el && (this.width = this.$el.getBoundingClientRect().width); }, diff --git a/src/views/pages/autoexec/components/common/addTarget/add-filters.vue b/src/views/pages/autoexec/components/common/addTarget/add-filters.vue index 66abadb41..f1b48e9f3 100644 --- a/src/views/pages/autoexec/components/common/addTarget/add-filters.vue +++ b/src/views/pages/autoexec/components/common/addTarget/add-filters.vue @@ -63,12 +63,12 @@ export default { }, valid() { let data = this.save(); - let complexModeSearch = this.getComplexModeSearchValue(); - if (this.$utils.isEmpty(data) && this.$utils.isEmptyObj(complexModeSearch)) { + let advancedModeSearch = this.getComplexModeSearchValue(); + if (this.$utils.isEmpty(data) && this.$utils.isEmptyObj(advancedModeSearch)) { this.isValid = false; - } else if (this.$utils.isEmpty(data) && !this.$utils.isEmptyObj(complexModeSearch)) { + } else if (this.$utils.isEmpty(data) && !this.$utils.isEmptyObj(advancedModeSearch)) { this.isValid = true; - } else if (!this.$utils.isEmpty(data) && this.$utils.isEmptyObj(complexModeSearch)) { + } else if (!this.$utils.isEmpty(data) && this.$utils.isEmptyObj(advancedModeSearch)) { this.isValid = true; } else { this.isValid = true; diff --git a/src/views/pages/autoexec/components/common/addTarget/add-node.vue b/src/views/pages/autoexec/components/common/addTarget/add-node.vue index 748acc3e4..8370d2f31 100644 --- a/src/views/pages/autoexec/components/common/addTarget/add-node.vue +++ b/src/views/pages/autoexec/components/common/addTarget/add-node.vue @@ -29,6 +29,7 @@ :defaultValue="defaultSearchValue" :defaultSearchValue="defaultSearchValue" @changeValue="changeValue" + @advancedModeSearch="advancedModeSearch" >
    diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue index 60d2859e0..889eb27b7 100644 --- a/src/views/pages/cmdb/asset/asset-manage.vue +++ b/src/views/pages/cmdb/asset/asset-manage.vue @@ -45,12 +45,15 @@