fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~urthur/fineui

es6
Urthur 7 years ago
parent
66965c08a1 32aa16225d
commit
8ae5637781
16 changed files with 160174 additions and 160122 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      bi/case.js
  2. 2
      bi/widget.css
  3. 67
      bi/widget.js
  4. 73320
      dist/base.js
  5. 2
      dist/bundle.css
  6. 191877
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 32
      dist/bundle.min.js
  9. 25424
      dist/case.js
  10. 29382
      dist/demo.js
  11. 2
      dist/widget.css
  12. 67
      dist/widget.js
  13. 24
      src/case/colorchooser/farbtastic/jquery.farbtastic.js
  14. 2
      src/css/widget/numberinterval/numberinterval.css
  15. 2
      src/less/widget/numberinterval/numberinterval.less
  16. 67
      src/widget/multiselectlist/multiselectlist.js

24
bi/case.js
Unescape View File

@ -4619,12 +4619,12 @@ jQuery._farbtastic = function (container, callback) {
/**
* Mousedown handler
*/
fb.mousedown = function (event) {
fb.click = function (event) {
// Capture mouse
if (!document.dragging) {
$(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
document.dragging = true;
}
// if (!document.dragging) {
// $(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
// document.dragging = true;
// }
// Check which area is being dragged
var pos = fb.widgetCoords(event);
@ -4659,12 +4659,12 @@ jQuery._farbtastic = function (container, callback) {
/**
* Mouseup handler
*/
fb.mouseup = function () {
// Uncapture mouse
$(document).unbind('mousemove', fb.mousemove);
$(document).unbind('mouseup', fb.mouseup);
document.dragging = false;
}
// fb.mouseup = function () {
// // Uncapture mouse
// $(document).unbind('mousemove', fb.mousemove);
// $(document).unbind('mouseup', fb.mouseup);
// document.dragging = false;
// }
/**
* Update the markers and styles
@ -4782,7 +4782,7 @@ jQuery._farbtastic = function (container, callback) {
}
// Install mousedown handler (the others are set on the document on-demand)
$('*', e).mousedown(fb.mousedown);
$('*', e).click(fb.click);
// Init color
fb.setColor('#000000');

2
bi/widget.css
Unescape View File

@ -181,7 +181,7 @@
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #e85050;
color: #e85050 !important;
}
.bi-page-table-cell {
-webkit-user-select: text;

67
bi/widget.js
Unescape View File

@ -10051,8 +10051,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false
},
// onLoaded: o.onLoaded,
el: {
}
el: {}
});
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue();
@ -10107,21 +10106,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, {
eventName: BI.Searcher.EVENT_PAUSE,
action: function () {
var keyword = this.getKeyword();
if (this.hasMatched()) {
var keyword = this.getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter();
self.adapter.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.adapter.populate();
self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
})
} else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
}
}
}, {
@ -10153,7 +10164,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
});
} else {
self._join(this.getValue(), function () {//安徽省 北京
self._join(this.getValue(), function () {
assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
});
@ -10274,30 +10285,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) {
var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust();
callback();
});
} else {
adjust();
callback();
}
// if (!this._count) {
// o.itemsCreator({
// type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
// }, function (res) {
// self._count = res.count;
// adjust();
// callback();
// });
// } else {
adjust();
callback();
// }
function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
}
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
}
}
// if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
// self.storeValue = {
// type: BI.Selection.Multi,
// value: []
// }
// } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
// self.storeValue = {
// type: BI.Selection.All,
// value: []
// }
// }
}
},

73320
dist/base.js vendored
View File

File diff suppressed because it is too large Load Diff

2
dist/bundle.css vendored
Unescape View File

@ -3268,7 +3268,7 @@ ul.ztree.zTreeDragUL {
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #e85050;
color: #e85050 !important;
}
.bi-page-table-cell {
-webkit-user-select: text;

191877
dist/bundle.js vendored
View File

File diff suppressed because it is too large Load Diff

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

32
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

25424
dist/case.js vendored
View File

File diff suppressed because it is too large Load Diff

29382
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/widget.css vendored
Unescape View File

@ -181,7 +181,7 @@
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #e85050;
color: #e85050 !important;
}
.bi-page-table-cell {
-webkit-user-select: text;

67
dist/widget.js vendored
Unescape View File

@ -10051,8 +10051,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false
},
// onLoaded: o.onLoaded,
el: {
}
el: {}
});
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue();
@ -10107,21 +10106,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, {
eventName: BI.Searcher.EVENT_PAUSE,
action: function () {
var keyword = this.getKeyword();
if (this.hasMatched()) {
var keyword = this.getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter();
self.adapter.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.adapter.populate();
self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
})
} else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
}
}
}, {
@ -10153,7 +10164,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
});
} else {
self._join(this.getValue(), function () {//安徽省 北京
self._join(this.getValue(), function () {
assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
});
@ -10274,30 +10285,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) {
var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust();
callback();
});
} else {
adjust();
callback();
}
// if (!this._count) {
// o.itemsCreator({
// type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
// }, function (res) {
// self._count = res.count;
// adjust();
// callback();
// });
// } else {
adjust();
callback();
// }
function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
}
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
}
}
// if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
// self.storeValue = {
// type: BI.Selection.Multi,
// value: []
// }
// } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
// self.storeValue = {
// type: BI.Selection.All,
// value: []
// }
// }
}
},

24
src/case/colorchooser/farbtastic/jquery.farbtastic.js
Unescape View File

@ -170,12 +170,12 @@ jQuery._farbtastic = function (container, callback) {
/**
* Mousedown handler
*/
fb.mousedown = function (event) {
fb.click = function (event) {
// Capture mouse
if (!document.dragging) {
$(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
document.dragging = true;
}
// if (!document.dragging) {
// $(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
// document.dragging = true;
// }
// Check which area is being dragged
var pos = fb.widgetCoords(event);
@ -210,12 +210,12 @@ jQuery._farbtastic = function (container, callback) {
/**
* Mouseup handler
*/
fb.mouseup = function () {
// Uncapture mouse
$(document).unbind('mousemove', fb.mousemove);
$(document).unbind('mouseup', fb.mouseup);
document.dragging = false;
}
// fb.mouseup = function () {
// // Uncapture mouse
// $(document).unbind('mousemove', fb.mousemove);
// $(document).unbind('mouseup', fb.mouseup);
// document.dragging = false;
// }
/**
* Update the markers and styles
@ -333,7 +333,7 @@ jQuery._farbtastic = function (container, callback) {
}
// Install mousedown handler (the others are set on the document on-demand)
$('*', e).mousedown(fb.mousedown);
$('*', e).click(fb.click);
// Init color
fb.setColor('#000000');

2
src/css/widget/numberinterval/numberinterval.css
Unescape View File

@ -37,5 +37,5 @@
font-size: 14px;
}
.bi-number-interval.number-error .bi-input {
color: #e85050;
color: #e85050 !important;
}

2
src/less/widget/numberinterval/numberinterval.less
Unescape View File

@ -26,6 +26,6 @@
}
&.number-error .bi-input {
color: @color-bi-text-warning
color: @color-bi-text-warning !important;
}
}

67
src/widget/multiselectlist/multiselectlist.js
Unescape View File

@ -29,8 +29,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
dynamic: false
},
// onLoaded: o.onLoaded,
el: {
}
el: {}
});
this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () {
self.storeValue = this.getValue();
@ -85,21 +84,33 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
}, {
eventName: BI.Searcher.EVENT_PAUSE,
action: function () {
var keyword = this.getKeyword();
if (this.hasMatched()) {
var keyword = this.getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter();
self.adapter.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.adapter.populate();
self._setStartValue("");
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
})
} else {
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword)
}
self._showAdapter();
self.adapter.setValue(self.storeValue);
self.adapter.populate();
if (self.storeValue.type === BI.Selection.Multi) {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
}
}
}
}, {
@ -131,7 +142,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
});
} else {
self._join(this.getValue(), function () {//安徽省 北京
self._join(this.getValue(), function () {
assertShowValue();
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE);
});
@ -252,30 +263,32 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
_adjust: function (callback) {
var self = this, o = this.options;
if (!this._count) {
o.itemsCreator({
type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
}, function (res) {
self._count = res.count;
adjust();
callback();
});
} else {
adjust();
callback();
}
// if (!this._count) {
// o.itemsCreator({
// type: BI.MultiSelectList.REQ_GET_DATA_LENGTH
// }, function (res) {
// self._count = res.count;
// adjust();
// callback();
// });
// } else {
adjust();
callback();
// }
function adjust() {
if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.Multi,
value: []
}
} else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
self.storeValue = {
type: BI.Selection.All,
value: []
}
}
// if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
// self.storeValue = {
// type: BI.Selection.Multi,
// value: []
// }
// } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
// self.storeValue = {
// type: BI.Selection.All,
// value: []
// }
// }
}
},

Write Preview
Loading…
Cancel
Save