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

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/visual/fineui 

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
qcc 6 years ago
parent
0411f51fa7 ba459f3e60
commit
3640889730
14 changed files with 51 additions and 28 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. 4
      dist/bundle.ie.js
  2. 6
      dist/bundle.ie.min.js
  3. 4
      dist/bundle.js
  4. 6
      dist/bundle.min.js
  5. 25
      dist/demo.js
  6. 4
      dist/fineui.ie.js
  7. 6
      dist/fineui.ie.min.js
  8. 4
      dist/fineui.js
  9. 6
      dist/fineui.min.js
  10. 4
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 4
      dist/widget.js
  13. 2
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  14. 2
      src/widget/numbereditor/number.editor.js

4
dist/bundle.ie.js vendored
Unescape View File

@ -62576,7 +62576,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;
@ -71737,7 +71737,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

6
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored
Unescape View File

@ -63119,7 +63119,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;
@ -72280,7 +72280,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored
Unescape View File

@ -6044,7 +6044,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

4
dist/fineui.ie.js vendored
Unescape View File

@ -62818,7 +62818,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;
@ -71979,7 +71979,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

6
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored
Unescape View File

@ -63361,7 +63361,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;
@ -72522,7 +72522,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

6
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -46243,7 +46243,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;
@ -55404,7 +55404,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored
Unescape View File

@ -4424,7 +4424,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;
@ -13585,7 +13585,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

2
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
Unescape View File

@ -137,7 +137,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
_autoSwitch: function (v, type) {
var limit = 0;
var value = v;
var value = v + "";
switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
limit = 2;

2
src/widget/numbereditor/number.editor.js
Unescape View File

@ -90,7 +90,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调
_finetuning: function (add) {
var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add));
this.setValue(BI.add(v, add));
},
setUpEnable: function (v) {

Write Preview
Loading…
Cancel
Save