Browse Source

Merge pull request #589 in VISUAL/fineui from ~IMP/fineui_fui:master to master

* commit '512d633b8c2b977e3823a57922e1b75be1161aae':
  fix 数组监听
es6
guy 6 years ago
parent
commit
100bcf8501
  1. 5
      dist/base.css
  2. 5
      dist/bundle.css
  3. 84
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 26
      dist/bundle.min.js
  6. 2
      dist/case.js
  7. 1063
      dist/demo.js
  8. 5
      dist/fineui.css
  9. 84
      dist/fineui.js
  10. 2
      dist/fineui.min.css
  11. 26
      dist/fineui.min.js
  12. 8
      dist/fix/fix.js
  13. 74
      dist/widget.js

5
dist/base.css vendored

@ -576,10 +576,6 @@
.bi-small-search-editor .search-font {
font-size: 18px;
}
.bi-sign-initial-editor .sign-initial-editor-text {
font-size: 14px;
}
.bi-message-title {
font-size: 14px;
cursor: pointer;
@ -1069,7 +1065,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;

5
dist/bundle.css vendored

@ -2506,10 +2506,6 @@ textarea {
.bi-small-search-editor .search-font {
font-size: 18px;
}
.bi-sign-initial-editor .sign-initial-editor-text {
font-size: 14px;
}
.bi-message-title {
font-size: 14px;
cursor: pointer;
@ -2999,7 +2995,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;

84
dist/bundle.js vendored

@ -34147,7 +34147,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
break;
}
var result = original.apply(this, args);
notify(ob.parent, ob.parentKey, ob.dep);
notify(ob.parent, ob.parentKey, ob.dep, true);
return result;
};
});
@ -34355,8 +34355,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return ob;
}
function notify(observer, key, dep) {
dep.notify({ observer: observer, key: key });
function notify(observer, key, dep, refresh) {
dep.notify({ observer: observer, key: key, refresh: refresh });
if (observer) {
//触发a.*绑定的依赖
_.each(observer._deps, function (dep) {
@ -34715,7 +34715,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
// Deep watchers and watchers on Object/Arrays should fire even
// when the value is the same, because the value may
// have mutated.
_.isArray(value) || this.deep) {
options && options.refresh || this.deep) {
// set new value
var oldValue = this.value;
this.value = value;
@ -50882,7 +50882,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}
}]
}, o.popup),
stopPropagation: false,
stopPropagation: true,
width: 230
},
value: o.value
@ -64023,10 +64023,10 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
valueTwo = o.digit === false ? valueTwo : valueTwo.toFixed(o.digit);
if (!isNaN(valueOne) && !isNaN(valueTwo)) {
if (this._checkValidation(valueOne)) {
this.valueOne = valueOne;
this.valueOne = (this.valueOne <= this.valueTwo ? valueOne : valueTwo);
}
if (this._checkValidation(valueTwo)) {
this.valueTwo = valueTwo;
this.valueTwo = (this.valueOne <= this.valueTwo ? valueTwo : valueOne);
}
if (valueOne < this.min) {
this.valueOne = this.min;
@ -74127,7 +74127,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
type: "bi.single_select_item",
logic: {
dynamic: false
},
@ -74816,72 +74816,6 @@ BI.extend(BI.SingleSelectInsertCombo, {
BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);/**
* guy
* 单选框item
* @type {*|void|Object}
*/
BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-single-select-radio-item",
logic: {
dynamic: false
},
height: 24
});
},
_init: function () {
BI.SingleSelectComboItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.radio = BI.createWidget({
type: "bi.radio"
});
this.text = BI.createWidget({
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
text: o.text,
keyword: o.keyword,
value: o.value,
py: o.py
});
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 26
}, this.text)
}))));
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doClick: function () {
BI.SingleSelectComboItem.superclass.doClick.apply(this, arguments);
this.radio.setSelected(this.isSelected());
},
setSelected: function (v) {
BI.SingleSelectComboItem.superclass.setSelected.apply(this, arguments);
this.radio.setSelected(v);
}
});
BI.shortcut("bi.single_select_combo.item", BI.SingleSelectComboItem);/**
* 选择列表
*
* Created by GUY on 2015/11/1.
@ -75119,7 +75053,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
type: "bi.single_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

26
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/case.js vendored

@ -2258,7 +2258,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}
}]
}, o.popup),
stopPropagation: false,
stopPropagation: true,
width: 230
},
value: o.value

1063
dist/demo.js vendored

File diff suppressed because it is too large Load Diff

5
dist/fineui.css vendored

@ -2506,10 +2506,6 @@ textarea {
.bi-small-search-editor .search-font {
font-size: 18px;
}
.bi-sign-initial-editor .sign-initial-editor-text {
font-size: 14px;
}
.bi-message-title {
font-size: 14px;
cursor: pointer;
@ -2999,7 +2995,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;

84
dist/fineui.js vendored

@ -34368,7 +34368,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
break;
}
var result = original.apply(this, args);
notify(ob.parent, ob.parentKey, ob.dep);
notify(ob.parent, ob.parentKey, ob.dep, true);
return result;
};
});
@ -34576,8 +34576,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return ob;
}
function notify(observer, key, dep) {
dep.notify({ observer: observer, key: key });
function notify(observer, key, dep, refresh) {
dep.notify({ observer: observer, key: key, refresh: refresh });
if (observer) {
//触发a.*绑定的依赖
_.each(observer._deps, function (dep) {
@ -34936,7 +34936,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
// Deep watchers and watchers on Object/Arrays should fire even
// when the value is the same, because the value may
// have mutated.
_.isArray(value) || this.deep) {
options && options.refresh || this.deep) {
// set new value
var oldValue = this.value;
this.value = value;
@ -51103,7 +51103,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}
}]
}, o.popup),
stopPropagation: false,
stopPropagation: true,
width: 230
},
value: o.value
@ -64244,10 +64244,10 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
valueTwo = o.digit === false ? valueTwo : valueTwo.toFixed(o.digit);
if (!isNaN(valueOne) && !isNaN(valueTwo)) {
if (this._checkValidation(valueOne)) {
this.valueOne = valueOne;
this.valueOne = (this.valueOne <= this.valueTwo ? valueOne : valueTwo);
}
if (this._checkValidation(valueTwo)) {
this.valueTwo = valueTwo;
this.valueTwo = (this.valueOne <= this.valueTwo ? valueTwo : valueOne);
}
if (valueOne < this.min) {
this.valueOne = this.min;
@ -74348,7 +74348,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
type: "bi.single_select_item",
logic: {
dynamic: false
},
@ -75037,72 +75037,6 @@ BI.extend(BI.SingleSelectInsertCombo, {
BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);/**
* guy
* 单选框item
* @type {*|void|Object}
*/
BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-single-select-radio-item",
logic: {
dynamic: false
},
height: 24
});
},
_init: function () {
BI.SingleSelectComboItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.radio = BI.createWidget({
type: "bi.radio"
});
this.text = BI.createWidget({
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
text: o.text,
keyword: o.keyword,
value: o.value,
py: o.py
});
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 26
}, this.text)
}))));
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doClick: function () {
BI.SingleSelectComboItem.superclass.doClick.apply(this, arguments);
this.radio.setSelected(this.isSelected());
},
setSelected: function (v) {
BI.SingleSelectComboItem.superclass.setSelected.apply(this, arguments);
this.radio.setSelected(v);
}
});
BI.shortcut("bi.single_select_combo.item", BI.SingleSelectComboItem);/**
* 选择列表
*
* Created by GUY on 2015/11/1.
@ -75340,7 +75274,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
type: "bi.single_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

26
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/fix/fix.js vendored

@ -250,7 +250,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
break;
}
var result = original.apply(this, args);
notify(ob.parent, ob.parentKey, ob.dep);
notify(ob.parent, ob.parentKey, ob.dep, true);
return result;
};
});
@ -458,8 +458,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return ob;
}
function notify(observer, key, dep) {
dep.notify({ observer: observer, key: key });
function notify(observer, key, dep, refresh) {
dep.notify({ observer: observer, key: key, refresh: refresh });
if (observer) {
//触发a.*绑定的依赖
_.each(observer._deps, function (dep) {
@ -818,7 +818,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
// Deep watchers and watchers on Object/Arrays should fire even
// when the value is the same, because the value may
// have mutated.
_.isArray(value) || this.deep) {
options && options.refresh || this.deep) {
// set new value
var oldValue = this.value;
this.value = value;

74
dist/widget.js vendored

@ -5622,10 +5622,10 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
valueTwo = o.digit === false ? valueTwo : valueTwo.toFixed(o.digit);
if (!isNaN(valueOne) && !isNaN(valueTwo)) {
if (this._checkValidation(valueOne)) {
this.valueOne = valueOne;
this.valueOne = (this.valueOne <= this.valueTwo ? valueOne : valueTwo);
}
if (this._checkValidation(valueTwo)) {
this.valueTwo = valueTwo;
this.valueTwo = (this.valueOne <= this.valueTwo ? valueTwo : valueOne);
}
if (valueOne < this.min) {
this.valueOne = this.min;
@ -15726,7 +15726,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
type: "bi.single_select_item",
logic: {
dynamic: false
},
@ -16415,72 +16415,6 @@ BI.extend(BI.SingleSelectInsertCombo, {
BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);/**
* guy
* 单选框item
* @type {*|void|Object}
*/
BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
return BI.extend(BI.SingleSelectComboItem.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-single-select-radio-item",
logic: {
dynamic: false
},
height: 24
});
},
_init: function () {
BI.SingleSelectComboItem.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.radio = BI.createWidget({
type: "bi.radio"
});
this.text = BI.createWidget({
type: "bi.label",
cls: "list-item-text",
textAlign: "left",
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.hgap,
text: o.text,
keyword: o.keyword,
value: o.value,
py: o.py
});
BI.createWidget(BI.extend({
element: this
}, BI.LogicFactory.createLogic("horizontal", BI.extend(o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 26
}, this.text)
}))));
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},
unRedMark: function () {
this.text.unRedMark.apply(this.text, arguments);
},
doClick: function () {
BI.SingleSelectComboItem.superclass.doClick.apply(this, arguments);
this.radio.setSelected(this.isSelected());
},
setSelected: function (v) {
BI.SingleSelectComboItem.superclass.setSelected.apply(this, arguments);
this.radio.setSelected(v);
}
});
BI.shortcut("bi.single_select_combo.item", BI.SingleSelectComboItem);/**
* 选择列表
*
* Created by GUY on 2015/11/1.
@ -16718,7 +16652,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
_createItems: function (items) {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
type: "bi.single_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,

Loading…
Cancel
Save