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

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

* commit '41179de20faf0c13878b28ca13b8824472608bf4':
  无JIRA任务 container
  update
  update
  无JIRA任务 container
  无JIRA任务 container
  BI-28479 combo的container少了
es6
windy 7 years ago
parent
c6d200947c 41179de20f
commit
0d5c1a9c48
13 changed files with 404 additions and 402 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 398
      demo/js/base/button/demo.button.js
  2. 396
      dist/demo.js
  3. 1
      src/case/colorchooser/colorchooser.js
  4. 1
      src/case/colorchooser/colorchooser.simple.js
  5. 1
      src/case/combo/bubblecombo/combo.bubble.js
  6. 1
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  7. 1
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  8. 1
      src/case/combo/staticcombo/combo.static.js
  9. 2
      src/case/richeditor/niceditor/niceditor.js
  10. 1
      src/widget/multiselect/multiselect.combo.js
  11. 1
      src/widget/multiselect/multiselect.insert.combo.js
  12. 1
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  13. 1
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

398
demo/js/base/button/demo.button.js
Unescape View File

@ -17,207 +17,203 @@ Demo.Button = BI.inherit(BI.Widget, {
level: "success", level: "success",
height: 30 height: 30
} }
}, }, {
{ el: {
el: { type: "bi.button",
type: "bi.button", text: "表示警告状态的按钮",
text: "表示警告状态的按钮", level: "warning",
level: "warning", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "表示错误状态的按钮",
text: "表示错误状态的按钮", level: "error",
level: "error", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "表示忽略状态的按钮",
text: "表示忽略状态的按钮", level: "ignore",
level: "ignore", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "普通灰化按钮",
text: "普通灰化按钮", disabled: true,
disabled: true, level: "success",
level: "success", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "忽略状态灰化按钮",
text: "忽略状态灰化按钮", disabled: true,
disabled: true, level: "ignore",
level: "ignore", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "带图标的按钮",
text: "带图标的按钮", // level: 'ignore',
// level: 'ignore', iconCls: "close-font",
iconCls: "close-font", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "一般按钮",
text: "一般按钮", block: true,
block: true, level: "common",
level: "common", height: 30
height: 30 }
} }, {
}, { el: {
el: { type: "bi.button",
type: "bi.button", text: "表示成功状态按钮",
text: "表示成功状态按钮", block: true,
block: true, level: "success",
level: "success", height: 30
height: 30 }
} }, {
}, el: {
{ type: "bi.button",
el: { text: "表示警告状态的按钮",
type: "bi.button", block: true,
text: "表示警告状态的按钮", level: "warning",
block: true, height: 30
level: "warning", }
height: 30 }, {
} el: {
}, { type: "bi.button",
el: { text: "表示忽略状态的按钮",
type: "bi.button", block: true,
text: "表示忽略状态的按钮", level: "ignore",
block: true, height: 30
level: "ignore", }
height: 30 }, {
} el: {
}, { type: "bi.button",
el: { text: "普通灰化按钮",
type: "bi.button", block: true,
text: "普通灰化按钮", disabled: true,
block: true, level: "success",
disabled: true, height: 30
level: "success", }
height: 30 }, {
} el: {
}, { type: "bi.button",
el: { text: "忽略状态灰化按钮",
type: "bi.button", block: true,
text: "忽略状态灰化按钮", disabled: true,
block: true, level: "ignore",
disabled: true, height: 30
level: "ignore", }
height: 30 }, {
} el: {
}, { type: "bi.button",
el: { text: "带图标的按钮",
type: "bi.button", block: true,
text: "带图标的按钮", // level: 'ignore',
block: true, iconCls: "close-font",
// level: 'ignore', height: 30
iconCls: "close-font", }
height: 30 }, {
} el: {
}, { type: "bi.button",
el: { text: "一般按钮",
type: "bi.button", clear: true,
text: "一般按钮", level: "common",
clear: true, height: 30
level: "common", }
height: 30 }, {
} el: {
}, { type: "bi.button",
el: { text: "表示成功状态按钮",
type: "bi.button", clear: true,
text: "表示成功状态按钮", level: "success",
clear: true, height: 30
level: "success", }
height: 30 }, {
} el: {
}, type: "bi.button",
{ text: "表示警告状态的按钮",
el: { clear: true,
type: "bi.button", level: "warning",
text: "表示警告状态的按钮", height: 30
clear: true, }
level: "warning", }, {
height: 30 el: {
} type: "bi.button",
}, { text: "表示忽略状态的按钮",
el: { clear: true,
type: "bi.button", level: "ignore",
text: "表示忽略状态的按钮", height: 30
clear: true, }
level: "ignore", }, {
height: 30 el: {
} type: "bi.button",
}, { text: "普通灰化按钮",
el: { clear: true,
type: "bi.button", disabled: true,
text: "普通灰化按钮", level: "success",
clear: true, height: 30
disabled: true, }
level: "success", }, {
height: 30 el: {
} type: "bi.button",
}, { text: "忽略状态灰化按钮",
el: { clear: true,
type: "bi.button", disabled: true,
text: "忽略状态灰化按钮", level: "ignore",
clear: true, height: 30
disabled: true, }
level: "ignore", }, {
height: 30 el: {
} type: "bi.button",
}, { text: "带图标的按钮",
el: { clear: true,
type: "bi.button", // level: 'ignore',
text: "带图标的按钮", iconCls: "close-font",
clear: true, height: 30
// level: 'ignore', }
iconCls: "close-font", }, {
height: 30 el: {
} type: "bi.text_button",
}, { text: "文字按钮",
el: { height: 30
type: "bi.text_button", }
text: "文字按钮", }, {
height: 30 el: {
} type: "bi.button",
}, { text: "幽灵按钮（common）",
el: { ghost: true,
type: "bi.button", height: 30
text: "幽灵按钮（common）", }
ghost: true, }, {
height: 30 el: {
} type: "bi.button",
}, { text: "幽灵按钮（common）灰化",
el: { disabled: true,
type: "bi.button", ghost: true,
text: "幽灵按钮（common）灰化", height: 30
disabled: true, }
ghost: true, }, {
height: 30 el: {
} type: "bi.button",
}, { text: "弹出bubble",
el: { bubble: function () {
type: "bi.button", return BI.parseInt(Math.random() * 100) % 10 + "提示"
text: "弹出bubble", },
bubble: function () { handler: function () {
return BI.parseInt(Math.random() * 100) % 10 + "提示" BI.Msg.toast("1111");
}, },
handler: function () { height: 30
BI.Msg.toast("1111"); }
}, }];
height: 30
}
}
];
// BI.each(items, function (i, item) { // BI.each(items, function (i, item) {
// item.el.handler = function () { // item.el.handler = function () {
// BI.Msg.alert("按钮", this.options.text); // BI.Msg.alert("按钮", this.options.text);

