add directive focus
fix close dropdown
Merge branch 'develop'