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

Pull request #2567: 无JIRA任务 bugfix 

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '1acc0a778e3adda5fb60505d6c7f99c18e4de6a1':
  bugfix
es6
guy 3 years ago
parent
605cb11e9d 1acc0a778e
commit
37a33c7d1c
22 changed files with 211 additions and 140 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. 28
      src/base/single/button/listitem/blankiconicontextitem.js
  2. 28
      src/base/single/button/listitem/blankicontexticonitem.js
  3. 30
      src/base/single/button/listitem/blankicontextitem.js
  4. 28
      src/base/single/button/listitem/icontexticonitem.js
  5. 30
      src/base/single/button/listitem/icontextitem.js
  6. 30
      src/base/single/button/listitem/texticonitem.js
  7. 28
      src/base/single/button/node/icontexticonnode.js
  8. 30
      src/base/single/button/node/icontextnode.js
  9. 30
      src/base/single/button/node/texticonnode.js
  10. 8
      src/case/button/item.multiselect.js
  11. 4
      src/case/button/item.singleselect.icontext.js
  12. 7
      src/case/button/item.singleselect.js
  13. 9
      src/case/button/item.singleselect.radio.js
  14. 5
      src/case/button/node/node.arrow.js
  15. 5
      src/case/button/node/node.plus.js
  16. 8
      src/case/combo/iconcombo/combo.icon.js
  17. 8
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  18. 6
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  19. 8
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  20. 8
      src/case/combo/textvaluecombo/combo.textvalue.js
  21. 8
      src/case/combo/textvaluecombo/combo.textvaluesmall.js
  22. 5
      src/case/trigger/trigger.text.js

28
src/base/single/button/listitem/blankiconicontextitem.js
Unescape View File

@ -50,19 +50,21 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}]
};
},

28
src/base/single/button/listitem/blankicontexticonitem.js
Unescape View File

@ -44,19 +44,21 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}, {
type: "bi.icon_label",
cls: o.iconCls2,

30
src/base/single/button/listitem/blankicontextitem.js
Unescape View File

@ -42,20 +42,22 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}]
};
},

28
src/base/single/button/listitem/icontexticonitem.js
Unescape View File

@ -40,19 +40,21 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}, {
type: "bi.icon_label",
cls: o.iconCls2,

30
src/base/single/button/listitem/icontextitem.js
Unescape View File

@ -40,20 +40,22 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}]
};
},

30
src/base/single/button/listitem/texticonitem.js
Unescape View File

@ -33,20 +33,22 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
type: "bi.vertical_adapt",
columnSize: ["fill", o.iconWrapperWidth || o.height],
items: [{
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}, {
type: "bi.icon_label",
cls: o.iconCls,

28
src/base/single/button/node/icontexticonnode.js
Unescape View File

@ -38,19 +38,21 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}, {
type: "bi.icon_label",
cls: o.iconCls2,

30
src/base/single/button/node/icontextnode.js
Unescape View File

@ -37,20 +37,22 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
iconWidth: o.iconWidth,
iconHeight: o.iconHeight
}, {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}]
};
},

30
src/base/single/button/node/texticonnode.js
Unescape View File

@ -29,20 +29,22 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
type: "bi.vertical_adapt",
columnSize: ["fill", o.iconWrapperWidth || o.height],
items: [{
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
el: {
type: "bi.label",
ref: function (_ref) {
self.text = _ref;
},
cls: "list-item-text",
textAlign: "left",
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,
height: o.height
}
}, {
type: "bi.icon_label",
cls: o.iconCls,

8
src/case/button/item.multiselect.js
Unescape View File

@ -17,7 +17,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
iconWrapperWidth: 26,
textHgap: 0,
textLgap: 0,
textRgap: 0
textRgap: 0,
textVgap: 0,
});
},
@ -48,9 +49,10 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
rgap: o.rgap,
hgap: o.textHgap,
rgap: o.textRgap,
lgap: o.textLgap,
vgap: o.textVgap,
text: o.text,
keyword: o.keyword,
value: o.value,

