Multiple Imageアップロード機能を追加しました。

このコミットが含まれているのは:
dragon1211 2021-11-25 06:06:26 -08:00
コミット 1cd5605163
4個のファイルの変更282行の追加166行の削除

ファイルの表示

@ -36317,10 +36317,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var REGISTED_IMAGE_ID = -100; //登録された画像を区別するために導入されます。
var MeetingEdit = function MeetingEdit(props) {
var _ref;
var meeting_id = props.match.params.meeting_id;
var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_4__.useHistory)();
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
@ -36404,6 +36406,11 @@ var MeetingEdit = function MeetingEdit(props) {
children_temp = _useState30[0],
setChildrenTemp = _useState30[1];
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState32 = _slicedToArray(_useState31, 2),
deleted_image_id = _useState32[0],
setDeletedImageID = _useState32[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
@ -36512,15 +36519,38 @@ var MeetingEdit = function MeetingEdit(props) {
formdata.append('children', JSON.stringify(approval_registerIndexes));
axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/admin/meeting/approvals/register', formdata, {
params: {
meeting_id: props.match.params.meeting_id
meeting_id: meeting_id
}
});
axios__WEBPACK_IMPORTED_MODULE_1___default().delete('/api/admin/meeting/approvals/delete', {
params: {
children: approval_deleteIndexes,
meeting_id: props.match.params.meeting_id
meeting_id: meeting_id
}
}); //---------------------------------------
deleted_image_id.map(function (image_id) {
if (image_id != REGISTED_IMAGE_ID) axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/admin/meeting/images/delete/".concat(meeting_id), {
params: {
image_id: image_id
}
});
});
setDeletedImageID([]);
meeting_image.map(function (item) {
if (item.id == REGISTED_IMAGE_ID) {
var _formdata = new FormData();
_formdata.append('image', item.image);
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/admin/meeting/images/register", _formdata, {
params: {
meeting_id: meeting_id
}
});
}
}); //----------------------------------------
var request = {
title: title,
text: text,
@ -36556,34 +36586,37 @@ var MeetingEdit = function MeetingEdit(props) {
var handleImageChange = function handleImageChange(e) {
e.preventDefault();
var reader = new FileReader();
var _file = e.target.files[0];
if (!_file) return;
reader.readAsDataURL(_file);
var files = Array.from(e.target.files);
reader.onloadend = function () {
var formdata = new FormData();
formdata.append('image', reader.result);
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/admin/meeting/images/register", formdata, {
params: {
meeting_id: props.match.params.meeting_id
}
}).then(function (response) {
switch (response.data.status_code) {
case 200:
setMeetingImages(response.data.params);
break;
if (e.target.files.length + meeting_image.length > 10) {
set400Error("画像は最大10個までです。");
return;
}
case 400:
set400Error(response.data.error_messages);
break;
case 422:
set422Errors(response.data.error_messages);
break;
}
var promises = files.map(function (_file) {
return new Promise(function (resolve, reject) {
var reader = new FileReader();
reader.addEventListener('load', function (ev) {
resolve(ev.target.result);
});
reader.addEventListener('error', reject);
reader.readAsDataURL(_file);
});
};
});
Promise.all(promises).then(function (images) {
var temp = [];
for (var i in images) {
temp.push({
id: REGISTED_IMAGE_ID,
image: images[i]
});
}
setMeetingImages([].concat(_toConsumableArray(meeting_image), temp));
}, function (error) {
console.error(error);
});
};
var handlePDFChange = function handlePDFChange(e) {
@ -36598,23 +36631,12 @@ var MeetingEdit = function MeetingEdit(props) {
};
};
var handleDeleteImage = function handleDeleteImage(image_id) {
var _props$match$params4;
var handleRemoveImage = function handleRemoveImage(index, image_id) {
var list = _toConsumableArray(meeting_image);
axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/admin/meeting/images/delete/".concat((_props$match$params4 = props.match.params) === null || _props$match$params4 === void 0 ? void 0 : _props$match$params4.meeting_id), {
params: {
image_id: image_id
}
}).then(function (response) {
switch (response.data.status_code) {
case 200:
setMeetingImages(response.data.params);
break;
case 400:
set400Error("画像の削除に失敗しました。");
}
});
list.splice(index, 1);
setMeetingImages(list);
setDeletedImageID([].concat(_toConsumableArray(deleted_image_id), [image_id])); //削除した画像IDを登録します。
};
var handleCheck = function handleCheck(e, index) {
@ -36752,7 +36774,8 @@ var MeetingEdit = function MeetingEdit(props) {
htmlFor: meeting_image.length < 10 ? 'file_image' : '',
children: ["\u753B\u50CF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", {
type: "file",
name: "file_image",
multiple: "multiple",
name: "file_image[]",
accept: ".png, .jpg, .jpeg",
id: "file_image",
onChange: handleImageChange
@ -36771,7 +36794,7 @@ var MeetingEdit = function MeetingEdit(props) {
alt: x.image
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_6__.default, {
onClick: function onClick(e) {
return handleDeleteImage(x.id);
return handleRemoveImage(k, x.id);
},
style: {
position: 'absolute',
@ -47411,14 +47434,29 @@ var MeetingAdd = function MeetingAdd(props) {
var handleImageChange = function handleImageChange(e) {
e.preventDefault();
var reader = new FileReader();
var _file = e.target.files[0];
if (!_file) return;
reader.readAsDataURL(_file);
var files = Array.from(e.target.files);
reader.onloadend = function () {
setMeetingImages([].concat(_toConsumableArray(meeting_image), [reader.result]));
};
if (e.target.files.length + meeting_image.length > 10) {
set400Error("画像は最大10個までです。");
return;
}
var promises = files.map(function (_file) {
return new Promise(function (resolve, reject) {
var reader = new FileReader();
reader.addEventListener('load', function (ev) {
resolve(ev.target.result);
});
reader.addEventListener('error', reject);
reader.readAsDataURL(_file);
});
});
Promise.all(promises).then(function (images) {
console.log(images.length);
setMeetingImages([].concat(_toConsumableArray(meeting_image), _toConsumableArray(images)));
}, function (error) {
console.error(error);
});
};
var handlePDFChange = function handlePDFChange(e) {
@ -47577,7 +47615,8 @@ var MeetingAdd = function MeetingAdd(props) {
htmlFor: meeting_image.length < 10 ? 'file_image' : '',
children: ["\u753B\u50CF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
type: "file",
name: "file_image",
multiple: "multiple",
name: "file_image[]",
accept: ".png, .jpg, .jpeg",
id: "file_image",
onChange: handleImageChange
@ -48288,6 +48327,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var REGISTED_IMAGE_ID = -100; //登録された画像を区別するために導入されます。
var MeetingEdit = function MeetingEdit(props) {
var _ref;
@ -48377,6 +48417,11 @@ var MeetingEdit = function MeetingEdit(props) {
check_radio = _useState30[0],
setCheckRadio = _useState30[1];
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState32 = _slicedToArray(_useState31, 2),
deleted_image_id = _useState32[0],
setDeletedImageID = _useState32[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
axios__WEBPACK_IMPORTED_MODULE_1___default().get("/api/fathers/meetings/detail/".concat(meeting_id), {
@ -48386,6 +48431,7 @@ var MeetingEdit = function MeetingEdit(props) {
}).then(function (response) {
setLoaded(true);
setNotice(response.data.notice);
console.log(response.data);
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;
@ -48504,6 +48550,27 @@ var MeetingEdit = function MeetingEdit(props) {
meeting_id: meeting_id
}
});
deleted_image_id.map(function (image_id) {
if (image_id != REGISTED_IMAGE_ID) axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/fathers/meeting/images/delete/".concat(meeting_id), {
params: {
image_id: image_id
}
});
});
setDeletedImageID([]);
meeting_image.map(function (item) {
if (item.id == REGISTED_IMAGE_ID) {
var _formdata = new FormData();
_formdata.append('image', item.image);
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/fathers/meeting/images/register", _formdata, {
params: {
meeting_id: meeting_id
}
});
}
});
var request = {
title: title,
text: text,
@ -48540,55 +48607,45 @@ var MeetingEdit = function MeetingEdit(props) {
var handleImageChange = function handleImageChange(e) {
e.preventDefault();
var reader = new FileReader();
var _file = e.target.files[0];
if (!_file) return;
reader.readAsDataURL(_file);
var files = Array.from(e.target.files);
reader.onloadend = function () {
var formdata = new FormData();
formdata.append('image', reader.result);
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/fathers/meeting/images/register", formdata, {
params: {
meeting_id: meeting_id
}
}).then(function (response) {
setNotice(response.data.notice);
if (e.target.files.length + meeting_image.length > 10) {
set400Error("画像は最大10個までです。");
return;
}
switch (response.data.status_code) {
case 200:
setMeetingImages(response.data.params);
break;
case 400:
set400Error(response.data.error_messages);
break;
case 422:
set422Errors(response.data.error_messages);
break;
}
var promises = files.map(function (_file) {
return new Promise(function (resolve, reject) {
var reader = new FileReader();
reader.addEventListener('load', function (ev) {
resolve(ev.target.result);
});
reader.addEventListener('error', reject);
reader.readAsDataURL(_file);
});
};
});
Promise.all(promises).then(function (images) {
var temp = [];
for (var i in images) {
temp.push({
id: REGISTED_IMAGE_ID,
image: images[i]
});
}
setMeetingImages([].concat(_toConsumableArray(meeting_image), temp));
}, function (error) {
console.error(error);
});
};
var handleDeleteImage = function handleDeleteImage(image_id) {
axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/fathers/meeting/images/delete/".concat(meeting_id), {
params: {
image_id: image_id
}
}).then(function (response) {
setNotice(response.data.notice);
var handleRemoveImage = function handleRemoveImage(index, image_id) {
var list = _toConsumableArray(meeting_image);
switch (response.data.status_code) {
case 200:
setMeetingImages(response.data.params);
break;
case 400:
set400Error("画像の削除に失敗しました。");
}
});
list.splice(index, 1);
setMeetingImages(list);
setDeletedImageID([].concat(_toConsumableArray(deleted_image_id), [image_id])); //削除した画像IDを登録します。
};
var handleChangePDF = function handleChangePDF(e) {
@ -48740,7 +48797,8 @@ var MeetingEdit = function MeetingEdit(props) {
htmlFor: meeting_image.length < 10 ? 'file_image' : '',
children: ["\u753B\u50CF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
type: "file",
name: "file_image",
multiple: "multiple",
name: "file_image[]",
accept: ".png, .jpg, .jpeg",
id: "file_image",
onChange: handleImageChange
@ -48759,7 +48817,7 @@ var MeetingEdit = function MeetingEdit(props) {
alt: x.image
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_8__.default, {
onClick: function onClick(e) {
return handleDeleteImage(x.id);
return handleRemoveImage(k, x.id);
},
style: {
position: 'absolute',

ファイルの表示

@ -8,10 +8,12 @@ import RemoveIcon from '@mui/icons-material/Remove';
import Alert from '../../component/alert';
const MeetingEdit = (props) => {
const REGISTED_IMAGE_ID = -100; //
const MeetingEdit = (props) => {
const meeting_id = props.match.params.meeting_id;
const history = useHistory();
const [meeting, setMeeting] = useState(null);
const [title, setTitle] = useState('');
const [memo, setMemo] = useState('');
@ -30,6 +32,7 @@ const MeetingEdit = (props) => {
const [check_radio, setCheckRadio] = useState(null);
const [children_temp, setChildrenTemp] = useState([]);
const [deleted_image_id, setDeletedImageID] = useState([]);
useEffect(()=>{
@ -102,9 +105,22 @@ const MeetingEdit = (props) => {
const formdata = new FormData();
formdata.append('children', JSON.stringify(approval_registerIndexes));
axios.post('/api/admin/meeting/approvals/register',formdata, {params:{meeting_id: props.match.params.meeting_id}})
axios.delete('/api/admin/meeting/approvals/delete',{params:{children: approval_deleteIndexes, meeting_id: props.match.params.meeting_id}})
axios.post('/api/admin/meeting/approvals/register',formdata, {params:{meeting_id: meeting_id}})
axios.delete('/api/admin/meeting/approvals/delete',{params:{children: approval_deleteIndexes, meeting_id: meeting_id}})
//---------------------------------------
deleted_image_id.map(image_id=>{
if(image_id != REGISTED_IMAGE_ID)
axios.delete(`/api/admin/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
})
setDeletedImageID([]);
meeting_image.map(item=>{
if(item.id == REGISTED_IMAGE_ID){
const formdata = new FormData();
formdata.append('image', item.image);
axios.post(`/api/admin/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}})
}
})
//----------------------------------------
const request = { title: title, text: text, memo: memo, pdf: pdf };
setSubmit(true);
axios.put(`/api/admin/meetings/update/${props.match.params?.meeting_id}`, request)
@ -126,23 +142,31 @@ const MeetingEdit = (props) => {
const handleImageChange = (e) => {
e.preventDefault();
let reader = new FileReader();
let _file = e.target.files[0];
if(!_file) return;
reader.readAsDataURL(_file);
reader.onloadend = () => {
const formdata = new FormData();
formdata.append('image', reader.result);
axios.post(`/api/admin/meeting/images/register`, formdata, {params:{meeting_id: props.match.params.meeting_id}})
.then(response => {
switch(response.data.status_code){
case 200: setMeetingImages(response.data.params); break;
case 400: set400Error(response.data.error_messages); break;
case 422: set422Errors(response.data.error_messages); break;
}
});
const files = Array.from(e.target.files);
if(e.target.files.length + meeting_image.length > 10)
{
set400Error("画像は最大10個までです。");
return;
}
const promises = files.map(_file => {
return (new Promise((resolve, reject) => {
const reader = new FileReader();
reader.addEventListener('load', (ev) => {
resolve(ev.target.result);
});
reader.addEventListener('error', reject);
reader.readAsDataURL(_file);
}))
});
};
Promise.all(promises).then(images => {
var temp = [];
for(let i in images){
temp.push({id: REGISTED_IMAGE_ID, image: images[i]});
}
setMeetingImages([...meeting_image, ...temp]);
},
error => { console.error(error); });
};
const handlePDFChange = (e) => {
@ -156,14 +180,11 @@ const MeetingEdit = (props) => {
}
}
const handleDeleteImage = (image_id) => {
axios.delete(`/api/admin/meeting/images/delete/${props.match.params?.meeting_id}`, {params:{image_id: image_id}})
.then(response=>{
switch(response.data.status_code){
case 200: setMeetingImages(response.data.params); break;
case 400: set400Error("画像の削除に失敗しました。");
}
})
const handleRemoveImage = (index, image_id) => {
let list = [...meeting_image];
list.splice(index, 1);
setMeetingImages(list);
setDeletedImageID([...deleted_image_id, image_id]) //ID
}
const handleCheck = (e, index) => {
@ -253,7 +274,7 @@ const MeetingEdit = (props) => {
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor={meeting_image.length < 10 ? 'file_image': ''}>
画像アップロード
<input type="file" name="file_image" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
<input type="file" multiple="multiple" name="file_image[]" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
</label>
{
_422errors.image &&
@ -269,7 +290,7 @@ const MeetingEdit = (props) => {
<figure className="image-upload" key={k}>
<img src={x.image} alt={x.image} />
<IconButton
onClick={e=>handleDeleteImage(x.id)}
onClick={e=>handleRemoveImage(k, x.id)}
style={{position: 'absolute',
bottom: '-6px',
right: '-6px'}}>

ファイルの表示

@ -129,13 +129,28 @@ const MeetingAdd = (props) => {
const handleImageChange = (e) => {
e.preventDefault();
let reader = new FileReader();
let _file = e.target.files[0];
if(!_file) return;
reader.readAsDataURL(_file);
reader.onloadend = () => {
setMeetingImages([...meeting_image, reader.result]);
};
const files = Array.from(e.target.files);
if(e.target.files.length + meeting_image.length > 10)
{
set400Error("画像は最大10個までです。");
return;
}
const promises = files.map(_file => {
return (new Promise((resolve, reject) => {
const reader = new FileReader();
reader.addEventListener('load', (ev) => {
resolve(ev.target.result);
});
reader.addEventListener('error', reject);
reader.readAsDataURL(_file);
}))
});
Promise.all(promises).then(images => {
console.log(images.length)
setMeetingImages([...meeting_image, ...images]);
},
error => { console.error(error); });
};
const handlePDFChange = (e) => {
@ -244,7 +259,7 @@ const MeetingAdd = (props) => {
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor={meeting_image.length < 10 ? 'file_image': ''}>
画像アップロード
<input type="file" name="file_image" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
<input type="file" multiple="multiple" name="file_image[]" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
</label>
{
_422errors.image &&

ファイルの表示

@ -10,6 +10,7 @@ import 'react-toastify/dist/ReactToastify.css';
import Alert from '../../component/alert';
import Notification from '../notification';
const REGISTED_IMAGE_ID = -100; //
const MeetingEdit = (props) => {
@ -36,13 +37,16 @@ const MeetingEdit = (props) => {
const [check_radio, setCheckRadio] = useState(null);
const [deleted_image_id, setDeletedImageID] = useState([]);
useEffect(() => {
setLoaded(false);
axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}})
.then(response => {
setLoaded(true);
setNotice(response.data.notice)
setNotice(response.data.notice);
console.log(response.data);
if(response.data.status_code==200){
setMeeting(response.data.params);
setTitle(response.data.params?.title);
@ -121,6 +125,19 @@ useEffect(()=>{
axios.post('/api/fathers/meeting/approvals/register', formdata, {params:{meeting_id: meeting_id}})
axios.delete('/api/fathers/meeting/approvals/delete', {params:{children: approval_deleteIndexes, meeting_id: meeting_id}})
deleted_image_id.map(image_id=>{
if(image_id != REGISTED_IMAGE_ID)
axios.delete(`/api/fathers/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
})
setDeletedImageID([]);
meeting_image.map(item=>{
if(item.id == REGISTED_IMAGE_ID){
const formdata = new FormData();
formdata.append('image', item.image);
axios.post(`/api/fathers/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}})
}
})
const request = { title: title, text: text, memo: memo, pdf: pdf };
setSubmit(true);
axios.put(`/api/fathers/meetings/update/${meeting_id}`, request)
@ -144,34 +161,39 @@ useEffect(()=>{
const handleImageChange = (e) => {
e.preventDefault();
let reader = new FileReader();
let _file = e.target.files[0];
if(!_file) return;
reader.readAsDataURL(_file);
reader.onloadend = () => {
const formdata = new FormData();
formdata.append('image', reader.result);
axios.post(`/api/fathers/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}})
.then(response => {
setNotice(response.data.notice);
switch(response.data.status_code){
case 200: setMeetingImages(response.data.params); break;
case 400: set400Error(response.data.error_messages); break;
case 422: set422Errors(response.data.error_messages); break;
}
});
};
const files = Array.from(e.target.files);
if(e.target.files.length + meeting_image.length > 10)
{
set400Error("画像は最大10個までです。");
return;
}
const promises = files.map(_file => {
return (new Promise((resolve, reject) => {
const reader = new FileReader();
reader.addEventListener('load', (ev) => {
resolve(ev.target.result);
});
reader.addEventListener('error', reject);
reader.readAsDataURL(_file);
}))
});
Promise.all(promises).then(images => {
var temp = [];
for(let i in images){
temp.push({id: REGISTED_IMAGE_ID, image: images[i]});
}
setMeetingImages([...meeting_image, ...temp]);
},
error => { console.error(error); });
};
const handleDeleteImage = (image_id) => {
axios.delete(`/api/fathers/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
.then(response=>{
setNotice(response.data.notice);
switch(response.data.status_code){
case 200: setMeetingImages(response.data.params); break;
case 400: set400Error("画像の削除に失敗しました。");
}
})
const handleRemoveImage = (index, image_id) => {
let list = [...meeting_image];
list.splice(index, 1);
setMeetingImages(list);
setDeletedImageID([...deleted_image_id, image_id]) //ID
}
const handleChangePDF = (e) => {
@ -274,7 +296,7 @@ useEffect(()=>{
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor={meeting_image.length < 10 ? 'file_image': ''}>
画像アップロード
<input type="file" name="file_image" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
<input type="file" multiple="multiple" name="file_image[]" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
</label>
{
_422errors.image &&
@ -290,7 +312,7 @@ useEffect(()=>{
<figure className="image-upload" key={k}>
<img src={x.image} alt={x.image} />
<IconButton
onClick={e=>handleDeleteImage(x.id)}
onClick={e=>handleRemoveImage(k, x.id)}
style={{position: 'absolute',
bottom: '-6px',
right: '-6px'}}>