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

Merge branch 'master' into bugfix/BI-20841

es6
iapyang 7 years ago
parent
c7c7d5cd08 65472f57d7
commit
bee92ea95e
18 changed files with 142 additions and 93 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. 2
      demo/version.js
  2. 40
      dist/_fineui.min.js
  3. 28
      dist/bundle.js
  4. 39
      dist/bundle.min.js
  5. 6
      dist/case.js
  6. 2
      dist/config.js
  7. 28
      dist/fineui.js
  8. 40
      dist/fineui.min.js
  9. 20
      dist/widget.js
  10. 2
      public/js/index.js
  11. 6
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  12. 1
      src/widget/dynamicdate/dynamicdate.card.js
  13. 5
      src/widget/dynamicdate/dynamicdate.combo.js
  14. 7
      src/widget/dynamicdate/dynamicdate.param.item.js
  15. 1
      src/widget/dynamicdate/dynamicdate.popup.js
  16. 5
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  17. 1
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  18. 2
      ui/js/index.js

2
demo/version.js
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点按\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",

40
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

28
dist/bundle.js vendored
Unescape View File

@ -78478,7 +78478,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
baseCls: "bi-search-text-value-combo",
height: 30,
text: "",
items: []
items: [],
tipType: "",
warningTitle: ""
},
render: function () {
@ -78502,6 +78504,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
height: o.height - 2,
text: o.text,
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {
@ -90563,6 +90567,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
setValue: function (v) {
v = v || {};
this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
var values = [];
var valuesItems = [];
if(BI.isNotNull(v.year)) {
@ -90864,7 +90869,10 @@ BI.extend(BI.DynamicDateCard, {
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {
@ -90961,7 +90969,7 @@ BI.extend(BI.DynamicDateCombo, {
height: 24,
text: this._getText()
},
width: 20
width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
}, {
type: "bi.text_value_combo",
height: 24,
@ -91002,9 +91010,12 @@ BI.extend(BI.DynamicDateCombo, {
text = BI.i18nText("BI-Basic_Week");
break;
case BI.DynamicDateCard.TYPE.DAY:
default:
text = BI.i18nText("BI-Basic_Day");
break;
case BI.DynamicDateCard.TYPE.WORK_DAY:
default:
text = BI.i18nText("BI-Basic_Work_Day");
break;
}
return text;
},
@ -91101,7 +91112,6 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},
@ -91722,7 +91732,10 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {
@ -91850,7 +91863,6 @@ BI.extend(BI.DynamicDateTimeCombo, {
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},
@ -112640,7 +112652,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点按\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",

39
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/case.js vendored
Unescape View File

@ -6005,7 +6005,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
baseCls: "bi-search-text-value-combo",
height: 30,
text: "",
items: []
items: [],
tipType: "",
warningTitle: ""
},
render: function () {
@ -6029,6 +6031,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
height: o.height - 2,
text: o.text,
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {

2
dist/config.js vendored
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点按\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",

28
dist/fineui.js vendored
Unescape View File

@ -78721,7 +78721,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
baseCls: "bi-search-text-value-combo",
height: 30,
text: "",
items: []
items: [],
tipType: "",
warningTitle: ""
},
render: function () {
@ -78745,6 +78747,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
height: o.height - 2,
text: o.text,
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {
@ -90806,6 +90810,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
setValue: function (v) {
v = v || {};
this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
var values = [];
var valuesItems = [];
if(BI.isNotNull(v.year)) {
@ -91107,7 +91112,10 @@ BI.extend(BI.DynamicDateCard, {
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {
@ -91204,7 +91212,7 @@ BI.extend(BI.DynamicDateCombo, {
height: 24,
text: this._getText()
},
width: 20
width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
}, {
type: "bi.text_value_combo",
height: 24,
@ -91245,9 +91253,12 @@ BI.extend(BI.DynamicDateCombo, {
text = BI.i18nText("BI-Basic_Week");
break;
case BI.DynamicDateCard.TYPE.DAY:
default:
text = BI.i18nText("BI-Basic_Day");
break;
case BI.DynamicDateCard.TYPE.WORK_DAY:
default:
text = BI.i18nText("BI-Basic_Work_Day");
break;
}
return text;
},
@ -91344,7 +91355,6 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},
@ -91965,7 +91975,10 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {
@ -92093,7 +92106,6 @@ BI.extend(BI.DynamicDateTimeCombo, {
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},
@ -112883,7 +112895,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点按\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",

40
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
dist/widget.js vendored
Unescape View File

@ -3009,6 +3009,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
setValue: function (v) {
v = v || {};
this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
var values = [];
var valuesItems = [];
if(BI.isNotNull(v.year)) {
@ -3310,7 +3311,10 @@ BI.extend(BI.DynamicDateCard, {
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {
@ -3407,7 +3411,7 @@ BI.extend(BI.DynamicDateCombo, {
height: 24,
text: this._getText()
},
width: 20
width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
}, {
type: "bi.text_value_combo",
height: 24,
@ -3448,9 +3452,12 @@ BI.extend(BI.DynamicDateCombo, {
text = BI.i18nText("BI-Basic_Week");
break;
case BI.DynamicDateCard.TYPE.DAY:
default:
text = BI.i18nText("BI-Basic_Day");
break;
case BI.DynamicDateCard.TYPE.WORK_DAY:
default:
text = BI.i18nText("BI-Basic_Work_Day");
break;
}
return text;
},
@ -3547,7 +3554,6 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},
@ -4168,7 +4174,10 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {
@ -4296,7 +4305,6 @@ BI.extend(BI.DynamicDateTimeCombo, {
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},

2
public/js/index.js
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点按\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",

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

@ -7,7 +7,9 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
baseCls: "bi-search-text-value-combo",
height: 30,
text: "",
items: []
items: [],
tipType: "",
warningTitle: ""
},
render: function () {
@ -31,6 +33,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
height: o.height - 2,
text: o.text,
value: o.value,
tipType: o.tipType,
warningTitle: o.warningTitle,
listeners: [{
eventName: BI.SearchTextValueTrigger.EVENT_CHANGE,
action: function () {

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

@ -241,6 +241,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
setValue: function (v) {
v = v || {};
this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
var values = [];
var valuesItems = [];
if(BI.isNotNull(v.year)) {

5
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -211,7 +211,10 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {

7
src/widget/dynamicdate/dynamicdate.param.item.js
Unescape View File

@ -45,7 +45,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
height: 24,
text: this._getText()
},
width: 20
width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
}, {
type: "bi.text_value_combo",
height: 24,
@ -86,9 +86,12 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
text = BI.i18nText("BI-Basic_Week");
break;
case BI.DynamicDateCard.TYPE.DAY:
default:
text = BI.i18nText("BI-Basic_Day");
break;
case BI.DynamicDateCard.TYPE.WORK_DAY:
default:
text = BI.i18nText("BI-Basic_Work_Day");
break;
}
return text;
},

1
src/widget/dynamicdate/dynamicdate.popup.js
Unescape View File

@ -72,7 +72,6 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},

5
src/widget/dynamicdatetime/dynamicdatetime.combo.js
Unescape View File

@ -214,7 +214,10 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
},
mounted: function () {
this._checkDynamicValue(this.options.value);
var o = this.options;
if(BI.isNotNull(o.value)) {
this._checkDynamicValue(o.value);
}
},
_checkDynamicValue: function (v) {

1
src/widget/dynamicdatetime/dynamicdatetime.popup.js
Unescape View File

@ -72,7 +72,6 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
var self = this;
return {
type: "bi.tab",
showIndex: BI.DynamicDateCombo.Static,
ref: function () {
self.dateTab = this;
},

2
ui/js/index.js
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点按\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",

Write Preview
Loading…
Cancel
Save