Merge remote-tracking branch 'origin/master'

chuanyi_client2/src/views/report_template/index.vue

@@ -643,6 +643,8 @@ export default {
   },
   data() {
     return {
+      ctrlxstatus: false,
+      sheetAxis: [],
       showReportData: true,
       dialogBarChartVisible: false,
       dialogDataItemVisible: false,
@@ -851,6 +853,13 @@ export default {
         _this.forceRefreshLuckysheet()
       }
       if (event.ctrlKey && event.keyCode == 67) {
+        _this.$data.ctrlxstatus = false;
+        setTimeout(()=> {
+          navigator.clipboard.writeText(luckysheet.getRangeHtml())
+        }, 100)
+      } else if (event.ctrlKey && event.keyCode == 88) {
+        _this.$data.ctrlxstatus = true;
+        _this.$data.sheetAxis = luckysheet.getRangeAxis();
         setTimeout(()=> {
           navigator.clipboard.writeText(luckysheet.getRangeHtml())
         }, 100)
@@ -930,6 +939,12 @@ export default {
             if (!(r === 49 && c === 0)) {
               _this.forceRefreshLuckysheet()
             }
+          },
+          rangePasteBefore(r, d) {
+            if (_this.$data.ctrlxstatus) {
+              _this.$data.ctrlxstatus = false;
+              luckysheet.clearRange(_this.$data.sheetAxis)
+            }
           }
         }
         luckysheet.create(option)
@@ -945,6 +960,12 @@ export default {
             if (!(r === 49 && c === 0)) {
               _this.forceRefreshLuckysheet()
             }
+          },
+          rangePasteBefore(r, d) {
+            if (_this.$data.ctrlxstatus) {
+              _this.$data.ctrlxstatus = false;
+              luckysheet.clearRange(_this.$data.sheetAxis)
+            }
           }
         }
         luckysheet.create(option)
@@ -1229,6 +1250,12 @@ export default {
           if (!(r === 49 && c === 0)) {
             _this.forceRefreshLuckysheet()
           }
+        },
+        rangePasteBefore(r, d) {
+          if (_this.$data.ctrlxstatus) {
+            _this.$data.ctrlxstatus = false;
+            luckysheet.clearRange(_this.$data.sheetAxis)
+          }
         }
       }
       luckysheet.create(option)
@@ -1276,6 +1303,12 @@ export default {
             if (!(r === 49 && c === 0)) {
               _this.forceRefreshLuckysheet()
             }
+          },
+          rangePasteBefore(r, d) {
+            if (_this.$data.ctrlxstatus) {
+              _this.$data.ctrlxstatus = false;
+              luckysheet.clearRange(_this.$data.sheetAxis)
+            }
           }
         }
 
@@ -1624,6 +1657,12 @@ export default {
             if (!(r === 49 && c === 0)) {
               _this.forceRefreshLuckysheet()
             }
+          },
+          rangePasteBefore(r, d) {
+            if (_this.$data.ctrlxstatus) {
+              _this.$data.ctrlxstatus = false;
+              luckysheet.clearRange(_this.$data.sheetAxis)
+            }
           }
         }
         luckysheet.create(option)
@@ -2088,6 +2127,12 @@ export default {
             if (!(r === 49 && c === 0)) {
               _this.forceRefreshLuckysheet()
             }
+          },
+          rangePasteBefore(r, d) {
+            if (_this.$data.ctrlxstatus) {
+              _this.$data.ctrlxstatus = false;
+              luckysheet.clearRange(_this.$data.sheetAxis)
+            }
           }
         }
         luckysheet.create(option)