|
|
@@ -8,12 +8,13 @@ import (
|
|
|
"eta/eta_api/services/data"
|
|
|
"eta/eta_api/utils"
|
|
|
"fmt"
|
|
|
- "github.com/dengsgo/math-engine/engine"
|
|
|
- "github.com/shopspring/decimal"
|
|
|
"sort"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
+
|
|
|
+ "github.com/dengsgo/math-engine/engine"
|
|
|
+ "github.com/shopspring/decimal"
|
|
|
)
|
|
|
|
|
|
// BaseCalculate
|
|
|
@@ -1277,13 +1278,7 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
|
|
|
cell.ShowFormatValue = cell.ShowValue
|
|
|
}
|
|
|
// 前端传过来的json中有可能有glObj，需要去掉
|
|
|
-<<<<<<< HEAD
|
|
|
styleConf.GlObj = nil
|
|
|
-=======
|
|
|
- if styleConf.GlObj != nil {
|
|
|
- styleConf.GlObj = nil
|
|
|
- }
|
|
|
->>>>>>> 2b87a411fbc8b3f0f69825135dc8f61df939c1bc
|
|
|
tmpStyleConf, err := json.Marshal(styleConf)
|
|
|
if err == nil {
|
|
|
cell.ShowStyle = string(tmpStyleConf)
|
zqbao