diff --git a/backend/public/css/app.css b/backend/public/css/app.css index e65d8760..ede38d97 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -13047,6 +13047,7 @@ categories: [project] min-width: 52px; height: 52px; margin-right: 10px; + pointer-events: none; } .icon-text-wrap:after { position: absolute; @@ -17365,6 +17366,7 @@ a { .btn-disabled { background-color: #eaeff2; color: #6f7372; + pointer-events: none; } .meeting-item:last-child { diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 1a3f844f..559c3aa1 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -36457,20 +36457,20 @@ var MeetingEdit = function MeetingEdit(props) { setLoaded(true); if (response.data.status_code == 200) { - var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8; + var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6; setMeeting(response.data.params); //Success setTitle((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.title); - setMemo((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.memo); - setText((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.text); - setMeetingImages((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.meeting_image); - setApproval((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.approval); - setPdf((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.pdf); + setMemo(response.data.params.memo ? response.data.params.memo : ''); + setText(response.data.params.text ? response.data.params.text : ''); + setMeetingImages((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.meeting_image); + setApproval((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.approval); + setPdf((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.pdf); - var list = _toConsumableArray((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children); + var list = _toConsumableArray((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.children); - var approval = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.approval); + var approval = _toConsumableArray((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.approval); var arr = []; @@ -37766,7 +37766,7 @@ var ParentEdit = function ParentEdit(props) { setCompany(parent === null || parent === void 0 ? void 0 : parent.company); setEmail(parent.email); setTelephone(parent.tel); - setProfile(parent.profile); + setProfile(parent.profile ? parent.profile : ''); } } else { set400Error("失敗しました。"); @@ -41722,7 +41722,7 @@ var ProfileEdit = function ProfileEdit() { setEmail(params.email); setTel(params.tel); setIdentity(params.identity); - if (params.company) setCompany(params.company); + setCompany(params.company ? params.company : ''); } else { set400Error("失敗しました。"); } @@ -48646,19 +48646,19 @@ var MeetingEdit = function MeetingEdit(props) { setNotice(response.data.notice); if (response.data.status_code == 200) { - var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8; + var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6; setMeeting(response.data.params); setTitle((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.title); - setMemo((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.memo); - setText((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.text); - setMeetingImages((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.meeting_image); - setApproval((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.approval); - setPdf((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.pdf); + setMemo(response.data.params.memo ? response.data.params.memo : ''); + setText(response.data.params.text ? response.data.params.text : ''); + setMeetingImages((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.meeting_image); + setApproval((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.approval); + setPdf((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.pdf); - var list = _toConsumableArray((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children); + var list = _toConsumableArray((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.children); - var approval = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.approval); + var approval = _toConsumableArray((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.approval); var arr = []; @@ -49913,13 +49913,13 @@ var ProfileEdit = function ProfileEdit() { setNotice(response.data.notice); if (response.data.status_code == 200) { - var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4; + var _response$data$params, _response$data$params2, _response$data$params3; setParams(response.data.params); setCompany((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.company); setEmail((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.email); setTel((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.tel); - setProfile((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.profile); + setProfile(response.data.params.profile ? response.data.params.profile : ''); } else { set400Error("失敗しました。"); } diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index ecc4250c..f08a1b9b 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -62,8 +62,8 @@ const MeetingEdit = (props) => { if(response.data.status_code==200){ setMeeting(response.data.params); //Success setTitle(response.data.params?.title); - setMemo(response.data.params?.memo); - setText(response.data.params?.text); + setMemo(response.data.params.memo ? response.data.params.memo: ''); + setText(response.data.params.text ? response.data.params.text: ''); setMeetingImages(response.data.params?.meeting_image); setApproval(response.data.params?.approval); setPdf(response.data.params?.pdf); diff --git a/backend/resources/js/admin/parent/edit.jsx b/backend/resources/js/admin/parent/edit.jsx index cbfb0faf..73e1a3fc 100644 --- a/backend/resources/js/admin/parent/edit.jsx +++ b/backend/resources/js/admin/parent/edit.jsx @@ -39,8 +39,8 @@ const ParentEdit = (props) => { if(parent){ setCompany(parent?.company); setEmail(parent.email); - setTelephone(parent.tel) - setProfile(parent.profile); + setTelephone(parent.tel); + setProfile(parent.profile ? parent.profile: ''); } } else{ diff --git a/backend/resources/js/child/profile/edit.jsx b/backend/resources/js/child/profile/edit.jsx index 7945afe5..13a93a7c 100644 --- a/backend/resources/js/child/profile/edit.jsx +++ b/backend/resources/js/child/profile/edit.jsx @@ -52,7 +52,7 @@ const ProfileEdit = () => { setEmail(params.email); setTel(params.tel); setIdentity(params.identity); - if(params.company)setCompany(params.company); + setCompany(params.company? params.company: ''); }else { set400Error("失敗しました。"); } diff --git a/backend/resources/js/parent/meeting/edit.jsx b/backend/resources/js/parent/meeting/edit.jsx index f54fd590..836981ad 100644 --- a/backend/resources/js/parent/meeting/edit.jsx +++ b/backend/resources/js/parent/meeting/edit.jsx @@ -49,8 +49,8 @@ const MeetingEdit = (props) => { if(response.data.status_code==200){ setMeeting(response.data.params); setTitle(response.data.params?.title); - setMemo(response.data.params?.memo); - setText(response.data.params?.text); + setMemo(response.data.params.memo ? response.data.params.memo: ''); + setText(response.data.params.text ? response.data.params.text: ''); setMeetingImages(response.data.params?.meeting_image); setApproval(response.data.params?.approval); setPdf(response.data.params?.pdf); diff --git a/backend/resources/js/parent/profile/edit.jsx b/backend/resources/js/parent/profile/edit.jsx index 3c64b120..72c8e56b 100644 --- a/backend/resources/js/parent/profile/edit.jsx +++ b/backend/resources/js/parent/profile/edit.jsx @@ -40,7 +40,7 @@ const ProfileEdit = () => { setCompany(response.data.params?.company); setEmail(response.data.params?.email); setTel(response.data.params?.tel); - setProfile(response.data.params?.profile); + setProfile(response.data.params.profile ? response.data.params.profile: ''); } else { set400Error("失敗しました。"); diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index f57192e9..64d7550c 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -65,6 +65,7 @@ a{ .btn-disabled{ background-color: #eaeff2; color: #6f7372; + pointer-events: none; } diff --git a/backend/resources/sass/scss/object/project/_icon.scss b/backend/resources/sass/scss/object/project/_icon.scss index 7af8da2b..487ad11c 100644 --- a/backend/resources/sass/scss/object/project/_icon.scss +++ b/backend/resources/sass/scss/object/project/_icon.scss @@ -186,6 +186,7 @@ categories: [project] min-width: 52px; height: 52px; margin-right: 10px; + pointer-events: none; &:after{ position: absolute; top: 50%;