396
dist/demo.js vendored
Unescape View File

@ -39,207 +39,203 @@ $(function () {
level: "success", level: "success",
height: 30 height: 30
} }
}, }, {
{ el: {
el: { type: "bi.button",
type: "bi.button", text: "表示警告状态的按钮",
text: "表示警告状态的按钮", level: "warning",
level: "warning", height: 30
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示错误状态的按钮",
level: "error",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示忽略状态的按钮",
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "普通灰化按钮",
disabled: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "忽略状态灰化按钮",
disabled: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "带图标的按钮",
// level: 'ignore',
iconCls: "close-font",
height: 30
}
}, {
el: {
type: "bi.button",
text: "一般按钮",
block: true,
level: "common",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示成功状态按钮",
block: true,
level: "success",
height: 30
}
},
{
el: {
type: "bi.button",
text: "表示警告状态的按钮",
block: true,
level: "warning",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示忽略状态的按钮",
block: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "普通灰化按钮",
block: true,
disabled: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "忽略状态灰化按钮",
block: true,
disabled: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "带图标的按钮",
block: true,
// level: 'ignore',
iconCls: "close-font",
height: 30
}
}, {
el: {
type: "bi.button",
text: "一般按钮",
clear: true,
level: "common",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示成功状态按钮",
clear: true,
level: "success",
height: 30
}
},
{
el: {
type: "bi.button",
text: "表示警告状态的按钮",
clear: true,
level: "warning",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示忽略状态的按钮",
clear: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "普通灰化按钮",
clear: true,
disabled: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "忽略状态灰化按钮",
clear: true,
disabled: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "带图标的按钮",
clear: true,
// level: 'ignore',
iconCls: "close-font",
height: 30
}
}, {
el: {
type: "bi.text_button",
text: "文字按钮",
height: 30
}
}, {
el: {
type: "bi.button",
text: "幽灵按钮（common）",
ghost: true,
height: 30
}
}, {
el: {
type: "bi.button",
text: "幽灵按钮（common）灰化",
disabled: true,
ghost: true,
height: 30
}
}, {
el: {
type: "bi.button",
text: "弹出bubble",
bubble: function () {
return BI.parseInt(Math.random() * 100) % 10 + "提示"
},
handler: function () {
BI.Msg.toast("1111");
},
height: 30
}
} }
]; }, {
el: {
type: "bi.button",
text: "表示错误状态的按钮",
level: "error",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示忽略状态的按钮",
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "普通灰化按钮",
disabled: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "忽略状态灰化按钮",
disabled: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "带图标的按钮",
// level: 'ignore',
iconCls: "close-font",
height: 30
}
}, {
el: {
type: "bi.button",
text: "一般按钮",
block: true,
level: "common",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示成功状态按钮",
block: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示警告状态的按钮",
block: true,
level: "warning",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示忽略状态的按钮",
block: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "普通灰化按钮",
block: true,
disabled: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "忽略状态灰化按钮",
block: true,
disabled: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "带图标的按钮",
block: true,
// level: 'ignore',
iconCls: "close-font",
height: 30
}
}, {
el: {
type: "bi.button",
text: "一般按钮",
clear: true,
level: "common",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示成功状态按钮",
clear: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示警告状态的按钮",
clear: true,
level: "warning",
height: 30
}
}, {
el: {
type: "bi.button",
text: "表示忽略状态的按钮",
clear: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "普通灰化按钮",
clear: true,
disabled: true,
level: "success",
height: 30
}
}, {
el: {
type: "bi.button",
text: "忽略状态灰化按钮",
clear: true,
disabled: true,
level: "ignore",
height: 30
}
}, {
el: {
type: "bi.button",
text: "带图标的按钮",
clear: true,
// level: 'ignore',
iconCls: "close-font",
height: 30
}
}, {
el: {
type: "bi.text_button",
text: "文字按钮",
height: 30
}
}, {
el: {
type: "bi.button",
text: "幽灵按钮（common）",
ghost: true,
height: 30
}
}, {
el: {
type: "bi.button",
text: "幽灵按钮（common）灰化",
disabled: true,
ghost: true,
height: 30
}
}, {
el: {
type: "bi.button",
text: "弹出bubble",
bubble: function () {
return BI.parseInt(Math.random() * 100) % 10 + "提示"
},
handler: function () {
BI.Msg.toast("1111");
},
height: 30
}
}];
// BI.each(items, function (i, item) { // BI.each(items, function (i, item) {
// item.el.handler = function () { // item.el.handler = function () {
// BI.Msg.alert("按钮", this.options.text); // BI.Msg.alert("按钮", this.options.text);

