Merge pull request #1 from airen/master

merge
调整判断逻辑
Merge pull request #3 from tonyssc/master

调整选择器组合时的逻辑判断