完善图形设置
Merge remote-tracking branch 'origin/branch_1.1.0' into branch_1.1.0