diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js index 59da24b4b44c766ad7c3b731213f2c2b4db989ac..95fda18c6276c0680563bfc3935994401069220f 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js @@ -2262,15 +2262,15 @@ export class SchedulingSetCreate extends Component { async clipboardEvent(e){ var key = e.which || e.keyCode; var ctrl = e.ctrlKey ? e.ctrlKey : ((key === 17 || key === 91) ? true : false); - if ( key === 67 && ctrl ) { //Ctrl+C + if ( ctrl && (key === 67 || key === 45) ) { //Ctrl+C(Windows & linux) or Cmd+C(Mac) or Ctrl+Insert(windows & linux) this.copyToClipboard(); } - else if ( key === 86 && ctrl ) { // Ctrl+V - try{ + else if ( (ctrl && key === 86) || (e.shiftKey && key === 45) ) { // Ctrl+V(windows & linux) or Cmd+V or Shift+Insert(windows & linux) + try { var clipText = await this.readClipBoard(); await this.setState({clipText: clipText}); this.copyFromClipboard(); - }catch(error) { + } catch(error) { //this.setState({disabled: 'none'}) this.callBackFunction = this.copyFromClipboard; this.onCancel = () => {