Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ESYTD
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Дияр Амангельды
ESYTD
Commits
74485741
Commit
74485741
authored
Jul 30, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed dictionary update
parent
7c1232a6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
src/features/pagination/mainPagination.ts
src/features/pagination/mainPagination.ts
+1
-1
src/pages/HomePage/Columns.tsx
src/pages/HomePage/Columns.tsx
+2
-1
src/pages/HomePage/HomePage.tsx
src/pages/HomePage/HomePage.tsx
+12
-4
No files found.
src/features/pagination/mainPagination.ts
View file @
74485741
...
@@ -9,7 +9,7 @@ interface InitialState {
...
@@ -9,7 +9,7 @@ interface InitialState {
const
initialState
:
InitialState
=
{
const
initialState
:
InitialState
=
{
currentPage
:
1
,
currentPage
:
1
,
totalOrgNumber
:
0
,
totalOrgNumber
:
0
,
ORG_NUMBER_PER_PAGE
:
1
2
ORG_NUMBER_PER_PAGE
:
1
1
}
}
const
mainPaginationSlice
=
createSlice
({
const
mainPaginationSlice
=
createSlice
({
...
...
src/pages/HomePage/Columns.tsx
View file @
74485741
...
@@ -72,7 +72,7 @@ export const CheckboxColumn: React.FC<{ data: DataType }> = ({ data }) => {
...
@@ -72,7 +72,7 @@ export const CheckboxColumn: React.FC<{ data: DataType }> = ({ data }) => {
useEffect
(()
=>
{
useEffect
(()
=>
{
setChecked
(
checkedCodes
.
includes
(
data
.
code
));
setChecked
(
checkedCodes
.
includes
(
data
.
code
));
},
[
checkedCodes
,
data
.
code
]);
},
[
checkedCodes
]);
const
handleCheck
=
(
e
:
{
target
:
{
checked
:
any
}
})
=>
{
const
handleCheck
=
(
e
:
{
target
:
{
checked
:
any
}
})
=>
{
const
isChecked
=
e
.
target
.
checked
;
const
isChecked
=
e
.
target
.
checked
;
...
@@ -89,6 +89,7 @@ export const CheckboxColumn: React.FC<{ data: DataType }> = ({ data }) => {
...
@@ -89,6 +89,7 @@ export const CheckboxColumn: React.FC<{ data: DataType }> = ({ data }) => {
className=
'checkbox_org--custom'
className=
'checkbox_org--custom'
checked=
{
checked
}
checked=
{
checked
}
onChange=
{
handleCheck
}
onChange=
{
handleCheck
}
id=
{
`checkbox-${data.id}`
}
/>
/>
);
);
};
};
...
...
src/pages/HomePage/HomePage.tsx
View file @
74485741
import
React
,
{
createRef
,
useEffect
}
from
'
react
'
;
import
React
,
{
createRef
,
useEffect
,
useState
}
from
'
react
'
;
import
{
useNavigate
}
from
'
react-router
'
;
import
{
useNavigate
}
from
'
react-router
'
;
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
{
Button
,
message
,
Pagination
,
Space
,
Spin
,
Table
}
from
'
antd
'
;
import
{
Button
,
message
,
Pagination
,
Space
,
Spin
,
Table
}
from
'
antd
'
;
...
@@ -21,18 +21,24 @@ const HomePage: React.FC = () => {
...
@@ -21,18 +21,24 @@ const HomePage: React.FC = () => {
const
syncBtnState
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
disabled
);
const
syncBtnState
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
disabled
);
const
checkedCodes
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
checkedCodes
);
const
checkedCodes
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
checkedCodes
);
const
[
updateDictionary
]
=
useUpdateDictionaryMutation
();
const
[
updateDictionary
]
=
useUpdateDictionaryMutation
();
const
[
isSyncLoading
,
setIsSyncLoading
]
=
useState
(
false
);
const
handleAddClick
=
()
=>
{
const
handleAddClick
=
()
=>
{
navigate
(
"
/add
"
);
navigate
(
"
/add
"
);
};
};
const
handleSyncClick
=
async
()
=>
{
const
handleSyncClick
=
async
()
=>
{
setIsSyncLoading
(
true
);
try
{
try
{
await
updateDictionary
(
checkedCodes
);
console
.
log
(
checkedCodes
);
dispatch
(
clearCheckedCodes
()
);
await
updateDictionary
(
checkedCodes
).
unwrap
(
);
message
.
success
(
'
Организации успешны синхронизированы!
'
)
message
.
success
(
'
Организации успешны синхронизированы!
'
)
}
catch
(
err
)
{
}
catch
(
err
)
{
console
.
log
(
err
);
message
.
error
(
'
Произошла ошибка при синхронизации организации!
'
)
message
.
error
(
'
Произошла ошибка при синхронизации организации!
'
)
}
finally
{
dispatch
(
clearCheckedCodes
());
setIsSyncLoading
(
false
);
}
}
};
};
...
@@ -102,6 +108,8 @@ const HomePage: React.FC = () => {
...
@@ -102,6 +108,8 @@ const HomePage: React.FC = () => {
className=
'add_title'
className=
'add_title'
onClick=
{
handleSyncClick
}
onClick=
{
handleSyncClick
}
disabled=
{
syncBtnState
}
disabled=
{
syncBtnState
}
loading=
{
isSyncLoading
}
type=
'primary'
>
>
Синхронизировать справочники
Синхронизировать справочники
</
Button
>
</
Button
>
...
...
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