CITKParus/P8-Panels
2
0
Fork 2
Code Issues Pull Requests 1 Projects Releases Wiki Activity

ЦИТК-1006 - Доработка диалога добавления/исправления #40

Merged
Mim merged 3 commits from Dollerok/P8-Panels:main into main 2025-11-12 12:34:38 +03:00
Conversation 7 Commits 3 Files Changed 5 +118 -104
Dollerok commented 2025-11-07 14:39:23 +03:00
Member
Copy Link
No description provided.
Dollerok added 2 commits 2025-11-07 14:39:24 +03:00
Mim reviewed 2025-11-11 15:24:48 +03:00
app/components/p8p_dialog.js Outdated
@ -28,1 +29,4 @@
//Стили
const STYLES = {
SCROLL: { overflow: "auto", ...APP_STYLES.SCROLL },
Mim commented 2025-11-11 15:24:48 +03:00
Owner
Copy Link

Сделать функцией:
SCROLL: display => (display === true ? { overflow: "auto", ...APP_STYLES.SCROLL } : { overflow: "hidden", display: "flex", flexDirection: "column" })

Сделать функцией: SCROLL: display => (display === true ? { overflow: "auto", ...APP_STYLES.SCROLL } : { overflow: "hidden", display: "flex", flexDirection: "column" })
Mim reviewed 2025-11-11 15:25:35 +03:00
app/components/p8p_dialog.js
@ -43,0 +56,4 @@
onCancel,
onClose,
onInputChange,
okDisabled = false,
Mim commented 2025-11-11 15:25:35 +03:00
Owner
Copy Link

Переместить okDisabled и scrollContent между children и onOk

Переместить okDisabled и scrollContent между children и onOk
Mim reviewed 2025-11-11 15:26:36 +03:00
app/components/p8p_dialog.js Outdated
@ -103,2 +126,3 @@
onClose: PropTypes.func,
onInputChange: PropTypes.func
onInputChange: PropTypes.func,
okDisabled: PropTypes.bool,
Mim commented 2025-11-11 15:26:36 +03:00
Owner
Copy Link

Переместить okDisabled и scrollContent между children и onOk

Переместить okDisabled и scrollContent между children и onOk
Mim reviewed 2025-11-11 15:27:26 +03:00
app/components/p8p_dialog.js Outdated
@ -76,3 +95,3 @@
<Dialog onClose={handleClose} open {...{ ...(width ? { maxWidth: width } : {}), ...(fullWidth === true ? { fullWidth: true } : {}) }}>
<DialogTitle>{title}</DialogTitle>
<DialogContent>
<DialogContent sx={scrollContent ? STYLES.SCROLL : STYLES.SCROLL_HIDE}>
Mim commented 2025-11-11 15:27:26 +03:00
Owner
Copy Link

sx={STYLES.SCROLL(scrollContent)}

sx={STYLES.SCROLL(scrollContent)}
Mim reviewed 2025-11-11 15:32:00 +03:00
app/panels/clnt_task_board/task_dialog.js Outdated
@ -183,2 +141,2 @@
</Dialog>
)}{" "}
<P8PDialog
title={task.nRn ? `Исправление события${task.nClosed ? " (событые аннулировано)" : ""}` : "Добавление события"}
Mim commented 2025-11-11 15:32:00 +03:00
Owner
Copy Link

"(событые аннулировано)" заменить на просто "[аннулировано]" (в квадратных скобках)

"(событые аннулировано)" заменить на просто "[аннулировано]" (в квадратных скобках)
Mim requested changes 2025-11-11 15:32:42 +03:00
Mim left a comment
Owner
Copy Link

Прошу доработать согласно комментариям по коду.

Прошу доработать согласно комментариям по коду.
Dollerok added 1 commit 2025-11-11 15:53:21 +03:00
Dollerok commented 2025-11-11 15:53:44 +03:00
Author
Member
Copy Link

Сделал доработки по замечаниям

Сделал доработки по замечаниям
Mim merged commit b7f9daa258 into main 2025-11-12 12:34:38 +03:00
Sign in to join this conversation.
Reviewers
No Reviewers
Mim
Labels
Clear labels
bug
Something isn't working
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
question
Further information is requested
wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Mim
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: CITKParus/P8-Panels#40
No description provided.
Delete Branch "Dollerok/P8-Panels:main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?