Browse Source

Merge pull request #671 in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master

* commit '4e4f4c39b553cd4bc6fb9e324b821e3df5fa572f':
  BI-31697 IE下用一倍图
  BI-31697 pane的loading动画:矩形宽度调为3,解决有些浏览器对小数点像素的补正问题
  BI-31697 上传新的加载图标
  BI-31697 组件加载尺寸修改为30*30
es6
Zhenfei.Li 6 years ago
parent
commit
b15f8f9d72
  1. 20
      dist/base.js
  2. 57
      dist/bundle.js
  3. 32
      dist/bundle.min.js
  4. 33
      dist/core.js
  5. 58
      dist/fineui.js
  6. 32
      dist/fineui.min.js
  7. 42393
      dist/fineui_without_jquery_polyfill.js
  8. BIN
      dist/images/1x/icon/wave_loading.gif
  9. BIN
      dist/images/2x/icon/wave_loading.gif
  10. 20
      src/base/pane.js
  11. 8
      src/less/base/pane.less
  12. 1
      src/less/lib/icon.less

20
dist/base.js vendored

@ -254,25 +254,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 60,
width: 60,
hgap: 10,
vgap: 5,
height: 30,
width: 30,
hgap: 5.625,
vgap: 2.5,
items: [{
type: "bi.layout",
cls: "rect1",
height: 50,
width: 5
height: 25,
width: 2.5
}, {
type: "bi.layout",
cls: "rect2",
height: 50,
width: 5
height: 25,
width: 2.5
}, {
type: "bi.layout",
cls: "rect3",
height: 50,
width: 5
height: 25,
width: 2.5
}]
});
// pane在同步方式下由items决定tipText的显示与否

57
dist/bundle.js vendored

@ -17650,13 +17650,13 @@ _.extend(BI, {
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(sArray, obj)) {
if (!BI.contains(obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
BI.pushDistinct(sArray, array[i]);
sArray.pushDistinct(array[i]);
}
}
});
@ -24411,11 +24411,34 @@ Expr = Sizzle.selectors = {
};
}),
"has": markFunction(function( selector ) {
return function( elem ) {
return Sizzle( selector, elem ).length > 0;
};
}),
pushArray: function (sArray, array) {
for (var i = 0; i < array.length; i++) {
sArray.push(array[i]);
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(sArray, obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
BI.pushDistinct(sArray, array[i]);
}
}
});
BI.prepares.push(function () {
BI.Date = BI.Date || {};
// 牵扯到国际化这些常量在页面加载后再生效
// full day names
BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
BI.i18nText("BI-Basic_Wednesday"),
BI.i18nText("BI-Basic_Thursday"),
BI.i18nText("BI-Basic_Friday"),
BI.i18nText("BI-Basic_Saturday"),
BI.i18nText("BI-Basic_Sunday")];
"contains": markFunction(function( text ) {
return function( elem ) {
@ -35611,25 +35634,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 60,
width: 60,
hgap: 10,
vgap: 5,
height: 30,
width: 30,
hgap: 5.625,
vgap: 2.5,
items: [{
type: "bi.layout",
cls: "rect1",
height: 50,
width: 5
height: 25,
width: 2.5
}, {
type: "bi.layout",
cls: "rect2",
height: 50,
width: 5
height: 25,
width: 2.5
}, {
type: "bi.layout",
cls: "rect3",
height: 50,
width: 5
height: 25,
width: 2.5
}]
});
// pane在同步方式下由items决定tipText的显示与否

32
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

33
dist/core.js vendored

@ -17650,13 +17650,13 @@ _.extend(BI, {
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(sArray, obj)) {
if (!BI.contains(obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
BI.pushDistinct(sArray, array[i]);
sArray.pushDistinct(array[i]);
}
}
});
@ -23485,7 +23485,34 @@ function Sizzle( selector, context, results, seed ) {
return [];
}
if ( !documentIsXML && !seed ) {
pushArray: function (sArray, array) {
for (var i = 0; i < array.length; i++) {
sArray.push(array[i]);
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(sArray, obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
BI.pushDistinct(sArray, array[i]);
}
}
});
BI.prepares.push(function () {
BI.Date = BI.Date || {};
// 牵扯到国际化这些常量在页面加载后再生效
// full day names
BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
BI.i18nText("BI-Basic_Wednesday"),
BI.i18nText("BI-Basic_Thursday"),
BI.i18nText("BI-Basic_Friday"),
BI.i18nText("BI-Basic_Saturday"),
BI.i18nText("BI-Basic_Sunday")];
// Shortcuts
if ( (match = rquickExpr.exec( selector )) ) {

58
dist/fineui.js vendored

@ -17892,13 +17892,13 @@ _.extend(BI, {
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(sArray, obj)) {
if (!BI.contains(obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
BI.pushDistinct(sArray, array[i]);
sArray.pushDistinct(array[i]);
}
}
});
@ -24056,12 +24056,34 @@ setDocument = Sizzle.setDocument = function( node ) {
// on a disconnected node (IE 9)
support.disconnectedMatch = matches.call( div, "div" );
// This should fail with an exception
// Gecko does not error, returns false instead
matches.call( div, "[s!='']:x" );
rbuggyMatches.push( "!=", pseudos );
});
}
pushArray: function (sArray, array) {
for (var i = 0; i < array.length; i++) {
sArray.push(array[i]);
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(sArray, obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
BI.pushDistinct(sArray, array[i]);
}
}
});
BI.prepares.push(function () {
BI.Date = BI.Date || {};
// 牵扯到国际化这些常量在页面加载后再生效
// full day names
BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
BI.i18nText("BI-Basic_Wednesday"),
BI.i18nText("BI-Basic_Thursday"),
BI.i18nText("BI-Basic_Friday"),
BI.i18nText("BI-Basic_Saturday"),
BI.i18nText("BI-Basic_Sunday")];
rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
@ -35853,25 +35875,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 60,
width: 60,
hgap: 10,
vgap: 5,
height: 30,
width: 30,
hgap: 5.625,
vgap: 2.5,
items: [{
type: "bi.layout",
cls: "rect1",
height: 50,
width: 5
height: 25,
width: 2.5
}, {
type: "bi.layout",
cls: "rect2",
height: 50,
width: 5
height: 25,
width: 2.5
}, {
type: "bi.layout",
cls: "rect3",
height: 50,
width: 5
height: 25,
width: 2.5
}]
});
// pane在同步方式下由items决定tipText的显示与否

