add button active support
Merge branch '改变结构'