Browse Source

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

* commit '50a4fb20c7b7053013b137d0f30d41ebb1f1f921':
  BI-20011
es6
guy 7 years ago
parent
commit
114df62079
  1. 4
      dist/_fineui.min.js
  2. 4
      dist/bundle.js
  3. 26
      dist/bundle.min.js
  4. 2
      dist/config.js
  5. 105
      dist/demo.js
  6. 4
      dist/fineui.js
  7. 4
      dist/fineui.min.js
  8. 4
      dist/widget.js
  9. 4
      src/widget/dynamicdate/dynamicdate.card.js

4
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -90396,10 +90396,12 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
});
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
var comboItems = this._getText(BI.DynamicDateCard.TYPE.MONTH);
comboItems[0].text = BI.i18nText("BI-Basic_Empty");
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
items: comboItems,
value: positionValue || BI.DynamicDateCard.OFFSET.CURRENT,
listeners: [{
eventName: "EVENT_CHANGE",

26
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/config.js vendored

@ -89,7 +89,7 @@ BI.i18n = {
"BI-Created_By_Me": "我创建的",
"BI-Basic_Simple_Tuesday": "二",
"BI-Word_Align_Right": "文字居右",
"BI-Summary_Values": "汇总",
"BI-Summary_Values": "合计",
"BI-Basic_Clear": "清除",
"BI-Upload_File_Size_Error": "文件大小不支持",
"BI-Up_Page": "向上翻页",

105
dist/demo.js vendored

@ -11014,6 +11014,111 @@ BI.shortcut("demo.tmp", Demo.Func);
});
BI.shortcut("demo.fix_global_watcher", Demo.Fix);
}());(function () {
var State = BI.inherit(Fix.Model, {
state: function () {
return {
name: "原始属性",
info: {
age: 12,
sex: "male",
birth: {
year: 2018,
month: 9,
day: 11
}
},
career: [{
a: 1,
b: 2,
c: 3
}]
};
},
computed: {
b: function () {
return this.model.name + "-计算属性";
},
birth: function () {
return this.model.info.birth;
}
}
});
Demo.Fix = BI.inherit(BI.Widget, {
_store: function () {
return new State();
},
watch: {
b: function () {
this.button.setText(this.model.b);
},
"birth.**": function () {
console.log(123);
}
},
render: function () {
var self = this;
return {
type: "bi.vertical",
items: [{
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.name = "这是改变后的属性";
},
text: this.model.b
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.birth.year = 2019;
},
text: "birthYearButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career.push({
year: 2017,
month: 3,
day: 24
});
},
text: "careerAddButton"
}
}, {
el: {
type: "bi.button",
ref: function () {
self.button = this;
},
handler: function () {
self.model.career[0].a = 24;
},
text: "careerChangeButton"
}
}]
};
},
mounted: function () {
}
});
BI.shortcut("demo.fix_immutable", Demo.Fix);
}());/**
* @Author: Young
* @CreationDate 2017-11-06 10:32

4
dist/fineui.js vendored

@ -90639,10 +90639,12 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
});
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
var comboItems = this._getText(BI.DynamicDateCard.TYPE.MONTH);
comboItems[0].text = BI.i18nText("BI-Basic_Empty");
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
items: comboItems,
value: positionValue || BI.DynamicDateCard.OFFSET.CURRENT,
listeners: [{
eventName: "EVENT_CHANGE",

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -2910,10 +2910,12 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
});
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
var comboItems = this._getText(BI.DynamicDateCard.TYPE.MONTH);
comboItems[0].text = BI.i18nText("BI-Basic_Empty");
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
items: comboItems,
value: positionValue || BI.DynamicDateCard.OFFSET.CURRENT,
listeners: [{
eventName: "EVENT_CHANGE",

4
src/widget/dynamicdate/dynamicdate.card.js

@ -144,10 +144,12 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
});
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
var comboItems = this._getText(BI.DynamicDateCard.TYPE.MONTH);
comboItems[0].text = BI.i18nText("BI-Basic_Empty");
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
items: comboItems,
value: positionValue || BI.DynamicDateCard.OFFSET.CURRENT,
listeners: [{
eventName: "EVENT_CHANGE",

Loading…
Cancel
Save