Skip to content

修正表格保存时数据丢失的问题 #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iwinmin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修正表格保存时数据丢失的问题 #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 18 additions & 29 deletions app/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,10 +613,10 @@ function ($markdowns, $tableName, $tableComment) {
<table class="table table-hover">
<thead>
<tr>
<th>字段</th>
<th>类型</th>
<th>空</th>
<th>说明</th>
<th>字段</th>
<th>类型</th>
<th>空</th>
<th>说明</th>
</tr>
</thead>
<tbody>{$html}</tbody>
Expand Down Expand Up @@ -791,7 +791,7 @@ function processSpreedSheetSingle($contentArray, $minRow, $minCol)
$cells = $item['cells'] ?? [];
$lastIndex = count($cells);
if ($lastIndex === 0) {
return $item;
return 0;
}

for ($i = $lastIndex; $i > 0; $i--) {
Expand Down Expand Up @@ -831,33 +831,22 @@ function processSpreedSheetSingle($contentArray, $minRow, $minCol)
*/
function processSpreedSheetRows($originalRows): array
{
// 提取行的元信息
$rows = collect($originalRows)->filter(function ($item, $key) {
return !is_numeric($key);
})->toArray();
// 每一行的数据
$rowsForCol = collect($originalRows)->filter(function ($item, $key) {
return is_numeric($key);
})->sortKeys()->toArray();

// 逆序遍历行，直到遇到第一个存在非空列的行未知，截取从第一行开始到当前行
$lastIndex = count($rowsForCol);
if ($lastIndex > 0) {
for ($i = $lastIndex; $i > 0; $i--) {
$colCount = collect($rowsForCol[$i]['cells'] ?? [])->filter(function ($cell) {
return !empty($cell['text']);
})->count();

if ($colCount > 0) {
foreach (array_slice($rowsForCol, 0, $i + 1) as $index => $v) {
$rows["{$index}"] = $v;
return collect($originalRows)->filter(function ($item, $key) {
// 保留行元信息
if (!is_numeric($key)) {
return true;
}
else {
foreach ($item['cells'] as $k => $v) {
if (is_numeric($k) && !empty($v['text'])) {
// 保留非空行数据
return true;
}

break;
}
// 过滤空行数据
return false;
}
}
return $rows;
})->toArray();
}

/**
Expand Down