Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xuri
excelize
提交
9cbe3b6b
excelize
项目概览
xuri
/
excelize
通知
13
Star
2
Fork
4
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
excelize
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
9cbe3b6b
编写于
2月 05, 2024
作者:
Z
zhukewen
提交者:
GitHub
2月 05, 2024
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
This closes #1807, calculation engine support date and formula type cell (#1810)
Co-authored-by:
N
zhualong
<
274131322@qq.com
>
上级
bba155e0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
1 deletion
+44
-1
.github/workflows/go.yml
.github/workflows/go.yml
+2
-0
calc.go
calc.go
+13
-1
calc_test.go
calc_test.go
+29
-0
未找到文件。
.github/workflows/go.yml
浏览文件 @
9cbe3b6b
...
...
@@ -32,6 +32,8 @@ jobs:
-
name
:
Codecov
uses
:
codecov/codecov-action@v4
env
:
CODECOV_TOKEN
:
${{ secrets.CODECOV_TOKEN }}
with
:
file
:
coverage.txt
flags
:
unittests
...
...
calc.go
浏览文件 @
9cbe3b6b
...
...
@@ -1632,8 +1632,20 @@ func (f *File) cellResolver(ctx *calcContext, sheet, cell string) (formulaArg, e
return arg.ToNumber(), err
case CellTypeInlineString, CellTypeSharedString:
return arg, err
default:
case CellTypeFormula:
if value != "" {
return arg, err
}
return newEmptyFormulaArg(), err
case CellTypeDate:
if value, err = f.GetCellValue(sheet, cell); err == nil {
if num := newStringFormulaArg(value).ToNumber(); num.Type == ArgNumber {
return num, err
}
}
return arg, err
default:
return newErrorFormulaArg(value, value), err
}
}
...
...
calc_test.go
浏览文件 @
9cbe3b6b
...
...
@@ -6379,6 +6379,35 @@ func TestCalcCellResolver(t *testing.T) {
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
expected
,
result
)
}
// Test calculates formula that reference date and error type cells
assert
.
NoError
(
t
,
f
.
SetCellValue
(
"Sheet1"
,
"C1"
,
"20200208T080910.123"
))
assert
.
NoError
(
t
,
f
.
SetCellValue
(
"Sheet1"
,
"C2"
,
"2020-07-10 15:00:00.000"
))
assert
.
NoError
(
t
,
f
.
SetCellValue
(
"Sheet1"
,
"C3"
,
formulaErrorDIV
))
ws
,
ok
:=
f
.
Sheet
.
Load
(
"xl/worksheets/sheet1.xml"
)
assert
.
True
(
t
,
ok
)
ws
.
(
*
xlsxWorksheet
)
.
SheetData
.
Row
[
0
]
.
C
[
2
]
.
T
=
"d"
ws
.
(
*
xlsxWorksheet
)
.
SheetData
.
Row
[
0
]
.
C
[
2
]
.
V
=
"20200208T080910.123"
ws
.
(
*
xlsxWorksheet
)
.
SheetData
.
Row
[
1
]
.
C
[
2
]
.
T
=
"d"
ws
.
(
*
xlsxWorksheet
)
.
SheetData
.
Row
[
1
]
.
C
[
2
]
.
V
=
"2020-07-10 15:00:00.000"
ws
.
(
*
xlsxWorksheet
)
.
SheetData
.
Row
[
2
]
.
C
[
2
]
.
T
=
"e"
ws
.
(
*
xlsxWorksheet
)
.
SheetData
.
Row
[
2
]
.
C
[
2
]
.
V
=
formulaErrorDIV
for
_
,
tbl
:=
range
[][]
string
{
{
"D1"
,
"=SUM(C1,1)"
,
"43870.3397004977"
},
{
"D2"
,
"=LEN(C2)"
,
"23"
},
{
"D3"
,
"=IFERROR(C3,TRUE)"
,
"TRUE"
},
}
{
assert
.
NoError
(
t
,
f
.
SetCellFormula
(
"Sheet1"
,
tbl
[
0
],
tbl
[
1
]))
result
,
err
:=
f
.
CalcCellValue
(
"Sheet1"
,
tbl
[
0
])
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
tbl
[
2
],
result
)
}
// Test calculates formula that reference invalid cell
assert
.
NoError
(
t
,
f
.
SetCellValue
(
"Sheet1"
,
"E1"
,
"E1"
))
assert
.
NoError
(
t
,
f
.
SetCellFormula
(
"Sheet1"
,
"F1"
,
"=LEN(E1)"
))
f
.
SharedStrings
=
nil
f
.
Pkg
.
Store
(
defaultXMLPathSharedStrings
,
MacintoshCyrillicCharset
)
_
,
err
:=
f
.
CalcCellValue
(
"Sheet1"
,
"F1"
)
assert
.
EqualError
(
t
,
err
,
"XML syntax error on line 1: invalid UTF-8"
)
}
func
TestEvalInfixExp
(
t
*
testing
.
T
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录