4
src/case/button/item.singleselect.icontext.js
Unescape View File

@ -28,6 +28,10 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
height: o.height,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth,
textHgap: o.textHgap,
textVgap: o.textVgap,
textLgap: o.textLgap,
textRgap: o.textRgap,
text: o.text,
keyword: o.keyword,
value: o.value,

7
src/case/button/item.singleselect.js
Unescape View File

@ -5,7 +5,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
attributes: {
tabIndex: 1
},
hgap: 10,
textHgap: 10,
height: 24,
textAlign: "left"
});
@ -20,7 +20,10 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
hgap: o.hgap || o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
keyword: o.keyword,
value: o.value,

9
src/case/button/item.singleselect.radio.js
Unescape View File

@ -15,8 +15,8 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
},
height: 24,
iconWrapperWidth: 16,
hgap: 10,
textHgap: 0,
textHgap: 10,
textVgap: 0,
textLgap: 0,
textRgap: 0
});
@ -46,9 +46,10 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
rgap: o.textRgap,
hgap: o.hgap || o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
keyword: o.keyword,
value: o.value,

5
src/case/button/node/node.arrow.js
Unescape View File

@ -41,7 +41,10 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
hgap: o.hgap || o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
py: o.py,

5
src/case/button/node/node.plus.js
Unescape View File

@ -46,7 +46,10 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
hgap: o.hgap || o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
value: o.value,
keyword: o.keyword,

8
src/case/combo/iconcombo/combo.icon.js
Unescape View File

@ -25,8 +25,14 @@ BI.IconCombo = BI.inherit(BI.Widget, {
},
_init: function () {
BI.IconCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options;
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
self.populate(newValue);
}) : o.items;
BI.IconCombo.superclass._init.apply(this, arguments);
this.trigger = BI.createWidget(o.el, {
type: "bi.icon_combo_trigger",
iconCls: o.iconCls,

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

@ -15,8 +15,14 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
_init: function () {
var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.isNumeric(o.height) && (o.height -= 2);
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
self.populate(newValue);
}) : o.items;
BI.IconTextValueCombo.superclass._init.apply(this, arguments);
this.trigger = BI.createWidget({
type: "bi.select_icon_text_trigger",

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

@ -15,6 +15,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
render: function () {
var self = this, o = this.options;
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
self.populate(newValue);
}) : o.items;
return {
type: "bi.absolute",
items: [{

8
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
Unescape View File

@ -16,8 +16,14 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
_init: function () {
var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.isNumeric(o.height) && (o.height -= 2);
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
self.populate(newValue);
}) : o.items;
BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",

8
src/case/combo/textvaluecombo/combo.textvalue.js
Unescape View File

@ -17,8 +17,14 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
_init: function () {
var self = this, o = this.options;
o.height -= 2;
BI.isNumeric(o.width) && (o.width -= 2);
BI.isNumeric(o.height) && (o.height -= 2);
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
self.populate(newValue);
}) : o.items;
BI.TextValueCombo.superclass._init.apply(this, arguments);
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",

8
src/case/combo/textvaluecombo/combo.textvaluesmall.js
Unescape View File

@ -16,8 +16,14 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
},
_init: function () {
BI.SmallTextValueCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options;
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
self.populate(newValue);
}) : o.items;
BI.SmallTextValueCombo.superclass._init.apply(this, arguments);
this.trigger = BI.createWidget(o.el, {
type: "bi.small_select_text_trigger",
items: o.items,

5
src/case/trigger/trigger.text.js
Unescape View File

@ -44,10 +44,11 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
BI.createWidget({
element: this,
type: "bi.htape",
type: "bi.horizontal_fill",
items: [
{
el: this.text
el: this.text,
width: "fill"
}, {
el: this.trigerButton,
width: o.triggerWidth || o.height

Write Preview
Loading…
Cancel
Save