数据检索功能完善+layoutPreview边框
Merge remote-tracking branch 'origin/master'