优化代码和文档
update doc
Merge branch 'master' into upColorpicker
update doc name
merge from master
up doc name