Commit da09810a authored by 王源's avatar 王源
Browse files

Merge branch 'develop' into test

parents f6071107 1c23d31d

src/Manager/UploadManager.php

+4 −4
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ class UploadManager 
    {

    {

        $excelOptions = [

        $excelOptions = [

            'path' => 'excel',

            'path' => 'excel',

            'mime' => ['xlsx', 'xls']

            'mime' => ['xlsx', 'xls', 'csv']

        ];

        ];

        $options = array_merge($excelOptions, $options);

        $options = array_merge($excelOptions, $options);

        return self::uploadFile($excel, $options);

        return self::uploadFile($excel, $options);
@@ -69,7 +69,7 @@ class UploadManager 
    {

    {

        $excelOptions = [

        $excelOptions = [

            'path' => 'excel',

            'path' => 'excel',

            'mime' => ['xlsx', 'xls']

            'mime' => ['xlsx', 'xls', 'csv']

        ];

        ];

        $options = array_merge($excelOptions, $options);

        $options = array_merge($excelOptions, $options);

        return self::uploadFile($excel, $options, true);

        return self::uploadFile($excel, $options, true);

src/Tools/Exporter.php

+6 −4
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ class Exporter 
     * @return Exporter

     * @return Exporter

     * @throws PhpSpreadsheetException

     * @throws PhpSpreadsheetException

     */

     */

    public function append(array $data, $keys = [])

    public function append(array $data, $keys = [], $noStyle = false)

    {

    {

        // 一维数组转二维

        // 一维数组转二维

        foreach ($data as $v) {

        foreach ($data as $v) {
@@ -233,8 +233,10 @@ class Exporter 
        }

        }





        $this->sheet->fromArray($data, null, $this->beginColumnChar . $this->beginRowIndex);

        $this->sheet->fromArray($data, null, $this->beginColumnChar . $this->beginRowIndex);

        if (!$noStyle) {

            // 美化样式

            // 美化样式

            $this->applyStyle($this->beginColumnChar . $this->beginRowIndex . ":" . $this->sheet->getHighestColumn() . ($this->beginRowIndex + count($data) - 1));

            $this->applyStyle($this->beginColumnChar . $this->beginRowIndex . ":" . $this->sheet->getHighestColumn() . ($this->beginRowIndex + count($data) - 1));

        }

        $this->beginRowIndex += count($data);

        $this->beginRowIndex += count($data);

        return $this;

        return $this;

    }

    }