Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
quasar-web-base
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nguyễn Hải Sơn
quasar-web-base
Commits
b1b14c35
Commit
b1b14c35
authored
May 19, 2021
by
Võ Quang Thành Đạt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug user-group page
parent
27241479
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
10 deletions
+13
-10
UserGroup.ts
src/components/user-group/UserGroup.ts
+5
-2
index.vue
src/components/user-management/add-new-user-dialog/index.vue
+1
-1
index.vue
src/components/user-management/update-user-dialog/index.vue
+1
-1
index.ts
src/i18n/vi/index.ts
+2
-2
UserGroup.ts
src/pages/nhom-nguoi-dung/UserGroup.ts
+4
-4
No files found.
src/components/user-group/UserGroup.ts
View file @
b1b14c35
...
@@ -20,8 +20,11 @@ export default defineComponent({
...
@@ -20,8 +20,11 @@ export default defineComponent({
const
keyword
=
ref
(
''
);
const
keyword
=
ref
(
''
);
const
filteredListUsers
=
computed
(()
=>
{
const
filteredListUsers
=
computed
(()
=>
{
return
props
.
listUsers
.
filter
((
group
)
=>
return
props
.
listUsers
.
filter
(
group
.
groupName
.
includes
(
keyword
.
value
)
(
group
)
=>
group
.
groupName
.
includes
(
keyword
.
value
.
trim
())
||
group
.
groupName
.
includes
(
keyword
.
value
.
trim
().
toUpperCase
())
||
group
.
groupName
.
includes
(
keyword
.
value
.
trim
().
toLowerCase
())
);
);
});
});
...
...
src/components/user-management/add-new-user-dialog/index.vue
View file @
b1b14c35
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
>
>
<template
v-slot:prepend
>
<template
v-slot:prepend
>
<div
class=
"text-body2"
>
<div
class=
"text-body2"
>
{{
$t
(
'userPage.dialogLabel.fieldLabels.birthday'
)
}}
{{
$t
(
'userPage.dialogLabel.fieldLabels.birthday'
)
}}
*
</div>
</div>
</
template
>
</
template
>
</q-input>
</q-input>
...
...
src/components/user-management/update-user-dialog/index.vue
View file @
b1b14c35
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
>
>
<template
v-slot:prepend
>
<template
v-slot:prepend
>
<div
class=
"text-body2"
>
<div
class=
"text-body2"
>
{{
$t
(
'userPage.dialogLabel.fieldLabels.birthday'
)
}}
{{
$t
(
'userPage.dialogLabel.fieldLabels.birthday'
)
}}
*
</div>
</div>
</
template
>
</
template
>
</q-input>
</q-input>
...
...
src/i18n/vi/index.ts
View file @
b1b14c35
...
@@ -40,10 +40,10 @@ export default {
...
@@ -40,10 +40,10 @@ export default {
groupInfo
:
{
groupInfo
:
{
title
:
'Thông tin nhóm'
,
title
:
'Thông tin nhóm'
,
validateMessages
:
{
validateMessages
:
{
requireGroupName
:
'Vui lòng
cung cấp t
ên nhóm người dùng'
,
requireGroupName
:
'Vui lòng
nhập T
ên nhóm người dùng'
,
groupNameLengthInvalid
:
groupNameLengthInvalid
:
'Tên nhóm người dùng chỉ có thể dài tối đa 10 ký tự'
,
'Tên nhóm người dùng chỉ có thể dài tối đa 10 ký tự'
,
requireGroupDescription
:
'Vui lòng
cung cấp m
ô tả nhóm người dùng'
,
requireGroupDescription
:
'Vui lòng
nhập M
ô tả nhóm người dùng'
,
},
},
actionMessages
:
{
actionMessages
:
{
addNewSuccess
:
'Thêm nhóm người dùng thành công'
,
addNewSuccess
:
'Thêm nhóm người dùng thành công'
,
...
...
src/pages/nhom-nguoi-dung/UserGroup.ts
View file @
b1b14c35
...
@@ -35,8 +35,8 @@ const addNewGroupInfo = async ($store: Store<StateInterface>) => {
...
@@ -35,8 +35,8 @@ const addNewGroupInfo = async ($store: Store<StateInterface>) => {
method
:
'POST'
,
method
:
'POST'
,
data
:
{
data
:
{
group
:
{
group
:
{
groupName
:
groupName
.
value
,
groupName
:
groupName
.
value
.
trim
()
,
description
:
groupDescription
.
value
,
description
:
groupDescription
.
value
.
trim
()
,
},
},
users
:
[],
users
:
[],
pageRoles
:
[],
pageRoles
:
[],
...
@@ -108,8 +108,8 @@ const updateGroupInfo = async ($store: Store<StateInterface>) => {
...
@@ -108,8 +108,8 @@ const updateGroupInfo = async ($store: Store<StateInterface>) => {
data
:
{
data
:
{
group
:
{
group
:
{
id
:
selectedGroupId
.
value
,
id
:
selectedGroupId
.
value
,
groupName
:
groupName
.
value
,
groupName
:
groupName
.
value
.
trim
()
,
description
:
groupDescription
.
value
,
description
:
groupDescription
.
value
.
trim
()
,
},
},
pageRoles
,
pageRoles
,
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment