百分比

services/data/table/mixed_table.go

@@ -1199,11 +1199,16 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
 			}
 
 			cell := config[cellPosition.Column][cellPosition.Row]
-			_, e := strconv.ParseFloat(cell.ShowStyle, 64) // 将字符串转换成float类型
-			if e != nil {                                  // 如果没有错误发生则返回true，说明该字符串是一个合法的数字
+			val := cell.ShowValue
+			isPercent := false
+			if strings.Contains(val, "%") {
+				isPercent = true
+				val = strings.Trim(val, "%")
+			}
+			_, e := strconv.ParseFloat(val, 64) // 将字符串转换成float类型
+			if e != nil {                       // 如果没有错误发生则返回true，说明该字符串是一个合法的数字
 				continue
 			}
-			val := cell.ShowStyle
 			var styleConf request.MixCellShowStyle
 			err = json.Unmarshal([]byte(cell.ShowStyle), &styleConf)
 			if err != nil {
@@ -1211,7 +1216,7 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
 				return
 			}
 
-			val = changePointDecimalPlaces(cell.ShowValue, styleConf.Pn, styleConf.Nt)
+			val = changePointDecimalPlaces(val, styleConf.Pn, styleConf.Nt, isPercent)
 			cell.ShowFormatValue = val
 			config[cellPosition.Column][cellPosition.Row] = cell
 		}
@@ -1220,11 +1225,8 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
 }
 
 // changePointDecimalPlaces 小数点位数加减和百分比格式
-func changePointDecimalPlaces(str string, changeNum int, numberType string) (newStr string) {
+func changePointDecimalPlaces(str string, changeNum int, numberType string, isPercent bool) (newStr string) {
 	newStr = str
-	if changeNum == 0 { //无需改变
-		return
-	}
 	var decimalPlaces int               // 计算小数位数
 	dotIndex := strings.Index(str, ".") // 查找小数点的位置
 	if dotIndex == -1 {
@@ -1232,16 +1234,39 @@ func changePointDecimalPlaces(str string, changeNum int, numberType string) (new
 	} else {
 		decimalPlaces = len(str) - dotIndex - 1
 	}
+
 	// 把字符串转成浮点数
 	val, _ := strconv.ParseFloat(str, 64)
-	// 如果有，则处理百分位，
-	if numberType == "percent" {
-		val = val * 100
+
+	if isPercent {
+		if numberType == "number" { //百分数转成小数
+			if decimalPlaces == 0 {
+				if len(str) < 3 {
+					decimalPlaces = decimalPlaces + 2
+				} else if len(str) == 3 {
+					decimalPlaces = decimalPlaces + 1
+				}
+			} else {
+				decimalPlaces = decimalPlaces + 2
+			}
+			val = val / 100
+			isPercent = false
+		}
+	} else {
+		if numberType == "percent" {
+			val = val * 100
+			decimalPlaces = decimalPlaces - 2
+		}
 	}
+
 	decimalPlaces += changeNum
+
+	if decimalPlaces < 0 {
+		decimalPlaces = 0
+	}
 	val, _ = decimal.NewFromFloat(val).Round(int32(decimalPlaces)).Float64()
-	newStr = fmt.Sprintf("%v", val)
-	if numberType == "percent" {
+	newStr = strconv.FormatFloat(val, 'f', decimalPlaces, 64)
+	if numberType == "percent" || isPercent {
 		newStr += "%"
 	}
 	return