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
a04ed386
Commit
a04ed386
authored
Aug 11, 2020
by
王源
🎧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
5d8757b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Drawer.php
src/Tools/Drawer.php
+4
-4
ExcelImporter.php
src/Tools/ExcelImporter.php
+2
-2
No files found.
src/Tools/Drawer.php
View file @
a04ed386
...
@@ -154,14 +154,14 @@ class Drawer
...
@@ -154,14 +154,14 @@ class Drawer
* @param int $h 图片高度
* @param int $h 图片高度
* @param string $p 单元格索引
* @param string $p 单元格索引
* @param Worksheet $sheet
* @param Worksheet $sheet
* @param
bool $addBoard
* @param
int $boardPx
*/
*/
public
function
draw2Excel
(
$path
,
$h
,
$p
,
$sheet
,
$
addBoard
=
true
)
public
function
draw2Excel
(
$path
,
$h
,
$p
,
$sheet
,
$
boardPx
=
0
)
{
{
try
{
try
{
$path
=
$this
->
parseImagePath
(
$path
);
$path
=
$this
->
parseImagePath
(
$path
);
if
(
$
addBoard
)
{
if
(
$
boardPx
)
{
$path
=
$this
->
addBoard
(
$path
);
$path
=
$this
->
addBoard
(
$path
,
$boardPx
);
}
}
$drawing
=
new
Drawing
();
$drawing
=
new
Drawing
();
$drawing
->
setPath
(
$path
)
->
setCoordinates
(
$p
)
->
setHeight
(
$h
)
->
setWorksheet
(
$sheet
);
$drawing
->
setPath
(
$path
)
->
setCoordinates
(
$p
)
->
setHeight
(
$h
)
->
setWorksheet
(
$sheet
);
...
...
src/Tools/ExcelImporter.php
View file @
a04ed386
...
@@ -116,7 +116,7 @@ class ExcelImporter
...
@@ -116,7 +116,7 @@ class ExcelImporter
}
}
/**
/**
*
必填检测
数据
*
检测必填
数据
* @param $requires
* @param $requires
* @param $errorCount
* @param $errorCount
* @throws \PhpOffice\PhpSpreadsheet\Exception
* @throws \PhpOffice\PhpSpreadsheet\Exception
...
@@ -136,7 +136,7 @@ class ExcelImporter
...
@@ -136,7 +136,7 @@ class ExcelImporter
}
}
/**
/**
*
必填检测
数据
*
检测数字类型
数据
* @param $data
* @param $data
* @param $errorCount
* @param $errorCount
* @throws \PhpOffice\PhpSpreadsheet\Exception
* @throws \PhpOffice\PhpSpreadsheet\Exception
...
...
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