Browse Source

Merge pull request #784 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '716d87097558f8d3184a4296498246b685af1786':
  update
  update
  BI-35550 input的...
  BI-35733 loader的populate没有覆盖完之前的路径
master
windy 6 years ago
parent
commit
93a639eada
  1. 2
      dist/base.js
  2. 2
      dist/bundle.ie.js
  3. 14
      dist/bundle.ie.min.js
  4. 2
      dist/bundle.js
  5. 10
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 2
      dist/fineui.ie.js
  8. 14
      dist/fineui.ie.min.js
  9. 2
      dist/fineui.js
  10. 44
      dist/fineui.min.js
  11. 2
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 2
      src/base/single/input/input.js

2
dist/base.js vendored

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

2
dist/bundle.ie.js vendored

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

14
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored

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

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -6126,7 +6126,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. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

2
dist/fineui.ie.js vendored

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

14
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

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

44
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

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

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

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

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

Loading…
Cancel
Save