Fix层与层之间的线条bug
Merge branch 'fixbug/layerline' into dev
右边选项功能，优化组件拖动算法，优化层层拖动放大缩小
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
解决层选项失效问题
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
fix
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
修正层title实现方法
Merge branch 'feature/transparent' into dev
完善层放大缩小时的碰撞检测
添加getCategory方法
Merge branch 'feature/dialog' into dev
连线样式bug
Merge branch 'fixbug/line' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into dev
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	views/index.ejs
fix 删除层时的bug