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

BI-28479 combo的container少了

es6
windy 6 years ago
parent
c6d200947c
commit
5e42e1832e
12 changed files with 477 additions and 471 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. 45
      dist/_fineui.min.js
  3. 5
      dist/bundle.js
  4. 44
      dist/bundle.min.js
  5. 5
      dist/case.js
  6. 396
      dist/demo.js
  7. 5
      dist/fineui.js
  8. 45
      dist/fineui.min.js
  9. 1
      src/case/colorchooser/colorchooser.js
  10. 1
      src/case/colorchooser/colorchooser.simple.js
  11. 1
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  12. 2
      src/case/richeditor/niceditor/niceditor.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);

45
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/bundle.js vendored
Unescape View File

@ -76316,6 +76316,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,
@ -76691,6 +76692,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"
@ -78641,6 +78643,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: {
@ -83487,7 +83490,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
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;
} }

44
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/case.js vendored
Unescape View File

@ -3635,6 +3635,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,
@ -4010,6 +4011,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"
@ -5960,6 +5962,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: {
@ -10806,7 +10809,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
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;
} }

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);

5
dist/fineui.js vendored
Unescape View File

@ -76565,6 +76565,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,
@ -76940,6 +76941,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"
@ -78890,6 +78892,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: {
@ -83736,7 +83739,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
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;
} }

45
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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/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: {

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;
} }

Write Preview
Loading…
Cancel
Save