caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

* commit '2e77a22bf1e814b2d23e8ae9bc7ebc2967d1e173':
  update
  text_area间距
  update
  无JIRA任务 会被继承的Widget, Trigger, BasicButton, Single, NodeButton, Pane, PopupView, IconButton
es6
windy 6 years ago
parent
890b7e66c4 2e77a22bf1
commit
5d0663b386
30 changed files with 193 additions and 206 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. 5
      demo/js/base/editor/demo.textarea_editor.js
  2. 12
      demo/js/case/combo/demo.text_value_down_list_combo.js
  3. 4
      demo/js/config/base.js
  4. 29
      dist/base.js
  5. 35
      dist/bundle.ie.js
  6. 22
      dist/bundle.ie.min.js
  7. 35
      dist/bundle.js
  8. 34
      dist/bundle.min.js
  9. 2
      dist/case.js
  10. 4
      dist/core.js
  11. 21
      dist/demo.js
  12. 35
      dist/fineui.ie.js
  13. 22
      dist/fineui.ie.min.js
  14. 35
      dist/fineui.js
  15. 34
      dist/fineui.min.js
  16. 33
      dist/fineui_without_jquery_polyfill.js
  17. 2
      dist/utils.min.js
  18. 2
      src/base/layer/layer.popup.js
  19. 2
      src/base/pane.js
  20. 2
      src/base/single/button/button.basic.js
  21. 2
      src/base/single/button/button.node.js
  22. 2
      src/base/single/button/buttons/button.icon.js
  23. 8
      src/base/single/editor/editor.textarea.js
  24. 2
      src/base/single/single.js
  25. 2
      src/base/single/tip/tip.js
  26. 3
      src/base/single/tip/tip.toast.js
  27. 2
      src/base/single/trigger/trigger.js
  28. 2
      src/base/tree/ztree/treeview.js
  29. 2
      src/case/layer/layer.multipopup.js
  30. 4
      src/core/widget.js

5
demo/js/base/editor/demo.textarea_editor.js
Unescape View File

