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

7 years ago · 28e2621be5
17 changed files with 87 additions and 103 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.js
+++ b/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));
                }
            }
        }
--- a/dist/bundle.css
+++ b/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);
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
+  border: 2px solid #3685f2;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+  background-color: #ffffff;
 }
 .bi-slider-track .gray-track {
  background-color: #F2F4F7;
--- a/dist/bundle.js
+++ b/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",
-            cls: "slider-icon slider-button",
-            iconWidth: 14,
-            iconHeight: 14,
-            height: 14,
-            width: 14
+            type: "bi.text_button",
+            cls: "slider-button",
+            height: 12,
+            width: 12
        });
        BI.createWidget({
            type: "bi.absolute",
            element: this,
            items: [{
                el: this.slider,
-                top: 7,
-                left: -7
+                top: 6,
+                left: -6
            }],
            width: 0,
-            height: 14
+            height: 12
        });
    }
 });
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/fineui.css
+++ b/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);
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
+  border: 2px solid #3685f2;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+  background-color: #ffffff;
 }
 .bi-slider-track .gray-track {
  background-color: #F2F4F7;
--- a/dist/fineui.js
+++ b/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",
-            cls: "slider-icon slider-button",
-            iconWidth: 14,
-            iconHeight: 14,
-            height: 14,
-            width: 14
+            type: "bi.text_button",
+            cls: "slider-button",
+            height: 12,
+            width: 12
        });
        BI.createWidget({
            type: "bi.absolute",
            element: this,
            items: [{
                el: this.slider,
-                top: 7,
-                left: -7
+                top: 6,
+                left: -6
            }],
            width: 0,
-            height: 14
+            height: 12
        });
    }
 });
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/widget.css
+++ b/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);
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
+  border: 2px solid #3685f2;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+  background-color: #ffffff;
 }
 .bi-slider-track .gray-track {
  background-color: #F2F4F7;
--- a/dist/widget.js
+++ b/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",
-            cls: "slider-icon slider-button",
-            iconWidth: 14,
-            iconHeight: 14,
-            height: 14,
-            width: 14
+            type: "bi.text_button",
+            cls: "slider-button",
+            height: 12,
+            width: 12
        });
        BI.createWidget({
            type: "bi.absolute",
            element: this,
            items: [{
                el: this.slider,
-                top: 7,
-                left: -7
+                top: 6,
+                left: -6
            }],
            width: 0,
-            height: 14
+            height: 12
        });
    }
 });
--- a/src/base/formula/formulaeditor.js
+++ b/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();
    },

--- a/src/base/sql/codemirrior/sql-hint.js
+++ b/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));
                }
            }
        }
--- a/src/css/widget/singleslider/slider/widget.css
+++ b/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);
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
+  border: 2px solid #3685f2;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+  background-color: #ffffff;
 }
--- a/src/less/widget/singleslider/slider/widget.slider.less
+++ b/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-radius(7px);
+    border: 2px solid @color-bi-border-highlight;
+    .border-radius(8px);
+    background-color: @color-bi-background-default;
  }
 }
--- a/src/widget/singleslider/button/iconbutton.slider.js
+++ b/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",
-            cls: "slider-icon slider-button",
-            iconWidth: 14,
-            iconHeight: 14,
-            height: 14,
-            width: 14
+            type: "bi.text_button",
+            cls: "slider-button",
+            height: 12,
+            width: 12
        });
        BI.createWidget({
            type: "bi.absolute",
            element: this,
            items: [{
                el: this.slider,
-                top: 7,
-                left: -7
+                top: 6,
+                left: -6
            }],
            width: 0,
-            height: 14
+            height: 12
        });
    }
 });