|
@@ -720,10 +720,8 @@ func ExcelRuleFormat(req *request.ExcelRuleMappingReq, lang string) (res *excel.
|
|
return nil, err
|
|
return nil, err
|
|
}
|
|
}
|
|
res.LeftValue = fmt.Sprintf("%d,%d", x, y)
|
|
res.LeftValue = fmt.Sprintf("%d,%d", x, y)
|
|
- res.LeftValueShow = req.LeftValue
|
|
|
|
default:
|
|
default:
|
|
res.LeftValue = req.LeftValue
|
|
res.LeftValue = req.LeftValue
|
|
- res.LeftValueShow = req.LeftValue
|
|
|
|
}
|
|
}
|
|
switch req.RightValueType {
|
|
switch req.RightValueType {
|
|
// 坐标
|
|
// 坐标
|
|
@@ -738,7 +736,12 @@ func ExcelRuleFormat(req *request.ExcelRuleMappingReq, lang string) (res *excel.
|
|
res.RightValue = req.RightValue
|
|
res.RightValue = req.RightValue
|
|
res.RightValueShow = req.RightValue
|
|
res.RightValueShow = req.RightValue
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if res.LeftValueShow == "" {
|
|
|
|
+ res.LeftValueShow = req.LeftValue
|
|
|
|
+ }
|
|
|
|
+ if res.RightValueShow == "" {
|
|
|
|
+ res.RightValueShow = req.RightValue
|
|
|
|
+ }
|
|
res.RuleType = req.RuleType
|
|
res.RuleType = req.RuleType
|
|
res.ExcelInfoId = req.ExcelInfoId
|
|
res.ExcelInfoId = req.ExcelInfoId
|
|
res.ExcelInfoRuleMappingId = req.ExcelRuleMappingId
|
|
res.ExcelInfoRuleMappingId = req.ExcelRuleMappingId
|