改进all方法

top-think · Jul 20, 2021 · 1012fe7 · 1012fe7
1 parent 2ce3a39
commit 1012fe7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/think/Request.php b/src/think/Request.php
@@ -879,10 +879,12 @@ public function param($name = '', $default = null, $filter = '')
      */
     public function all($name = '', $filter = '')
     {
-        $data = array_merge($this->param(), $this->file());
+        $data = array_merge($this->param(), $this->file() ?: []);
 
         if (is_array($name)) {
             $data = $this->only($name, $data, $filter);
+        } elseif ($name) {
+            $data = $data[$name] ?? null;
         }
 
         return $data;
@@ -1148,7 +1150,6 @@ public function file(string $name = '')
     {
         $files = $this->file;
         if (!empty($files)) {
-
             if (strpos($name, '.')) {
                 [$name, $sub] = explode('.', $name);
             }