p71924506
/
excelize
forked from p30928647/excelize
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #340 from rentiansheng/datavalidation_formula_error 

fix: datavalidation list error, formula > 255 issue #339
This commit is contained in:
xuri 2019-01-24 09:27:06 +08:00 committed by GitHub
parent 0c5c99e2ad daf32a37f9
commit 36fc39feb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
datavalidation.go
View File

@ -108,7 +108,11 @@ func (dd *DataValidation) SetInput(title, msg string) {
// SetDropList data validation list. // SetDropList data validation list.
func (dd *DataValidation) SetDropList(keys []string) error { func (dd *DataValidation) SetDropList(keys []string) error {
dd.Formula1 = "\"" + strings.Join(keys, ",") + "\"" formula := "\"" + strings.Join(keys, ",") + "\""
if dataValidationFormulaStrLen < len(formula) {
return fmt.Errorf(dataValidationFormulaStrLenErr)
}
dd.Formula1 = formula
dd.Type = convDataValidationType(typeList) dd.Type = convDataValidationType(typeList)
return nil return nil
} }

10
datavalidation_test.go
View File

@ -72,10 +72,14 @@ func TestDataValidationError(t *testing.T) {
} }
dvRange = NewDataValidation(true) dvRange = NewDataValidation(true)
dvRange.SetDropList(make([]string, 258)) err = dvRange.SetDropList(make([]string, 258))
if dvRange.Formula1 != "" {
err = dvRange.SetRange(10, 20, DataValidationTypeWhole, DataValidationOperatorGreaterThan) t.Errorf("data validation error. Formula1 must be empty!")
return
}
assert.EqualError(t, err, "data validation must be 0-255 characters") assert.EqualError(t, err, "data validation must be 0-255 characters")
dvRange.SetRange(10, 20, DataValidationTypeWhole, DataValidationOperatorGreaterThan)
dvRange.SetSqref("A9:B10")
xlsx.AddDataValidation("Sheet1", dvRange) xlsx.AddDataValidation("Sheet1", dvRange)
if !assert.NoError(t, xlsx.SaveAs(resultFile)) { if !assert.NoError(t, xlsx.SaveAs(resultFile)) {