From f1c2b671b95424cbaf1b50291fa342bc84ac0443 Mon Sep 17 00:00:00 2001
From: imp <imp@fanruan.com>
Date: Sat, 1 Apr 2017 16:33:00 +0800
Subject: [PATCH 1/3] change colors of colorPicker

---
 bi/case.js                                    | 122 +++++++++---------
 dist/case.js                                  | 122 +++++++++---------
 .../colorchooser/colorpicker/colorpicker.js   | 122 +++++++++---------
 3 files changed, 183 insertions(+), 183 deletions(-)

diff --git a/bi/case.js b/bi/case.js
index af310f6c8..a3efe2cac 100644
--- a/bi/case.js
+++ b/bi/case.js
@@ -2710,29 +2710,29 @@ BI.ColorPicker = BI.inherit(BI.Widget, {
 
     _items: [
         [{
-            value: "#ff0000"
-        }, {
-            value: "#ffff02"
-        }, {
-            value: "#00ff00"
+            value: "#ffffff"
         }, {
-            value: "#00ffff"
+            value: "#f2f2f2"
         }, {
-            value: "#0000ff"
+            value: "#e5e5e5"
         }, {
-            value: "#ff02ff"
+            value: "#d9d9d9"
         }, {
-            value: "#ffffff"
+            value: "#cccccc"
         }, {
-            value: "#e6e6e6"
+            value: "#bfbfbf"
         }, {
-            value: "#cccccc"
+            value: "#b2b2b2"
         }, {
-            value: "#b3b3b3"
+            value: "#a6a6a6"
         }, {
             value: "#999999"
+        }, {
+            value: "#8c8c8c"
         }, {
             value: "#808080"
+        }, {
+            value: "#737373"
         }, {
             value: "#666666"
         }, {
@@ -2740,106 +2740,106 @@ BI.ColorPicker = BI.inherit(BI.Widget, {
         }, {
             value: "#333333"
         }, {
-            value: "#1a1a1a"
+            value: "#000000"
         }],
         [{
-            value: "#ea9b5e"
+            value: "#d8b5a6"
         }, {
-            value: "#ebb668"
+            value: "#ff9e9a"
         }, {
-            value: "#efca69"
+            value: "#ffc17d"
         }, {
-            value: "#faf4a2"
+            value: "#f5e56b"
         }, {
-            value: "#c9da73"
+            value: "#d8e698"
         }, {
-            value: "#b6d19c"
+            value: "#e0ebaf"
         }, {
-            value: "#86be85"
+            value: "#c3d825"
         }, {
-            value: "#87c5c3"
+            value: "#bce2e8"
         }, {
-            value: "#75bfec"
+            value: "#85d3cd"
         }, {
-            value: "#85a9e0"
+            value: "#bce2e8"
         }, {
-            value: "#8890d3"
+            value: "#a0d8ef"
         }, {
-            value: "#a484b9"
+            value: "#89c3eb"
         }, {
-            value: "#b48bbf"
+            value: "#bbc8e6"
         }, {
-            value: "#ba8dc6"
+            value: "#bbbcde"
         }, {
-            value: "#e697c8"
+            value: "#d6b4cc"
         }, {
-            value: "#e49da0"
+            value: "#fbc0d3"
         }],
         [{
-            value: "#df6a18"
+            value: "#bb9581"
         }, {
-            value: "#df8d04"
+            value: "#f37d79"
         }, {
-            value: "#efb500"
+            value: "#fba74f"
         }, {
-            value: "#faf201"
+            value: "#ffdb4f"
         }, {
-            value: "#b2cc23"
+            value: "#c7dc68"
         }, {
-            value: "#7dbd2f"
+            value: "#b0ca71"
         }, {
-            value: "#48a754"
+            value: "#99ab4e"
         }, {
-            value: "#27acaa"
+            value: "#84b9cb"
         }, {
-            value: "#09abe9"
+            value: "#00a3af"
         }, {
-            value: "#357bcc"
+            value: "#2ca9e1"
         }, {
-            value: "#4d67c1"
+            value: "#0095d9"
         }, {
-            value: "#5b4aa5"
+            value: "#4c6cb3"
         }, {
-            value: "#7e52a5"
+            value: "#8491c3"
         }, {
-            value: "#a057a4"
+            value: "#a59aca"
         }, {
-            value: "#d1689c"
+            value: "#cc7eb1"
         }, {
-            value: "#d66871"
+            value: "#e89bb4"
         }],
         [{
-            value: "#d12d02"
+            value: "#9d775f"
         }, {
-            value: "#db6700"
+            value: "#dd4b4b"
         }, {
-            value: "#ee9106"
+            value: "#ef8b07"
         }, {
-            value: "#f7ed02"
+            value: "#fcc800"
         }, {
-            value: "#92b801"
+            value: "#aacf53"
         }, {
-            value: "#37a600"
+            value: "#82ae46"
         }, {
-            value: "#289100"
+            value: "#69821b"
         }, {
-            value: "#1a9589"
+            value: "#59b9c6"
         }, {
-            value: "#0292e0"
+            value: "#2a83a2"
         }, {
-            value: "#005dbb"
+            value: "#007bbb"
         }, {
-            value: "#005eb4"
+            value: "#19448e"
         }, {
-            value: "#0041a3"
+            value: "#274a78"
         }, {
-            value: "#00217f"
+            value: "#4a488e"
         }, {
-            value: "#811e89"
+            value: "#7058a3"
         }, {
-            value: "#cd2a7c"
+            value: "#884898"
         }, {
-            value: "#cd324a"
+            value: "#d47596"
         }]
     ],
 
diff --git a/dist/case.js b/dist/case.js
index af310f6c8..a3efe2cac 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -2710,29 +2710,29 @@ BI.ColorPicker = BI.inherit(BI.Widget, {
 
     _items: [
         [{
-            value: "#ff0000"
-        }, {
-            value: "#ffff02"
-        }, {
-            value: "#00ff00"
+            value: "#ffffff"
         }, {
-            value: "#00ffff"
+            value: "#f2f2f2"
         }, {
-            value: "#0000ff"
+            value: "#e5e5e5"
         }, {
-            value: "#ff02ff"
+            value: "#d9d9d9"
         }, {
-            value: "#ffffff"
+            value: "#cccccc"
         }, {
-            value: "#e6e6e6"
+            value: "#bfbfbf"
         }, {
-            value: "#cccccc"
+            value: "#b2b2b2"
         }, {
-            value: "#b3b3b3"
+            value: "#a6a6a6"
         }, {
             value: "#999999"
+        }, {
+            value: "#8c8c8c"
         }, {
             value: "#808080"
+        }, {
+            value: "#737373"
         }, {
             value: "#666666"
         }, {
@@ -2740,106 +2740,106 @@ BI.ColorPicker = BI.inherit(BI.Widget, {
         }, {
             value: "#333333"
         }, {
-            value: "#1a1a1a"
+            value: "#000000"
         }],
         [{
-            value: "#ea9b5e"
+            value: "#d8b5a6"
         }, {
-            value: "#ebb668"
+            value: "#ff9e9a"
         }, {
-            value: "#efca69"
+            value: "#ffc17d"
         }, {
-            value: "#faf4a2"
+            value: "#f5e56b"
         }, {
-            value: "#c9da73"
+            value: "#d8e698"
         }, {
-            value: "#b6d19c"
+            value: "#e0ebaf"
         }, {
-            value: "#86be85"
+            value: "#c3d825"
         }, {
-            value: "#87c5c3"
+            value: "#bce2e8"
         }, {
-            value: "#75bfec"
+            value: "#85d3cd"
         }, {
-            value: "#85a9e0"
+            value: "#bce2e8"
         }, {
-            value: "#8890d3"
+            value: "#a0d8ef"
         }, {
-            value: "#a484b9"
+            value: "#89c3eb"
         }, {
-            value: "#b48bbf"
+            value: "#bbc8e6"
         }, {
-            value: "#ba8dc6"
+            value: "#bbbcde"
         }, {
-            value: "#e697c8"
+            value: "#d6b4cc"
         }, {
-            value: "#e49da0"
+            value: "#fbc0d3"
         }],
         [{
-            value: "#df6a18"
+            value: "#bb9581"
         }, {
-            value: "#df8d04"
+            value: "#f37d79"
         }, {
-            value: "#efb500"
+            value: "#fba74f"
         }, {
-            value: "#faf201"
+            value: "#ffdb4f"
         }, {
-            value: "#b2cc23"
+            value: "#c7dc68"
         }, {
-            value: "#7dbd2f"
+            value: "#b0ca71"
         }, {
-            value: "#48a754"
+            value: "#99ab4e"
         }, {
-            value: "#27acaa"
+            value: "#84b9cb"
         }, {
-            value: "#09abe9"
+            value: "#00a3af"
         }, {
-            value: "#357bcc"
+            value: "#2ca9e1"
         }, {
-            value: "#4d67c1"
+            value: "#0095d9"
         }, {
-            value: "#5b4aa5"
+            value: "#4c6cb3"
         }, {
-            value: "#7e52a5"
+            value: "#8491c3"
         }, {
-            value: "#a057a4"
+            value: "#a59aca"
         }, {
-            value: "#d1689c"
+            value: "#cc7eb1"
         }, {
-            value: "#d66871"
+            value: "#e89bb4"
         }],
         [{
-            value: "#d12d02"
+            value: "#9d775f"
         }, {
-            value: "#db6700"
+            value: "#dd4b4b"
         }, {
-            value: "#ee9106"
+            value: "#ef8b07"
         }, {
-            value: "#f7ed02"
+            value: "#fcc800"
         }, {
-            value: "#92b801"
+            value: "#aacf53"
         }, {
-            value: "#37a600"
+            value: "#82ae46"
         }, {
-            value: "#289100"
+            value: "#69821b"
         }, {
-            value: "#1a9589"
+            value: "#59b9c6"
         }, {
-            value: "#0292e0"
+            value: "#2a83a2"
         }, {
-            value: "#005dbb"
+            value: "#007bbb"
         }, {
-            value: "#005eb4"
+            value: "#19448e"
         }, {
-            value: "#0041a3"
+            value: "#274a78"
         }, {
-            value: "#00217f"
+            value: "#4a488e"
         }, {
-            value: "#811e89"
+            value: "#7058a3"
         }, {
-            value: "#cd2a7c"
+            value: "#884898"
         }, {
-            value: "#cd324a"
+            value: "#d47596"
         }]
     ],
 
diff --git a/src/case/colorchooser/colorpicker/colorpicker.js b/src/case/colorchooser/colorpicker/colorpicker.js
index 871cb28e6..1469ed3ac 100644
--- a/src/case/colorchooser/colorpicker/colorpicker.js
+++ b/src/case/colorchooser/colorpicker/colorpicker.js
@@ -16,29 +16,29 @@ BI.ColorPicker = BI.inherit(BI.Widget, {
 
     _items: [
         [{
-            value: "#ff0000"
-        }, {
-            value: "#ffff02"
-        }, {
-            value: "#00ff00"
+            value: "#ffffff"
         }, {
-            value: "#00ffff"
+            value: "#f2f2f2"
         }, {
-            value: "#0000ff"
+            value: "#e5e5e5"
         }, {
-            value: "#ff02ff"
+            value: "#d9d9d9"
         }, {
-            value: "#ffffff"
+            value: "#cccccc"
         }, {
-            value: "#e6e6e6"
+            value: "#bfbfbf"
         }, {
-            value: "#cccccc"
+            value: "#b2b2b2"
         }, {
-            value: "#b3b3b3"
+            value: "#a6a6a6"
         }, {
             value: "#999999"
+        }, {
+            value: "#8c8c8c"
         }, {
             value: "#808080"
+        }, {
+            value: "#737373"
         }, {
             value: "#666666"
         }, {
@@ -46,106 +46,106 @@ BI.ColorPicker = BI.inherit(BI.Widget, {
         }, {
             value: "#333333"
         }, {
-            value: "#1a1a1a"
+            value: "#000000"
         }],
         [{
-            value: "#ea9b5e"
+            value: "#d8b5a6"
         }, {
-            value: "#ebb668"
+            value: "#ff9e9a"
         }, {
-            value: "#efca69"
+            value: "#ffc17d"
         }, {
-            value: "#faf4a2"
+            value: "#f5e56b"
         }, {
-            value: "#c9da73"
+            value: "#d8e698"
         }, {
-            value: "#b6d19c"
+            value: "#e0ebaf"
         }, {
-            value: "#86be85"
+            value: "#c3d825"
         }, {
-            value: "#87c5c3"
+            value: "#bce2e8"
         }, {
-            value: "#75bfec"
+            value: "#85d3cd"
         }, {
-            value: "#85a9e0"
+            value: "#bce2e8"
         }, {
-            value: "#8890d3"
+            value: "#a0d8ef"
         }, {
-            value: "#a484b9"
+            value: "#89c3eb"
         }, {
-            value: "#b48bbf"
+            value: "#bbc8e6"
         }, {
-            value: "#ba8dc6"
+            value: "#bbbcde"
         }, {
-            value: "#e697c8"
+            value: "#d6b4cc"
         }, {
-            value: "#e49da0"
+            value: "#fbc0d3"
         }],
         [{
-            value: "#df6a18"
+            value: "#bb9581"
         }, {
-            value: "#df8d04"
+            value: "#f37d79"
         }, {
-            value: "#efb500"
+            value: "#fba74f"
         }, {
-            value: "#faf201"
+            value: "#ffdb4f"
         }, {
-            value: "#b2cc23"
+            value: "#c7dc68"
         }, {
-            value: "#7dbd2f"
+            value: "#b0ca71"
         }, {
-            value: "#48a754"
+            value: "#99ab4e"
         }, {
-            value: "#27acaa"
+            value: "#84b9cb"
         }, {
-            value: "#09abe9"
+            value: "#00a3af"
         }, {
-            value: "#357bcc"
+            value: "#2ca9e1"
         }, {
-            value: "#4d67c1"
+            value: "#0095d9"
         }, {
-            value: "#5b4aa5"
+            value: "#4c6cb3"
         }, {
-            value: "#7e52a5"
+            value: "#8491c3"
         }, {
-            value: "#a057a4"
+            value: "#a59aca"
         }, {
-            value: "#d1689c"
+            value: "#cc7eb1"
         }, {
-            value: "#d66871"
+            value: "#e89bb4"
         }],
         [{
-            value: "#d12d02"
+            value: "#9d775f"
         }, {
-            value: "#db6700"
+            value: "#dd4b4b"
         }, {
-            value: "#ee9106"
+            value: "#ef8b07"
         }, {
-            value: "#f7ed02"
+            value: "#fcc800"
         }, {
-            value: "#92b801"
+            value: "#aacf53"
         }, {
-            value: "#37a600"
+            value: "#82ae46"
         }, {
-            value: "#289100"
+            value: "#69821b"
         }, {
-            value: "#1a9589"
+            value: "#59b9c6"
         }, {
-            value: "#0292e0"
+            value: "#2a83a2"
         }, {
-            value: "#005dbb"
+            value: "#007bbb"
         }, {
-            value: "#005eb4"
+            value: "#19448e"
         }, {
-            value: "#0041a3"
+            value: "#274a78"
         }, {
-            value: "#00217f"
+            value: "#4a488e"
         }, {
-            value: "#811e89"
+            value: "#7058a3"
         }, {
-            value: "#cd2a7c"
+            value: "#884898"
         }, {
-            value: "#cd324a"
+            value: "#d47596"
         }]
     ],
 

From c3068e6b1ad2ebc158020886e15a7c5ceb720c19 Mon Sep 17 00:00:00 2001
From: zcf <chaofeng@finereport.com>
Date: Sat, 1 Apr 2017 16:53:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/numericalinterval/numericalinterval.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/numericalinterval/numericalinterval.js b/src/widget/numericalinterval/numericalinterval.js
index 470624d6b..9c1df31b9 100644
--- a/src/widget/numericalinterval/numericalinterval.js
+++ b/src/widget/numericalinterval/numericalinterval.js
@@ -159,7 +159,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, {
         }
         this.label = BI.createWidget({
             type: "bi.label",
-            text: BI.i18nText("BI-Value"),
+            text: BI.i18nText("BI-Basic_Value"),
             textHeight: o.height - c.border * 2,
             width: c.width - c.border * 2,
             height: o.height - c.border * 2,

From cb5b69cc8a4000456d23e5d7906f3e62145c84a4 Mon Sep 17 00:00:00 2001
From: zcf <chaofeng@finereport.com>
Date: Sat, 1 Apr 2017 16:55:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/numericalinterval/numericalinterval.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/numericalinterval/numericalinterval.js b/src/widget/numericalinterval/numericalinterval.js
index 470624d6b..9c1df31b9 100644
--- a/src/widget/numericalinterval/numericalinterval.js
+++ b/src/widget/numericalinterval/numericalinterval.js
@@ -159,7 +159,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, {
         }
         this.label = BI.createWidget({
             type: "bi.label",
-            text: BI.i18nText("BI-Value"),
+            text: BI.i18nText("BI-Basic_Value"),
             textHeight: o.height - c.border * 2,
             width: c.width - c.border * 2,
             height: o.height - c.border * 2,