diff --git a/app/components/p8p_dialog.js b/app/components/p8p_dialog.js index 11e6e9d..1bc2a4a 100644 --- a/app/components/p8p_dialog.js +++ b/app/components/p8p_dialog.js @@ -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 => + 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, - onInputChange, - okDisabled = false, - scrollContent = true + onInputChange }) => { //Состояние элементов ввода диалога const [inputsState, setInputsState] = useState([]); @@ -94,7 +94,7 @@ const P8PDialog = ({ return ( {title} - + {inputsState.map((input, i) => ( ))} @@ -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, - onInputChange: PropTypes.func, - okDisabled: PropTypes.bool, - scrollContent: PropTypes.bool + onInputChange: PropTypes.func }; //---------------- diff --git a/app/panels/clnt_task_board/task_dialog.js b/app/panels/clnt_task_board/task_dialog.js index fb3e159..940fcef 100644 --- a/app/panels/clnt_task_board/task_dialog.js +++ b/app/panels/clnt_task_board/task_dialog.js @@ -139,7 +139,7 @@ const TaskDialog = ({ taskRn, taskType, editable, onTasksReload, onClose }) => { <> {!task.init && docProps.loaded && ( (taskRn ? handleUpdateEvent(onClose).then(onTasksReload) : handleInsertTask(onClose).then(onTasksReload))} onClose={onClose ? onClose : null}