Browse Source

Merge pull request #398 in FUI/fineui from ~LEI.WANG/fineui:master to master

* commit '0d2c0979c19b383f3007111b5fb984965b15e0f0':
  BI-20001 bi.search_text_value_combo组件warningTitle提示
es6
guy 7 years ago
parent
commit
65472f57d7
  1. 40
      dist/_fineui.min.js
  2. 6
      dist/bundle.js
  3. 40
      dist/bundle.min.js
  4. 6
      dist/case.js
  5. 105
      dist/demo.js
  6. 6
      dist/fineui.js
  7. 40
      dist/fineui.min.js
  8. 6
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

40
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored

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

40
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/case.js vendored

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

105
dist/demo.js vendored

@ -11014,111 +11014,6 @@ BI.shortcut("demo.tmp", Demo.Func);
}); });
BI.shortcut("demo.fix_global_watcher", Demo.Fix); 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 * @Author: Young
* @CreationDate 2017-11-06 10:32 * @CreationDate 2017-11-06 10:32

6
dist/fineui.js vendored

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

40
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

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

Loading…
Cancel
Save