floraachy/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2024-11-29 18:39:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

excel导出优化+css优化

Browse Source
This commit is contained in:
gongfuxiang 2022-10-26 15:43:09 +08:00
parent 39fd27440b
commit c0f92963a4
5 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/module/FormHandleModule.php
View File

@ -634,7 +634,7 @@ class FormHandleModule
// 根据详情数据追加数据
for($i=0; $i<$detail_data_row_max; $i++)
{
$temp = ($i == 0) ? $v : [];
$temp = $v;
for($t=0; $t<$detail_form_count; $t++)
{
$dv = $this->form_data['detail_form_list'][$t];

8
extend/base/Excel.php
View File

@ -123,7 +123,7 @@ class Excel
$csv_title = implode(',', array_map(function($v) {
return str_replace([',', "\n"], ['，', ''], $v['name']);
}, $this->title));
$csv_content = (($excel_charset == 0) ? $csv_title : iconv('utf-8', $charset, $csv_title))."\n";
$csv_content = (($excel_charset == 0) ? $csv_title : mb_convert_encoding($csv_title, $charset, 'utf-8'))."\n";
foreach($this->data as $v)
{
$temp = '';
@ -133,7 +133,7 @@ class Excel
$temp .= ($index == 0 ? '' : ',').((array_key_exists($tk, $v) && !is_array($v[$tk])) ? str_replace([',', "\n"], [ '，', ''], $v[$tk]) : '')."\t";
$index++;
}
$csv_content .= (($excel_charset == 0) ? $temp : iconv('utf-8', $charset, $temp))."\n";
$csv_content .= (($excel_charset == 0) ? $temp : mb_convert_encoding($temp, $charset, 'utf-8'))."\n";
}
// 头信息设置
@ -207,7 +207,7 @@ class Excel
if(array_key_exists($temp_cum, $letter_data))
{
$temp_letter = $letter_data[$temp_cum].$temp_row;
$value = ($excel_charset == 0) ? $v['name'] : iconv('utf-8', $charset, $v['name']);
$value = ($excel_charset == 0) ? $v['name'] : mb_convert_encoding($v['name'], $charset, 'utf-8');
$sheet->setCellValue($temp_letter, $value);
$sheet->getStyle($temp_letter)->getFont()->setBold(true);
$temp_cum++;
@ -245,7 +245,7 @@ class Excel
$drawing->setOffsetY(15);
$drawing->setWorksheet($spreadsheet->getActiveSheet());
} else {
$value = (array_key_exists($tk, $v) && is_array($v[$tk])) ? (($excel_charset == 0) ? $v[$tk] : iconv('utf-8', $charset, $v[$tk])) : '';
$value = (array_key_exists($tk, $v) && !is_array($v[$tk])) ? (($excel_charset == 0) ? $v[$tk] : mb_convert_encoding($v[$tk], $charset, 'utf-8')) : '';
$sheet->setCellValueByColumnAndRow($temp_cum+1, $temp_row, $value);
}

18
public/static/common/css/color/black.css
View File

@ -185,6 +185,11 @@ form.am-form .am-form-group,
.forth-selection-list .forth-selection-items .forth-selection-content li,
.spec-inventory-list ul li:not(:last-child),
#package-upgrade-modal .am-scrollable-vertical,
hr,
.am-divider-default,
.am-divider-dashed,
.am-divider-dashed,
.chosen-container-active.chosen-with-drop .chosen-single,
.product-container table tbody tr td select, .product-container table tbody tr td textarea, .product-container table tbody tr td input[type="text"], .product-container table tbody tr td input[type="password"], .product-container table tbody tr td input[type="datetime"], .product-container table tbody tr td input[type="datetime-local"], .product-container table tbody tr td input[type="date"], .product-container table tbody tr td input[type="month"], .product-container table tbody tr td input[type="time"], .product-container table tbody tr td input[type="week"], .product-container table tbody tr td input[type="number"], .product-container table tbody tr td input[type="email"], .product-container table tbody tr td input[type="url"], .product-container table tbody tr td input[type="search"], .product-container table tbody tr td input[type="tel"], .product-container table tbody tr td input[type="color"] {
border-color: #232323;
}
@ -225,12 +230,6 @@ form.am-form .am-form-group,
.content-right [class*="-content"] .nav-items:hover {
border-color: #353535;
}
hr,
.am-divider-default,
.am-divider-dashed,
.am-divider-dashed {
border-color: #232323;
}
.am-img-thumbnail {
background-color: #484848;
}
@ -820,6 +819,13 @@ ul.plug-file-upload-view li {
#modal-unit-list .am-selected-list li:not(:last-child) {
border-bottom: 1px solid #222222;
}
.table-bottom-item-right .auto-sales-deliver {
border-color: #2f2f2f;
}
.product-table-input-search-list {
border-color: #404040;
background: #191919;
}
@media only screen and (max-width: 640px) {
.admin-offcanvas-bar:after {
background: #2c2c2c;

3
public/static/common/css/common.css
View File

@ -1126,9 +1126,6 @@ button.colorpicker-submit img {
.am-table-scrollable-horizontal .am-table > tbody > tr:first-child > td {
border-top: 0px !important;
}
.am-table-scrollable-horizontal .am-table > tbody > tr:last-child td {
border-bottom: 1px solid rgb(123 123 123 / 3%);
}
.am-table-scrollable-horizontal .am-table > tbody > tr > td .am-text-truncate-2 {
max-height: 34px;
height: auto;

13
public/static/common/lib/assets/css/amazeui.css
View File

@ -2097,6 +2097,9 @@ table.am-table-bordered {
.am-table-bordered > thead + tbody > tr:first-child > td {
border-top: 1px solid rgba(0,0,0,.03);
}
.am-table-bordered > thead + tbody > tr:last-child td {
border-bottom: 1px solid rgb(123 123 123 / 3%);
}
/* Border-radius version */
.am-table-radius {
border: 1px solid rgba(0,0,0,.03);
@ -2871,6 +2874,7 @@ fieldset[disabled] .am-checkbox-inline {
margin-top: -0.5em;
line-height: 1;
z-index: 2;
color: #888;
}
.am-form-icon label ~ [class*='am-icon-'] {
top: 70%;
@ -6932,6 +6936,15 @@ a.am-close:hover {
border: 1px solid rgba(0,0,0,.03);
border-width: 1px 0;
}
.am-list > li.am-hover {
background-color: #f6f6f6;
}
.am-list > li:hover {
background-color: #f9f9f9;
}
.am-list > li.am-active {
background-color: #ffd;
}
.am-list > li > a {
display: block;
padding: 1rem 0;