Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~young/fineui

master
Young 7 years ago
parent
commit
7cd3dc244f
  1. 22
      dist/_fineui.min.js
  2. 10
      dist/bundle.js
  3. 16
      dist/bundle.min.js
  4. 1
      dist/case.js
  5. 105
      dist/demo.js
  6. 10
      dist/fineui.js
  7. 22
      dist/fineui.min.js
  8. 9
      dist/widget.js
  9. 1
      src/case/richeditor/niceditor/niceditor.js
  10. 3
      src/widget/numberinterval/numberinterval.js
  11. 2
      src/widget/singleslider/singleslider.js
  12. 2
      src/widget/singleslider/singleslider.label.js
  13. 2
      src/widget/singleslider/singleslider.normal.js

22
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/bundle.js vendored

@ -83279,6 +83279,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
disable: function () {
this.elm.element.attr("contentEditable", false);
this.elm.element.css("word-break", "break-all");
},
getSel: function () {
@ -100999,7 +101000,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
return BI.extend(conf, {
extraCls: "bi-number-interval",
height: 25,
validation: "valid"
validation: "valid",
closeMin: true
});
},
_init: function () {
@ -106594,7 +106596,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;
@ -106924,7 +106926,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;
@ -107212,7 +107214,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/case.js vendored

@ -10801,6 +10801,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
disable: function () {
this.elm.element.attr("contentEditable", false);
this.elm.element.css("word-break", "break-all");
},
getSel: function () {

105
dist/demo.js vendored

@ -11017,6 +11017,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

10
dist/fineui.js vendored

@ -83522,6 +83522,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
disable: function () {
this.elm.element.attr("contentEditable", false);
this.elm.element.css("word-break", "break-all");
},
getSel: function () {
@ -101242,7 +101243,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
return BI.extend(conf, {
extraCls: "bi-number-interval",
height: 25,
validation: "valid"
validation: "valid",
closeMin: true
});
},
_init: function () {
@ -106837,7 +106839,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;
@ -107167,7 +107169,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;
@ -107455,7 +107457,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;

22
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/widget.js vendored

@ -13436,7 +13436,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
return BI.extend(conf, {
extraCls: "bi-number-interval",
height: 25,
validation: "valid"
validation: "valid",
closeMin: true
});
},
_init: function () {
@ -19031,7 +19032,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;
@ -19361,7 +19362,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;
@ -19649,7 +19650,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;

1
src/case/richeditor/niceditor/niceditor.js

@ -151,6 +151,7 @@
disable: function () {
this.elm.element.attr("contentEditable", false);
this.elm.element.css("word-break", "break-all");
},
getSel: function () {

3
src/widget/numberinterval/numberinterval.js

@ -24,7 +24,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
return BI.extend(conf, {
extraCls: "bi-number-interval",
height: 25,
validation: "valid"
validation: "valid",
closeMin: true
});
},
_init: function () {

2
src/widget/singleslider/singleslider.js

@ -51,7 +51,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;

2
src/widget/singleslider/singleslider.label.js

@ -52,7 +52,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;

2
src/widget/singleslider/singleslider.normal.js

@ -40,7 +40,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
height: c.SLIDER_HEIGHT
});
sliderVertical.element.click(function (e) {
if (self.enable) {
if (self.enable && self.isEnabled()) {
var offset = e.clientX - self.element.offset().left - c.SLIDER_WIDTH_HALF;
var trackLength = self.track.element[0].scrollWidth;
var percent = 0;

Loading…
Cancel
Save