-

+
{:__('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;