调整属性配置UI
Merge branch 'fixui' into dev