From 3f4e54d0dd22a12e16461d907926c5b672aae1a5 Mon Sep 17 00:00:00 2001 From: Karson Date: Fri, 14 Aug 2020 09:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAPI=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=89=E6=8B=A9=E5=99=A8=E4=BC=98=E5=85=88?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=AE=89=E8=A3=85=E5=90=8E=E7=BB=AD=E9=99=90?= =?UTF-8?q?=E5=88=B6=20=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/addon/index.html | 2 +- application/admin/view/general/profile/index.html | 4 ++-- application/api/controller/Common.php | 4 ++-- public/assets/js/frontend/user.js | 2 +- public/assets/js/require-backend.min.js | 6 +++--- public/assets/js/require-upload.js | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/admin/view/addon/index.html b/application/admin/view/addon/index.html index 83ec73f5..bef08766 100644 --- a/application/admin/view/addon/index.html +++ b/application/admin/view/addon/index.html @@ -77,7 +77,7 @@
{:build_toolbar('refresh')} - {if $Think.config.fastadmin.api_url} diff --git a/application/admin/view/general/profile/index.html b/application/admin/view/general/profile/index.html index d68f2ac0..db2a2c28 100644 --- a/application/admin/view/general/profile/index.html +++ b/application/admin/view/general/profile/index.html @@ -51,9 +51,9 @@
- +
{:__('Click to edit')}
- +

{$admin.username|htmlentities}

diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index aedcc610..98d2a187 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -69,7 +69,7 @@ class Common extends Api } catch (UploadException $e) { $this->error($e->getMessage()); } - $this->success(__('Uploaded successful'), '', ['url' => $attachment->url]); + $this->success(__('Uploaded successful'), ['url' => $attachment->url]); } elseif ($method == 'clean') { //删除冗余的分片文件 try { @@ -102,7 +102,7 @@ class Common extends Api $this->error($e->getMessage()); } - $this->success(__('Uploaded successful'), '', ['url' => $attachment->url]); + $this->success(__('Uploaded successful'), ['url' => $attachment->url]); } } diff --git a/public/assets/js/frontend/user.js b/public/assets/js/frontend/user.js index d3080832..ac266854 100755 --- a/public/assets/js/frontend/user.js +++ b/public/assets/js/frontend/user.js @@ -77,7 +77,7 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und $("#faupload-avatar").data("upload-success", function (data) { var url = Fast.api.cdnurl(data.url); $(".profile-user-img").prop("src", url); - Toastr.success(__('Upload successful')); + Toastr.success(__('Uploaded successful')); }); Form.api.bindevent($("#profile-form")); $(document).on("click", ".btn-change", function () { diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js index d5d17ab7..9206dd7a 100644 --- a/public/assets/js/require-backend.min.js +++ b/public/assets/js/require-backend.min.js @@ -7387,7 +7387,7 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un } $(this).attr("initialized", true); var that = this; - var id = $(this).prop("id"); + var id = $(this).prop("id") || $(this).prop("name") || Dropzone.uuidv4(); var url = $(this).data("url"); var maxsize = $(this).data("maxsize"); var maxcount = $(this).data("maxcount"); @@ -7431,12 +7431,12 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un return bytes / Math.pow(1024, 2); }(maxsize)); - var options = $("#" + id).data() || {}; + var options = $(this).data() || {}; delete options.success; delete options.url; multipart = $.isArray(multipart) ? {} : multipart; - Upload.list[id] = new Dropzone("#" + id, $.extend({ + Upload.list[id] = new Dropzone(this, $.extend({ url: url, params: function (files, xhr, chunk) { var params = multipart; diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js index 828023ec..87518045 100755 --- a/public/assets/js/require-upload.js +++ b/public/assets/js/require-upload.js @@ -125,7 +125,7 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined, } $(this).attr("initialized", true); var that = this; - var id = $(this).prop("id"); + var id = $(this).prop("id") || $(this).prop("name") || Dropzone.uuidv4(); var url = $(this).data("url"); var maxsize = $(this).data("maxsize"); var maxcount = $(this).data("maxcount"); @@ -169,12 +169,12 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined, return bytes / Math.pow(1024, 2); }(maxsize)); - var options = $("#" + id).data() || {}; + var options = $(this).data() || {}; delete options.success; delete options.url; multipart = $.isArray(multipart) ? {} : multipart; - Upload.list[id] = new Dropzone("#" + id, $.extend({ + Upload.list[id] = new Dropzone(this, $.extend({ url: url, params: function (files, xhr, chunk) { var params = multipart;