fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

es6
windy 7 years ago
parent
321266a3bd
commit
28e2621be5
17 changed files with 87 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/_fineui.min.js
  2. 3
      dist/base.js
  3. 11
      dist/bundle.css
  4. 19
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 52
      dist/bundle.min.js
  7. 11
      dist/fineui.css
  8. 19
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 5
      dist/fineui.min.js
  11. 11
      dist/widget.css
  12. 16
      dist/widget.js
  13. 1
      src/base/formula/formulaeditor.js
  14. 2
      src/base/sql/codemirrior/sql-hint.js
  15. 11
      src/css/widget/singleslider/slider/widget.css
  16. 5
      src/less/widget/singleslider/slider/widget.slider.less
  17. 16
      src/widget/singleslider/button/iconbutton.slider.js

4
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.js vendored
Unescape View File

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

11
dist/bundle.css vendored
Unescape View File

@ -4117,12 +4117,11 @@ ul.ztree.zTreeDragUL {
} }
.bi-single-slider-button .slider-button { .bi-single-slider-button .slider-button {
cursor: ew-resize; 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 { .bi-slider-track .gray-track {
background-color: #F2F4F7; background-color: #F2F4F7;

19
dist/bundle.js vendored
Unescape View File

@ -50430,7 +50430,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
className = "error-field"; className = "error-field";
} }
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value}); this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
this.editor.replaceSelection(" ");
this.editor.focus(); this.editor.focus();
}, },
@ -56649,7 +56648,7 @@ BI.Trigger = BI.inherit(BI.Single, {
if (wordlist.hasOwnProperty(word)) { if (wordlist.hasOwnProperty(word)) {
var val = wordlist[word]; var val = wordlist[word];
if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;} 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 () { _init: function () {
BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ 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({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
el: this.slider, el: this.slider,
top: 7, top: 6,
left: -7 left: -6
}], }],
width: 0, width: 0,
height: 14 height: 12
}); });
} }
}); });

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

52
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/fineui.css vendored
Unescape View File

@ -4117,12 +4117,11 @@ ul.ztree.zTreeDragUL {
} }
.bi-single-slider-button .slider-button { .bi-single-slider-button .slider-button {
cursor: ew-resize; 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 { .bi-slider-track .gray-track {
background-color: #F2F4F7; background-color: #F2F4F7;

19
dist/fineui.js vendored
Unescape View File

@ -50673,7 +50673,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
className = "error-field"; className = "error-field";
} }
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value}); this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});
this.editor.replaceSelection(" ");
this.editor.focus(); this.editor.focus();
}, },
@ -56892,7 +56891,7 @@ BI.Trigger = BI.inherit(BI.Single, {
if (wordlist.hasOwnProperty(word)) { if (wordlist.hasOwnProperty(word)) {
var val = wordlist[word]; var val = wordlist[word];
if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;} 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 () { _init: function () {
BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ 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({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
el: this.slider, el: this.slider,
top: 7, top: 6,
left: -7 left: -6
}], }],
width: 0, width: 0,
height: 14 height: 12
}); });
} }
}); });

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/widget.css vendored
Unescape View File

@ -412,12 +412,11 @@
} }
.bi-single-slider-button .slider-button { .bi-single-slider-button .slider-button {
cursor: ew-resize; 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 { .bi-slider-track .gray-track {
background-color: #F2F4F7; background-color: #F2F4F7;

16
dist/widget.js vendored
Unescape View File

@ -20876,23 +20876,21 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ 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({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
el: this.slider, el: this.slider,
top: 7, top: 6,
left: -7 left: -6
}], }],
width: 0, width: 0,
height: 14 height: 12
}); });
} }
}); });

1
src/base/formula/formulaeditor.js
Unescape View File

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

2
src/base/sql/codemirrior/sql-hint.js
Unescape View File

@ -80,7 +80,7 @@
if (wordlist.hasOwnProperty(word)) { if (wordlist.hasOwnProperty(word)) {
var val = wordlist[word]; var val = wordlist[word];
if (!val || val === true) {val = word;} else {val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text;} 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));
} }
} }
} }

11
src/css/widget/singleslider/slider/widget.css
Unescape View File

@ -1,9 +1,8 @@
.bi-single-slider-button .slider-button { .bi-single-slider-button .slider-button {
cursor: ew-resize; 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;
} }

5
src/less/widget/singleslider/slider/widget.slider.less
Unescape View File

@ -3,7 +3,8 @@
.bi-single-slider-button { .bi-single-slider-button {
& .slider-button { & .slider-button {
cursor: ew-resize; 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;
} }
} }

16
src/widget/singleslider/button/iconbutton.slider.js
Unescape View File

@ -10,23 +10,21 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments)); BI.extend(BI.SliderIconButton.superclass._init.apply(this, arguments));
this.slider = BI.createWidget({ 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({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
el: this.slider, el: this.slider,
top: 7, top: 6,
left: -7 left: -6
}], }],
width: 0, width: 0,
height: 14 height: 12
}); });
} }
}); });

Write Preview
Loading…
Cancel
Save