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

Pull request #2576: 无JIRA任务 chore: bugfix 

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

* commit 'a99f85d4b654708720fa15d7d8482d2c2b02dbee':
  chore: bugfix
  chore: bugfix
  chore: bugfix
es6
guy 2 years ago
parent
aaaa322046 a99f85d4b6
commit
d56a67281c
6 changed files with 73 additions and 31 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. 9
      src/case/trigger/trigger.editor.js
  2. 23
      src/case/trigger/trigger.icon.text.js
  3. 14
      src/case/trigger/trigger.icon.text.select.js
  4. 14
      src/case/trigger/trigger.text.select.js
  5. 18
      src/case/trigger/trigger.text.select.small.js
  6. 26
      src/case/trigger/trigger.text.small.js

9
src/case/trigger/trigger.editor.js
Unescape View File

@ -6,10 +6,6 @@
* @extends BI.Trigger
*/
BI.EditorTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
},
_defaultConfig: function () {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
@ -61,10 +57,11 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
BI.createWidget({
element: this,
type: "bi.htape",
type: "bi.horizontal_fill",
items: [
{
el: this.editor
el: this.editor,
width: "fill"
}, {
el: {
type: "bi.trigger_icon_button",

23
src/case/trigger/trigger.icon.text.js
Unescape View File

@ -65,13 +65,14 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
},
width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
},
{
el: this.text,
lgap: BI.isEmptyString(o.iconCls) ? 5 : 0
}, {
el: this.trigerButton,
width: o.triggerWidth || o.height
}
{
el: this.text,
lgap: BI.isEmptyString(o.iconCls) ? 5 : 0,
width: "fill"
}, {
el: this.trigerButton,
width: o.triggerWidth || o.height
}
]
});
},
@ -86,13 +87,13 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
var iconItem = this.wrapper.attr("items")[0];
var textItem = this.wrapper.attr("items")[1];
if (BI.isNull(iconCls) || BI.isEmptyString(iconCls)) {
if(iconItem.width !== 0) {
if (iconItem.width !== 0) {
iconItem.width = 0;
textItem.lgap = 5;
this.wrapper.resize();
}
} else {
if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
if (iconItem.width !== (o.iconWrapperWidth || o.height)) {
iconItem.width = (o.iconWrapperWidth || o.height);
textItem.lgap = 0;
this.wrapper.resize();
@ -100,7 +101,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
}
},
setTextCls: function(cls) {
setTextCls: function (cls) {
var o = this.options;
var oldCls = o.textCls;
o.textCls = cls;
@ -111,4 +112,4 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.text.setText(text);
}
});
BI.shortcut("bi.icon_text_trigger", BI.IconTextTrigger);
BI.shortcut("bi.icon_text_trigger", BI.IconTextTrigger);

14
src/case/trigger/trigger.icon.text.select.js
Unescape View File

@ -9,6 +9,12 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
height: 24,
iconHeight: null,
iconWidth: null,
textHgap: 0,
textVgap: 0,
textLgap: 0,
textRgap: 0,
textTgap: 0,
textBgap: 0,
iconCls: ""
});
},
@ -23,6 +29,12 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
text: obj.text,
textCls: obj.textCls,
iconCls: obj.iconCls,
textHgap: o.textHgap,
textVgap: o.textVgap,
textLgap: o.textLgap,
textRgap: o.textRgap,
textTgap: o.textTgap,
textBgap: o.textBgap,
height: o.height,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth,
@ -71,4 +83,4 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
this.options.items = items;
}
});
BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);
BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);

14
src/case/trigger/trigger.text.select.js
Unescape View File

@ -10,7 +10,13 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-text-trigger",
height: 24
height: 24,
textHgap: 6,
textVgap: 0,
textLgap: 0,
textRgap: 0,
textTgap: 0,
textBgap: 0,
});
},
@ -25,6 +31,12 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
readonly: o.readonly,
text: obj.text,
textCls: obj.textCls,
textHgap: o.textHgap,
textVgap: o.textVgap,
textLgap: o.textLgap,
textRgap: o.textRgap,
textTgap: o.textTgap,
textBgap: o.textBgap,
tipType: o.tipType,
warningTitle: o.warningTitle
});

18
src/case/trigger/trigger.text.select.small.js
Unescape View File

@ -9,7 +9,13 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SmallSelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-small-select-text-trigger bi-border",
height: 20
height: 20,
textHgap: 6,
textVgap: 0,
textLgap: 0,
textRgap: 0,
textTgap: 0,
textBgap: 0,
});
},
@ -23,7 +29,13 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
element: this,
height: o.height,
text: obj.text,
cls: obj.cls
cls: obj.cls,
textHgap: o.textHgap,
textVgap: o.textVgap,
textLgap: o.textLgap,
textRgap: o.textRgap,
textTgap: o.textTgap,
textBgap: o.textBgap,
});
},
@ -61,4 +73,4 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
this.options.items = items;
}
});
BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);
BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);

26
src/case/trigger/trigger.text.small.js
Unescape View File

@ -5,15 +5,17 @@
* @extends BI.Trigger
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 6
},
_defaultConfig: function () {
var conf = BI.SmallTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 20
height: 20,
textHgap: 6,
textVgap: 0,
textLgap: 0,
textRgap: 0,
textTgap: 0,
textBgap: 0,
});
},
@ -25,7 +27,12 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: c.hgap
hgap: o.textHgap,
vgap: o.textVgap,
lgap: o.textLgap,
rgap: o.textRgap,
tgap: o.textTgap,
bgap: o.textBgap,
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
@ -34,10 +41,11 @@ BI.SmallTextTrigger = 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
@ -54,4 +62,4 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
this.text.setText(text);
}
});
BI.shortcut("bi.small_text_trigger", BI.SmallTextTrigger);
BI.shortcut("bi.small_text_trigger", BI.SmallTextTrigger);

Write Preview
Loading…
Cancel
Save