caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1141 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master 

* commit '5cd37a1bf07dd77016066e55ee3597c012c45772':
  DEC-9661 fix：使用数组的碰到pId为fill等关键字会有问题
es6
guy 5 years ago
parent
df4c7a88c2 5cd37a1bf0
commit
8c1f47c493
18 changed files with 349 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      dist/2.0/fineui.ie.js
  2. 78
      dist/2.0/fineui.ie.min.js
  3. 18
      dist/2.0/fineui.js
  4. 78
      dist/2.0/fineui.min.js
  5. 18
      dist/bundle.ie.js
  6. 78
      dist/bundle.ie.min.js
  7. 18
      dist/bundle.js
  8. 78
      dist/bundle.min.js
  9. 2
      dist/case.js
  10. 16
      dist/core.js
  11. 18
      dist/fineui.ie.js
  12. 78
      dist/fineui.ie.min.js
  13. 18
      dist/fineui.js
  14. 26
      dist/fineui.min.js
  15. 18
      dist/fineui_without_jquery_polyfill.js
  16. 16
      dist/utils.js
  17. 10
      dist/utils.min.js
  18. 4
      src/core/utils/tree.js

18
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -16877,7 +16877,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -16909,7 +16909,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20439,6 +20439,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -61657,7 +61669,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

78
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/2.0/fineui.js vendored
Unescape View File

@ -16877,7 +16877,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -16909,7 +16909,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20439,6 +20439,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -62061,7 +62073,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

78
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/bundle.ie.js vendored
Unescape View File

@ -16877,7 +16877,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -16909,7 +16909,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20439,6 +20439,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -61657,7 +61669,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

78
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/bundle.js vendored
Unescape View File

@ -16877,7 +16877,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -16909,7 +16909,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20439,6 +20439,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -62061,7 +62073,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

78
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/case.js vendored
Unescape View File

@ -9634,7 +9634,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

16
dist/core.js vendored
Unescape View File

@ -16877,7 +16877,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -16909,7 +16909,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20439,6 +20439,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items

18
dist/fineui.ie.js vendored
Unescape View File

@ -17122,7 +17122,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -17154,7 +17154,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20684,6 +20684,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -61902,7 +61914,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

78
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/fineui.js vendored
Unescape View File

@ -17122,7 +17122,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -17154,7 +17154,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20684,6 +20684,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -62306,7 +62318,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

26
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -16623,7 +16623,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -16655,7 +16655,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -20185,6 +20185,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -44605,7 +44617,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
}; };
} else { } else {
return { return {
text: o.text, text: BI.isFunction(o.text) ? o.text() : o.text,
textCls: "bi-water-mark", textCls: "bi-water-mark",
iconCls: o.iconCls iconCls: o.iconCls
}; };

16
dist/utils.js vendored
Unescape View File

@ -10881,6 +10881,18 @@ _.extend(BI.Func, {
} }
return name; return name;
}, },
/**
* 获取字符宽度
* @param str
* @return {number}
*/
getGBWidth: function (str) {
str = str + "";
str = str.replace(/[^\x00-\xff]/g, "xx");
return Math.ceil(str.length / 2);
},
/** /**
* 获取搜索结果 * 获取搜索结果
* @param items * @param items
@ -17976,7 +17988,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -18008,7 +18020,7 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;

10
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/core/utils/tree.js
Unescape View File

@ -446,7 +446,7 @@
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;
@ -478,7 +478,7 @@
if (BI.isArray(sNodes)) { if (BI.isArray(sNodes)) {
var r = []; var r = [];
var tmpMap = []; var tmpMap = {};
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) { if (BI.isNull(sNodes[i].id)) {
return sNodes; return sNodes;

Write Preview
Loading…
Cancel
Save