chore: add env remark search #20
This commit is contained in:
@@ -58,7 +58,7 @@ func (es *EnvService) GetEnvVarsWithPagination(userID string, name string, envTy
|
|||||||
|
|
||||||
query := database.DB.Model(&models.EnvironmentVariable{}).Where("user_id = ?", userID)
|
query := database.DB.Model(&models.EnvironmentVariable{}).Where("user_id = ?", userID)
|
||||||
if name != "" {
|
if name != "" {
|
||||||
query = query.Where("name LIKE ?", "%"+name+"%")
|
query = query.Where("name LIKE ? OR remark LIKE ?", "%"+name+"%", "%"+name+"%")
|
||||||
}
|
}
|
||||||
if envType != "" {
|
if envType != "" {
|
||||||
query = query.Where("type = ?", envType)
|
query = query.Where("type = ?", envType)
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ func (ts *TaskService) GetTasksWithPagination(page, pageSize int, name string, a
|
|||||||
|
|
||||||
query := database.DB.Model(&models.Task{})
|
query := database.DB.Model(&models.Task{})
|
||||||
if name != "" {
|
if name != "" {
|
||||||
query = query.Where("name LIKE ?", "%"+name+"%")
|
query = query.Where("name LIKE ? OR remark LIKE ?", "%"+name+"%", "%"+name+"%")
|
||||||
}
|
}
|
||||||
if tags != "" {
|
if tags != "" {
|
||||||
query = query.Where("tags LIKE ?", "%"+tags+"%")
|
query = query.Where("tags LIKE ?", "%"+tags+"%")
|
||||||
|
|||||||
@@ -108,7 +108,10 @@ const cleanConfig = computed(() => {
|
|||||||
|
|
||||||
const filteredEnvVars = computed(() => {
|
const filteredEnvVars = computed(() => {
|
||||||
return allEnvVars.value.filter((env: EnvVar) => {
|
return allEnvVars.value.filter((env: EnvVar) => {
|
||||||
const matchSearch = !envSearchQuery.value || env.name.toLowerCase().includes(envSearchQuery.value.toLowerCase())
|
const q = envSearchQuery.value.toLowerCase()
|
||||||
|
const matchSearch = !q ||
|
||||||
|
env.name.toLowerCase().includes(q) ||
|
||||||
|
(env.remark && env.remark.toLowerCase().includes(q))
|
||||||
const notSelected = !selectedEnvIds.value.includes(env.id)
|
const notSelected = !selectedEnvIds.value.includes(env.id)
|
||||||
return matchSearch && notSelected
|
return matchSearch && notSelected
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user