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

BI-18029 加字体和支持自定义param

es6
windy 6 years ago
parent
3a8e0af2ba
commit
44e9e7e1f3
20 changed files with 101 additions and 142 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. 44
      dist/_fineui.min.js
  2. 8
      dist/bundle.css
  3. 17
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 44
      dist/bundle.min.js
  6. 8
      dist/case.js
  7. 7
      dist/core.js
  8. 8
      dist/fineui.css
  9. 2
      dist/fineui.min.css
  10. 44
      dist/fineui.min.js
  11. 8
      dist/resource.css
  12. 2
      dist/widget.js
  13. 8
      public/css/app.css
  14. 6
      src/case/combo/iconcombo/combo.icon.js
  15. 2
      src/case/combo/iconcombo/trigger.iconcombo.js
  16. 7
      src/core/func/function.js
  17. 8
      src/css/resource/app.css
  18. 8
      src/less/resource/app.less
  19. 2
      src/widget/numberinterval/numberinterval.js
  20. 8
      ui/css/app.css

44
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/bundle.css vendored
Unescape View File

@ -5209,14 +5209,6 @@ ul.ztree.zTreeDragUL {
.bi-year-month-interval.time-error .sign-editor-text {
color: #ff4949;
}
html,
button,
input,
select,
textarea,
* {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

17
dist/bundle.js vendored
Unescape View File

@ -28471,7 +28471,7 @@ BI.extend(BI.DOM, {
return this._scrollWidth;
},
getImage: function (param) {
getImage: function (param, fillStyle, backgroundColor) {
var image = new Image();
var canvas = document.createElement("canvas");
$("body").append(canvas);
@ -28481,15 +28481,16 @@ BI.extend(BI.DOM, {
var ctx = canvas.getContext("2d");
// ctx.fillStyle = "#EAF2FD";
ctx.font = "12px Georgia";
ctx.fillStyle = "#3D4D66";
ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle";
ctx.fillText(param, 6, 12);
$(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD";
return {
width: w,
height: 24,
src: canvas.toDataURL("image/png"),
style: "background-color: #EAF2FD; vertical-align: sub; margin: 0 3px;",
style: "background-color: " + backColor + ";vertical-align: sub; margin: 0 3px;",
alt: param
};
}
@ -77237,7 +77238,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
adjustXOffset: 0,
adjustYOffset: 0,
offsetStyle: "left",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
isShowDown: true
});
},
@ -77253,7 +77255,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
value: o.value
value: o.value,
isShowDown: o.isShowDown
});
this.popup = BI.createWidget(o.popup, {
type: "bi.icon_combo_popup",
@ -77408,7 +77411,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.width - 12,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
@ -100350,6 +100353,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border",
height: o.height - 2,
isShowDown: false,
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",
iconCls: "less-font",
@ -100368,6 +100372,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigCombo = BI.createWidget({
type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border",
isShowDown: false,
height: o.height - 2,
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

44
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/case.js vendored
Unescape View File

@ -5289,7 +5289,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
adjustXOffset: 0,
adjustYOffset: 0,
offsetStyle: "left",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
isShowDown: true
});
},
@ -5305,7 +5306,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
value: o.value
value: o.value,
isShowDown: o.isShowDown
});
this.popup = BI.createWidget(o.popup, {
type: "bi.icon_combo_popup",
@ -5460,7 +5462,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.width - 12,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,

7
dist/core.js vendored
Unescape View File

@ -28471,7 +28471,7 @@ BI.extend(BI.DOM, {
return this._scrollWidth;
},
getImage: function (param) {
getImage: function (param, fillStyle, backgroundColor) {
var image = new Image();
var canvas = document.createElement("canvas");
$("body").append(canvas);
@ -28481,15 +28481,16 @@ BI.extend(BI.DOM, {
var ctx = canvas.getContext("2d");
// ctx.fillStyle = "#EAF2FD";
ctx.font = "12px Georgia";
ctx.fillStyle = "#3D4D66";
ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle";
ctx.fillText(param, 6, 12);
$(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD";
return {
width: w,
height: 24,
src: canvas.toDataURL("image/png"),
style: "background-color: #EAF2FD; vertical-align: sub; margin: 0 3px;",
style: "background-color: " + backColor + ";vertical-align: sub; margin: 0 3px;",
alt: param
};
}

8
dist/fineui.css vendored
Unescape View File

@ -5209,14 +5209,6 @@ ul.ztree.zTreeDragUL {
.bi-year-month-interval.time-error .sign-editor-text {
color: #ff4949;
}
html,
button,
input,
select,
textarea,
* {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

44
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/resource.css vendored
Unescape View File

@ -1,11 +1,3 @@
html,
button,
input,
select,
textarea,
* {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

2
dist/widget.js vendored
Unescape View File

@ -13709,6 +13709,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border",
height: o.height - 2,
isShowDown: false,
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",
iconCls: "less-font",
@ -13727,6 +13728,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigCombo = BI.createWidget({
type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border",
isShowDown: false,
height: o.height - 2,
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",

8
public/css/app.css
Unescape View File

@ -1,11 +1,3 @@
html,
button,
input,
select,
textarea,
* {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

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

@ -20,7 +20,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
adjustXOffset: 0,
adjustYOffset: 0,
offsetStyle: "left",
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
isShowDown: true
});
},
@ -36,7 +37,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,
value: o.value
value: o.value,
isShowDown: o.isShowDown
});
this.popup = BI.createWidget(o.popup, {
type: "bi.icon_combo_popup",

2
src/case/combo/iconcombo/trigger.iconcombo.js
Unescape View File

@ -30,7 +30,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon",
iconCls: iconCls,
disableSelected: true,
width: o.width - 12,
width: o.isShowDown ? o.width - 12 : o.width,
height: o.height,
iconWidth: o.iconWidth,
iconHeight: o.iconHeight,

7
src/core/func/function.js
Unescape View File

@ -300,7 +300,7 @@ BI.extend(BI.DOM, {
return this._scrollWidth;
},
getImage: function (param) {
getImage: function (param, fillStyle, backgroundColor) {
var image = new Image();
var canvas = document.createElement("canvas");
$("body").append(canvas);
@ -310,15 +310,16 @@ BI.extend(BI.DOM, {
var ctx = canvas.getContext("2d");
// ctx.fillStyle = "#EAF2FD";
ctx.font = "12px Georgia";
ctx.fillStyle = "#3D4D66";
ctx.fillStyle = fillStyle || "#3D4D66";
ctx.textBaseline = "middle";
ctx.fillText(param, 6, 12);
$(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD";
return {
width: w,
height: 24,
src: canvas.toDataURL("image/png"),
style: "background-color: #EAF2FD; vertical-align: sub; margin: 0 3px;",
style: "background-color: " + backColor + ";vertical-align: sub; margin: 0 3px;",
alt: param
};
}

8
src/css/resource/app.css
Unescape View File

@ -1,11 +1,3 @@
html,
button,
input,
select,
textarea,
* {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

8
src/less/resource/app.less
Unescape View File

@ -1,13 +1,5 @@
@import "../index";
html,
button,
input,
select,
textarea, * {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

2
src/widget/numberinterval/numberinterval.js
Unescape View File

@ -123,6 +123,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border",
height: o.height - 2,
isShowDown: false,
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",
iconCls: "less-font",
@ -141,6 +142,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigCombo = BI.createWidget({
type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border",
isShowDown: false,
height: o.height - 2,
items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")",

8
ui/css/app.css
Unescape View File

@ -1,11 +1,3 @@
html,
button,
input,
select,
textarea,
* {
font-family: "Microsoft YaHei", "Hiragino Sans GB W3";
}
html {
height: 100%;
overflow: hidden;

Write Preview
Loading…
Cancel
Save