Browse Source

Merge pull request #720 in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'd0326a3412153ec4e669c50fb0bdff305bb6b362':
  update
es6
Dailer 6 years ago
parent
commit
7bbcddc280
  1. 3
      demo/config.js
  2. 10
      dist/bundle.ie.js
  3. 72
      dist/bundle.ie.min.js
  4. 2
      dist/bundle.min.js
  5. 28
      dist/demo.js
  6. 10
      dist/fineui.ie.js
  7. 72
      dist/fineui.ie.min.js
  8. 2
      dist/fineui.min.js

3
demo/config.js

@ -1535,8 +1535,7 @@ Demo.CONSTANTS = {
{id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
{id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
{id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"},
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"},
{id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}],
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}],
LEVELTREE: [{
id: 1,
text: "第一项",

10
dist/bundle.ie.js vendored

@ -13185,17 +13185,21 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
};
var _mkPYRslt = function (arr) {
var arrRslt = [""], k;
var arrRslt = [""], k, multiLen = 0;
for (var i = 0, len = arr.length; i < len; i++) {
var str = arr[i];
var strlen = str.length;
if (strlen == 1) {
// 多音字过多的情况下,指数增长会造成浏览器卡死,超过20完全卡死,18勉强能用,考虑到不同性能最好是16或者14
// 超过14个多音字之后,后面的都用第一个拼音
if (strlen == 1 || multiLen > 14) {
var tmpStr = str.substring(0, 1);
for (k = 0; k < arrRslt.length; k++) {
arrRslt[k] += str;
arrRslt[k] += tmpStr;
}
} else {
var tmpArr = arrRslt.slice(0);
arrRslt = [];
multiLen ++;
for (k = 0; k < strlen; k++) {
// 复制一个相同的arrRslt
var tmp = tmpArr.slice(0);

72
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

28
dist/demo.js vendored

@ -6044,30 +6044,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {
@ -13297,8 +13274,7 @@ Demo.CONSTANTS = {
{id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},
{id: 211, pId: 21, value: "第三级目录2", text: "第三级目录2"},
{id: 212, pId: 21, value: "第三级文件2", text: "第三级文件2"},
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"},
{id: 3, pId: -1, value: "第一级目录3", text: "第一级目录3", isParent: true}],
{id: 2111, pId: 211, value: "第四级文件1", text: "第四级文件1"}],
LEVELTREE: [{
id: 1,
text: "第一项",

10
dist/fineui.ie.js vendored

@ -13427,17 +13427,21 @@ BI.ScalingCellSizeAndPositionManager.prototype = {
};
var _mkPYRslt = function (arr) {
var arrRslt = [""], k;
var arrRslt = [""], k, multiLen = 0;
for (var i = 0, len = arr.length; i < len; i++) {
var str = arr[i];
var strlen = str.length;
if (strlen == 1) {
// 多音字过多的情况下,指数增长会造成浏览器卡死,超过20完全卡死,18勉强能用,考虑到不同性能最好是16或者14
// 超过14个多音字之后,后面的都用第一个拼音
if (strlen == 1 || multiLen > 14) {
var tmpStr = str.substring(0, 1);
for (k = 0; k < arrRslt.length; k++) {
arrRslt[k] += str;
arrRslt[k] += tmpStr;
}
} else {
var tmpArr = arrRslt.slice(0);
arrRslt = [];
multiLen ++;
for (k = 0; k < strlen; k++) {
// 复制一个相同的arrRslt
var tmp = tmpArr.slice(0);

72
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save