feat: 变更树结构线条颜色为#ababab

public/web/sheet/sheet_common.js

@@ -1422,7 +1422,7 @@ var sheetCommonObj = {
         ctx.restore();
     },
     drawLine : function (ctx, x1, y1, x2, y2, color) {
-        let l_color = color?color:"gray";
+        let l_color = color?color:"#ababab";
         ctx.save();
         ctx.translate(0.5, 0.5);
         ctx.beginPath();
@@ -1461,7 +1461,7 @@ var sheetCommonObj = {
         let t_step = step?step:6;
         offset += t_step;
         ctx.save();
-        ctx.strokeStyle = "gray";
+        ctx.strokeStyle = "#ababab";
         ctx.translate(0.5, 0.5);
         ctx.beginPath();
         ctx.moveTo(x + offset, y);

public/web/tree_sheet/tree_sheet_helper.js

@@ -386,19 +386,20 @@ var TREE_SHEET_HELPER = {
             let x1 = centerX + indent / 2;
             let centerY = Math.floor((y + (y + h)) / 2);
             let y1;
+            const lineColor = '#ababab';
             // Draw Sibling Line
             if (showTreeLine) {
                 // Draw Horizontal Line
                 if (centerX < x + w) {
-                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, 'gray');
+                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, lineColor);
                 }
                 // Draw Vertical Line
                 if (centerX < x + w) {
                     y1 = node.isLast() ? centerY : y + h;
                     if (node.isFirst() && !node.parent) {
-                        drawLine(ctx, centerX, centerY, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, centerY, centerX, y1, lineColor);
                     } else {
-                        drawLine(ctx, centerX, y, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, y, centerX, y1, lineColor);
                     }
                 }
             }
@@ -412,7 +413,7 @@ var TREE_SHEET_HELPER = {
                 while (parent) {
                     if (!parent.isLast()) {
                         if (parentCenterX < x + w) {
-                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, 'gray');
+                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, lineColor);
                         }
                     }
                     parent = parent.parent;

web/building_saas/main/js/models/exportStdInterfaceBase.js

@@ -319,7 +319,7 @@ const XML_EXPORT_BASE = (() => {
     function isDef(v) {
         return typeof v !== 'undefined' && v !== null;
     }
-    function hasValue(v) {
+    function /*  */hasValue(v) {
         // v是否有值，不为undefined、null、''
         return typeof v !== 'undefined' && v !== null && v !== '';
     }

web/building_saas/main/js/views/block_lib.js

@@ -222,11 +222,11 @@ var blockLibObj = {
             let x1 = centerX + indent / 2;
             let centerY = Math.floor((y + (y + h)) / 2);
             let y1;
-
+            const lineColor = '#ababab';
             // Draw Horizontal Line、Image、sibling Vertical Line
             if (centerX < x + w) {
                 // Draw Horizontal Line
-                drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, 'gray');
+                drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, lineColor);
 
                 // Draw Image
                 let imgId;
@@ -241,9 +241,9 @@ var blockLibObj = {
                 // Draw Vertical Line
                 y1 = node.isLast() ? centerY : y + h;
                 if (node.isFirst() && !node.parent/*.parent*/) {
-                    drawLine(ctx, centerX, centerY, centerX, y1, 'gray');
+                    drawLine(ctx, centerX, centerY, centerX, y1, lineColor);
                 } else {
-                    drawLine(ctx, centerX, y, centerX, y1, 'gray');
+                    drawLine(ctx, centerX, y, centerX, y1, lineColor);
                 }
             }
 
@@ -257,7 +257,7 @@ var blockLibObj = {
             while (curNode) {
                 if (!curNode.isLast()) {
                     if (parentCenterX < x + w) {
-                        drawLine(ctx, parentCenterX, y, parentCenterX, y + h, 'gray');
+                        drawLine(ctx, parentCenterX, y, parentCenterX, y + h, lineColor);
                     }
                 }
                 curNode = curNode.parent;

web/building_saas/pm/js/pm_gc.js

@@ -252,10 +252,11 @@ const gcTreeObj = {
             let centerY = Math.floor((y + (y + h)) / 2);
             let y1;
             // Draw Sibling Line
+            const lineColor = '#ababab';
             if (showTreeLine) {
                 // Draw Horizontal Line
                 if (centerX < x + w) {
-                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, 'gray');
+                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, lineColor);
                     let img;
                     if(node.data.projType === projectType.folder){
                         img = document.getElementById('folder_open_pic');
@@ -279,9 +280,9 @@ const gcTreeObj = {
                 if (centerX < x + w) {
                     y1 = node.isLast() ? centerY : y + h;
                     if (node.isFirst() && !node.parent.parent) {
-                        drawLine(ctx, centerX, centerY, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, centerY, centerX, y1, lineColor);
                     } else {
-                        drawLine(ctx, centerX, y, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, y, centerX, y1, lineColor);
                     }
                 }
             }
@@ -295,7 +296,7 @@ const gcTreeObj = {
                 while (parent.parent) {
                     if (!parent.isLast()) {
                         if (parentCenterX < x + w) {
-                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, 'gray');
+                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, lineColor);
                         }
                     }
                     parent = parent.parent;

web/building_saas/pm/js/pm_newMain.js

@@ -1024,10 +1024,11 @@ const projTreeObj = {
             let centerY = Math.floor((y + (y + h)) / 2);
             let y1;
             // Draw Sibling Line
+            const lineColor = '#ababab';
             if (showTreeLine) {
                 // Draw Horizontal Line
                 if (centerX < x + w) {
-                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, 'gray');
+                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, lineColor);
                     let img;
                     if(node.data.projType === projectType.folder){
                         img = document.getElementById('folder_open_pic');
@@ -1052,9 +1053,9 @@ const projTreeObj = {
                 if (centerX < x + w) {
                     y1 = node.isLast() ? centerY : y + h;
                     if (node.isFirst() && !node.parent.parent) {
-                        drawLine(ctx, centerX, centerY, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, centerY, centerX, y1, lineColor);
                     } else {
-                        drawLine(ctx, centerX, y, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, y, centerX, y1, lineColor);
                     }
                 }
             }
@@ -1068,7 +1069,7 @@ const projTreeObj = {
                 while (parent.parent) {
                     if (!parent.isLast()) {
                         if (parentCenterX < x + w) {
-                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, 'gray');
+                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, lineColor);
                         }
                     }
                     parent = parent.parent;

web/building_saas/pm/js/pm_share.js

@@ -280,11 +280,12 @@ const pmShare = (function () {
             let x1 = centerX + indent / 2;
             let centerY = Math.floor((y + (y + h)) / 2);
             let y1;
+            const lineColor = '#ababab';
             // Draw Sibling Line
             if (showTreeLine) {
                 // Draw Horizontal Line
                 if (centerX < x + w) {
-                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, 'gray');
+                    drawLine(ctx, centerX, centerY, Math.min(x1, x + w), centerY, lineColor);
                     let img;
                     if(node.data.projType === projectType.folder){
                         img = document.getElementById('folder_open_pic');
@@ -308,9 +309,9 @@ const pmShare = (function () {
                 if (centerX < x + w) {
                     y1 = node.isLast() ? centerY : y + h;
                     if (node.isFirst() && !node.parent.parent) {
-                        drawLine(ctx, centerX, centerY, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, centerY, centerX, y1, lineColor);
                     } else {
-                        drawLine(ctx, centerX, y, centerX, y1, 'gray');
+                        drawLine(ctx, centerX, y, centerX, y1, lineColor);
                     }
                 }
             }
@@ -324,7 +325,7 @@ const pmShare = (function () {
                 while (parent.parent) {
                     if (!parent.isLast()) {
                         if (parentCenterX < x + w) {
-                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, 'gray');
+                            drawLine(ctx, parentCenterX, y, parentCenterX, y + h, lineColor);
                         }
                     }
                     parent = parent.parent;