Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

src/components/GM/courseDetailGM.vue

@@ -47,7 +47,7 @@
                 </div>
               </div>
               <div class="cType" style="font-size: 18px; color: #6c6c6c">
-                <div>
+                <div style="min-width:150px">
                   创建者:<span style="color: #000">{{
                   courseDetail.username
                   }}</span>
@@ -703,5 +703,6 @@ export default {
 
 .Tname {
   margin-left: 40px;
+  word-break: break-all;
 }
 </style>

src/components/courseDetail.vue

@@ -47,7 +47,7 @@
                 </div>
               </div>
               <div class="cType" style="font-size: 18px; color: #6c6c6c">
-                <div>
+                <div style="min-width:150px">
                   创建者:<span style="color: #000">{{
                   courseDetail.username
                   }}</span>
@@ -702,5 +702,6 @@ export default {
 
 .Tname {
   margin-left: 40px;
+  word-break: break-all;
 }
 </style>

src/components/tools/imgDraw/imgDraw.vue

@@ -521,8 +521,14 @@ export default {
       };
       let mousemove = (e) => {
         e = e || window.event;
-        mx = e.clientX - this.canvas_front.offsetLeft;
-        my = e.clientY - this.canvas_front.offsetTop;
+        var scrollL =
+          document.getElementsByClassName("d_body")[0].scrollLeft ||
+          document.getElementsByClassName("d_body")[0].scrollLeft;
+        var scrollT =
+          document.getElementsByClassName("d_body")[0].scrollTop ||
+          document.getElementsByClassName("d_body")[0].scrollTop;
+        mx = e.clientX - this.canvas_front.offsetLeft + scrollL;
+        my = e.clientY - this.canvas_front.offsetTop + scrollT;
         const cbx = this.ctx_base.getImageData(
           (e.offsetX || e.pageX) - this.slide / 2,
           (e.offsetY || e.pageY) - this.slide / 2,
@@ -1024,4 +1030,8 @@ export default {
 .imgDraw >>> .el-dialog .el-dialog__footer span button:last-of-type {
   margin-left: 50px;
 }
+
+div{
+  user-select: none;
+}
 </style>