Skip to content

Commit 9c67f6b

Browse files
committed
refactor: Search ignores capitalization
--story=1017866 --user=ηŽ‹ε­εˆš 【Bugθ½¬ιœ€ζ±‚γ€‘γ€ζœη΄’γ€‘-ε‡½ζ•°εΊ“γ€ζ¨‘εž‹γ€ε›’ι˜Ÿζˆε‘˜η•Œι’ζœη΄’δΈζ”―ζŒεΏ½η•₯倧小写 #2126 https://www.tapd.cn/57709429/s/1654282
1 parent a8d79c5 commit 9c67f6b

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

β€Žapps/function_lib/serializers/function_lib_serializer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def get_query_set(self):
105105
query_set = QuerySet(FunctionLib).filter(
106106
(Q(user_id=self.data.get('user_id')) | Q(permission_type='PUBLIC')))
107107
if self.data.get('name') is not None:
108-
query_set = query_set.filter(name__contains=self.data.get('name'))
108+
query_set = query_set.filter(name__icontains=self.data.get('name'))
109109
if self.data.get('desc') is not None:
110110
query_set = query_set.filter(desc__contains=self.data.get('desc'))
111111
if self.data.get('is_active') is not None:

β€Žapps/setting/serializers/provider_serializers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def list(self, with_valid):
106106
model_query_set = QuerySet(Model).filter((Q(user_id=user_id) | Q(permission_type='PUBLIC')))
107107
query_params = {}
108108
if name is not None:
109-
query_params['name__contains'] = name
109+
query_params['name__icontains'] = name
110110
if self.data.get('model_type') is not None:
111111
query_params['model_type'] = self.data.get('model_type')
112112
if self.data.get('model_name') is not None:

β€Žui/src/views/team/component/PermissionSetting.vue

+9-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@
5757
/>
5858
</template>
5959
</el-table-column>
60-
<el-table-column :label="$t('views.team.setting.check')" align="center" width="100" fixed="right">
60+
<el-table-column
61+
:label="$t('views.team.setting.check')"
62+
align="center"
63+
width="100"
64+
fixed="right"
65+
>
6166
<template #header>
6267
<el-checkbox
6368
:disabled="props.manage"
@@ -135,7 +140,9 @@ const allChecked: any = ref({
135140
136141
const filterText = ref('')
137142
138-
const filterData = computed(() => props.data.filter((v: any) => v.name.includes(filterText.value)))
143+
const filterData = computed(() =>
144+
props.data.filter((v: any) => v.name.toLowerCase().includes(filterText.value.toLowerCase()))
145+
)
139146
140147
const allIndeterminate: any = ref({
141148
[TeamEnum.MANAGE]: computed(() => {

0 commit comments

Comments
Β (0)