零碎的改动
修复editor无法编辑的问题
Merge branch 'master' of github.com:tumao/Smar_xd