From 0290d00f9a8fbbc65a3f86c94d772e2ead5d1b8a Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 26 Jun 2019 18:38:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B9=E4=B8=BA=E5=8D=95=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/Uploader.php                                    | 6 ++++++
 .../common/lib/ueditor/dialogs/attachment/attachment.js     | 3 ++-
 public/static/common/lib/ueditor/dialogs/image/image.js     | 1 +
 public/static/common/lib/ueditor/dialogs/video/video.js     | 3 ++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/extend/base/Uploader.php b/extend/base/Uploader.php
index 5ecf0f788..0c9a4d942 100755
--- a/extend/base/Uploader.php
+++ b/extend/base/Uploader.php
@@ -107,6 +107,12 @@ class Uploader
      */
     private function uploadFile()
     {
+        if(empty($_FILES[$this->fileField]))
+        {
+            $this->stateInfo = $this->getStateInfo("ERROR_SIZE_EXCEED");
+            return;
+        }
+        
         $file = $this->file = $_FILES[$this->fileField];
         if (!$file) {
             $this->stateInfo = $this->getStateInfo("ERROR_FILE_NOT_FOUND");
diff --git a/public/static/common/lib/ueditor/dialogs/attachment/attachment.js b/public/static/common/lib/ueditor/dialogs/attachment/attachment.js
index 966d5ad73..7f8c3e951 100755
--- a/public/static/common/lib/ueditor/dialogs/attachment/attachment.js
+++ b/public/static/common/lib/ueditor/dialogs/attachment/attachment.js
@@ -176,7 +176,8 @@
                 fileVal: editor.getOpt('fileFieldName'),
                 duplicate: true,
                 fileSingleSizeLimit: fileMaxSize,
-                compress: false
+                compress: false,
+                threads: 1
             });
             uploader.addButton({
                 id: '#filePickerBlock'
diff --git a/public/static/common/lib/ueditor/dialogs/image/image.js b/public/static/common/lib/ueditor/dialogs/image/image.js
index ee67cbfbe..3af42fd4c 100755
--- a/public/static/common/lib/ueditor/dialogs/image/image.js
+++ b/public/static/common/lib/ueditor/dialogs/image/image.js
@@ -348,6 +348,7 @@
                 server: actionUrl,
                 fileVal: editor.getOpt('imageFieldName'),
                 duplicate: true,
+                threads: 1,
                 fileSingleSizeLimit: imageMaxSize,    // 默认 2 M
                 compress: editor.getOpt('imageCompressEnable') ? {
                     width: imageCompressBorder,
diff --git a/public/static/common/lib/ueditor/dialogs/video/video.js b/public/static/common/lib/ueditor/dialogs/video/video.js
index a96a2f0b3..030fc54e2 100755
--- a/public/static/common/lib/ueditor/dialogs/video/video.js
+++ b/public/static/common/lib/ueditor/dialogs/video/video.js
@@ -625,7 +625,8 @@
                 fileVal: editor.getOpt('videoFieldName'),
                 duplicate: true,
                 fileSingleSizeLimit: fileMaxSize,
-                compress: false
+                compress: false,
+                threads: 1
             });
             uploader.addButton({
                 id: '#filePickerBlock'