From 7e2140f8d2b0e357b98d94a4509114bf16d65688 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 26 Apr 2017 19:16:31 +0800 Subject: [PATCH] add --- bi/core.js | 12 ++++++------ docs/core.js | 12 ++++++------ src/core/func/function.js | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bi/core.js b/bi/core.js index db3206894..de9d4e153 100644 --- a/bi/core.js +++ b/bi/core.js @@ -17238,9 +17238,9 @@ $(function () { return tempValue; }, - rgba2rgb: function (rgbColour, BGcolur) { - if (BI.isNull(BGcolur)) { - BGcolur = 1; + rgba2rgb: function (rgbColour, BGcolor) { + if (BI.isNull(BGcolor)) { + BGcolor = 1; } if (rgbColour.substr(0, 4) != "rgba") { return ""; @@ -17254,9 +17254,9 @@ $(function () { var B = BI.parseFloat(rgbValues[2]); var A = BI.parseFloat(rgbValues[3]); - return "rgb(" + Math.floor(255 * (BGcolur * (1 - A )) + R * A) + "," + - Math.floor(255 * (BGcolur * (1 - A )) + G * A) + "," + - Math.floor(255 * (BGcolur * (1 - A )) + B * A) + ")"; + return "rgb(" + Math.floor(255 * (BGcolor * (1 - A )) + R * A) + "," + + Math.floor(255 * (BGcolor * (1 - A )) + G * A) + "," + + Math.floor(255 * (BGcolor * (1 - A )) + B * A) + ")"; }, getTextSizeWidth: function (text, fontSize) { diff --git a/docs/core.js b/docs/core.js index d8367ba60..1c584e7e2 100644 --- a/docs/core.js +++ b/docs/core.js @@ -22764,9 +22764,9 @@ $(function () { return tempValue; }, - rgba2rgb: function (rgbColour, BGcolur) { - if (BI.isNull(BGcolur)) { - BGcolur = 1; + rgba2rgb: function (rgbColour, BGcolor) { + if (BI.isNull(BGcolor)) { + BGcolor = 1; } if (rgbColour.substr(0, 4) != "rgba") { return ""; @@ -22780,9 +22780,9 @@ $(function () { var B = BI.parseFloat(rgbValues[2]); var A = BI.parseFloat(rgbValues[3]); - return "rgb(" + Math.floor(255 * (BGcolur * (1 - A )) + R * A) + "," + - Math.floor(255 * (BGcolur * (1 - A )) + G * A) + "," + - Math.floor(255 * (BGcolur * (1 - A )) + B * A) + ")"; + return "rgb(" + Math.floor(255 * (BGcolor * (1 - A )) + R * A) + "," + + Math.floor(255 * (BGcolor * (1 - A )) + G * A) + "," + + Math.floor(255 * (BGcolor * (1 - A )) + B * A) + ")"; }, getTextSizeWidth: function (text, fontSize) { diff --git a/src/core/func/function.js b/src/core/func/function.js index 3d5f4a8d1..7d8421890 100644 --- a/src/core/func/function.js +++ b/src/core/func/function.js @@ -225,9 +225,9 @@ $(function () { return tempValue; }, - rgba2rgb: function (rgbColour, BGcolur) { - if (BI.isNull(BGcolur)) { - BGcolur = 1; + rgba2rgb: function (rgbColour, BGcolor) { + if (BI.isNull(BGcolor)) { + BGcolor = 1; } if (rgbColour.substr(0, 4) != "rgba") { return ""; @@ -241,9 +241,9 @@ $(function () { var B = BI.parseFloat(rgbValues[2]); var A = BI.parseFloat(rgbValues[3]); - return "rgb(" + Math.floor(255 * (BGcolur * (1 - A )) + R * A) + "," + - Math.floor(255 * (BGcolur * (1 - A )) + G * A) + "," + - Math.floor(255 * (BGcolur * (1 - A )) + B * A) + ")"; + return "rgb(" + Math.floor(255 * (BGcolor * (1 - A )) + R * A) + "," + + Math.floor(255 * (BGcolor * (1 - A )) + G * A) + "," + + Math.floor(255 * (BGcolor * (1 - A )) + B * A) + ")"; }, getTextSizeWidth: function (text, fontSize) {