diff --git a/resources/views/components/upload.blade.php b/resources/views/components/upload.blade.php index 3f1c95f5..be7f5d2b 100644 --- a/resources/views/components/upload.blade.php +++ b/resources/views/components/upload.blade.php @@ -54,7 +54,7 @@
-
+

__name__

__info__, 等待上传 @@ -137,31 +137,38 @@ $getPreview(file.id).find('[data-operate="upload"]').hide(); }); uploader.on('uploadAccept', function (object, ret) { - console.log('uploadAccept', object, ret) }); uploader.on('uploadProgress', function (file, percentage) { var $preview = $getPreview(file.id); var $uploadInfo = $preview.find('.upload-info'); var $uploadProgress = $preview.find('.upload-progress'); var rate = (percentage * 100).toFixed(2) + '%'; - $uploadInfo.text('正在上传...' + rate); + $uploadInfo.text('上传中...' + rate); $uploadProgress.css('width', rate); }); uploader.on('uploadError', function (file, reason) { + // Status Code: 400 ~ 400 if (reason === 'http') { - // 400 ~ 400 - $setPreviewStatus($getPreview(file.id), UPLOAD_ERROR, '服务异常,请刷新重试') } + if (reason === 'server') { + } + $setPreviewStatus($getPreview(file.id), UPLOAD_ERROR, '服务异常,请刷新重试') }); uploader.on('uploadSuccess', function (file, response) { var $preview = $getPreview(file.id); - $preview.attr('uploaded', true); - $setPreviewStatus($preview, UPLOAD_SUCCESS); - // 追加链接 - for (var key in response) { - $('#links [data-tab="' + key + '"]').append('

' + response[key].toString() + '

') + if (response.status) { + $preview.attr('uploaded', true); + $setPreviewStatus($preview, UPLOAD_SUCCESS); + // 追加链接 + for (var key in response.data) { + $('#links [data-tab="' + key + '"]').append('

' + response.data[key].toString() + '

') + } + $links.show(); + } else { + $setPreviewStatus($preview, UPLOAD_ERROR, response.message); + // 重新显示上传按钮 + $preview.find('[data-operate="upload"]').show(); } - $links.show(); }); uploader.on('uploadComplete', function (file) { console.log('uploadComplete', file) @@ -180,7 +187,8 @@ if (uploader.isInProgress()) { return false; } - uploader.upload(); + // 上传队列中状态正常的文件,上传失败的需要传指定文件重新上传 + uploader.upload(); }); $previews.click(function (e) { diff --git a/routes/web.php b/routes/web.php index 2a494eb7..4210a118 100644 --- a/routes/web.php +++ b/routes/web.php @@ -18,13 +18,16 @@ Route::get('/', function () { }); Route::post('/upload', function () { - return [ + $data = [ 'url' => 'https://pic.iqy.ink/2021/12/12/e8cfd03eb787f.png', 'html' => '<img src="https://pic.iqy.ink/2021/12/12/e8cfd03eb787f.png" alt="e212bc43771ad6d391952732a1713e31.png" title="e212bc43771ad6d391952732a1713e31.png" />', 'bbcode' => '[img]https://pic.iqy.ink/2021/12/12/e8cfd03eb787f.png[/img]', 'markdown' => '![e212bc43771ad6d391952732a1713e31.png](https://pic.iqy.ink/2021/12/12/e8cfd03eb787f.png)', 'markdown_with_link' => '[![e212bc43771ad6d391952732a1713e31.png](https://pic.iqy.ink/2021/12/12/e8cfd03eb787f.png)](https://pic.iqy.ink/2021/12/12/e8cfd03eb787f.png)', ]; + $status = true; + $message = '上传失败,储存空间不足'; + return compact('status', 'data', 'message'); }); Route::get('/dashboard', function () {