[FIX]fix the refactor issue and refactor js code.