调整代码，去掉设置flag样式处的重复代码

Signed-off-by: bee0060 <bee0060@126.com>
调整代码，去掉设置flag样式处的重复代码

Signed-off-by: bee0060 <bee0060@126.com>
Merge branch 'master' into gh-pages