修改层的默认大小
解决合并冲突
Merge branch 'feature/drag' into dev