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

Merge remote-tracking branch 'origin/master'

es6
guy 6 years ago
parent
92eb0f6183 b6be793df2
commit
457cfcc6b7
10 changed files with 99 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      dist/_fineui.min.js
  2. 19
      dist/base.js
  3. 23
      dist/bundle.js
  4. 36
      dist/bundle.min.js
  5. 44
      dist/fineui.min.js
  6. 4
      dist/widget.js
  7. 10
      src/base/formula/formulaeditor.js
  8. 9
      src/base/single/editor/editor.code.js
  9. 12
      src/less/visual.less
  10. 4
      src/widget/datetime/datetime.combo.js

34
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
dist/base.js vendored
Unescape View File

@ -14563,11 +14563,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
if (BI.isKey(o.value)) {
self.setValue(o.value);
}
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -14606,6 +14601,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
@ -18102,6 +18102,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
watermark: "",
lineHeight: 2,
readOnly: false,
lineNumbers: false,
// 参数显示值构造函数
paramFormatter: function (v) {
return v;
@ -18114,7 +18115,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false,
lineNumbers: o.lineNumbers,
readOnly: o.readOnly,
// 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
@ -18173,11 +18174,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{
el: this.watermark,
top: 0,
left: 5
left: o.lineNumbers ? 5 : 30 + 5
}]
});
if (BI.isKey(o.value)) {
if (BI.isNumber(o.value) || BI.isString(o.value)) {
BI.nextTick(function () {
self.setValue(o.value);
});
@ -18267,7 +18268,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
focus: function () {
this.editor.focus();
},
blur: function () {
this.editor.getInputField().blur();
},

23
dist/bundle.js vendored
Unescape View File

@ -50072,11 +50072,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
if (BI.isKey(o.value)) {
self.setValue(o.value);
}
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -50115,6 +50110,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}
@ -53611,6 +53611,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
watermark: "",
lineHeight: 2,
readOnly: false,
lineNumbers: false,
// 参数显示值构造函数
paramFormatter: function (v) {
return v;
@ -53623,7 +53624,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false,
lineNumbers: o.lineNumbers,
readOnly: o.readOnly,
// 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
@ -53682,11 +53683,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{
el: this.watermark,
top: 0,
left: 5
left: o.lineNumbers ? 5 : 30 + 5
}]
});
if (BI.isKey(o.value)) {
if (BI.isNumber(o.value) || BI.isString(o.value)) {
BI.nextTick(function () {
self.setValue(o.value);
});
@ -53776,7 +53777,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
focus: function () {
this.editor.focus();
},
blur: function () {
this.editor.getInputField().blur();
},
@ -88661,10 +88662,6 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
});
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue());
self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,

36
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

44
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored
Unescape View File

@ -1775,10 +1775,6 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
});
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue());
self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,

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

@ -45,11 +45,6 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
if (BI.isKey(o.value)) {
self.setValue(o.value);
}
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -88,6 +83,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
bottom: 0
});
}
},
mounted: function () {
var o = this.options;
if(BI.isNotNull(o.value)) {
this.setValue(o.value);
}

9
src/base/single/editor/editor.code.js
Unescape View File

@ -12,6 +12,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
watermark: "",
lineHeight: 2,
readOnly: false,
lineNumbers: false,
// 参数显示值构造函数
paramFormatter: function (v) {
return v;
@ -24,7 +25,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
this.editor = CodeMirror(this.element[0], {
textWrapping: true,
lineWrapping: true,
lineNumbers: false,
lineNumbers: o.lineNumbers,
readOnly: o.readOnly,
// 解决插入字段由括号或其他特殊字符包围时分裂的bug
specialChars: /[\u0000-\u001f\u007f\u00ad\u200c-\u200f\u2028\u2029\ufeff]/
@ -83,11 +84,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
items: [{
el: this.watermark,
top: 0,
left: 5
left: o.lineNumbers ? 5 : 30 + 5
}]
});
if (BI.isKey(o.value)) {
if (BI.isNumber(o.value) || BI.isString(o.value)) {
BI.nextTick(function () {
self.setValue(o.value);
});
@ -177,7 +178,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
focus: function () {
this.editor.focus();
},
blur: function () {
this.editor.getInputField().blur();
},

12
src/less/visual.less
Unescape View File

@ -59,6 +59,18 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='@{start}', endColorstr='@{end}', GradientType='0');
}
// toSide表示渐变的方向, 使用角度兼容性好一些
.gradient(@toSide, @start, @end) when not (@toSide = none) {
background: @start; //不支持的用这个
background: -webkit-gradient(linear, 0 0, 0 100%, from(@start) to(@end)); /*old webkit*/
background: -webkit-linear-gradient(@toSide, @start, @end); /*new webkit*/
background: -moz-linear-gradient(@toSide, @start, @end); /*gecko*/
background: -ms-linear-gradient(@toSide, @start, @end); /*IE10 preview*/
background: -o-linear-gradient(@toSide, @start, @end); /*opera 11.10+*/
background: linear-gradient(@toSide, @start, @end); /*future CSS3 browsers*/
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='@{start}', endColorstr='@{end}', GradientType='0');
}
.border-radius(@radius: 5px) {
-webkit-border-radius: @radius;
-moz-border-radius: @radius;

4
src/widget/datetime/datetime.combo.js
Unescape View File

@ -55,10 +55,6 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
self.hidePopupView();
self.fireEvent(BI.DateTimeCombo.EVENT_CONFIRM);
});
this.popup.on(BI.DateTimePopup.CALENDAR_EVENT_CHANGE, function () {
self.trigger.setValue(self.popup.getValue());
self.fireEvent(BI.DateTimeCombo.EVENT_CHANGE);
});
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,

Write Preview
Loading…
Cancel
Save