diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index 443a89080..224ca0343 100644
Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
index 4a61059e8..268b5cb8d 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -14,6 +14,134 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -58,7 +186,7 @@
-
+
@@ -90,9 +218,9 @@
-
+
-
+
@@ -152,15 +280,15 @@
-
+
-
+
-
+
-
+
@@ -170,27 +298,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -292,19 +420,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -318,9 +446,9 @@
-
+
-
+
@@ -332,27 +460,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -690,7 +818,7 @@
-
+
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index 3da32e241..743021ccc 100644
Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
index fdf6eb37f..ada633840 100644
Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ
diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2
index 7680d7107..2a5f9019d 100644
Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ
diff --git a/package.json b/package.json
index d46ba2d72..917ab54db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20230314171452",
+ "version": "2.0.20230413101426",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",
diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js
index f45437627..a47a78ec3 100644
--- a/src/base/collection/collection.js
+++ b/src/base/collection/collection.js
@@ -300,7 +300,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
var o = this.options;
// 兼容一下
var scrollable = o.scrollable, scrolly = o.scrolly;
- if (o.overflowX === false) {
+ if (o.overflowY === false) {
return false;
}
if (scrolly) {
diff --git a/src/base/combination/group.combo.js b/src/base/combination/group.combo.js
index 2f8b0c72e..12e11cad7 100644
--- a/src/base/combination/group.combo.js
+++ b/src/base/combination/group.combo.js
@@ -22,9 +22,11 @@ BI.ComboGroup = BI.inherit(BI.Widget, {
el: {
type: "bi.button_tree",
chooseType: 0,
- layouts: [{
- type: "bi.vertical",
- }],
+ layouts: [
+ {
+ type: "bi.vertical",
+ }
+ ],
},
},
});
@@ -38,7 +40,7 @@ BI.ComboGroup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
var children = o.items;
if (BI.isEmpty(children)) {
- throw new Error("ComboGroup构造错误");
+ throw new Error("ComboGroup create items error");
}
BI.each(children, function (i, ch) {
var son = BI.formatEL(ch).el.children;
diff --git a/src/base/combination/loader.js b/src/base/combination/loader.js
index cf548b024..686354c9e 100644
--- a/src/base/combination/loader.js
+++ b/src/base/combination/loader.js
@@ -38,19 +38,23 @@ BI.Loader = BI.inherit(BI.Widget, {
_prevLoad: function () {
var self = this, o = this.options;
this.prev.setLoading();
- o.itemsCreator.apply(this, [{ times: --this.times }, function () {
- self.prev.setLoaded();
- self.prependItems.apply(self, arguments);
- }]);
+ o.itemsCreator.apply(this, [
+ { times: --this.times }, function () {
+ self.prev.setLoaded();
+ self.prependItems.apply(self, arguments);
+ }
+ ]);
},
_nextLoad: function () {
var self = this, o = this.options;
this.next.setLoading();
- o.itemsCreator.apply(this, [{ times: ++this.times }, function () {
- self.next.setLoaded();
- self.addItems.apply(self, arguments);
- }]);
+ o.itemsCreator.apply(this, [
+ { times: ++this.times }, function () {
+ self.next.setLoaded();
+ self.addItems.apply(self, arguments);
+ }
+ ]);
},
render: function () {
@@ -75,9 +79,11 @@ BI.Loader = BI.inherit(BI.Widget, {
chooseType: 0,
items: o.items,
behaviors: {},
- layouts: [{
- type: "bi.vertical",
- }],
+ layouts: [
+ {
+ type: "bi.vertical",
+ }
+ ],
value: o.value,
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function (type, value, obj) {
@@ -123,10 +129,12 @@ BI.Loader = BI.inherit(BI.Widget, {
return this.count < o.count;
}
- return !!o.hasPrev.apply(this, [{
- times: this.times,
- count: this.count,
- }]);
+ return !!o.hasPrev.apply(this, [
+ {
+ times: this.times,
+ count: this.count,
+ }
+ ]);
},
hasNext: function () {
@@ -135,10 +143,12 @@ BI.Loader = BI.inherit(BI.Widget, {
return this.count < o.count;
}
- return !!o.hasNext.apply(this, [{
- times: this.times,
- count: this.count,
- }]);
+ return !!o.hasNext.apply(this, [
+ {
+ times: this.times,
+ count: this.count,
+ }
+ ]);
},
prependItems: function (items) {
@@ -170,13 +180,15 @@ BI.Loader = BI.inherit(BI.Widget, {
_populate: function (items) {
var self = this, o = this.options;
if (arguments.length === 0 && (BI.isFunction(o.itemsCreator))) {
- o.itemsCreator.apply(this, [{ times: 1 }, function () {
- if (arguments.length === 0) {
- throw new Error("参数不能为空");
+ o.itemsCreator.apply(this, [
+ { times: 1 }, function () {
+ if (arguments.length === 0) {
+ throw new Error("Parameter cannot be empty");
+ }
+ self.populate.apply(self, arguments);
+ o.onLoaded();
}
- self.populate.apply(self, arguments);
- o.onLoaded();
- }]);
+ ]);
return false;
}
@@ -198,7 +210,7 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible();
}
}
-
+
return true;
},
diff --git a/src/base/combination/searcher.js b/src/base/combination/searcher.js
index 2098f4ce0..45d19488c 100644
--- a/src/base/combination/searcher.js
+++ b/src/base/combination/searcher.js
@@ -39,6 +39,8 @@ BI.Searcher = BI.inherit(BI.Widget, {
masker: { // masker层
offset: {},
},
+
+ simple: false,
});
},
@@ -47,6 +49,7 @@ BI.Searcher = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(o.el, {
type: "bi.search_editor",
+ simple: o.simple,
});
BI.createWidget({
@@ -230,7 +233,7 @@ BI.Searcher = BI.inherit(BI.Widget, {
this.editor.blur();
} catch (e) {
if (!this.editor.blur) {
- throw new Error("editor没有实现blur方法");
+ throw new Error("The editor does not implement the blur method ");
}
} finally {
this.editor.setValue("");
diff --git a/src/base/pager/pager.js b/src/base/pager/pager.js
index 06514fb99..ffce61a33 100644
--- a/src/base/pager/pager.js
+++ b/src/base/pager/pager.js
@@ -10,11 +10,13 @@ BI.Pager = BI.inherit(BI.Widget, {
return BI.extend(BI.Pager.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-pager",
behaviors: {},
- layouts: [{
- type: "bi.horizontal",
- hgap: 10,
- vgap: 0,
- }],
+ layouts: [
+ {
+ type: "bi.horizontal",
+ hgap: 10,
+ vgap: 0,
+ }
+ ],
dynamicShow: true, // 是否动态显示上一页、下一页、首页、尾页， 若为false，则指对其设置使能状态
// dynamicShow为false时以下两个有用
@@ -28,8 +30,8 @@ BI.Pager = BI.inherit(BI.Widget, {
jump: BI.emptyFn, // 分页的回调函数
first: false, // 是否显示首页
last: false, // 是否显示尾页
- prev: "上一页",
- next: "下一页",
+ prev: BI.i18nText("BI-Previous_Page"),
+ next: BI.i18nText("BI-Next_Page"),
firstPage: 1,
lastPage: function () { // 在万不得已时才会调用这个函数获取最后一页的页码, 主要作用于setValue方法
@@ -217,10 +219,12 @@ BI.Pager = BI.inherit(BI.Widget, {
self.currPage = v;
break;
}
- o.jump.apply(self, [{
- pages: pages,
- curr: self.currPage,
- }]);
+ o.jump.apply(self, [
+ {
+ pages: pages,
+ curr: self.currPage,
+ }
+ ]);
self._populate();
self.fireEvent(BI.Pager.EVENT_CHANGE, obj);
}
diff --git a/src/base/single/input/input.js b/src/base/single/input/input.js
index 8f20bddbb..57cd580b5 100644
--- a/src/base/single/input/input.js
+++ b/src/base/single/input/input.js
@@ -102,7 +102,7 @@ BI.Input = BI.inherit(BI.Single, {
blur();
}
- function blur () {
+ function blur() {
if (!self.isValid() && self.options.quitChecker.apply(self, [BI.trim(self.getValue())]) !== false) {
self.element.val(self._lastValidValue ? self._lastValidValue : "");
self._checkValidationOnValueChange();
@@ -236,7 +236,7 @@ BI.Input = BI.inherit(BI.Single, {
focus: function () {
if (!this.element.is(":visible")) {
- throw new Error("input输入框在不可见下不能focus");
+ throw new Error("input cannot be focus when it's invisible");
}
if (!this._isEditing === true) {
this.element.focus();
@@ -246,7 +246,7 @@ BI.Input = BI.inherit(BI.Single, {
blur: function () {
if (!this.element.is(":visible")) {
- throw new Error("input输入框在不可见下不能blur");
+ throw new Error("input cannot be blur when it's invisible");
}
if (this._isEditing === true) {
this.element.blur();
@@ -256,7 +256,7 @@ BI.Input = BI.inherit(BI.Single, {
selectAll: function () {
if (!this.element.is(":visible")) {
- throw new Error("input输入框在不可见下不能select");
+ throw new Error("input cannot be select when it's invisible");
}
this.element.select();
this._isEditing = true;
diff --git a/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/src/case/combo/textvaluecombo/combo.textvaluesmall.js
index 155b124ce..96678c736 100644
--- a/src/case/combo/textvaluecombo/combo.textvaluesmall.js
+++ b/src/case/combo/textvaluecombo/combo.textvaluesmall.js
@@ -28,6 +28,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.small_select_text_trigger",
...o.el
},
+ items: o.items,
text: o.text,
value: o.value,
defaultText: o.defaultText,
diff --git a/src/case/layer/pane.list.js b/src/case/layer/pane.list.js
index d4b774d00..01b24e7ae 100644
--- a/src/case/layer/pane.list.js
+++ b/src/case/layer/pane.list.js
@@ -60,9 +60,11 @@ BI.ListPane = BI.inherit(BI.Pane, {
});
},
hasNext: o.hasNext,
- layouts: [{
- type: "bi.vertical"
- }]
+ layouts: [
+ {
+ type: "bi.vertical"
+ }
+ ]
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function (type, value, obj) {
@@ -118,12 +120,14 @@ BI.ListPane = BI.inherit(BI.Pane, {
populate: function (items) {
var self = this, o = this.options;
if (arguments.length === 0 && (BI.isFunction(this.button_group.attr("itemsCreator")))) {// 接管loader的populate方法
- this.button_group.attr("itemsCreator").apply(this, [{ times: 1 }, function () {
- if (arguments.length === 0) {
- throw new Error("参数不能为空");
+ this.button_group.attr("itemsCreator").apply(this, [
+ { times: 1 }, function () {
+ if (arguments.length === 0) {
+ throw new Error("Parameter cannot be empty");
+ }
+ self.populate.apply(self, arguments);
}
- self.populate.apply(self, arguments);
- }]);
+ ]);
return;
}
diff --git a/src/case/loader/loader.list.js b/src/case/loader/loader.list.js
index aeb3ad959..4339aac21 100644
--- a/src/case/loader/loader.list.js
+++ b/src/case/loader/loader.list.js
@@ -31,10 +31,12 @@ BI.ListLoader = BI.inherit(BI.Widget, {
_nextLoad: function () {
var self = this, o = this.options;
this.next.setLoading();
- o.itemsCreator.apply(this, [{times: ++this.times}, function () {
- self.next.setLoaded();
- self.addItems.apply(self, arguments);
- }]);
+ o.itemsCreator.apply(this, [
+ { times: ++this.times }, function () {
+ self.next.setLoaded();
+ self.addItems.apply(self, arguments);
+ }
+ ]);
},
_init: function () {
@@ -50,9 +52,11 @@ BI.ListLoader = BI.inherit(BI.Widget, {
chooseType: 0,
items: o.items,
behaviors: {},
- layouts: [{
- type: "bi.vertical"
- }]
+ layouts: [
+ {
+ type: "bi.vertical"
+ }
+ ]
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function (type, value, obj) {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@@ -91,10 +95,12 @@ BI.ListLoader = BI.inherit(BI.Widget, {
if (BI.isNumber(o.count)) {
return this.count < o.count;
}
- return !!o.hasNext.apply(this, [{
- times: this.times,
- count: this.count
- }]);
+ return !!o.hasNext.apply(this, [
+ {
+ times: this.times,
+ count: this.count
+ }
+ ]);
},
addItems: function (items) {
@@ -114,13 +120,15 @@ BI.ListLoader = BI.inherit(BI.Widget, {
populate: function (items) {
var self = this, o = this.options;
if (arguments.length === 0 && (BI.isFunction(o.itemsCreator))) {
- o.itemsCreator.apply(this, [{times: 1}, function () {
- if (arguments.length === 0) {
- throw new Error("参数不能为空");
+ o.itemsCreator.apply(this, [
+ { times: 1 }, function () {
+ if (arguments.length === 0) {
+ throw new Error("Parameter cannot be empty");
+ }
+ self.populate.apply(self, arguments);
+ o.onLoaded();
}
- self.populate.apply(self, arguments);
- o.onLoaded();
- }]);
+ ]);
return;
}
this.options.items = items;
@@ -193,4 +201,4 @@ BI.ListLoader = BI.inherit(BI.Widget, {
}
});
BI.ListLoader.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.list_loader", BI.ListLoader);
\ No newline at end of file
+BI.shortcut("bi.list_loader", BI.ListLoader);
diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js
index 5bdcc8f56..1c87c612c 100644
--- a/src/case/trigger/trigger.editor.js
+++ b/src/case/trigger/trigger.editor.js
@@ -9,7 +9,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function (config) {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
- baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+ baseCls: (conf.baseCls || "") + " bi-editor-trigger " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
diff --git a/src/case/trigger/trigger.text.js b/src/case/trigger/trigger.text.js
index 4c1335ce6..6e7273252 100644
--- a/src/case/trigger/trigger.text.js
+++ b/src/case/trigger/trigger.text.js
@@ -40,7 +40,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
height: o.height,
text: text || o.defaultText,
tipType: o.tipType,
- title: o.title,
warningTitle: o.warningTitle,
hgap: o.textHgap,
vgap: o.textVgap,
diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js
index feb0f138b..005ac241b 100644
--- a/src/case/trigger/trigger.text.select.js
+++ b/src/case/trigger/trigger.text.select.js
@@ -35,7 +35,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
textTgap: o.textTgap,
textBgap: o.textBgap,
tipType: o.tipType,
- title: o.title,
+ title: null,
allowClear: o.allowClear,
listeners: [
{
diff --git a/src/component/allvaluechooser/combo.allvaluechooser.js b/src/component/allvaluechooser/combo.allvaluechooser.js
index 11494b584..17dc244b7 100644
--- a/src/component/allvaluechooser/combo.allvaluechooser.js
+++ b/src/component/allvaluechooser/combo.allvaluechooser.js
@@ -34,6 +34,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
valueFormatter: BI.bind(this._valueFormatter, this),
width: o.width,
height: o.height,
+ defaultText: o.defaultText,
value: this._assertValue({
type: BI.Selection.Multi,
value: o.value || []
diff --git a/src/core/2.base.js b/src/core/2.base.js
index 8f05642be..dc94a3d98 100644
--- a/src/core/2.base.js
+++ b/src/core/2.base.js
@@ -61,7 +61,7 @@
createWidgets: function (items, options, context) {
if (!BI.isArray(items)) {
- throw new Error("items必须是数组", items);
+ throw new Error("items must be array", items);
}
if (BI.isWidget(options)) {
context = options;
@@ -149,8 +149,10 @@
BI._.each(["where", "findWhere", "invoke", "pluck", "shuffle", "sample", "toArray", "size"], function (name) {
BI[name] = _apply(name);
});
- BI._.each(["get", "set", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
- "sortBy", "groupBy", "indexBy", "countBy", "partition", "clamp"], function (name) {
+ BI._.each([
+ "get", "set", "each", "map", "reduce", "reduceRight", "find", "filter", "reject", "every", "all", "some", "any", "max", "min",
+ "sortBy", "groupBy", "indexBy", "countBy", "partition", "clamp"
+ ], function (name) {
if (name === "any") {
BI[name] = _applyFunc("some");
} else {
@@ -347,8 +349,10 @@
});
// 数组相关的方法
- BI._.each(["first", "initial", "last", "rest", "compact", "flatten", "without", "union", "intersection",
- "difference", "zip", "unzip", "object", "indexOf", "lastIndexOf", "sortedIndex", "range", "take", "takeRight", "uniqBy"], function (name) {
+ BI._.each([
+ "first", "initial", "last", "rest", "compact", "flatten", "without", "union", "intersection",
+ "difference", "zip", "unzip", "object", "indexOf", "lastIndexOf", "sortedIndex", "range", "take", "takeRight", "uniqBy"
+ ], function (name) {
BI[name] = _apply(name);
});
BI._.each(["findIndex", "findLastIndex"], function (name) {
@@ -412,10 +416,12 @@
});
// 对象相关方法
- BI._.each(["keys", "allKeys", "values", "pairs", "invert", "create", "functions", "extend", "extendOwn",
+ BI._.each([
+ "keys", "allKeys", "values", "pairs", "invert", "create", "functions", "extend", "extendOwn",
"defaults", "clone", "property", "propertyOf", "matcher", "isEqual", "isMatch", "isEmpty",
"isElement", "isNumber", "isString", "isArray", "isObject", "isPlainObject", "isArguments", "isFunction", "isFinite",
- "isBoolean", "isDate", "isRegExp", "isError", "isNaN", "isUndefined", "zipObject", "cloneDeep"], function (name) {
+ "isBoolean", "isDate", "isRegExp", "isError", "isNaN", "isUndefined", "zipObject", "cloneDeep"
+ ], function (name) {
BI[name] = _apply(name);
});
BI._.each(["mapObject", "findKey", "pick", "omit", "tap"], function (name) {
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index e541191df..73ef472fe 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -129,7 +129,7 @@
function init() {
// 加个保险
if (initCallbackCalled === true) {
- _global.console && console.error("组件： 请检查beforeInit内部的写法，callback只能执行一次");
+ _global.console && console.error("widget：please check the beforeInit method. The callback can only be executed once");
return;
}
initCallbackCalled = true;
@@ -137,7 +137,7 @@
function render() {
// 加个保险
if (renderCallbackCalled === true) {
- _global.console && console.error("组件： 请检查beforeRender内部的写法，callback只能执行一次");
+ _global.console && console.error("widget：please check the beforeRender method. The callback can only be executed once");
return;
}
renderCallbackCalled = true;
@@ -607,7 +607,7 @@
}
name = name || widget.getName() || BI.uniqueId("widget");
if (this._children[name]) {
- throw new Error("组件：组件名已存在，不能进行添加");
+ throw new Error("widget：widget name already exists, cannot be added ");
}
widget._setParent && widget._setParent(this);
widget.on(BI.Events.DESTROY, function () {
diff --git a/src/core/5.inject.js b/src/core/5.inject.js
index 9602deed9..b7c539f4d 100644
--- a/src/core/5.inject.js
+++ b/src/core/5.inject.js
@@ -9,7 +9,7 @@
};
BI.module = BI.module || function (xtype, cls) {
if (moduleInjection[xtype] != null) {
- _global.console && console.error("module： [" + xtype + "] 已经注册过了");
+ _global.console && console.error("module： [" + xtype + "] already registered");
} else {
if (BI.isFunction(cls)) {
cls = cls();
@@ -41,7 +41,7 @@
var constantInjection = {};
BI.constant = BI.constant || function (xtype, cls) {
if (constantInjection[xtype] != null) {
- _global.console && console.error("constant: [" + xtype + "]已经注册过了");
+ _global.console && console.error("constant: [" + xtype + "]already registered");
} else {
constantInjection[xtype] = cls;
}
@@ -54,7 +54,7 @@
var modelInjection = {};
BI.model = BI.model || function (xtype, cls) {
if (modelInjection[xtype] != null) {
- _global.console && console.error("model: [" + xtype + "] 已经注册过了");
+ _global.console && console.error("model: [" + xtype + "] already registered");
} else {
modelInjection[xtype] = cls;
}
@@ -67,7 +67,7 @@
var storeInjection = {};
BI.store = BI.store || function (xtype, cls) {
if (storeInjection[xtype] != null) {
- _global.console && console.error("store: [" + xtype + "] 已经注册过了");
+ _global.console && console.error("store: [" + xtype + "] already registered");
} else {
storeInjection[xtype] = cls;
}
@@ -80,7 +80,7 @@
var serviceInjection = {};
BI.service = BI.service || function (xtype, cls) {
if (serviceInjection[xtype] != null) {
- _global.console && console.error("service: [" + xtype + "] 已经注册过了");
+ _global.console && console.error("service: [" + xtype + "] already registered");
}
serviceInjection[xtype] = cls;
@@ -93,7 +93,7 @@
var providerInjection = {};
BI.provider = BI.provider || function (xtype, cls) {
if (providerInjection[xtype] != null) {
- _global.console && console.error("provider: [" + xtype + "] 已经注册过了");
+ _global.console && console.error("provider: [" + xtype + "] already registered");
} else {
providerInjection[xtype] = cls;
}
@@ -151,7 +151,7 @@
}
}
if (findVersion === true) {
- _global.console && console.error("moduleId: [" + module.moduleId + "] 接口: [" + type + "] 接口版本: [" + version + "] 已过期，版本要求为：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
+ _global.console && console.error("moduleId: [" + module.moduleId + "] interface : [" + type + "] version: [" + version + "] has expired，The version requirement is：", dependencies[module.moduleId], "=>", moduleInjection[module.moduleId]);
continue;
}
}
@@ -251,7 +251,7 @@
BI.Modules = BI.Modules || {
getModule: function (type) {
if (!moduleInjection[type]) {
- _global.console && console.error("module: [" + type + "] 未定义");
+ _global.console && console.error("module: [" + type + "] undefined");
}
return moduleInjection[type];
},
@@ -263,7 +263,7 @@
BI.Constants = BI.Constants || {
getConstant: function (type) {
if (BI.isNull(constantInjection[type])) {
- _global.console && console.error("constant: [" + type + "] 未定义");
+ _global.console && console.error("constant: [" + type + "] undefined");
}
runConfigFunction(type);
return BI.isFunction(constantInjection[type]) ? constantInjection[type]() : constantInjection[type];
@@ -311,7 +311,7 @@
BI.Models = BI.Models || {
getModel: function (type, config) {
if (!modelInjection[type]) {
- _global.console && console.error("model: [" + type + "] 未定义");
+ _global.console && console.error("model: [" + type + "] undefined");
}
runConfigFunction(type);
var inst = new modelInjection[type](config);
@@ -327,7 +327,7 @@
BI.Stores = BI.Stores || {
getStore: function (type, config) {
if (!storeInjection[type]) {
- _global.console && console.error("store: [" + type + "] 未定义");
+ _global.console && console.error("store: [" + type + "] undefined");
}
if (stores[type]) {
return stores[type];
@@ -346,7 +346,7 @@
BI.Services = BI.Services || {
getService: function (type, config) {
if (!serviceInjection[type]) {
- _global.console && console.error("service: [" + type + "] 未定义");
+ _global.console && console.error("service: [" + type + "] undefined");
}
if (services[type]) {
return services[type];
@@ -363,7 +363,7 @@
BI.Providers = BI.Providers || {
getProvider: function (type, config) {
if (!providerInjection[type]) {
- _global.console && console.error("provider: [" + type + "] 未定义");
+ _global.console && console.error("provider: [" + type + "] undefined");
}
runConfigFunction(type);
if (!providers[type]) {
@@ -401,7 +401,7 @@
var kv = {};
BI.shortcut = BI.component = BI.shortcut || function (xtype, cls) {
if (kv[xtype] != null) {
- _global.console && console.error("组件： [" + xtype + "] 已经注册过了");
+ _global.console && console.error("widget： [" + xtype + "] already registered");
}
if (cls) {
cls["xtype"] = xtype;
@@ -414,7 +414,7 @@
var cls = BI.isFunction(config.type) ? config.type : kv[config.type];
if (!cls) {
- throw new Error("组件： [" + config.type + "] 未定义");
+ throw new Error("widget： [" + config.type + "] undefined");
}
var pushed = false;
var widget = new cls();
@@ -472,12 +472,14 @@
if (wType === elType) {
if (BI.Plugin.hasObject(elType)) {
if (!w.listeners || BI.isArray(w.listeners)) {
- w.listeners = (w.listeners || []).concat([{
- eventName: BI.Events.MOUNT,
- action: function () {
- BI.Plugin.getObject(elType, this);
+ w.listeners = (w.listeners || []).concat([
+ {
+ eventName: BI.Events.MOUNT,
+ action: function () {
+ BI.Plugin.getObject(elType, this);
+ }
}
- }]);
+ ]);
} else {
w.listeners[BI.Events.MOUNT] = [
function () {
@@ -493,7 +495,7 @@
if (BI.isWidget(item.el)) {
return item.el;
}
- throw new Error("组件：无法根据item创建组件", item);
+ throw new Error("widget： Unable to create widget from item ", item);
};
BI._lazyCreateWidget = BI._lazyCreateWidget || function (item, options, context) {
@@ -521,6 +523,6 @@
if (providerInjection[type]) {
return BI.Providers.getProvider(type, config);
}
- throw new Error("未知类型: [" + type + "] 未定义");
+ throw new Error("unknown type: [" + type + "] undefined");
};
})();
diff --git a/src/core/6.plugin.js b/src/core/6.plugin.js
index bbfd5e5ac..8880380fc 100644
--- a/src/core/6.plugin.js
+++ b/src/core/6.plugin.js
@@ -73,7 +73,7 @@ BI.Plugin = BI.Plugin || {};
_WidgetsPlugin[type] = [];
}
if (_WidgetsPlugin[type].length > 0) {
- console.log("组件已经注册过了!");
+ console.log("widget already registered!");
}
_WidgetsPlugin[type].push(fn);
},
@@ -111,7 +111,7 @@ BI.Plugin = BI.Plugin || {};
_ObjectPlugin[type] = [];
}
if (_ObjectPlugin[type].length > 0) {
- console.log("对象已经注册过了!");
+ console.log("object already registered!");
}
_ObjectPlugin[type].push(fn);
},
diff --git a/src/core/controller/controller.layer.js b/src/core/controller/controller.layer.js
index abc2d7f0e..f0edac403 100644
--- a/src/core/controller/controller.layer.js
+++ b/src/core/controller/controller.layer.js
@@ -141,7 +141,7 @@ BI.LayerController = BI.inherit(BI.Controller, {
add: function (name, layer, layout) {
if (this.has(name)) {
- throw new Error("不能创建同名的Layer");
+ throw new Error("can not create Layers with the same name");
}
layout.setVisible(false);
this.layerManager[name] = layer;
diff --git a/src/core/listener/listener.show.js b/src/core/listener/listener.show.js
index af2236578..569461bda 100644
--- a/src/core/listener/listener.show.js
+++ b/src/core/listener/listener.show.js
@@ -27,7 +27,7 @@ BI.ShowListener = BI.inherit(BI.OB, {
v = v || o.eventObj.getValue();
v = BI.isArray(v) ? (v.length > 1 ? v.toString() : v[0]) : v;
if (BI.isNull(v)) {
- throw new Error("不能为null");
+ throw new Error("canot be null");
}
var cardName = o.cardNameCreator(v);
if (!o.cardLayout.isCardExisted(cardName)) {
diff --git a/src/core/platform/web/dom.js b/src/core/platform/web/dom.js
index 66f4b3651..f7086bbc7 100644
--- a/src/core/platform/web/dom.js
+++ b/src/core/platform/web/dom.js
@@ -23,7 +23,7 @@
});
var fromChildren = fromElement.children(), toChildren = toElement.children();
if (fromChildren.length !== toChildren.length) {
- throw new Error("不匹配");
+ throw new Error("don't match");
}
BI.each(fromChildren, function (i, child) {
BI.DOM.patchProps(BI.jQuery(child), BI.jQuery(toChildren[i]));
@@ -108,12 +108,13 @@
},
// 获取滚动条的宽度，页面display: none时候获取到的为0
- getScrollWidth: function () {
- if (BI.isNull(this._scrollWidth) || this._scrollWidth === 0) {
+ getScrollWidth: function (css) {
+ if (BI.isNull(this._scrollWidth) || BI.isNotNull(css) || this._scrollWidth === 0) {
var ul = BI.Widget._renderEngine.createElement("").width(50).height(50).css({
position: "absolute",
top: "-9999px",
- overflow: "scroll"
+ overflow: "scroll",
+ ...css
}).appendTo("body");
this._scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
ul.destroy();
@@ -156,7 +157,7 @@
var popupEl = popup.element;
var elRect = el[0].getBoundingClientRect();
var popupElRect = popupEl[0].getBoundingClientRect();
- var containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+ var containerRect = container ? container.getBoundingClientRect() : {left: 0};
return {
left: elRect.left - containerRect.left - popupElRect.width - (extraWidth || 0)
@@ -172,7 +173,7 @@
getRightPosition: function (combo, popup, extraWidth, container) {
var el = combo.element;
var elRect = el[0].getBoundingClientRect();
- var containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+ var containerRect = container ? container.getBoundingClientRect() : {left: 0};
return {
left: elRect.left + elRect.width - containerRect.left + (extraWidth || 0)
@@ -191,7 +192,7 @@
var popupEl = popup.element;
var elRect = el[0].getBoundingClientRect();
var popupElRect = popupEl[0].getBoundingClientRect();
- var containerRect = container ? container.getBoundingClientRect() : { top: 0 };
+ var containerRect = container ? container.getBoundingClientRect() : {top: 0};
return {
top: elRect.top - containerRect.top - popupElRect.height - (extraHeight || 0)
@@ -201,7 +202,7 @@
getBottomPosition: function (combo, popup, extraHeight, container) {
var el = combo.element;
var elRect = el[0].getBoundingClientRect();
- var containerRect = container ? container.getBoundingClientRect() : { top: 0 };
+ var containerRect = container ? container.getBoundingClientRect() : {top: 0};
return {
top: elRect.top - containerRect.top + elRect.height + (extraHeight || 0)
@@ -254,7 +255,7 @@
var comboRect = combo.element[0].getBoundingClientRect(),
popupRect = popup.element[0].getBoundingClientRect(),
viewportRect = document.documentElement.getBoundingClientRect(),
- containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+ containerRect = container ? container.getBoundingClientRect() : {left: 0};
var left = comboRect.left - containerRect.left + extraWidth;
if (comboRect.left + popupRect.width > viewportRect.width) {
@@ -267,7 +268,7 @@
var left = this._getLeftAlignPosition(combo, popup, extraWidth, container);
var dir = "";
// 如果放不下，优先使用RightAlign, 如果RightAlign也放不下, 再使用left=0
- var containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+ var containerRect = container ? container.getBoundingClientRect() : {left: 0};
if (left + containerRect.left < 0) {
left = this._getRightAlignPosition(combo, popup, extraWidth);
dir = "left";
@@ -293,7 +294,7 @@
_getRightAlignPosition: function (combo, popup, extraWidth, container) {
var comboBounds = combo.element[0].getBoundingClientRect(),
viewBounds = popup.element[0].getBoundingClientRect(),
- containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+ containerRect = container ? container.getBoundingClientRect() : {left: 0};
return comboBounds.left + comboBounds.width - viewBounds.width - extraWidth - containerRect.left;
},
@@ -327,7 +328,7 @@
var comboBounds = combo.element[0].getBoundingClientRect(),
popupBounds = popup.element[0].getBoundingClientRect(),
viewportBounds = document.documentElement.getBoundingClientRect(),
- containerBounds = container ? container.getBoundingClientRect() : { top: 0 };
+ containerBounds = container ? container.getBoundingClientRect() : {top: 0};
var top, adaptHeight, dir;
if (BI.DOM.isBottomSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
top = comboBounds.top - containerBounds.top + extraHeight;
@@ -386,7 +387,7 @@
var comboBounds = combo.element[0].getBoundingClientRect(),
popupBounds = popup.element[0].getBoundingClientRect(),
windowBounds = BI.Widget._renderEngine.createElement("body").bounds(),
- containerBounds = container ? container.getBoundingClientRect() : { top: 0 };
+ containerBounds = container ? container.getBoundingClientRect() : {top: 0};
var top, adaptHeight, dir;
if (BI.DOM.isTopSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
top = comboBounds.top + comboBounds.height - containerBounds.top - popupBounds.height;
@@ -746,7 +747,7 @@
*/
getPositionRelativeContainingBlockRect: function (element) {
const positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element);
- const { top, right, bottom, left, width, height, x, y } = positionRelativeElement.getBoundingClientRect();
+ const {top, right, bottom, left, width, height, x, y} = positionRelativeElement.getBoundingClientRect();
return {
diff --git a/src/core/structure/tree.js b/src/core/structure/tree.js
index d79ac99ef..62f0e1d71 100644
--- a/src/core/structure/tree.js
+++ b/src/core/structure/tree.js
@@ -30,23 +30,26 @@
initTree: function (nodes) {
var self = this;
this.clear();
- var queue = [];
+ var queue = new Set();
+
BI.each(nodes, function (i, node) {
var n = new BI.Node(node);
n.set("data", node);
self.addNode(n);
- queue.push(n);
+ queue.add(n);
});
- while (!BI.isEmpty(queue)) {
- var parent = queue.shift();
+
+ queue.forEach(parent => {
+ queue.delete(parent);
+
var node = parent.get("data");
BI.each(node.children, function (i, child) {
var n = new BI.Node(child);
n.set("data", child);
- queue.push(n);
+ queue.add(n);
self.addNode(parent, n);
});
- }
+ });
},
_toJSON: function (node) {
diff --git a/src/core/wrapper/layout/adapt/absolute.leftrightvertical.js b/src/core/wrapper/layout/adapt/absolute.leftrightvertical.js
index 25d5aab94..1df1d5c85 100644
--- a/src/core/wrapper/layout/adapt/absolute.leftrightvertical.js
+++ b/src/core/wrapper/layout/adapt/absolute.leftrightvertical.js
@@ -98,7 +98,7 @@ BI.AbsoluteLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
@@ -149,7 +149,7 @@ BI.AbsoluteRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js b/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
index cafc1dafb..94b533fc3 100644
--- a/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
+++ b/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
@@ -36,22 +36,24 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
type: "bi.left",
lgap: o.innerHgap,
vgap: o.innerVgap,
- items: [{
- el: {
- type: "bi.vertical_adapt",
- ref: function (_ref) {
- self.left = _ref;
- },
- height: "100%",
- items: leftRight.left || o.items.left,
- hgap: o.lhgap,
- lgap: o.llgap,
- rgap: o.lrgap,
- tgap: o.ltgap,
- bgap: o.lbgap,
- vgap: o.lvgap
+ items: [
+ {
+ el: {
+ type: "bi.vertical_adapt",
+ ref: function (_ref) {
+ self.left = _ref;
+ },
+ height: "100%",
+ items: leftRight.left || o.items.left,
+ hgap: o.lhgap,
+ lgap: o.llgap,
+ rgap: o.lrgap,
+ tgap: o.ltgap,
+ bgap: o.lbgap,
+ vgap: o.lvgap
+ }
}
- }]
+ ]
});
}
if (leftRight.right || "right" in o.items) {
@@ -59,22 +61,24 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
type: "bi.right",
rgap: o.innerHgap,
vgap: o.innerVgap,
- items: [{
- el: {
- type: "bi.vertical_adapt",
- ref: function (_ref) {
- self.right = _ref;
- },
- height: "100%",
- items: leftRight.right || o.items.right,
- hgap: o.rhgap,
- lgap: o.rlgap,
- rgap: o.rrgap,
- tgap: o.rtgap,
- bgap: o.rbgap,
- vgap: o.rvgap
+ items: [
+ {
+ el: {
+ type: "bi.vertical_adapt",
+ ref: function (_ref) {
+ self.right = _ref;
+ },
+ height: "100%",
+ items: leftRight.right || o.items.right,
+ hgap: o.rhgap,
+ lgap: o.rlgap,
+ rgap: o.rrgap,
+ tgap: o.rtgap,
+ bgap: o.rbgap,
+ vgap: o.rvgap
+ }
}
- }]
+ ]
});
}
return layoutArray;
@@ -106,7 +110,7 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
@@ -162,7 +166,7 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
@@ -216,7 +220,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/fill/float.fill.horizontal.js b/src/core/wrapper/layout/fill/float.fill.horizontal.js
index 512ffb627..a6b4c5be7 100644
--- a/src/core/wrapper/layout/fill/float.fill.horizontal.js
+++ b/src/core/wrapper/layout/fill/float.fill.horizontal.js
@@ -25,7 +25,7 @@ BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (items) {
@@ -33,7 +33,7 @@ BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, {
items = BI.compact(items);
var rank = 0;
- function createWidget (i, item, desc) {
+ function createWidget(i, item, desc) {
if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
var w = BI._lazyCreateWidget({
type: "bi.vertical_adapt",
diff --git a/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js b/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
index b52b1e456..1fc93a383 100644
--- a/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
+++ b/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
@@ -94,7 +94,7 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/float/float.absolute.leftrightvertical.js b/src/core/wrapper/layout/float/float.absolute.leftrightvertical.js
index 9de105651..2539d53c3 100644
--- a/src/core/wrapper/layout/float/float.absolute.leftrightvertical.js
+++ b/src/core/wrapper/layout/float/float.absolute.leftrightvertical.js
@@ -115,7 +115,7 @@ BI.FloatAbsoluteLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
@@ -179,7 +179,7 @@ BI.FloatAbsoluteRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/layout.border.js b/src/core/wrapper/layout/layout.border.js
index 15d3877af..bd133459b 100644
--- a/src/core/wrapper/layout/layout.border.js
+++ b/src/core/wrapper/layout/layout.border.js
@@ -22,7 +22,7 @@ BI.BorderLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (regions) {
diff --git a/src/core/wrapper/layout/layout.card.js b/src/core/wrapper/layout/layout.card.js
index 97034efba..4209ce375 100644
--- a/src/core/wrapper/layout/layout.card.js
+++ b/src/core/wrapper/layout/layout.card.js
@@ -81,7 +81,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
getCardByName: function (cardName) {
if (!this.isCardExisted(cardName)) {
- throw new Error("cardName不存在", cardName);
+ throw new Error("cardName not exist", cardName);
}
return this._children[this._getChildName(cardName)];
},
@@ -98,7 +98,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
deleteCardByName: function (cardName) {
if (!this.isCardExisted(cardName)) {
- throw new Error("cardName不存在", cardName);
+ throw new Error("cardName not exist", cardName);
}
var child = this._children[this._getChildName(cardName)];
@@ -108,7 +108,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
addCardByName: function (cardName, cardItem) {
if (this.isCardExisted(cardName)) {
- throw new Error("cardName 已存在", cardName);
+ throw new Error("cardName already exist", cardName);
}
var widget = BI._lazyCreateWidget(cardItem, this);
widget.element.css({
@@ -120,7 +120,7 @@ BI.CardLayout = BI.inherit(BI.Layout, {
}).appendTo(this.element);
widget.invisible();
this.addWidget(this._getChildName(cardName), widget);
- this.options.items.push({el: cardItem, cardName: cardName});
+ this.options.items.push({ el: cardItem, cardName: cardName });
return widget;
},
diff --git a/src/core/wrapper/layout/layout.division.js b/src/core/wrapper/layout/layout.division.js
index 307166283..65b07e95e 100644
--- a/src/core/wrapper/layout/layout.division.js
+++ b/src/core/wrapper/layout/layout.division.js
@@ -24,7 +24,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (items) {
@@ -32,19 +32,19 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0);
var map = BI.makeArray(rows), widths = {}, heights = {};
- function firstElement (item, cls) {
+ function firstElement(item, cls) {
item.addClass(cls);
return item;
}
- function firstObject (item, cls) {
+ function firstObject(item, cls) {
item.cls = (item.cls || "") + cls;
return item;
}
- function first (item, cls) {
+ function first(item, cls) {
if (item instanceof BI.Widget) {
firstElement(item.element, cls);
} else if (item.el instanceof BI.Widget) {
@@ -77,7 +77,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
var totalW = 0;
for (var j = 0; j < columns; j++) {
if (!map[i][j]) {
- throw new Error("item(" + i + "" + j + ") 必须", map);
+ throw new Error("item(" + i + "" + j + ") must exist", map);
}
if (!this.hasWidget(this._getChildName(i + "_" + j))) {
var w = BI._lazyCreateWidget(map[i][j]);
@@ -86,13 +86,13 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
w = this.getWidgetByName(this._getChildName(i + "_" + j));
}
var left = totalW * 100 / widths[i];
- w.element.css({position: "absolute", left: left + "%"});
+ w.element.css({ position: "absolute", left: left + "%" });
if (j > 0) {
var lastW = this.getWidgetByName(this._getChildName(i + "_" + (j - 1)));
- lastW.element.css({right: (100 - left) + "%"});
+ lastW.element.css({ right: (100 - left) + "%" });
}
if (j == o.columns - 1) {
- w.element.css({right: "0%"});
+ w.element.css({ right: "0%" });
}
first(w, self.getRowColumnCls(i, j, rows - 1, columns - 1));
totalW += map[i][j].width;
@@ -103,13 +103,13 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
for (var i = 0; i < o.rows; i++) {
var w = this.getWidgetByName(this._getChildName(i + "_" + j));
var top = totalH * 100 / heights[j];
- w.element.css({top: top + "%"});
+ w.element.css({ top: top + "%" });
if (i > 0) {
var lastW = this.getWidgetByName(this._getChildName((i - 1) + "_" + j));
- lastW.element.css({bottom: (100 - top) + "%"});
+ lastW.element.css({ bottom: (100 - top) + "%" });
}
if (i == o.rows - 1) {
- w.element.css({bottom: "0%"});
+ w.element.css({ bottom: "0%" });
}
totalH += map[i][j].height;
}
diff --git a/src/core/wrapper/layout/layout.grid.js b/src/core/wrapper/layout/layout.grid.js
index 53e4cf00b..a954c4f48 100644
--- a/src/core/wrapper/layout/layout.grid.js
+++ b/src/core/wrapper/layout/layout.grid.js
@@ -24,7 +24,7 @@ BI.GridLayout = BI.inherit(BI.Layout, {
addItem: function () {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (items) {
@@ -36,19 +36,19 @@ BI.GridLayout = BI.inherit(BI.Layout, {
els[i] = [];
}
- function firstElement (item, cls) {
+ function firstElement(item, cls) {
item.addClass(cls);
return item;
}
- function firstObject (item, cls) {
+ function firstObject(item, cls) {
item.cls = (item.cls || "") + cls;
return item;
}
- function first (item, row, col) {
+ function first(item, row, col) {
if (item instanceof BI.Widget) {
firstElement(item.element, row, col);
} else if (item.el instanceof BI.Widget) {
diff --git a/src/core/wrapper/layout/layout.tape.js b/src/core/wrapper/layout/layout.tape.js
index 9303f5865..39f852461 100644
--- a/src/core/wrapper/layout/layout.tape.js
+++ b/src/core/wrapper/layout/layout.tape.js
@@ -29,7 +29,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (items) {
@@ -154,7 +154,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (items) {
diff --git a/src/core/wrapper/layout/layout.window.js b/src/core/wrapper/layout/layout.window.js
index a6e6c6a26..281fa5e2a 100644
--- a/src/core/wrapper/layout/layout.window.js
+++ b/src/core/wrapper/layout/layout.window.js
@@ -31,7 +31,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
stroke: function (items) {
@@ -43,19 +43,19 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
o.columnSize = BI.makeArray(o.items[0].length, 1 / o.items[0].length);
}
- function firstElement (item, cls) {
+ function firstElement(item, cls) {
item.addClass(cls);
return item;
}
- function firstObject (item, cls) {
+ function firstObject(item, cls) {
item.cls = (item.cls || "") + cls;
return item;
}
- function first (item, row, col) {
+ function first(item, row, col) {
if (item instanceof BI.Widget) {
firstElement(item.element, row, col);
} else if (item.el instanceof BI.Widget) {
@@ -70,11 +70,11 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
for (var i = 0; i < o.rows; i++) {
for (var j = 0; j < o.columns; j++) {
if (!o.items[i][j]) {
- throw new Error("构造错误", o.items);
+ throw new Error("create items error", o.items);
}
if (!this.hasWidget(this._getChildName(i + "_" + j))) {
var w = BI._lazyCreateWidget(o.items[i][j]);
- w.element.css({position: "absolute"});
+ w.element.css({ position: "absolute" });
this.addWidget(this._getChildName(i + "_" + j), w);
}
}
@@ -95,7 +95,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
if (BI.isNumber(o.rowSize[i])) {
h = this._optimiseGap(o.rowSize[i]);
}
- wi.element.css({top: t, height: h});
+ wi.element.css({ top: t, height: h });
first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.rowSize[i])) {
@@ -113,7 +113,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
if (BI.isNumber(o.rowSize[i])) {
h = this._optimiseGap(o.rowSize[i]);
}
- wi.element.css({bottom: b, height: h});
+ wi.element.css({ bottom: b, height: h });
first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.rowSize[i])) {
@@ -131,7 +131,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
if (BI.isNumber(o.columnSize[j])) {
w = this._optimiseGap(o.columnSize[j]);
}
- wi.element.css({left: l, width: w});
+ wi.element.css({ left: l, width: w });
first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.columnSize[j])) {
@@ -149,7 +149,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
if (BI.isNumber(o.columnSize[j])) {
w = this._optimiseGap(o.columnSize[j]);
}
- wi.element.css({right: r, width: w});
+ wi.element.css({ right: r, width: w });
first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.columnSize[j])) {
diff --git a/src/core/wrapper/layout/middle/middle.center.js b/src/core/wrapper/layout/middle/middle.center.js
index 9d80a094f..bd13d360c 100644
--- a/src/core/wrapper/layout/middle/middle.center.js
+++ b/src/core/wrapper/layout/middle/middle.center.js
@@ -62,7 +62,7 @@ BI.CenterLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/middle/middle.float.center.js b/src/core/wrapper/layout/middle/middle.float.center.js
index d1e2a4695..90c130cb2 100644
--- a/src/core/wrapper/layout/middle/middle.float.center.js
+++ b/src/core/wrapper/layout/middle/middle.float.center.js
@@ -61,7 +61,7 @@ BI.FloatCenterLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/middle/middle.horizontal.js b/src/core/wrapper/layout/middle/middle.horizontal.js
index c42fde9c0..81c12e7ae 100644
--- a/src/core/wrapper/layout/middle/middle.horizontal.js
+++ b/src/core/wrapper/layout/middle/middle.horizontal.js
@@ -60,7 +60,7 @@ BI.HorizontalCenterLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/core/wrapper/layout/middle/middle.vertical.js b/src/core/wrapper/layout/middle/middle.vertical.js
index b835bc4f6..6cc161716 100644
--- a/src/core/wrapper/layout/middle/middle.vertical.js
+++ b/src/core/wrapper/layout/middle/middle.vertical.js
@@ -61,7 +61,7 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
addItem: function (item) {
// do nothing
- throw new Error("不能添加子组件");
+ throw new Error("Cannot add subwidget");
},
populate: function (items) {
diff --git a/src/less/base/single/text.less b/src/less/base/single/text.less
index bd4aada73..14f567d72 100644
--- a/src/less/base/single/text.less
+++ b/src/less/base/single/text.less
@@ -3,5 +3,8 @@
.bi-text {
.overflow-hidden();
.box-sizing(border-box);
- word-break: break-all;
-}
\ No newline at end of file
+
+ // https://developer.mozilla.org/en-US/docs/Web/CSS/word-break 参考mdn最标准的规范. 不再接受任何质疑
+ word-break: normal;
+ overflow-wrap: anywhere;
+}
diff --git a/src/less/widget/multitree/check/multi.tree.check.pane.less b/src/less/widget/multitree/check/multi.tree.check.pane.less
deleted file mode 100644
index e193fb210..000000000
--- a/src/less/widget/multitree/check/multi.tree.check.pane.less
+++ /dev/null
@@ -1,9 +0,0 @@
-@import "../../../index.less";
-
-.bi-multi-tree-check-pane {
- & .multi-tree-continue-select {
- }
- & .multi-tree-check-selected {
- color: @color-bi-text-multi-tree-check-pane-check-button;
- }
-}
\ No newline at end of file
diff --git a/src/widget/multiselect/loader.js b/src/widget/multiselect/loader.js
index c2c2d8de7..3ea50472f 100644
--- a/src/widget/multiselect/loader.js
+++ b/src/widget/multiselect/loader.js
@@ -26,9 +26,11 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
return true;
}
},
- layouts: [{
- type: "bi.vertical"
- }]
+ layouts: [
+ {
+ type: "bi.vertical"
+ }
+ ]
},
items: [],
@@ -53,10 +55,12 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
this.cachItems = this.cachItems.slice(100);
return;
}
- o.itemsCreator.apply(this, [{times: ++this.times}, function () {
- self.next.setLoaded();
- self.addItems.apply(self, arguments);
- }]);
+ o.itemsCreator.apply(this, [
+ { times: ++this.times }, function () {
+ self.next.setLoaded();
+ self.addItems.apply(self, arguments);
+ }
+ ]);
},
render: function () {
@@ -69,9 +73,11 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
chooseType: 0,
items: o.items,
behaviors: {},
- layouts: [{
- type: "bi.vertical"
- }],
+ layouts: [
+ {
+ type: "bi.vertical"
+ }
+ ],
value: o.value
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function (type, value, obj) {
@@ -95,9 +101,11 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
chooseType: 0,
items: o.items,
behaviors: {},
- layouts: [{
- type: "bi.vertical"
- }],
+ layouts: [
+ {
+ type: "bi.vertical"
+ }
+ ],
value: o.value
});
BI.Widget.registerRenderEngine(renderEngine);
@@ -132,10 +140,12 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
if (this.cachItems && this.cachItems.length > 0) {
return true;
}
- return !!o.hasNext.apply(this, [{
- times: this.times,
- count: this.count
- }]);
+ return !!o.hasNext.apply(this, [
+ {
+ times: this.times,
+ count: this.count
+ }
+ ]);
},
addItems: function (items) {
@@ -158,13 +168,15 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
_populate: function (items) {
var self = this, o = this.options;
if (arguments.length === 0 && (BI.isFunction(o.itemsCreator))) {
- o.itemsCreator.apply(this, [{times: 1}, function (items, keyword) {
- if (arguments.length === 0) {
- throw new Error("参数不能为空");
+ o.itemsCreator.apply(this, [
+ { times: 1 }, function (items, keyword) {
+ if (arguments.length === 0) {
+ throw new Error("Parameter cannot be empty");
+ }
+ self.populate.apply(self, arguments);
+ o.onLoaded();
}
- self.populate.apply(self, arguments);
- o.onLoaded();
- }]);
+ ]);
return false;
}
this.options.items = (items || []).slice(0, 100 + (items || []).length % 100);
diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js
index 8b6e8785f..4c7da6df9 100644
--- a/src/widget/multiselectlist/multiselectlist.insert.js
+++ b/src/widget/multiselectlist/multiselectlist.insert.js
@@ -9,6 +9,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
valueFormatter: BI.emptyFn,
searcherHeight: BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+ simple: false,
});
},
_init: function () {
@@ -70,6 +71,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
el: {
type: "bi.search_editor",
watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"),
+ simple: o.simple,
},
ref: function (ref) {
self.editor = ref;
diff --git a/src/widget/multiselecttree/multiselecttree.js b/src/widget/multiselecttree/multiselecttree.js
index 959c6593b..ef77287d9 100644
--- a/src/widget/multiselecttree/multiselecttree.js
+++ b/src/widget/multiselecttree/multiselecttree.js
@@ -9,7 +9,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree",
- itemsCreator: BI.emptyFn
+ itemsCreator: BI.emptyFn,
+ simple: false,
});
},
@@ -51,6 +52,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
type: "bi.searcher",
isAutoSearch: false,
isAutoSync: false,
+ simple: o.simple,
onSearch: function (op, callback) {
callback({
keyword: self.searcher.getKeyword()
diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js
index 598a19f21..4adbe1f90 100644
--- a/src/widget/multitree/check/multi.tree.check.pane.js
+++ b/src/widget/multitree/check/multi.tree.check.pane.js
@@ -32,7 +32,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
type: "bi.text_button",
title: BI.i18nText("BI-Continue_Select"),
text: BI.i18nText("BI-Continue_Select"),
- cls: "multi-tree-check-selected"
+ cls: "bi-high-light",
});
continueSelect.on(BI.TextButton.EVENT_CHANGE, function () {
opts.onClickContinueSelect();
diff --git a/src/widget/singleselect/singleselectlist.insert.js b/src/widget/singleselect/singleselectlist.insert.js
index cd32a22e8..def836349 100644
--- a/src/widget/singleselect/singleselectlist.insert.js
+++ b/src/widget/singleselect/singleselectlist.insert.js
@@ -12,6 +12,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
itemWrapper: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcherHeight: 24,
+ simple: false,
});
},
_init: function () {
@@ -70,6 +71,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
el: {
type: "bi.search_editor",
watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"),
+ simple: o.simple,
},
ref: function (ref) {
self.editor = ref;
diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
index 956e18552..55ff01e49 100644
--- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
+++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
@@ -5,7 +5,7 @@
BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function (config) {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
- baseCls: "bi-text-value-down-list-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+ baseCls: "bi-text-value-down-list-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24,
});
},
diff --git a/src/widget/timeinterval/dateinterval.js b/src/widget/timeinterval/dateinterval.js
index 2da77de8b..98e27e3ce 100644
--- a/src/widget/timeinterval/dateinterval.js
+++ b/src/widget/timeinterval/dateinterval.js
@@ -17,6 +17,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
maxDate: "2099-12-31",
height: 24,
supportDynamic: true,
+ simple: false,
});
},
diff --git a/src/widget/yearmonthinterval/yearmonthinterval.js b/src/widget/yearmonthinterval/yearmonthinterval.js
index 814123f67..2bec1d88d 100644
--- a/src/widget/yearmonthinterval/yearmonthinterval.js
+++ b/src/widget/yearmonthinterval/yearmonthinterval.js
@@ -11,7 +11,8 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
minDate: "1900-01-01",
maxDate: "2099-12-31",
supportDynamic: true,
- height: 24
+ height: 24,
+ simple: false,
},
render: function () {
@@ -45,6 +46,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_year_month_combo",
+ simple: o.simple,
supportDynamic: o.supportDynamic,
height: o.height,
minDate: o.minDate,
diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js
index a48a8c17f..c4bb88e5c 100644
--- a/webpack/webpack.prod.js
+++ b/webpack/webpack.prod.js
@@ -72,7 +72,7 @@ module.exports = merge.smart(common, {
}
}),
new webpack.BannerPlugin({
- banner: `time: ${new Date().toLocaleString()}; branch: ${git(
+ banner: `time: ${new Date().toLocaleString("en-US")}; branch: ${git(
'name-rev --name-only HEAD'
)} commit: ${git(
'rev-parse HEAD'