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

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

* commit '33f1d45cae860487417398496b44dda1e3fa0d09':
  build
  build
  无JIRA任务,  label _createNotCenterEl的时候要根据textAlign来决定用vertical_adapt还是right_vertical_adapt
es6
Dailer 6 years ago
parent
9f2d3c290e 33f1d45cae
commit
bc87f131cb
26 changed files with 372 additions and 315 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. 2
      dist/2.0/fineui.css
  2. 56
      dist/2.0/fineui.ie.js
  3. 34
      dist/2.0/fineui.ie.min.js
  4. 56
      dist/2.0/fineui.js
  5. 34
      dist/2.0/fineui.min.js
  6. 34
      dist/base.js
  7. 2
      dist/bundle.css
  8. 56
      dist/bundle.ie.js
  9. 34
      dist/bundle.ie.min.js
  10. 56
      dist/bundle.js
  11. 34
      dist/bundle.min.js
  12. 1
      dist/core.css
  13. 1
      dist/core.js
  14. 2
      dist/demo.js
  15. 2
      dist/fineui.css
  16. 56
      dist/fineui.ie.js
  17. 34
      dist/fineui.ie.min.js
  18. 56
      dist/fineui.js
  19. 34
      dist/fineui.min.js
  20. 56
      dist/fineui_without_jquery_polyfill.js
  21. 1
      dist/resource.css
  22. 2
      dist/utils.min.js
  23. 21
      dist/widget.js
  24. 11
      src/base/single/label/html.label.js
  25. 11
      src/base/single/label/label.js
  26. 1
      src/core/shortcut.js

2
dist/2.0/fineui.css vendored
Unescape View File

