Merge remote-tracking branch 'origin/master' into qdjl

web/building_saas/report/js/rpt_main.js

@@ -326,14 +326,10 @@ let canvasOprObj = {
         if (zTreeOprObj.currentNode) {
             let x = event.offsetX - JpcCanvasOutput.offsetX, canvas = event.originalTarget;
             if (!(canvas)) canvas = event.target; //chrome浏览器不认event.originalTarget,只认event.target或event.currentTarget
-            if (x < FIRST_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/FirstPageSimple.cur), auto";
-            } else if (x < PRE_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/PreviousPageSimple.cur), auto";
-            } else if ((canvas.width - x) < LAST_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/LastPageSimple.cur), auto";
+            if (x < PRE_PAGE_OFFSET) {
+                canvas.style.cursor = "url(/web/building_saas/img/PreviousPage.cur), auto";
             } else if ((canvas.width - x) < NEXT_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/NextPageSimple.cur), auto";
+                canvas.style.cursor = "url(/web/building_saas/img/NextPage.cur), auto";
             } else {
                 canvas.style.cursor = "";
             }
@@ -343,12 +339,8 @@ let canvasOprObj = {
         if (zTreeOprObj.currentNode) {
             let x = event.offsetX - JpcCanvasOutput.offsetX, canvas = event.originalTarget;
             if (!(canvas)) canvas = event.target; //chrome浏览器不认event.originalTarget,只认event.target或event.currentTarget
-            if (x < FIRST_PAGE_OFFSET) {
-                zTreeOprObj.showPage(1, canvas);
-            } else if (x < PRE_PAGE_OFFSET) {
+            if (x < PRE_PAGE_OFFSET) {
                 zTreeOprObj.showPage(zTreeOprObj.currentPage - 1, canvas);
-            } else if ((canvas.width - x) < LAST_PAGE_OFFSET) {
-                zTreeOprObj.showPage(zTreeOprObj.maxPages, canvas);
             } else if ((canvas.width - x) < NEXT_PAGE_OFFSET) {
                 zTreeOprObj.showPage(zTreeOprObj.currentPage + 1, canvas);
             }