Merge branch 'feature/eta1.5.6_excel' of eta_server/eta_chart_lib into master

services/data/table/mixed_table.go

@@ -1062,9 +1062,10 @@ func handlerDateCalculate(dateCalculateList []string, calculateCellMap map[strin
 
 			val, tmpErr, tmpErrMsg := DateCalculatePrepare(calculateCellMap, cell.Value)
 			if tmpErr != nil {
-				errMsg = tmpErrMsg
-				err = tmpErr
-				return
+				cell.ShowValue = ""
+				config[cellPosition.Column][cellPosition.Row] = cell
+				utils.FileLog.Error(fmt.Sprintf("%s 日期计算报错：Err：%s:%s", cellKey, tmpErr, tmpErrMsg))
+				continue
 			}
 
 			cell.ShowValue = utils.FormatMixTableDataShowValue(val)
@@ -1215,22 +1216,54 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
 // changePointDecimalPlaces 小数点位数加减和百分比格式
 func changePointDecimalPlaces(str string, changeNum int, numberType string, isPercent bool) (newStr string) {
 	newStr = str
+	var decimalPlaces int
+	dotIndex := strings.Index(newStr, ".") // 查找小数点的位置
+	if dotIndex == -1 {
+		decimalPlaces = 0
+	} else {
+		decimalPlaces = len(newStr) - dotIndex - 1
+	}
 	// 把字符串转成浮点数
 	val, _ := strconv.ParseFloat(str, 64)
-
 	if isPercent {
 		if numberType == "number" { //百分数转成小数
 			val = val / 100
+			if decimalPlaces > 2 {
+				decimalPlaces += 2
+			} else if decimalPlaces == 1 {
+				decimalPlaces += 1
+			} else if decimalPlaces == 0 {
+				if len(str) == 1 {
+					decimalPlaces = 2
+				} else if len(str) == 2 {
+					if str[1] == '0' {
+						decimalPlaces = 1
+					} else {
+						decimalPlaces = 2
+					}
+				}
+			}
 			isPercent = false
 		}
 	} else {
 		if numberType == "percent" {
+			if decimalPlaces > 2 {
+				decimalPlaces -= 2
+			} else if decimalPlaces == 1 {
+				decimalPlaces = 0
+			}
 			val = val * 100
 		}
 	}
-	newStr = fmt.Sprintf("%v", val)
-	var decimalPlaces int                  // 计算小数位数
-	dotIndex := strings.Index(newStr, ".") // 查找小数点的位置
+	if decimalPlaces > 0 {
+		val, _ = decimal.NewFromFloat(val).Round(int32(decimalPlaces)).Float64()
+		newStr = strconv.FormatFloat(val, 'f', decimalPlaces, 64)
+	} else {
+		newStr = fmt.Sprintf("%v", val)
+	}
+	// 计算小数位数
+	decimalPlaces = 0
+	dotIndex = strings.Index(newStr, ".") // 查找小数点的位置
 	if dotIndex == -1 {
 		decimalPlaces = 0
 	} else {