Enhancement of NUBEAM for the simulation of fast ion and RF-wave interaction based on the quasi-linear theory