@ -276,7 +276,6 @@ li {
} }
i { i {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
input, input,
@ -4633,7 +4632,6 @@ textarea::-webkit-scrollbar-thumb:hover {
font-family: 'fineui'; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.close-font .b-font { .close-font .b-font {

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

@ -12233,7 +12233,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -44550,7 +44549,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -44774,9 +44773,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -44825,9 +44824,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -44840,7 +44839,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -46454,13 +46453,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46473,7 +46473,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46509,7 +46509,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46527,7 +46527,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46574,7 +46574,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -46868,13 +46868,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46887,7 +46888,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46923,7 +46924,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46941,7 +46942,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46988,7 +46989,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -62559,6 +62560,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -63150,7 +63152,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -63176,11 +63179,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -63515,6 +63518,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -64217,7 +64221,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -64243,7 +64248,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -76682,7 +76687,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -80390,6 +80395,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -80536,6 +80542,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -80589,7 +80597,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

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

File diff suppressed because one or more lines are too long

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

@ -12233,7 +12233,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -44954,7 +44953,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -45178,9 +45177,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -45229,9 +45228,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -45244,7 +45243,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -46858,13 +46857,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46877,7 +46877,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46913,7 +46913,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46931,7 +46931,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46978,7 +46978,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -47272,13 +47272,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -47291,7 +47292,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47327,7 +47328,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47345,7 +47346,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47392,7 +47393,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -62963,6 +62964,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -63554,7 +63556,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -63580,11 +63583,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -63919,6 +63922,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -64621,7 +64625,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -64647,7 +64652,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -77086,7 +77091,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -80794,6 +80799,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -80940,6 +80946,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -80993,7 +81001,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

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

File diff suppressed because one or more lines are too long

34
dist/base.js vendored
Unescape View File

@ -9078,7 +9078,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -9302,9 +9302,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -9353,9 +9353,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -9368,7 +9368,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -10982,13 +10982,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -11001,7 +11002,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -11037,7 +11038,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -11055,7 +11056,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -11102,7 +11103,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -11396,13 +11397,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -11415,7 +11417,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -11451,7 +11453,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -11469,7 +11471,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -11516,7 +11518,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });

2
dist/bundle.css vendored
Unescape View File

@ -276,7 +276,6 @@ li {
} }
i { i {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
input, input,
@ -4633,7 +4632,6 @@ textarea::-webkit-scrollbar-thumb:hover {
font-family: 'fineui'; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.close-font .b-font { .close-font .b-font {

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

@ -12233,7 +12233,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -44550,7 +44549,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -44774,9 +44773,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -44825,9 +44824,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -44840,7 +44839,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -46454,13 +46453,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46473,7 +46473,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46509,7 +46509,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46527,7 +46527,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46574,7 +46574,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -46868,13 +46868,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46887,7 +46888,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46923,7 +46924,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46941,7 +46942,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46988,7 +46989,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -62559,6 +62560,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -63150,7 +63152,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -63176,11 +63179,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -63515,6 +63518,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -64217,7 +64221,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -64243,7 +64248,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -76682,7 +76687,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -80390,6 +80395,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -80536,6 +80542,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -80589,7 +80597,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

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

File diff suppressed because one or more lines are too long

56
dist/bundle.js vendored
Unescape View File

@ -12233,7 +12233,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -44954,7 +44953,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -45178,9 +45177,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -45229,9 +45228,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -45244,7 +45243,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -46858,13 +46857,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46877,7 +46877,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46913,7 +46913,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46931,7 +46931,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46978,7 +46978,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -47272,13 +47272,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -47291,7 +47292,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47327,7 +47328,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47345,7 +47346,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47392,7 +47393,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -62963,6 +62964,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -63554,7 +63556,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -63580,11 +63583,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -63919,6 +63922,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -64621,7 +64625,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -64647,7 +64652,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -77086,7 +77091,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -80794,6 +80799,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -80940,6 +80946,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -80993,7 +81001,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

34
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/core.css vendored
Unescape View File

@ -276,7 +276,6 @@ li {
} }
i { i {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
input, input,

1
dist/core.js vendored
Unescape View File

@ -12233,7 +12233,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {

2
dist/demo.js vendored
Unescape View File

@ -1854,7 +1854,7 @@ BI.shortcut("demo.tree_view", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: combo1, el: combo1,
left: 10, left: 150,
top: 10 top: 10
}, { }, {
el: combo2, el: combo2,

2
dist/fineui.css vendored
Unescape View File

@ -276,7 +276,6 @@ li {
} }
i { i {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
input, input,
@ -4633,7 +4632,6 @@ textarea::-webkit-scrollbar-thumb:hover {
font-family: 'fineui'; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.close-font .b-font { .close-font .b-font {

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

@ -12478,7 +12478,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -44795,7 +44794,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -45019,9 +45018,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -45070,9 +45069,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -45085,7 +45084,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -46699,13 +46698,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -46718,7 +46718,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46754,7 +46754,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46772,7 +46772,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -46819,7 +46819,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -47113,13 +47113,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -47132,7 +47133,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47168,7 +47169,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47186,7 +47187,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47233,7 +47234,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -62804,6 +62805,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -63395,7 +63397,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -63421,11 +63424,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -63760,6 +63763,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -64462,7 +64466,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -64488,7 +64493,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -76927,7 +76932,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -80635,6 +80640,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -80781,6 +80787,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -80834,7 +80842,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

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

File diff suppressed because one or more lines are too long

56
dist/fineui.js vendored
Unescape View File

@ -12478,7 +12478,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -45199,7 +45198,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -45423,9 +45422,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -45474,9 +45473,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -45489,7 +45488,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -47103,13 +47102,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -47122,7 +47122,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47158,7 +47158,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47176,7 +47176,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47223,7 +47223,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -47517,13 +47517,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -47536,7 +47537,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47572,7 +47573,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47590,7 +47591,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -47637,7 +47638,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -63208,6 +63209,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -63799,7 +63801,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -63825,11 +63828,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -64164,6 +64167,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -64866,7 +64870,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -64892,7 +64897,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -77331,7 +77336,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -81039,6 +81044,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -81185,6 +81191,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -81238,7 +81246,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

34
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

56
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -12233,7 +12233,6 @@ if (!_global.BI) {
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {
@ -32395,7 +32394,7 @@ BI.Editor = BI.inherit(BI.Single, {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {
errorText = errorText(this.editor.getValue()); errorText = errorText(BI.trim(this.editor.getValue()));
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -32619,9 +32618,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 10, left: 4,
right: 10, right: 10,
top: 8, top: 4,
bottom: 8 bottom: 8
}] }]
}); });
@ -32670,9 +32669,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
if (!this.watermark) { if (!this.watermark) {
this.watermark = BI.createWidget({ this.watermark = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "bi-water-mark", cls: "bi-water-mark cursor-default",
textAlign: "left", textAlign: "left",
height: 30, height: 20,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled disabled: o.disabled
@ -32685,7 +32684,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
element: this, element: this,
items: [{ items: [{
el: this.watermark, el: this.watermark,
left: 10, left: 4,
top: 4, top: 4,
right: 0 right: 0
}] }]
@ -33674,13 +33673,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -33693,7 +33693,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -33729,7 +33729,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -33747,7 +33747,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -33794,7 +33794,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -34088,13 +34088,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -34107,7 +34108,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -34143,7 +34144,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -34161,7 +34162,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -34208,7 +34209,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });
@ -45617,6 +45618,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -46208,7 +46210,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -46234,11 +46237,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -46573,6 +46576,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -47275,7 +47279,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -47301,7 +47306,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -59740,7 +59745,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -63448,6 +63453,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -63594,6 +63600,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -63647,7 +63655,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

1
dist/resource.css vendored
Unescape View File

@ -291,7 +291,6 @@ textarea::-webkit-scrollbar-thumb:hover {
font-family: 'fineui'; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.close-font .b-font { .close-font .b-font {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
dist/widget.js vendored
Unescape View File

@ -2750,6 +2750,7 @@ BI.extend(BI.DynamicDateCard, {
max: opts.maxDate, max: opts.maxDate,
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
ref: function () { ref: function () {
@ -3341,7 +3342,8 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -3367,11 +3369,11 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text"): BI.i18nText("BI-Year_Trigger_Invalid_Text"); str = self.editor.isEditing() ? BI.i18nText("BI-Date_Trigger_Error_Text") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
} }
return str; return str;
}, },
@ -3706,6 +3708,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
height: opts.height, height: opts.height,
value: opts.value, value: opts.value,
@ -4408,7 +4411,8 @@ BI.extend(BI.DynamicDateTimeSelect, {
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
height: 24, height: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: ""
}, },
_init: function () { _init: function () {
@ -4434,7 +4438,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
errorText: function () { errorText: function () {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -16873,7 +16877,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-select-tree-combo", baseCls: "bi-select-tree-combo",
height: 30, height: 24,
text: "", text: "",
items: [], items: [],
value: "", value: "",
@ -20581,6 +20585,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
el: { el: {
type: "bi.time_trigger", type: "bi.time_trigger",
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark,
format: opts.format, format: opts.format,
value: opts.value, value: opts.value,
ref: function (_ref) { ref: function (_ref) {
@ -20727,6 +20732,8 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE";
BI.TimeCombo.EVENT_VALID = "EVENT_VALID";
BI.TimeCombo.EVENT_ERROR = "EVENT_ERROR";
BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.time_combo", BI.TimeCombo); BI.shortcut("bi.time_combo", BI.TimeCombo);
})();!(function () { })();!(function () {
@ -20780,7 +20787,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
value: this._formatValue(o.value), value: this._formatValue(o.value),
hgap: 4, hgap: 4,
allowBlank: true, allowBlank: true,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
title: BI.bind(this._getTitle, this), title: BI.bind(this._getTitle, this),
listeners: [{ listeners: [{
eventName: "EVENT_KEY_DOWN", eventName: "EVENT_KEY_DOWN",

11
src/base/single/label/html.label.js
Unescape View File

@ -194,13 +194,14 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -213,7 +214,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -249,7 +250,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -267,7 +268,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -314,7 +315,7 @@ BI.HtmlLabel = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });

11
src/base/single/label/label.js
Unescape View File

@ -203,13 +203,14 @@ BI.Label = BI.inherit(BI.Single, {
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = o.textAlign === "right" ? "bi.right_vertical_adapt" : "bi.vertical_adapt";
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
height: o.height, height: o.height,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
element: this, element: this,
@ -222,7 +223,7 @@ BI.Label = BI.inherit(BI.Single, {
return; return;
} }
BI.createWidget({ // 2.2 BI.createWidget({ // 2.2
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -258,7 +259,7 @@ BI.Label = BI.inherit(BI.Single, {
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -276,7 +277,7 @@ BI.Label = BI.inherit(BI.Single, {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.width = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: "bi.vertical_adapt", type: adaptLayout,
scrollable: o.whiteSpace === "normal", scrollable: o.whiteSpace === "normal",
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,
@ -323,7 +324,7 @@ BI.Label = BI.inherit(BI.Single, {
maxWidth: "100%" maxWidth: "100%"
})); }));
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: adaptLayout,
element: this, element: this,
items: [this.text] items: [this.text]
}); });

1
src/core/shortcut.js
Unescape View File

@ -6,7 +6,6 @@
} }
kv[xtype] = cls; kv[xtype] = cls;
}; };
// 根据配置属性生成widget // 根据配置属性生成widget
var createWidget = function (config) { var createWidget = function (config) {
if (config["classType"]) { if (config["classType"]) {

Write Preview
Loading…
Cancel
Save