Browse Source

Merge pull request #728 in VISUAL/fineui from ~GUY/fineui:master to master

* commit '92c4751ac93166b3b3f1470eab01464bdc8fd006':
  update
es6
guy 6 years ago
parent
commit
efa1e1a0b7
  1. 16
      dist/base.js
  2. 16
      dist/bundle.ie.js
  3. 46
      dist/bundle.ie.min.js
  4. 16
      dist/bundle.js
  5. 46
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 16
      dist/fineui.ie.js
  8. 46
      dist/fineui.ie.min.js
  9. 16
      dist/fineui.js
  10. 46
      dist/fineui.min.js
  11. 11
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 5
      src/base/single/iframe/iframe.js
  14. 4
      src/base/single/img/img.js
  15. 5
      src/base/single/input/file.js
  16. 2
      src/base/single/input/input.js

16
dist/base.js vendored

@ -9019,8 +9019,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -9028,7 +9030,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},
@ -9071,8 +9074,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -9080,7 +9085,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},
@ -9520,7 +9525,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
var conf = BI.File.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-file display-block",
element: "<input type='file'>",
tagName: "input",
attributes: {
type: "file"
},
name: "",
url: "",
multiple: true,
@ -9754,7 +9762,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

16
dist/bundle.ie.js vendored

@ -43913,8 +43913,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -43922,7 +43924,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},
@ -43965,8 +43968,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -43974,7 +43979,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},
@ -44414,7 +44419,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
var conf = BI.File.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-file display-block",
element: "<input type='file'>",
tagName: "input",
attributes: {
type: "file"
},
name: "",
url: "",
multiple: true,
@ -44648,7 +44656,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

46
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/bundle.js vendored

@ -44452,8 +44452,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -44461,7 +44463,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},
@ -44504,8 +44507,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -44513,7 +44518,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},
@ -44953,7 +44958,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
var conf = BI.File.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-file display-block",
element: "<input type='file'>",
tagName: "input",
attributes: {
type: "file"
},
name: "",
url: "",
multiple: true,
@ -45187,7 +45195,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

46
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -6041,30 +6041,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
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);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

16
dist/fineui.ie.js vendored

@ -44155,8 +44155,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -44164,7 +44166,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},
@ -44207,8 +44210,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -44216,7 +44221,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},
@ -44656,7 +44661,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
var conf = BI.File.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-file display-block",
element: "<input type='file'>",
tagName: "input",
attributes: {
type: "file"
},
name: "",
url: "",
multiple: true,
@ -44890,7 +44898,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

46
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.js vendored

@ -44694,8 +44694,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -44703,7 +44705,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},
@ -44746,8 +44749,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -44755,7 +44760,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},
@ -45195,7 +45200,10 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
var conf = BI.File.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-file display-block",
element: "<input type='file'>",
tagName: "input",
attributes: {
type: "file"
},
name: "",
url: "",
multiple: true,
@ -45429,7 +45437,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

46
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

11
dist/fineui_without_jquery_polyfill.js vendored

@ -32361,8 +32361,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -32370,7 +32372,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},
@ -32413,8 +32416,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -32422,7 +32427,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},
@ -32480,7 +32485,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

5
src/base/single/iframe/iframe.js

@ -8,8 +8,10 @@ BI.Iframe = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Iframe.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "iframe",
baseCls: (conf.baseCls || "") + " bi-iframe",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -17,7 +19,8 @@ BI.Iframe = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<iframe frameborder='0' src='" + o.src + "'>");
o.attributes.frameborder = "0";
o.attributes.src = o.src;
BI.Iframe.superclass._init.apply(this, arguments);
},

4
src/base/single/img/img.js

@ -10,8 +10,10 @@ BI.Img = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Img.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
tagName: "img",
baseCls: (conf.baseCls || "") + " bi-img display-block",
src: "",
attributes: {},
width: "100%",
height: "100%"
});
@ -19,7 +21,7 @@ BI.Img = BI.inherit(BI.Single, {
_init: function () {
var o = this.options;
this.options.element = BI.Widget._renderEngine.createElement("<img src='" + o.src + "'>");
o.attributes.src = o.src;
BI.Img.superclass._init.apply(this, arguments);
},

5
src/base/single/input/file.js

@ -391,7 +391,10 @@
var conf = BI.File.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-file display-block",
element: "<input type='file'>",
tagName: "input",
attributes: {
type: "file"
},
name: "",
url: "",
multiple: true,

2
src/base/single/input/input.js

@ -9,7 +9,7 @@ BI.Input = BI.inherit(BI.Single, {
var conf = BI.Input.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-input display-block",
element: "<input/>",
tagName: "input",
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn, // 按确定键能否退出编辑
allowBlank: false

Loading…
Cancel
Save