Merge branch 'ETA_2.3.0' into debug

controllers/data_manage/chart_info.go

@@ -4657,7 +4657,12 @@ func (this *ChartInfoController) ChartList() {
 		}
 	}
 	if keyWord != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyWord + `%' OR chart_name_en LIKE '%` + keyWord + `%' )`
+		keyWordArr := strings.Split(keyWord, " ")
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				condition += ` AND CONCAT(chart_name,chart_name_en) LIKE '%` + v + `%'`
+			}
+		}
 	}
 	if sysUserIds != "" {
 		adminIds := strings.Split(sysUserIds, ",")

controllers/data_manage/edb_classify.go

@@ -1309,7 +1309,12 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 		}
 	}
 	if keyWord != "" {
-		condition += ` AND edb_name LIKE '%` + keyWord + `%' `
+		keyWordArr := strings.Split(keyWord, " ")
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				condition += ` AND edb_name LIKE '%` + v + `%' `
+			}
+		}
 	}
 	if sources != "" {
 		condition += " AND source IN(" + utils.GetOrmInReplace(len(strings.Split(sources, ","))) + ") "