Browse Source

BI-18860

上次修改bi.multi_select_bar的时候,代码有冲突导致这个部分重复了,做了两次监听处理,失误。
es6
MrErHu 7 years ago
parent
commit
0ebd65e532
  1. 8
      dist/_fineui.min.js
  2. 3
      dist/bundle.js
  3. 30
      dist/bundle.min.js
  4. 3
      dist/case.js
  5. 105
      dist/demo.js
  6. 3
      dist/fineui.js
  7. 8
      dist/fineui.min.js
  8. 3
      src/case/toolbar/toolbar.multiselect.js

8
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/bundle.js vendored

@ -85865,9 +85865,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () { this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self); self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
}); });
this.checkbox.on(BI.Checkbox.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
});
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
textAlign: "left", textAlign: "left",

30
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/case.js vendored

@ -13409,9 +13409,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () { this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self); self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
}); });
this.checkbox.on(BI.Checkbox.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
});
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
textAlign: "left", textAlign: "left",

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

3
dist/fineui.js vendored

@ -86108,9 +86108,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () { this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self); self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
}); });
this.checkbox.on(BI.Checkbox.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
});
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
textAlign: "left", textAlign: "left",

8
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
src/case/toolbar/toolbar.multiselect.js

@ -54,9 +54,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () { this.half.on(BI.HalfIconButton.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self); self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
}); });
this.checkbox.on(BI.Checkbox.EVENT_CHANGE, function () {
self.fireEvent(BI.MultiSelectBar.EVENT_CHANGE, self.isSelected(), self);
});
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
textAlign: "left", textAlign: "left",

Loading…
Cancel
Save