增加复制组件和复制层后复制其样式
Merge branch 'newdev' into dev