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

Merge pull request #322 in FUI/fineui from ~WINDY/fui:master to master 

* commit 'eec74cf58326a717ff91f9166ecd8d8798039397':
  update
  BI-17356 日期交互修改
  BI-18029 加字体和支持自定义param
es6
guy 7 years ago
parent
457ad11155 eec74cf583
commit
d7759cbdba
21 changed files with 152 additions and 145 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. 35
      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. 20
      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. 18
      src/widget/dynamicdate/dynamicdate.card.js
  20. 2
      src/widget/numberinterval/numberinterval.js
  21. 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;

35
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
};
}
@ -77224,7 +77225,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
});
},
@ -77240,7 +77242,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",
@ -77395,7 +77398,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,
@ -89801,10 +89804,26 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
if(value.length !== 0) {
self.workDayBox.setSelected(false);
}
var plainValue = {};
BI.each(self.resultPane.getAllButtons(), function (idx, button) {
var value = button.getValue();
if(BI.isNotNull(value.dateType)) {
plainValue[value.dateType] = {
value: value.value,
offset: value.offset
};
}
});
self.resultPane.populate(self._getParamJson(BI.map(self.checkgroup.getValue(), function (idx, v) {
return {
var obj = {
dateType: v
};
if(BI.has(plainValue, v)) {
obj.value = plainValue[v].value;
obj.offset = plainValue[v].offset;
}
return obj;
})));
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
@ -100337,6 +100356,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",
@ -100355,6 +100375,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;

20
dist/widget.js vendored
Unescape View File

@ -3173,10 +3173,26 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
if(value.length !== 0) {
self.workDayBox.setSelected(false);
}
var plainValue = {};
BI.each(self.resultPane.getAllButtons(), function (idx, button) {
var value = button.getValue();
if(BI.isNotNull(value.dateType)) {
plainValue[value.dateType] = {
value: value.value,
offset: value.offset
};
}
});
self.resultPane.populate(self._getParamJson(BI.map(self.checkgroup.getValue(), function (idx, v) {
return {
var obj = {
dateType: v
};
if(BI.has(plainValue, v)) {
obj.value = plainValue[v].value;
obj.offset = plainValue[v].offset;
}
return obj;
})));
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
@ -13709,6 +13725,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 +13744,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;

18
src/widget/dynamicdate/dynamicdate.card.js
Unescape View File

@ -55,10 +55,26 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
if(value.length !== 0) {
self.workDayBox.setSelected(false);
}
var plainValue = {};
BI.each(self.resultPane.getAllButtons(), function (idx, button) {
var value = button.getValue();
if(BI.isNotNull(value.dateType)) {
plainValue[value.dateType] = {
value: value.value,
offset: value.offset
};
}
});
self.resultPane.populate(self._getParamJson(BI.map(self.checkgroup.getValue(), function (idx, v) {
return {
var obj = {
dateType: v
};
if(BI.has(plainValue, v)) {
obj.value = plainValue[v].value;
obj.offset = plainValue[v].offset;
}
return obj;
})));
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");

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