Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
meibuyu-rpc
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
without authentication
meibuyu-rpc
Commits
1c23d31d
Commit
1c23d31d
authored
Jan 15, 2021
by
王源
🎧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化导入和导出工具类
parent
8c5e67ab
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
UploadManager.php
src/Manager/UploadManager.php
+4
-4
Exporter.php
src/Tools/Exporter.php
+6
-4
No files found.
src/Manager/UploadManager.php
View file @
1c23d31d
...
@@ -52,7 +52,7 @@ class UploadManager
...
@@ -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
...
@@ -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
);
...
@@ -150,9 +150,9 @@ class UploadManager
...
@@ -150,9 +150,9 @@ class UploadManager
$file
->
moveTo
(
$savePath
);
$file
->
moveTo
(
$savePath
);
if
(
$file
->
isMoved
())
{
if
(
$file
->
isMoved
())
{
if
(
$realPath
)
{
if
(
$realPath
)
{
return
$savePath
.
'?'
.
$name
;
return
$savePath
.
'?'
.
$name
;
}
else
{
}
else
{
return
str_replace
(
$documentRoot
,
''
,
$savePath
.
'?'
.
$name
);
return
str_replace
(
$documentRoot
,
''
,
$savePath
.
'?'
.
$name
);
}
}
}
else
{
}
else
{
throw
new
HttpResponseException
(
'文件保存失败'
);
throw
new
HttpResponseException
(
'文件保存失败'
);
...
...
src/Tools/Exporter.php
View file @
1c23d31d
...
@@ -216,7 +216,7 @@ class Exporter
...
@@ -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
...
@@ -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
;
}
}
...
@@ -386,7 +388,7 @@ class Exporter
...
@@ -386,7 +388,7 @@ class Exporter
$date
=
date
(
'YmdHis'
);
$date
=
date
(
'YmdHis'
);
$fileReadPath
=
$filePath
.
$filename
.
'-'
.
$date
.
"."
.
strtolower
(
$this
->
fileType
);
$fileReadPath
=
$filePath
.
$filename
.
'-'
.
$date
.
"."
.
strtolower
(
$this
->
fileType
);
$objWriter
->
save
(
$fileReadPath
);
$objWriter
->
save
(
$fileReadPath
);
return
config
(
'server.settings.document_root'
)
.
"/export/"
.
$filename
.
'-'
.
$date
.
"."
.
return
config
(
'server.settings.document_root'
)
.
"/export/"
.
$filename
.
'-'
.
$date
.
"."
.
strtolower
(
$this
->
fileType
);
strtolower
(
$this
->
fileType
);
break
;
break
;
default
:
default
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment