Refactor data.onclick
Fix grid and region when arc tyle - #518