dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4713 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
fit2cloudrd 2023-03-07 15:04:23 +08:00 committed by GitHub
commit c07f6dc487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/pom.xml
View File

@ -22,7 +22,6 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@ -204,7 +203,6 @@
<dependency> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId> <artifactId>dataease-plugin-interface</artifactId>
<version>${dataease.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
@ -215,12 +213,10 @@
<dependency> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId> <artifactId>dataease-plugin-view</artifactId>
<version>${dataease.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.dataease</groupId> <groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId> <artifactId>dataease-plugin-datasource</artifactId>
<version>${dataease.version}</version>
</dependency> </dependency>
<!-- kettle及数据源依赖 --> <!-- kettle及数据源依赖 -->
<dependency> <dependency>

5
frontend/src/views/panel/list/PanelList.vue
View File

@ -1127,8 +1127,9 @@ export default {
}, },
filterNode(value, data) { filterNode(value, data) {
if (!value) return true if (!value) return true
const result = data.label.toLowerCase().indexOf(value.toLowerCase()) !== -1
if (this.searchType === 'folder') { if (this.searchType === 'folder') {
if (data.nodeType === 'folder' && data.label.indexOf(value) !== -1) { if (data.nodeType === 'folder' && result) {
this.searchPids.push(data.id) this.searchPids.push(data.id)
return true return true
} }
@ -1139,7 +1140,7 @@ export default {
return true return true
} }
} else { } else {
return data.label.indexOf(value) !== -1 return result
} }
return false return false
}, },

27
pom.xml
View File

@ -26,6 +26,33 @@
<module>mobile</module> <module>mobile</module>
<module>backend</module> <module>backend</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId>
<version>${dataease.version}</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId>
<version>${dataease.version}</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId>
<version>${dataease.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<resources> <resources>