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
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
fix 删除层的bug
fix 组件右下角小图标不隐藏的bug
添加线条的顶端圆圈
Merge branch 'feature/linedel' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into dev