diff --git a/backend/pom.xml b/backend/pom.xml index 321cd4ffcd..26483f8851 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -22,7 +22,6 @@ - junit junit @@ -204,7 +203,6 @@ io.dataease dataease-plugin-interface - ${dataease.version} guava @@ -215,12 +213,10 @@ io.dataease dataease-plugin-view - ${dataease.version} io.dataease dataease-plugin-datasource - ${dataease.version} diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index d272855a9f..1356c7630d 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -1127,8 +1127,9 @@ export default { }, filterNode(value, data) { if (!value) return true + const result = data.label.toLowerCase().indexOf(value.toLowerCase()) !== -1 if (this.searchType === 'folder') { - if (data.nodeType === 'folder' && data.label.indexOf(value) !== -1) { + if (data.nodeType === 'folder' && result) { this.searchPids.push(data.id) return true } @@ -1139,7 +1140,7 @@ export default { return true } } else { - return data.label.indexOf(value) !== -1 + return result } return false }, diff --git a/pom.xml b/pom.xml index 690f74bc60..bb2355da07 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,33 @@ mobile backend + + + + io.dataease + dataease-plugin-interface + ${dataease.version} + + + guava + com.google.guava + + + + + io.dataease + dataease-plugin-view + ${dataease.version} + + + io.dataease + dataease-plugin-datasource + ${dataease.version} + + + + +