From 1cf9308e98bdecfd292af4a25fc4ce12b34605ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Thu, 31 Aug 2023 14:40:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E5=B7=A6=E4=BE=A7filter?=
=?UTF-8?q?=E7=9A=84tag=E9=80=89=E9=A1=B9=EF=BC=8C=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E5=8C=B9=E9=85=8Dhas=E5=87=BD=E6=95=B0=EF=BC=8C=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8Atag=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=A8=A1=E7=B3=8A?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E7=AC=A6=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/advancedSearch/TagMode.vue | 8 ++++----
src/components/advancedSearch/meta/parser.js | 1 +
src/views/entityExplorer/EntityExplorer.vue | 7 +++++++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/components/advancedSearch/TagMode.vue b/src/components/advancedSearch/TagMode.vue
index 48c74ec9..1e4313fb 100644
--- a/src/components/advancedSearch/TagMode.vue
+++ b/src/components/advancedSearch/TagMode.vue
@@ -44,7 +44,7 @@
{{meta.value.label}}
-
)
+ )
@@ -371,7 +371,7 @@ export default {
return value
}
} else {
- let newValue = column.type === columnType.string ? stringInQuot(value) : value
+ let newValue = (column.type.items ? column.type.items : column.type) === columnType.string ? stringInQuot(value) : value
if (flag) {
newValue = newValue.slice(1)
newValue = newValue.slice(0, newValue.length - 1)
@@ -388,9 +388,9 @@ export default {
})
const meta = new Meta()
meta.column.label = param.column
- meta.column.type = column ? column.type : columnType.string
+ meta.column.type = column ? (column.type.items ? column.type.items : column.type) : columnType.string
meta.column.label = column ? column.label : param.column
- meta.operator.value = '='
+ meta.operator.value = param.operator
meta.operator.show = true
meta.value.value = this.handleValue(param.value, column, column.operator, 'noQuotes')
meta.value.show = true
diff --git a/src/components/advancedSearch/meta/parser.js b/src/components/advancedSearch/meta/parser.js
index ca7aa90b..2130d552 100644
--- a/src/components/advancedSearch/meta/parser.js
+++ b/src/components/advancedSearch/meta/parser.js
@@ -794,6 +794,7 @@ export function handleMetaListToStr (metaList) {
metaList.forEach(item => {
if (item.column && item.column.type === 'fullText') {
item.operator.value = '='
+ item.operator.show = true
item.value.value = item.column.label
item.value.label = item.column.label
item.column.label = getEntityTypeByValue(item.column.label)
diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue
index 78c25723..fe41fcd0 100644
--- a/src/views/entityExplorer/EntityExplorer.vue
+++ b/src/views/entityExplorer/EntityExplorer.vue
@@ -472,6 +472,13 @@ export default {
}
]
this.$refs.search.addParams(params)
+ } else if (topData.topColumn === 'tag') {
+ const params = {
+ column: topData.topColumn,
+ operator: 'has',
+ value: name
+ }
+ this.$refs.search.addParams([params])
} else {
const params = {
column: topData.topColumn,