修复滚动时，光标不跟着移动的问题
Merge remote-tracking branch 'origin/dev' into dev