Simplify formik logic

Closed Zhou Fang requested to merge github/fork/linkfang/zhoufang/release-1.2/issue337 into release-1.2

Fixes issue337

Edited by Zhou Fang

Merge request reports