Merge branch 'YshadowZ-master'
solve confliect about .gitignore
fixed the bug about display 页面刷新有误
fixed the bug abou about the focus and disabled
fixed the confilect