Browse Source

Merge pull request #163805 in DEC/fineui from master to feature/x

* commit '69fb9ed436479803f89d6e8f90cf596c0b516128':
  KERNEL-11911 feat: label组件默认使用text作为tooltip,仅对label生效,不影响html_label
  KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿
  Revert "KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿"
  KERNEL-12683 feat: 文件上传支持自定义校验 , bi.file reset方法清空前一次上传的files
  无JIRA 去掉sameroute报错
master
superman 2 years ago
parent
commit
71cb208b6b
  1. 3
      src/base/single/editor/editor.multifile.js
  2. 1
      src/base/single/input/file.js
  3. 17
      src/base/single/label/abstract.label.js
  4. 17
      src/base/single/label/label.js
  5. 8
      src/base/single/tip/tip.tooltip.js
  6. 2
      src/router/router.js

3
src/base/single/editor/editor.multifile.js

@ -43,12 +43,14 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
});
this.file.on(BI.File.EVENT_ERROR, function () {
self.fireEvent(BI.MultifileEditor.EVENT_ERROR, arguments);
self._reset();
});
this.file.on(BI.File.EVENT_PROGRESS, function () {
self.fireEvent(BI.MultifileEditor.EVENT_PROGRESS, arguments);
});
this.file.on(BI.File.EVENT_UPLOADED, function () {
self.fireEvent(BI.MultifileEditor.EVENT_UPLOADED, arguments);
self._reset();
});
BI.createWidget({
@ -93,7 +95,6 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
upload: function () {
this._reset();
this.file.upload();
},

1
src/base/single/input/file.js

@ -705,6 +705,7 @@
reset: function () {
if (this.wrap) {
this.wrap.files = [];
this.wrap.attach_array = [];
this.wrap.attach_names = [];
this.wrap.attachNum = 0;

17
src/base/single/label/abstract.label.js

@ -24,23 +24,6 @@
});
},
getTitle: function () {
var title = this.options.title;
var text = this.options.text;
if (BI.isFunction(title)) {
return title();
}
if (BI.isNotNull(title)) {
return title;
}
if (BI.isFunction(text)) {
return text();
}
return text;
},
_createJson: function () {
var o = this.options;

17
src/base/single/label/label.js

@ -10,6 +10,23 @@ BI.Label = BI.inherit(BI.AbstractLabel, {
keyword: "",
},
getTitle: function () {
var title = this.options.title;
var text = this.options.text;
if (BI.isFunction(title)) {
return title();
}
if (BI.isNotNull(title)) {
return title;
}
if (BI.isFunction(text)) {
return text();
}
return text;
},
doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments);
},

8
src/base/single/tip/tip.tooltip.js

@ -25,12 +25,10 @@ BI.Tooltip = BI.inherit(BI.Tip, {
render: function () {
var o = this.options;
this.element.addClass("tooltip-" + o.level);
function fn(e) {
o.stopPropagation && e.stopPropagation();
o.stopEvent && e.stopEvent();
}
this.element.bind({
click: fn,
mousedown: fn,
@ -50,21 +48,23 @@ BI.Tooltip = BI.inherit(BI.Tip, {
innerVgap: this._const.vgap,
items: BI.map(texts, function (i, text) {
return {
type: "bi.text",
type: "bi.label",
textAlign: o.textAlign,
whiteSpace: "normal",
text: text,
textHeight: 18,
title: null,
};
}),
});
} else {
this.text = BI.createWidget({
type: "bi.text",
type: "bi.label",
element: this,
textAlign: o.textAlign,
whiteSpace: "normal",
text: o.text,
title: null,
textHeight: 18,
hgap: this._const.hgap,
vgap: this._const.vgap,

2
src/router/router.js

@ -2326,7 +2326,7 @@
route.matched[lastRouteIndex] === current.matched[lastCurrentIndex]
) {
this.ensureURL();
return abort(createNavigationDuplicatedError(current, route))
return;
}
var ref = resolveQueue(

Loading…
Cancel
Save