Browse Source

Merge pull request #401 in FUI/fineui from ~FAY/fineui:master to master

* commit 'a088fa098f285e95a31d369575236d9bd9aa7e87':
  继承single
es6
guy 7 years ago
parent
commit
d11309226f
  1. 6
      dist/bundle.js
  2. 105
      dist/demo.js
  3. 6
      dist/fineui.js
  4. 6
      dist/widget.js
  5. 2
      src/widget/multiselectlist/multiselectlist.insert.js
  6. 2
      src/widget/multiselecttree/multiselecttree.js
  7. 2
      src/widget/singleselect/singleselectlist.insert.js

6
dist/bundle.js vendored

@ -99184,7 +99184,7 @@ BI.MultiSelectCheckSelectedSwitcher.EVENT_BEFORE_POPUPVIEW = "MultiSelectCheckSe
BI.shortcut("bi.multi_select_check_selected_switcher", BI.MultiSelectCheckSelectedSwitcher);/** BI.shortcut("bi.multi_select_check_selected_switcher", BI.MultiSelectCheckSelectedSwitcher);/**
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectInsertList = BI.inherit(BI.Widget, { BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",
@ -99855,7 +99855,7 @@ BI.MultiSelectList.EVENT_CHANGE = "BI.MultiSelectList.EVENT_CHANGE";
BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/** BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Widget, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -104917,7 +104917,7 @@ BI.shortcut("bi.single_select_trigger", BI.SingleSelectTrigger);/**
* @createdAt: 2018/3/28 * @createdAt: 2018/3/28
* @Description * @Description
*/ */
BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",

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

@ -99427,7 +99427,7 @@ BI.MultiSelectCheckSelectedSwitcher.EVENT_BEFORE_POPUPVIEW = "MultiSelectCheckSe
BI.shortcut("bi.multi_select_check_selected_switcher", BI.MultiSelectCheckSelectedSwitcher);/** BI.shortcut("bi.multi_select_check_selected_switcher", BI.MultiSelectCheckSelectedSwitcher);/**
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectInsertList = BI.inherit(BI.Widget, { BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",
@ -100098,7 +100098,7 @@ BI.MultiSelectList.EVENT_CHANGE = "BI.MultiSelectList.EVENT_CHANGE";
BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/** BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Widget, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -105160,7 +105160,7 @@ BI.shortcut("bi.single_select_trigger", BI.SingleSelectTrigger);/**
* @createdAt: 2018/3/28 * @createdAt: 2018/3/28
* @Description * @Description
*/ */
BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",

6
dist/widget.js vendored

@ -11624,7 +11624,7 @@ BI.MultiSelectCheckSelectedSwitcher.EVENT_BEFORE_POPUPVIEW = "MultiSelectCheckSe
BI.shortcut("bi.multi_select_check_selected_switcher", BI.MultiSelectCheckSelectedSwitcher);/** BI.shortcut("bi.multi_select_check_selected_switcher", BI.MultiSelectCheckSelectedSwitcher);/**
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectInsertList = BI.inherit(BI.Widget, { BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",
@ -12295,7 +12295,7 @@ BI.MultiSelectList.EVENT_CHANGE = "BI.MultiSelectList.EVENT_CHANGE";
BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/** BI.shortcut("bi.multi_select_list", BI.MultiSelectList);/**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Widget, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
@ -17357,7 +17357,7 @@ BI.shortcut("bi.single_select_trigger", BI.SingleSelectTrigger);/**
* @createdAt: 2018/3/28 * @createdAt: 2018/3/28
* @Description * @Description
*/ */
BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",

2
src/widget/multiselectlist/multiselectlist.insert.js

@ -1,7 +1,7 @@
/** /**
* Created by zcf_1 on 2017/5/2. * Created by zcf_1 on 2017/5/2.
*/ */
BI.MultiSelectInsertList = BI.inherit(BI.Widget, { BI.MultiSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",

2
src/widget/multiselecttree/multiselecttree.js

@ -1,7 +1,7 @@
/** /**
* Created by zcf_1 on 2017/5/11. * Created by zcf_1 on 2017/5/11.
*/ */
BI.MultiSelectTree = BI.inherit(BI.Widget, { BI.MultiSelectTree = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",

2
src/widget/singleselect/singleselectlist.insert.js

@ -3,7 +3,7 @@
* @createdAt: 2018/3/28 * @createdAt: 2018/3/28
* @Description * @Description
*/ */
BI.SingleSelectInsertList = BI.inherit(BI.Widget, { BI.SingleSelectInsertList = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-list", baseCls: "bi-multi-select-insert-list",

Loading…
Cancel
Save