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 +10 -10
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6cc5bc5767 - Show all commits

18
app/components/p8p_dialog.js
View File

@ -29,8 +29,8 @@ const P8P_DIALOG_WIDTH = {
//Стили
const STYLES = {
SCROLL: { overflow: "auto", ...APP_STYLES.SCROLL },
SCROLL_HIDE: { overflow: "hidden", display: "flex", flexDirection: "column" }
SCROLL: display =>
Mim commented 2025-11-11 15:24:48 +03:00
Outdated
Review
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" })
display === true ? { overflow: "auto", ...APP_STYLES.SCROLL } : { overflow: "hidden", display: "flex", flexDirection: "column" }
};
//-----------------------
@ -52,12 +52,12 @@ const P8PDialog = ({
fullWidth,
inputs,
children,
okDisabled = false,
scrollContent = true,
onOk,
onCancel,
onClose,
Mim commented 2025-11-11 15:25:35 +03:00
Review
Copy Link

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

Переместить okDisabled и scrollContent между children и onOk
onInputChange,
okDisabled = false,
scrollContent = true
onInputChange
}) => {
//Состояние элементов ввода диалога
const [inputsState, setInputsState] = useState([]);
@ -94,7 +94,7 @@ const P8PDialog = ({
return (
<Dialog onClose={handleClose} open {...{ ...(width ? { maxWidth: width } : {}), ...(fullWidth === true ? { fullWidth: true } : {}) }}>
<DialogTitle>{title}</DialogTitle>
<DialogContent sx={scrollContent ? STYLES.SCROLL : STYLES.SCROLL_HIDE}>
<DialogContent sx={STYLES.SCROLL(scrollContent)}>
Mim commented 2025-11-11 15:27:26 +03:00
Outdated
Review
Copy Link

sx={STYLES.SCROLL(scrollContent)}

sx={STYLES.SCROLL(scrollContent)}
{inputsState.map((input, i) => (
<P8PInput key={i} {...input} formValues={formValues} onChange={handleInputChange} />
))}
@ -121,12 +121,12 @@ P8PDialog.propTypes = {
fullWidth: PropTypes.bool,
inputs: PropTypes.arrayOf(PropTypes.shape(P8P_INPUT)),
children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
okDisabled: PropTypes.bool,
scrollContent: PropTypes.bool,
onOk: PropTypes.func,
onCancel: PropTypes.func,
onClose: PropTypes.func,
Mim commented 2025-11-11 15:26:36 +03:00
Outdated
Review
Copy Link

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

Переместить okDisabled и scrollContent между children и onOk
onInputChange: PropTypes.func,
okDisabled: PropTypes.bool,
scrollContent: PropTypes.bool
onInputChange: PropTypes.func
};
//----------------

2
app/panels/clnt_task_board/task_dialog.js
View File

@ -139,7 +139,7 @@ const TaskDialog = ({ taskRn, taskType, editable, onTasksReload, onClose }) => {
<>
{!task.init && docProps.loaded && (
<P8PDialog
title={task.nRn ? `Исправление события${task.nClosed ? " (событые аннулировано)" : ""}` : "Добавление события"}
title={task.nRn ? `Исправление события${task.nClosed ? " [аннулировано]" : ""}` : "Добавление события"}
Mim commented 2025-11-11 15:32:00 +03:00
Outdated
Review
Copy Link

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

"(событые аннулировано)" заменить на просто "[аннулировано]" (в квадратных скобках)
fullWidth={true}
onOk={() => (taskRn ? handleUpdateEvent(onClose).then(onTasksReload) : handleInsertTask(onClose).then(onTasksReload))}
onClose={onClose ? onClose : null}