|
@@ -481,7 +481,7 @@ func (tableData TableData) WriteExcelSheetData(xlsxFile *xlsx.File, sheetName st
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (item *LuckySheetData) GetTableDataByLuckySheetDataStr() (selfTableData TableData, err error) {
|
|
|
+func (item *LuckySheetData) GetTableDataByLuckySheetDataStr(isRemoveBlankCell bool) (selfTableData TableData, err error) {
|
|
|
luckySheetCellDataList := item.CellData
|
|
|
|
|
|
tableDataMap := make(map[int64]map[int64]LuckySheetDataValue)
|
|
@@ -562,8 +562,13 @@ func (item *LuckySheetData) GetTableDataByLuckySheetDataStr() (selfTableData Tab
|
|
|
tableDataList = append(tableDataList, tmpTableColDataList)
|
|
|
}
|
|
|
|
|
|
+ tableDataMergeList := make([]TableDataMerge, 0)
|
|
|
+ tableRemoveNum := TableRemoveNum{}
|
|
|
+
|
|
|
|
|
|
- tableDataList, tableRemoveNum, rowHeightList, rowWidthList, tableDataMergeList := handleTableDataList(tableDataList, item.Config.Merge, rowHeightList, rowWidthList)
|
|
|
+ if isRemoveBlankCell {
|
|
|
+ tableDataList, tableRemoveNum, rowHeightList, rowWidthList, tableDataMergeList = handleTableDataList(tableDataList, item.Config.Merge, rowHeightList, rowWidthList)
|
|
|
+ }
|
|
|
|
|
|
|
|
|
{
|
|
@@ -761,7 +766,7 @@ func handleTableDataList(tableDataList [][]LuckySheetDataValue, luckySheetDataCo
|
|
|
|
|
|
|
|
|
func (item *LuckySheetData) ToExcel() (downloadFilePath string, err error) {
|
|
|
- tableData, err := item.GetTableDataByLuckySheetDataStr()
|
|
|
+ tableData, err := item.GetTableDataByLuckySheetDataStr(true)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
@@ -898,10 +903,10 @@ var LuckyFontFamilyMap = map[int]string{
|
|
|
2: "Tahoma",
|
|
|
3: "Verdana",
|
|
|
4: "微软雅黑",
|
|
|
- 5: "宋体",
|
|
|
- 6: "黑体",
|
|
|
- 7: "楷体",
|
|
|
- 8: "仿宋",
|
|
|
+ 5: "宋体",
|
|
|
+ 6: "黑体",
|
|
|
+ 7: "楷体",
|
|
|
+ 8: "仿宋",
|
|
|
9: "新宋体",
|
|
|
10: "华文新魏",
|
|
|
11: "华文行楷",
|
|
@@ -1201,7 +1206,7 @@ func (item *LuckySheetData) GetTableDataByLuckySheetDataStrBak() (selfTableData
|
|
|
}
|
|
|
|
|
|
func (item *LuckySheetData) ToExcel2() (downloadFilePath string, err error) {
|
|
|
- tableData, err := item.GetTableDataByLuckySheetDataStr()
|
|
|
+ tableData, err := item.GetTableDataByLuckySheetDataStr(true)
|
|
|
|
|
|
downloadFilePath, err = getDownloadPath()
|
|
|
if err != nil {
|