fix columnLock error in IE 8
merge code
solve conflict