Browse Source

Merge pull request #15 in ~GUY/fineui from ~WINDY/fineui:2.0 to 2.0

* commit '52c98fa24ba7c532237cd303a1e653fc29b75beb':
  update
es6
windy 8 years ago
parent
commit
88a89e0c7f
  1. 80
      bi/core.js
  2. 4
      bi/widget.css
  3. 3
      bi/widget.js
  4. 80
      dist/core.js
  5. 4
      dist/widget.css
  6. 3
      dist/widget.js
  7. 80
      src/core/proto/date.js
  8. 4
      src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
  9. 4
      src/less/widget/finetuningnumbereditor/finetuning.number.editor.less
  10. 3
      src/widget/date/trigger.date.js

80
bi/core.js

@ -6301,56 +6301,56 @@ BI.Cache = {
document.cookie = cookieString;
}
};// full day names
Date._DN = [BI.i18nText("BI-Sunday"),
BI.i18nText("BI-Monday"),
BI.i18nText("BI-Tuesday"),
BI.i18nText("BI-Wednesday"),
BI.i18nText("BI-Thursday"),
BI.i18nText("BI-Friday"),
BI.i18nText("BI-Saturday"),
BI.i18nText("BI-Sunday")];
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
BI.i18nText("BI-Basic_Wednesday"),
BI.i18nText("BI-Basic_Thursday"),
BI.i18nText("BI-Basic_Friday"),
BI.i18nText("BI-Basic_Saturday"),
BI.i18nText("BI-Basic_Sunday")];
// short day names
Date._SDN = ['',
'',
'',
'',
'',
'',
'',
''];
Date._SDN = [BI.i18nText("BI-Day_Ri"),
BI.i18nText("BI-Basic_One"),
BI.i18nText("BI-Basic_Two"),
BI.i18nText("BI-Basic_Three"),
BI.i18nText("BI-Basic_Four"),
BI.i18nText("BI-Basic_Five"),
BI.i18nText("BI-Basic_Six"),
BI.i18nText("BI-Day_Ri")];
// Monday first, etc.
Date._FD = 1;
// full month names
Date._MN = [
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
''];
BI.i18nText("BI-Basic_January"),
BI.i18nText("BI-Basic_February"),
BI.i18nText("BI-Basic_March"),
BI.i18nText("BI-Basic_April"),
BI.i18nText("BI-Basic_May"),
BI.i18nText("BI-Basic_June"),
BI.i18nText("BI-Basic_July"),
BI.i18nText("BI-Basic_August"),
BI.i18nText("BI-Basic_September"),
BI.i18nText("BI-Basic_October"),
BI.i18nText("BI-Basic_November"),
BI.i18nText("BI-Basic_December")];
// short month names
Date._SMN = ['',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
''];
Date._SMN = [0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11];
Date._QN = ["", BI.i18nText("BI-Quarter_1"),
BI.i18nText("BI-Quarter_2"),

4
bi/widget.css

@ -233,11 +233,13 @@
}
.bi-fine-tuning-number-editor .top-button {
border-left: 1px solid #d4dadd;
border-bottom: 1px solid #d4dadd;
}
.bi-fine-tuning-number-editor .bottom-button {
border-left: 1px solid #d4dadd;
}
.bi-fine-tuning-number-editor .split-line {
background-color: #d4dadd;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/

3
bi/widget.js

@ -4857,7 +4857,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
hgap: 4,
vgap: 2,
triggerWidth: 30,
watermark: BI.i18nText("BI-Unrestricted"),
yearLength: 4,
yearMonthLength: 7
},
@ -4891,7 +4890,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
watermark: c.watermark,
watermark: BI.i18nText("BI-Unrestricted"),
errorText: function () {
if (self.editor.isEditing()) {
return BI.i18nText("BI-Date_Trigger_Error_Text");

80
dist/core.js vendored

@ -23672,56 +23672,56 @@ BI.Cache = {
document.cookie = cookieString;
}
};// full day names
Date._DN = [BI.i18nText("BI-Sunday"),
BI.i18nText("BI-Monday"),
BI.i18nText("BI-Tuesday"),
BI.i18nText("BI-Wednesday"),
BI.i18nText("BI-Thursday"),
BI.i18nText("BI-Friday"),
BI.i18nText("BI-Saturday"),
BI.i18nText("BI-Sunday")];
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
BI.i18nText("BI-Basic_Wednesday"),
BI.i18nText("BI-Basic_Thursday"),
BI.i18nText("BI-Basic_Friday"),
BI.i18nText("BI-Basic_Saturday"),
BI.i18nText("BI-Basic_Sunday")];
// short day names
Date._SDN = ['',
'',
'',
'',
'',
'',
'',
''];
Date._SDN = [BI.i18nText("BI-Day_Ri"),
BI.i18nText("BI-Basic_One"),
BI.i18nText("BI-Basic_Two"),
BI.i18nText("BI-Basic_Three"),
BI.i18nText("BI-Basic_Four"),
BI.i18nText("BI-Basic_Five"),
BI.i18nText("BI-Basic_Six"),
BI.i18nText("BI-Day_Ri")];
// Monday first, etc.
Date._FD = 1;
// full month names
Date._MN = [
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
''];
BI.i18nText("BI-Basic_January"),
BI.i18nText("BI-Basic_February"),
BI.i18nText("BI-Basic_March"),
BI.i18nText("BI-Basic_April"),
BI.i18nText("BI-Basic_May"),
BI.i18nText("BI-Basic_June"),
BI.i18nText("BI-Basic_July"),
BI.i18nText("BI-Basic_August"),
BI.i18nText("BI-Basic_September"),
BI.i18nText("BI-Basic_October"),
BI.i18nText("BI-Basic_November"),
BI.i18nText("BI-Basic_December")];
// short month names
Date._SMN = ['',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
''];
Date._SMN = [0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11];
Date._QN = ["", BI.i18nText("BI-Quarter_1"),
BI.i18nText("BI-Quarter_2"),

4
dist/widget.css vendored

@ -233,11 +233,13 @@
}
.bi-fine-tuning-number-editor .top-button {
border-left: 1px solid #d4dadd;
border-bottom: 1px solid #d4dadd;
}
.bi-fine-tuning-number-editor .bottom-button {
border-left: 1px solid #d4dadd;
}
.bi-fine-tuning-number-editor .split-line {
background-color: #d4dadd;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/

3
dist/widget.js vendored

@ -4857,7 +4857,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
hgap: 4,
vgap: 2,
triggerWidth: 30,
watermark: BI.i18nText("BI-Unrestricted"),
yearLength: 4,
yearMonthLength: 7
},
@ -4891,7 +4890,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
watermark: c.watermark,
watermark: BI.i18nText("BI-Unrestricted"),
errorText: function () {
if (self.editor.isEditing()) {
return BI.i18nText("BI-Date_Trigger_Error_Text");

80
src/core/proto/date.js

@ -1,54 +1,54 @@
// full day names
Date._DN = [BI.i18nText("BI-Sunday"),
BI.i18nText("BI-Monday"),
BI.i18nText("BI-Tuesday"),
BI.i18nText("BI-Wednesday"),
BI.i18nText("BI-Thursday"),
BI.i18nText("BI-Friday"),
BI.i18nText("BI-Saturday"),
BI.i18nText("BI-Sunday")];
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
BI.i18nText("BI-Basic_Wednesday"),
BI.i18nText("BI-Basic_Thursday"),
BI.i18nText("BI-Basic_Friday"),
BI.i18nText("BI-Basic_Saturday"),
BI.i18nText("BI-Basic_Sunday")];
// short day names
Date._SDN = ['',
'',
'',
'',
'',
'',
'',
''];
Date._SDN = [BI.i18nText("BI-Day_Ri"),
BI.i18nText("BI-Basic_One"),
BI.i18nText("BI-Basic_Two"),
BI.i18nText("BI-Basic_Three"),
BI.i18nText("BI-Basic_Four"),
BI.i18nText("BI-Basic_Five"),
BI.i18nText("BI-Basic_Six"),
BI.i18nText("BI-Day_Ri")];
// Monday first, etc.
Date._FD = 1;
// full month names
Date._MN = [
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
''];
BI.i18nText("BI-Basic_January"),
BI.i18nText("BI-Basic_February"),
BI.i18nText("BI-Basic_March"),
BI.i18nText("BI-Basic_April"),
BI.i18nText("BI-Basic_May"),
BI.i18nText("BI-Basic_June"),
BI.i18nText("BI-Basic_July"),
BI.i18nText("BI-Basic_August"),
BI.i18nText("BI-Basic_September"),
BI.i18nText("BI-Basic_October"),
BI.i18nText("BI-Basic_November"),
BI.i18nText("BI-Basic_December")];
// short month names
Date._SMN = ['',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'',
''];
Date._SMN = [0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11];
Date._QN = ["", BI.i18nText("BI-Quarter_1"),
BI.i18nText("BI-Quarter_2"),

4
src/css/widget/finetuningnumbereditor/finetuning.number.editor.css

@ -9,8 +9,10 @@
}
.bi-fine-tuning-number-editor .top-button {
border-left: 1px solid #d4dadd;
border-bottom: 1px solid #d4dadd;
}
.bi-fine-tuning-number-editor .bottom-button {
border-left: 1px solid #d4dadd;
}
.bi-fine-tuning-number-editor .split-line {
background-color: #d4dadd;
}

4
src/less/widget/finetuningnumbereditor/finetuning.number.editor.less

@ -5,9 +5,11 @@
.border-radius(2px);
& .top-button {
border-left: 1px solid @border-color-normal;
border-bottom: 1px solid @border-color-normal;
}
& .bottom-button {
border-left: 1px solid @border-color-normal;
}
& .split-line{
background-color: @border-color-normal;
}
}

3
src/widget/date/trigger.date.js

@ -3,7 +3,6 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
hgap: 4,
vgap: 2,
triggerWidth: 30,
watermark: BI.i18nText("BI-Unrestricted"),
yearLength: 4,
yearMonthLength: 7
},
@ -37,7 +36,7 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
watermark: c.watermark,
watermark: BI.i18nText("BI-Unrestricted"),
errorText: function () {
if (self.editor.isEditing()) {
return BI.i18nText("BI-Date_Trigger_Error_Text");

Loading…
Cancel
Save