1
src/case/colorchooser/colorchooser.js
Unescape View File

@ -21,6 +21,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
element: this, element: this,
container: o.container,
adjustLength: 1, adjustLength: 1,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,

1
src/case/colorchooser/colorchooser.simple.js
Unescape View File

@ -21,6 +21,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.color_chooser", type: "bi.color_chooser",
element: this, element: this,
container: o.container,
value: o.value, value: o.value,
popup: { popup: {
type: "bi.simple_color_chooser_popup" type: "bi.simple_color_chooser_popup"

1
src/case/combo/bubblecombo/combo.bubble.js
Unescape View File

@ -36,6 +36,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
element: this, element: this,
trigger: o.trigger, trigger: o.trigger,
toggle: o.toggle, toggle: o.toggle,
container: o.container,
direction: o.direction, direction: o.direction,
isDefaultInit: o.isDefaultInit, isDefaultInit: o.isDefaultInit,
destroyWhenHide: o.destroyWhenHide, destroyWhenHide: o.destroyWhenHide,

1
src/case/combo/icontextvaluecombo/combo.icontextvalue.js
Unescape View File

@ -44,6 +44,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.textIconCombo = BI.createWidget({ this.textIconCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
element: this, element: this,
container: o.container,
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
popup: { popup: {

1
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -19,6 +19,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
container: o.container,
adjustLength: 2, adjustLength: 2,
toggle: false, toggle: false,
ref: function () { ref: function () {

1
src/case/combo/staticcombo/combo.static.js
Unescape View File

@ -45,6 +45,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.combo", type: "bi.combo",
element: this, element: this,
adjustLength: 2, adjustLength: 2,
container: o.container,
el: this.trigger, el: this.trigger,
popup: { popup: {
el: this.popup el: this.popup

2
src/case/richeditor/niceditor/niceditor.js
Unescape View File

@ -68,7 +68,7 @@
var self = this; var self = this;
var found = false; var found = false;
do { do {
if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) { if (t.nodeName !== "svg" && t.className && t.className.indexOf && t.className.indexOf(prefix) != -1) {
return; return;
// return false; // return false;
} }

1
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -119,6 +119,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {

1
src/widget/multiselect/multiselect.insert.combo.js
Unescape View File

@ -114,6 +114,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
toggle: false, toggle: false,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
container: o.container,
popup: { popup: {
type: "bi.multi_select_popup_view", type: "bi.multi_select_popup_view",
ref: function () { ref: function () {

1
src/widget/multiselect/multiselect.insert.combo.nobar.js
Unescape View File

@ -121,6 +121,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {

1
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
Unescape View File

@ -124,6 +124,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
container: o.container,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {

Write Preview
Loading…
Cancel
Save