BI-25547 && BI-24611 && BI-25389

dist/base.js

@@ -14660,7 +14660,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 
@@ -20879,7 +20878,7 @@ BI.Trigger = BI.inherit(BI.Single, {
                 if (wordlist.hasOwnProperty(word)) {
                     var val = wordlist[word];
                     if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;}
-                    if (match(search, val)) result.push(formatter(val));
+                    if (match(search, val)) result.push(formatter(val, -1));
                 }
             }
         }

dist/bundle.css

@@ -4117,12 +4117,11 @@ ul.ztree.zTreeDragUL {
 }
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  border: 2px solid #3685f2;
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 8px;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 8px;
-  -webkit-border-radius: 7px;
+  border-radius: 8px;
-  -moz-border-radius: 7px;
+  background-color: #ffffff;
-  border-radius: 7px;
 }
 .bi-slider-track .gray-track {
   background-color: #F2F4F7;

dist/bundle.js

@@ -50430,7 +50430,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 
@@ -56649,7 +56648,7 @@ BI.Trigger = BI.inherit(BI.Single, {
                 if (wordlist.hasOwnProperty(word)) {
                     var val = wordlist[word];
                     if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;}
-                    if (match(search, val)) result.push(formatter(val));
+                    if (match(search, val)) result.push(formatter(val, -1));
                 }
             }
         }
@@ -108530,23 +108529,21 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
     _init: function () {
         BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
         this.slider = BI.createWidget({
-            type: "bi.icon_button",
+            type: "bi.text_button",
-            cls: "slider-icon slider-button",
+            cls: "slider-button",
-            iconWidth: 14,
+            height: 12,
-            iconHeight: 14,
+            width: 12
-            height: 14,
-            width: 14
         });
         BI.createWidget({
             type: "bi.absolute",
             element: this,
             items: [{
                 el: this.slider,
-                top: 7,
+                top: 6,
-                left: -7
+                left: -6
             }],
             width: 0,
-            height: 14
+            height: 12
         });
     }
 });

dist/fineui.css

@@ -4117,12 +4117,11 @@ ul.ztree.zTreeDragUL {
 }
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  border: 2px solid #3685f2;
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 8px;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 8px;
-  -webkit-border-radius: 7px;
+  border-radius: 8px;
-  -moz-border-radius: 7px;
+  background-color: #ffffff;
-  border-radius: 7px;
 }
 .bi-slider-track .gray-track {
   background-color: #F2F4F7;

dist/fineui.js

@@ -50673,7 +50673,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 
@@ -56892,7 +56891,7 @@ BI.Trigger = BI.inherit(BI.Single, {
                 if (wordlist.hasOwnProperty(word)) {
                     var val = wordlist[word];
                     if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;}
-                    if (match(search, val)) result.push(formatter(val));
+                    if (match(search, val)) result.push(formatter(val, -1));
                 }
             }
         }
@@ -108773,23 +108772,21 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
     _init: function () {
         BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
         this.slider = BI.createWidget({
-            type: "bi.icon_button",
+            type: "bi.text_button",
-            cls: "slider-icon slider-button",
+            cls: "slider-button",
-            iconWidth: 14,
+            height: 12,
-            iconHeight: 14,
+            width: 12
-            height: 14,
-            width: 14
         });
         BI.createWidget({
             type: "bi.absolute",
             element: this,
             items: [{
                 el: this.slider,
-                top: 7,
+                top: 6,
-                left: -7
+                left: -6
             }],
             width: 0,
-            height: 14
+            height: 12
         });
     }
 });

dist/widget.css

@@ -412,12 +412,11 @@
 }
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  border: 2px solid #3685f2;
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 8px;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 8px;
-  -webkit-border-radius: 7px;
+  border-radius: 8px;
-  -moz-border-radius: 7px;
+  background-color: #ffffff;
-  border-radius: 7px;
 }
 .bi-slider-track .gray-track {
   background-color: #F2F4F7;

dist/widget.js

@@ -20876,23 +20876,21 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
     _init: function () {
         BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
         this.slider = BI.createWidget({
-            type: "bi.icon_button",
+            type: "bi.text_button",
-            cls: "slider-icon slider-button",
+            cls: "slider-button",
-            iconWidth: 14,
+            height: 12,
-            iconHeight: 14,
+            width: 12
-            height: 14,
-            width: 14
         });
         BI.createWidget({
             type: "bi.absolute",
             element: this,
             items: [{
                 el: this.slider,
-                top: 7,
+                top: 6,
-                left: -7
+                left: -6
             }],
             width: 0,
-            height: 14
+            height: 12
         });
     }
 });

src/base/formula/formulaeditor.js

@@ -137,7 +137,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
-        this.editor.replaceSelection(" ");
         this.editor.focus();
     },
 

src/base/sql/codemirrior/sql-hint.js

@@ -80,7 +80,7 @@
                 if (wordlist.hasOwnProperty(word)) {
                     var val = wordlist[word];
                     if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;}
-                    if (match(search, val)) result.push(formatter(val));
+                    if (match(search, val)) result.push(formatter(val, -1));
                 }
             }
         }

src/css/widget/singleslider/slider/widget.css

@@ -1,9 +1,8 @@
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  border: 2px solid #3685f2;
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 8px;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 8px;
-  -webkit-border-radius: 7px;
+  border-radius: 8px;
-  -moz-border-radius: 7px;
+  background-color: #ffffff;
-  border-radius: 7px;
 }

src/less/widget/singleslider/slider/widget.slider.less

@@ -3,7 +3,8 @@
 .bi-single-slider-button {
   & .slider-button {
     cursor: ew-resize;
-    .box-shadow(0 0 10px, rgba(0, 0, 0, 0.2));
+    border: 2px solid @color-bi-border-highlight;
-    .border-radius(7px);
+    .border-radius(8px);
+    background-color: @color-bi-background-default;
   }
 }

src/widget/singleslider/button/iconbutton.slider.js

@@ -10,23 +10,21 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
     _init: function () {
         BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
         this.slider = BI.createWidget({
-            type: "bi.icon_button",
+            type: "bi.text_button",
-            cls: "slider-icon slider-button",
+            cls: "slider-button",
-            iconWidth: 14,
+            height: 12,
-            iconHeight: 14,
+            width: 12
-            height: 14,
-            width: 14
         });
         BI.createWidget({
             type: "bi.absolute",
             element: this,
             items: [{
                 el: this.slider,
-                top: 7,
+                top: 6,
-                left: -7
+                left: -6
             }],
             width: 0,
-            height: 14
+            height: 12
         });
     }
 });