32
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

42393
dist/fineui_without_jquery_polyfill.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/images/1x/icon/wave_loading.gif vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
dist/images/2x/icon/wave_loading.gif vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

20
src/base/pane.js

@ -53,25 +53,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""),
height: 60,
width: 60,
hgap: 10,
vgap: 5,
height: 30,
width: 30,
hgap: 5.25,
vgap: 2.5,
items: [{
type: "bi.layout",
cls: "rect1",
height: 50,
width: 5
height: 25,
width: 3
}, {
type: "bi.layout",
cls: "rect2",
height: 50,
width: 5
height: 25,
width: 3
}, {
type: "bi.layout",
cls: "rect3",
height: 50,
width: 5
height: 25,
width: 3
}]
});
// pane在同步方式下由items决定tipText的显示与否

8
src/less/base/pane.less

@ -1,5 +1,6 @@
@import "../index";
@import "../resource/background";
@import "../image";
@import "../lib/icon";
.bi-pane {
min-height: 55px;
& .loading-container {
@ -8,9 +9,10 @@
}
.bi-loading-widget {
font-size: 0;
div {
.background-color(@background-color-highlight, 90%);
.border-radius(2.5px);
.border-radius(1.5px);
.animation(loading-widget 0.8s infinite linear);
}
.rect2 {
@ -28,7 +30,7 @@
}
});
&.hack {
.loading-background;
.imagePath(@icon-wave-loading);
div {
.background-color(@background-color-highlight, 0%);
}

1
src/less/lib/icon.less

@ -41,6 +41,7 @@
@icon-tree-vertical-line-4-theme-dark: "icon/dark/tree_vertical_line_4.png";
@icon-loading: "icon/loading.gif";
@icon-wave-loading: "icon/wave_loading.gif";
//滑块
@icon-slider-normal: "icon/slider_normal_small.png";

Loading…
Cancel
Save