|
|
@@ -1718,35 +1718,6 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq, lang str
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-func rgbStrToHex(rgbStr string) string {
|
|
|
- isRgba := strings.HasPrefix(rgbStr, "rgba")
|
|
|
- re := regexp.MustCompile(`\(([^)]+)\)`)
|
|
|
- matches := re.FindStringSubmatch(rgbStr)
|
|
|
- if len(matches) != 2 {
|
|
|
- return ""
|
|
|
- }
|
|
|
- rgbParts := strings.Split(matches[1], ",")
|
|
|
- var hexColor string
|
|
|
- // 默认如果不是rgba，则认为是rgb
|
|
|
- if isRgba {
|
|
|
- if len(rgbParts) != 4 {
|
|
|
- return ""
|
|
|
- }
|
|
|
- // 暂不处理a通道
|
|
|
- // a, _ := strconv.ParseFloat(strings.TrimSpace(rgbParts[3]), 64)
|
|
|
- // a255 := int(a * 255)
|
|
|
- } else {
|
|
|
- if len(rgbParts) != 3 {
|
|
|
- return ""
|
|
|
- }
|
|
|
- }
|
|
|
- r, _ := strconv.Atoi(strings.TrimSpace(rgbParts[0]))
|
|
|
- g, _ := strconv.Atoi(strings.TrimSpace(rgbParts[1]))
|
|
|
- b, _ := strconv.Atoi(strings.TrimSpace(rgbParts[2]))
|
|
|
- hexColor = fmt.Sprintf("#%02x%02x%02x", r, g, b)
|
|
|
- return hexColor
|
|
|
-}
|
|
|
-
|
|
|
// GetTableDataByMixedTableData 通过混合表格数据获取表格数据
|
|
|
func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hideMerged bool) (selfTableData TableData, err error) {
|
|
|
tableDataList := make([][]LuckySheetDataValue, 0)
|
zqbao