Added Edit_OnClick(), fixed issues MAGN4505

Issue:http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-4505
@Benglin Please review it. Thanks
@Benglin I updated as your feedback. Please take a look.