trim

dump.php

@@ -193,16 +193,19 @@ class Dump
         // 如果未设置字段名列, 那么自动生成, 到处所有列
         if (empty($columns)) {
             foreach ($sourceData[$columnLine - 1] as $key => $columnName) {
-                $columns[$columnName] = $sourceData[$typeLine - 1][$key];
+                $columnName           = trim($columnName);
+                $columnType           = trim($sourceData[$typeLine - 1][$key]);
+                $columns[$columnName] = $columnType;
             }
         }
 
         // 处理导出列对应的索引
         $indexes = [];
 //        vd($sourceData[$columnLine - 1]);
-        foreach ($sourceData[$columnLine - 1] as $index => $column) {
-            if (isset($columns[$column])) {
-                $indexes[$column] = $index;
+        foreach ($sourceData[$columnLine - 1] as $index => $columnName) {
+            $columnName = trim($columnName);
+            if (isset($columns[$columnName])) {
+                $indexes[$columnName] = $index;
             }
         }
 
@@ -215,8 +218,8 @@ class Dump
             }
 
             $row = [];
-            foreach ($columns as $column => $columnType) {
-                $columnValue = trim($v[$indexes[$column]]);
+            foreach ($columns as $columnName => $columnType) {
+                $columnValue = trim($v[$indexes[$columnName]]);
                 switch ($columnType) {
                     case 'float':
                         $columnValue = floatval($columnValue);
@@ -231,7 +234,7 @@ class Dump
                         $columnValue = strval($columnValue);
                         break;
                 }
-                $row[$column] = $columnValue;
+                $row[$columnName] = $columnValue;
             }
             // 跳过空行
             if (!$row[$keyColumn]) {