@ -5,9 +5,10 @@ Demo.CodeEditor = BI.inherit(BI.Widget, {
render: function () {
var editor = BI.createWidget({
type: "bi.textarea_editor",
cls: "mvc-border",
cls: "bi-border",
width: 600,
height: 400
height: 400,
watermark: "请输入内容"
});
editor.on(BI.TextAreaEditor.EVENT_FOCUS, function () {
BI.Msg.toast("Focus");

12
demo/js/case/combo/demo.text_value_down_list_combo.js
Unescape View File

@ -19,26 +19,26 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
text: "默认值",
value: 11,
items: [[{
text: BI.i18nText("BI-Basic_Number_IN"),
text: "属于",
value: 1,
cls: "dot-e-font"
}, {
text: BI.i18nText("BI-Basic_Not_Number_In"),
text: "不属于",
value: 2,
cls: "dot-e-font"
}], [{
el: {
text: BI.i18nText("BI-Basic_More_Than"),
text: "大于",
value: 3,
cls: "dot-e-font"
iconCls1: "dot-e-font"
},
value: 3,
children: [{
text: BI.i18nText("BI-Basic_Settled_Value"),
text: "固定值",
value: 4,
cls: "dot-e-font"
}, {
text: BI.i18nText("BI-Basic_Average_Value"),
text: "平均值",
value: 5,
cls: "dot-e-font"
}]

4
demo/js/config/base.js
Unescape View File

@ -22,10 +22,6 @@ Demo.BASE_CONFIG = [{
pId: 2,
text: "toast提示",
value: "demo.toast"
}, {
pId: 2,
text: "message提示",
value: "demo.message"
}, {
pId: 2,
id: 201,

29
dist/base.js vendored
Unescape View File

@ -211,7 +211,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn
@ -353,7 +353,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,
@ -639,7 +639,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,
@ -1051,7 +1051,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},
@ -1106,7 +1106,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},
@ -1634,7 +1634,7 @@ BI.shortcut("bi.button_tree", BI.ButtonTree);/**
BI.TreeView = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.TreeView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree",
_baseCls: "bi-tree",
paras: {},
itemsCreator: BI.emptyFn
});
@ -5910,7 +5910,7 @@ BI.Popover.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,
@ -6910,7 +6910,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});
@ -8857,10 +8857,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -8923,7 +8923,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]
@ -10789,8 +10789,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {
@ -10927,7 +10926,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},

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

@ -11776,8 +11776,8 @@ if (!_global.BI) {
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);
@ -35105,7 +35105,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn
@ -35247,7 +35247,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,
@ -35533,7 +35533,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,
@ -35945,7 +35945,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},
@ -36000,7 +36000,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},
@ -36528,7 +36528,7 @@ BI.shortcut("bi.button_tree", BI.ButtonTree);/**
BI.TreeView = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.TreeView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree",
_baseCls: "bi-tree",
paras: {},
itemsCreator: BI.emptyFn
});
@ -40804,7 +40804,7 @@ BI.Popover.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,
@ -41804,7 +41804,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});
@ -43751,10 +43751,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -43817,7 +43817,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]
@ -45683,8 +45683,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {
@ -45821,7 +45820,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},
@ -55168,7 +55167,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

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

File diff suppressed because one or more lines are too long

35
dist/bundle.js vendored
Unescape View File

@ -11776,8 +11776,8 @@ if (!_global.BI) {
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);
@ -35644,7 +35644,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn
@ -35786,7 +35786,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,
@ -36072,7 +36072,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,
@ -36484,7 +36484,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},
@ -36539,7 +36539,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},
@ -37067,7 +37067,7 @@ BI.shortcut("bi.button_tree", BI.ButtonTree);/**
BI.TreeView = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.TreeView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree",
_baseCls: "bi-tree",
paras: {},
itemsCreator: BI.emptyFn
});
@ -41343,7 +41343,7 @@ BI.Popover.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,
@ -42343,7 +42343,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});
@ -44290,10 +44290,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -44356,7 +44356,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]
@ -46222,8 +46222,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {
@ -46360,7 +46359,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},
@ -55707,7 +55706,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

34
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/case.js vendored
Unescape View File

@ -6841,7 +6841,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

4
dist/core.js vendored
Unescape View File

@ -11776,8 +11776,8 @@ if (!_global.BI) {
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);

21
dist/demo.js vendored
Unescape View File

@ -745,9 +745,10 @@ BI.shortcut("demo.multifile_editor", Demo.CodeEditor);Demo.CodeEditor = BI.inher
render: function () {
var editor = BI.createWidget({
type: "bi.textarea_editor",
cls: "mvc-border",
cls: "bi-border",
width: 600,
height: 400
height: 400,
watermark: "请输入内容"
});
editor.on(BI.TextAreaEditor.EVENT_FOCUS, function () {
BI.Msg.toast("Focus");
@ -1564,26 +1565,26 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
text: "默认值",
value: 11,
items: [[{
text: BI.i18nText("BI-Basic_Number_IN"),
text: "属于",
value: 1,
cls: "dot-e-font"
}, {
text: BI.i18nText("BI-Basic_Not_Number_In"),
text: "不属于",
value: 2,
cls: "dot-e-font"
}], [{
el: {
text: BI.i18nText("BI-Basic_More_Than"),
text: "大于",
value: 3,
cls: "dot-e-font"
iconCls1: "dot-e-font"
},
value: 3,
children: [{
text: BI.i18nText("BI-Basic_Settled_Value"),
text: "固定值",
value: 4,
cls: "dot-e-font"
}, {
text: BI.i18nText("BI-Basic_Average_Value"),
text: "平均值",
value: 5,
cls: "dot-e-font"
}]
@ -3026,10 +3027,6 @@ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG =
pId: 2,
text: "toast提示",
value: "demo.toast"
}, {
pId: 2,
text: "message提示",
value: "demo.message"
}, {
pId: 2,
id: 201,

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

@ -12018,8 +12018,8 @@ if (!_global.BI) {
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);
@ -35347,7 +35347,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn
@ -35489,7 +35489,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,
@ -35775,7 +35775,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,
@ -36187,7 +36187,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},
@ -36242,7 +36242,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},
@ -36770,7 +36770,7 @@ BI.shortcut("bi.button_tree", BI.ButtonTree);/**
BI.TreeView = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.TreeView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree",
_baseCls: "bi-tree",
paras: {},
itemsCreator: BI.emptyFn
});
@ -41046,7 +41046,7 @@ BI.Popover.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,
@ -42046,7 +42046,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});
@ -43993,10 +43993,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -44059,7 +44059,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]
@ -45925,8 +45925,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {
@ -46063,7 +46062,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},
@ -55410,7 +55409,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

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

File diff suppressed because one or more lines are too long

35
dist/fineui.js vendored
Unescape View File

@ -12018,8 +12018,8 @@ if (!_global.BI) {
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);
@ -35886,7 +35886,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn
@ -36028,7 +36028,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,
@ -36314,7 +36314,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,
@ -36726,7 +36726,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},
@ -36781,7 +36781,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},
@ -37309,7 +37309,7 @@ BI.shortcut("bi.button_tree", BI.ButtonTree);/**
BI.TreeView = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.TreeView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree",
_baseCls: "bi-tree",
paras: {},
itemsCreator: BI.emptyFn
});
@ -41585,7 +41585,7 @@ BI.Popover.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,
@ -42585,7 +42585,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});
@ -44532,10 +44532,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -44598,7 +44598,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]
@ -46464,8 +46464,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {
@ -46602,7 +46601,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},
@ -55949,7 +55948,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

34
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

33
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -11776,8 +11776,8 @@ if (!_global.BI) {
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);
@ -24454,7 +24454,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn
@ -24596,7 +24596,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,
@ -24882,7 +24882,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,
@ -25294,7 +25294,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},
@ -25349,7 +25349,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},
@ -29252,7 +29252,7 @@ BI.Popover.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,
@ -30252,7 +30252,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});
@ -32199,10 +32199,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -32265,7 +32265,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]
@ -33515,8 +33515,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {
@ -33653,7 +33652,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},
@ -39030,7 +39029,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/base/layer/layer.popup.js
Unescape View File

@ -6,7 +6,7 @@
BI.PopupView = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-popup-view",
_baseCls: "bi-popup-view",
maxWidth: "auto",
minWidth: 100,
// maxHeight: 200,

2
src/base/pane.js
Unescape View File

@ -10,7 +10,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.Pane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pane",
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
overlap: true,
onLoaded: BI.emptyFn

2
src/base/single/button/button.basic.js
Unescape View File

@ -9,7 +9,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
_baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer"),
value: "",
text: "",
stopEvent: false,

2
src/base/single/button/button.node.js
Unescape View File

@ -10,7 +10,7 @@ BI.NodeButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.NodeButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend( conf, {
baseCls: (conf.baseCls || "") + " bi-node",
_baseCls: (conf._baseCls || "") + " bi-node",
open: false
});
},

2
src/base/single/button/buttons/button.icon.js
Unescape View File

@ -7,7 +7,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-icon-button horizon-center",
_baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
iconWidth: null,
iconHeight: null
});

8
src/base/single/editor/editor.textarea.js
Unescape View File

@ -30,10 +30,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive",
items: [this.content]
},
left: 0,
right: 3,
left: 6,
right: 6,
top: 6,
bottom: 5
bottom: 6
}]
});
@ -96,7 +96,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.watermark,
left: 0,
left: 6,
top: 0,
right: 0
}]

2
src/base/single/single.js
Unescape View File

@ -13,7 +13,7 @@ BI.Single = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.Single.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-single",
_baseCls: (conf._baseCls || "") + " bi-single",
readonly: false,
title: null,
warningTitle: null,

2
src/base/single/tip/tip.js
Unescape View File

@ -10,7 +10,7 @@ BI.Tip = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-tip",
_baseCls: (conf._baseCls || "") + " bi-tip",
zIndex: BI.zIndex_tip
});
},

3
src/base/single/tip/tip.toast.js
Unescape View File

@ -49,8 +49,7 @@ BI.Toast = BI.inherit(BI.Tip, {
}
var items = [{
type: "bi.icon_button",
disableSelected: true,
type: "bi.icon_label",
cls: cls + " toast-icon",
width: 36
}, {

2
src/base/single/trigger/trigger.js
Unescape View File

@ -8,7 +8,7 @@ BI.Trigger = BI.inherit(BI.Single, {
_defaultConfig: function () {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
_baseCls: (conf._baseCls || "") + " bi-trigger cursor-pointer",
height: 24
});
},

2
src/base/tree/ztree/treeview.js
Unescape View File

@ -7,7 +7,7 @@
BI.TreeView = BI.inherit(BI.Pane, {
_defaultConfig: function () {
return BI.extend(BI.TreeView.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree",
_baseCls: "bi-tree",
paras: {},
itemsCreator: BI.emptyFn
});

2
src/case/layer/layer.multipopup.js
Unescape View File

@ -9,7 +9,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
_defaultConfig: function () {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-multi-list-view",
_baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")]
});
},

4
src/core/widget.js
Unescape View File

@ -99,8 +99,8 @@
this.element = BI.Widget._renderEngine.createElement(this);
}
this.element._isWidget = true;
if (o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
if (o._baseCls || o.baseCls || o.extraCls || o.cls) {
this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || "") + " " + (o.cls || ""));
}
if (o.attributes) {
this.element.attr(o.attributes);

Write Preview
Loading…
Cancel
Save