完善画布操作和拖放
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge branch 'fixbug/scale' into dev
fix 两个新建的ECS重叠样式
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into fixbug/scale
Merge branch 'fixbug/scale' into dev
修改左边组件样式
Merge branch 'fixbug/scale' into dev
修改样式
Merge branch 'fixbug/scale' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
Merge branch 'fixbug/scale' into dev
层拖动时，其中的组件的线一起重画