改进resize事件
Merge branch 'dev'