修正同时两个组件时图片资源混淆

ChunkUploader.php

@@ -18,42 +18,42 @@
  */
 class ChunkUploader {
 
-	/**
-	 * Processes a chunked file upload.
-	 * @param UploadedFile $uploadedFile
-	 * @param string $path path to write chunks to
-	 * @returns boolean true if file upload is complete, or false if there are more chunks
-	 * @throws Exception
-	 */
-	public static function process($uploadedFile, $path) {
-		if (!$uploadedFile || $uploadedFile->hasError) {
-			throw new Exception('Failed to upload file');
-		}
-		$chunk = (int) Yii::$app->request->getBodyParam('chunk', 0);
-		$totalChunks = (int) Yii::$app->request->getBodyParam('chunks', 0);
-		$out = fopen("$path.part", $chunk == 0 ? 'wb' : 'ab');
-		if (!$out) {
-			throw new Exception('Failed to open output stream');
-		}
-		// Read binary input stream and append it to temporary .part file
-		$in = fopen($uploadedFile->tempName, 'rb');
-		if ($in) {
-			while ($buff = fread($in, 4096)) {
-				fwrite($out, $buff);
-			}
-		} else {
-			throw new Exception('Failed to open input stream');
-		}
-		fclose($in);
-		fclose($out);
-		unlink($uploadedFile->tempName);
-		// Check if all chunks have been processed
-		if (!$totalChunks || $chunk == $totalChunks - 1) {
-			// Strip the temp .part suffix off
-			rename("$path.part", $path);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Processes a chunked file upload.
+     * @param UploadedFile $uploadedFile
+     * @param string $path path to write chunks to
+     * @returns boolean true if file upload is complete, or false if there are more chunks
+     * @throws Exception
+     */
+    public static function process($uploadedFile, $path) {
+        if (!$uploadedFile || $uploadedFile->hasError) {
+            throw new Exception('Failed to upload file');
+        }
+        $chunk = (int) Yii::$app->request->getBodyParam('chunk', 0);
+        $totalChunks = (int) Yii::$app->request->getBodyParam('chunks', 0);
+        $out = fopen("$path.part", $chunk == 0 ? 'wb' : 'ab');
+        if (!$out) {
+            throw new Exception('Failed to open output stream');
+        }
+        // Read binary input stream and append it to temporary .part file
+        $in = fopen($uploadedFile->tempName, 'rb');
+        if ($in) {
+            while ($buff = fread($in, 4096)) {
+                fwrite($out, $buff);
+            }
+        } else {
+            throw new Exception('Failed to open input stream');
+        }
+        fclose($in);
+        fclose($out);
+        unlink($uploadedFile->tempName);
+        // Check if all chunks have been processed
+        if (!$totalChunks || $chunk == $totalChunks - 1) {
+            // Strip the temp .part suffix off
+            rename("$path.part", $path);
+            return true;
+        }
+        return false;
+    }
 
 }

Plupload.php

@@ -102,7 +102,7 @@ public function init() {
             if (is_array($value) || $matches[3] === '[]') {
                 $this->multiSelection = true;
             }
-            if ($this->multiSelection && !is_array($value)) {
+            if ($value && $this->multiSelection && !is_array($value)) {
                 $model->$attribute = [$value];
             }
             $this->responeElement = Html::getInputId($this->model, $this->attribute);
@@ -129,7 +129,6 @@ public function init() {
             Html::addCssClass($this->htmlOptions, 'plupload_many_thumb');
         } else {
             Html::addCssClass($this->htmlOptions, 'plupload_one');
-            // Set wrapper of this widget style.
             $this->setWrapperStyle();
             $this->allow_max_nums = 1;
         }
@@ -241,9 +240,8 @@ public function registerAssets() {
                 'name' => $this->name,
                 'id' => $this->responeElement,
             ]);
+            $scripts .= "\nPluploadCustom.init({$customOptions});";
         }
-        $scripts .= "\nCustom.init({$customOptions});";
-
         $view->registerJs($scripts);
     }
 

PluploadAsset.php

@@ -27,7 +27,7 @@ class PluploadAsset extends AssetBundle {
      */
     public $js = [
         'js/plupload.full.min.js',
-        'js/custom.js',
+        'js/plupload.custom.js',
     ];
 
     /**

PluploadEvents.php

@@ -166,7 +166,7 @@ protected function bindFilesAdded() {
             ' . self::JQUERY . '("#' . $this->errorContainer . '").hide();
             var upfiles = "";
             plupload.each(files, function(file) {
-                upfiles += Custom.tplUploadItem(file);
+                upfiles += PluploadCustom.tplUploadItem(file,' . $this->multiSelection . ');
             });
             ' . self::JQUERY . '(document).on("click", ".plupload_file_action", function () {
                 var id = ' . self::JQUERY . '(this).parent().attr("id");

assets/js/custom.js → assets/js/plupload.custom.js

@@ -1,24 +1,20 @@
-/**
- Custom module for you to write your own javascript functions
- **/
-var Custom = function () {
-    var temp = '';
+
+var PluploadCustom = function () {
     var inputName;
     var inputId;
-    var multiInput = false;
     var plupload;
     return {
-        tplUploadItem: function (file) {
+        tplUploadItem: function (file, multi = false) {
             var path = file.path;
             if (path === undefined) {
                 path = '';
             }
-            return this.buildItem(file.id, file.name, path, plupload.formatSize(file.size));
+            return this.buildItem(file.id, file.name, path, plupload.formatSize(file.size), multi);
         },
-        buildItem: function (id, name, path, size) {
-            temp = '<li class="plupload_file plupload_file_loading" id="' + id + '">';
+        buildItem: function (id, name, path, size, multi) {
+            var temp = '<li class="plupload_file plupload_file_loading" id="' + id + '">';
 
-            temp += this.buildInput(id, path);
+            temp += this.buildInput(id, path, multi);
 
             temp += '<div class="plupload_file_thumb"><img src="' + path + '"></div>';
 
@@ -39,8 +35,8 @@ var Custom = function () {
                     '</div>';
             return temp += '</li>';
         },
-        buildInput: function (index, value) {
-            if (multiInput) {
+        buildInput: function (index, value, multi) {
+            if (multi) {
                 return '<input id="' + this.getInputId(index) + '" name="' + this.getInputName(index) + '" value="' + value + '" type="hidden" class="plupload_file_input">';
             }
             return '';
@@ -57,10 +53,9 @@ var Custom = function () {
                 return;
             }
             plupload = window.plupload;
-            if (options.length !== 0) {
+            if (options.length > 0) {
                 inputName = options.name;
                 inputId = options.id;
-                multiInput = true;
             }
         }
     };