Browse Source

Pull request #3140: BI-107080 fix: 【6.0三轮回归】只有时间过滤组件无限制的时候悬浮无tooltip

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '53f950706218bdad9f5a2715387d4ffb4a7ab6cf':
  无jira editor自适应
  无JIRA: sign_editor自适应
  BI-107080 fix: 【6.0三轮回归】只有时间过滤组件无限制的时候悬浮无tooltip
es6
Dailer-刘荣歆 2 years ago
parent
commit
357f5cef05
  1. 24
      src/case/editor/editor.shelter.js
  2. 24
      src/case/editor/editor.sign.js
  3. 24
      src/case/editor/editor.state.js
  4. 3
      src/widget/dynamicdate/dynamicdate.trigger.js
  5. 42
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js
  6. 3
      src/widget/time/time.trigger.js
  7. 2
      src/widget/yearquarter/trigger.yearquarter.js

24
src/case/editor/editor.shelter.js

@ -58,17 +58,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
height: o.height, height: o.height,
hgap: o.hgap + 2 hgap: o.hgap + 2
}); });
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.text,
left: 0,
right: 0,
top: 0,
bottom: 0
}]
});
this.text.on(BI.Controller.EVENT_CHANGE, function () { this.text.on(BI.Controller.EVENT_CHANGE, function () {
arguments[2] = self; arguments[2] = self;
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@ -134,10 +123,17 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.ShelterEditor.EVENT_EMPTY, arguments); self.fireEvent(BI.ShelterEditor.EVENT_EMPTY, arguments);
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute",
scrolly: false,
element: this, element: this,
items: [this.editor] items: [
{
el: this.text,
inset: 0,
}, {
el: this.editor,
inset: 0,
}
]
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();

24
src/case/editor/editor.sign.js

@ -68,17 +68,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignEditor.EVENT_CLICK_LABEL); self.fireEvent(BI.SignEditor.EVENT_CLICK_LABEL);
}); });
}); });
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.text,
left: 0,
right: 0,
top: 0,
bottom: 0
}]
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -137,10 +126,17 @@ BI.SignEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignEditor.EVENT_EMPTY, arguments); self.fireEvent(BI.SignEditor.EVENT_EMPTY, arguments);
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute",
scrolly: false,
element: this, element: this,
items: [this.editor] items: [
{
el: this.text,
inset: 0,
}, {
el: this.editor,
inset: 0,
}
]
}); });
this._showHint(); this._showHint();
self._checkText(); self._checkText();

24
src/case/editor/editor.state.js

@ -77,17 +77,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.StateEditor.EVENT_CLICK_LABEL); self.fireEvent(BI.StateEditor.EVENT_CLICK_LABEL);
}); });
}); });
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.text,
left: 0,
right: 0,
top: 0,
bottom: 0
}]
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () { this.editor.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
@ -143,10 +132,17 @@ BI.StateEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.StateEditor.EVENT_EMPTY, arguments); self.fireEvent(BI.StateEditor.EVENT_EMPTY, arguments);
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute",
scrolly: false,
element: this, element: this,
items: [this.editor] items: [
{
el: this.text,
inset: 0,
}, {
el: this.editor,
inset: 0,
}
]
}); });
this._showHint(); this._showHint();
if (BI.isNotNull(o.text)) { if (BI.isNotNull(o.text)) {

3
src/widget/dynamicdate/dynamicdate.trigger.js

@ -152,6 +152,9 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
_getTitle: function () { _getTitle: function () {
var storeValue = this.storeValue || {}; var storeValue = this.storeValue || {};
if (BI.isEmptyObject(storeValue)) {
return this.options.watermark;
}
var type = storeValue.type || BI.DynamicDateCombo.Static; var type = storeValue.type || BI.DynamicDateCombo.Static;
var value = storeValue.value; var value = storeValue.value;
switch (type) { switch (type) {

42
src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@ -9,7 +9,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
iconWidth: 24 iconWidth: 24
}, },
props: { props: () => ({
extraCls: "bi-date-time-trigger", extraCls: "bi-date-time-trigger",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
@ -17,8 +17,8 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
iconWidth: 24, iconWidth: 24,
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true, // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: "" watermark: BI.i18nText("BI-Basic_Unrestricted"),
}, }),
_init: function () { _init: function () {
BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments); BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments);
@ -44,7 +44,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap, hgap: c.hgap,
vgap: c.vgap, vgap: c.vgap,
allowBlank: true, allowBlank: true,
watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"), watermark: o.watermark,
errorText: function (v) { errorText: function (v) {
var str = ""; var str = "";
if (!BI.isKey(o.format)) { if (!BI.isKey(o.format)) {
@ -149,7 +149,11 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
}, },
_getTitle: function () { _getTitle: function () {
var o = this.options;
var storeValue = this.storeValue || {}; var storeValue = this.storeValue || {};
if (BI.isEmptyObject(storeValue)) {
return o.watermark;
}
var type = storeValue.type || BI.DynamicDateCombo.Static; var type = storeValue.type || BI.DynamicDateCombo.Static;
var value = storeValue.value; var value = storeValue.value;
switch (type) { switch (type) {
@ -197,7 +201,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
// 这边不能直接用\d+去切日期, 因为format格式可能是20190607这样的没有分割符的 = = // 这边不能直接用\d+去切日期, 因为format格式可能是20190607这样的没有分割符的 = =
// 先看一下是否是合法的, 如果合法就变成标准格式的走原来的流程, 不合法不关心 // 先看一下是否是合法的, 如果合法就变成标准格式的走原来的流程, 不合法不关心
var date = BI.parseDateTime(v, this._getFormatString()); var date = BI.parseDateTime(v, this._getFormatString());
if(BI.print(date, this._getFormatString()) === v) { if (BI.print(date, this._getFormatString()) === v) {
v = BI.print(date, c.compareFormat); v = BI.print(date, c.compareFormat);
result = [0, 1, 2]; result = [0, 1, 2];
} }
@ -214,7 +218,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
BI.isNumeric(v) && v.length === 1 && (suffixArray[idx] = "0" + v); BI.isNumeric(v) && v.length === 1 && (suffixArray[idx] = "0" + v);
}); });
// hh:mm // hh:mm
if(suffixArray.length === 2 && !hasSecond) { if (suffixArray.length === 2 && !hasSecond) {
suffixArray.push("00"); suffixArray.push("00");
} }
var suffixString = suffixArray.join(":"); var suffixString = suffixArray.join(":");
@ -283,42 +287,42 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_getText: function (obj) { _getText: function (obj) {
var value = ""; var value = "";
var endText = ""; var endText = "";
if(BI.isNotNull(obj.year)) { if (BI.isNotNull(obj.year)) {
if(BI.parseInt(obj.year) !== 0) { if (BI.parseInt(obj.year) !== 0) {
value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
} }
endText = getPositionText(BI.i18nText("BI-Basic_Year"), obj.position); endText = getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
} }
if(BI.isNotNull(obj.quarter)) { if (BI.isNotNull(obj.quarter)) {
if(BI.parseInt(obj.quarter) !== 0) { if (BI.parseInt(obj.quarter) !== 0) {
value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
} }
endText = getPositionText(BI.i18nText("BI-Basic_Single_Quarter"), obj.position); endText = getPositionText(BI.i18nText("BI-Basic_Single_Quarter"), obj.position);
} }
if(BI.isNotNull(obj.month)) { if (BI.isNotNull(obj.month)) {
if(BI.parseInt(obj.month) !== 0) { if (BI.parseInt(obj.month) !== 0) {
value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
} }
endText = getPositionText(BI.i18nText("BI-Basic_Month"), obj.position); endText = getPositionText(BI.i18nText("BI-Basic_Month"), obj.position);
} }
if(BI.isNotNull(obj.week)) { if (BI.isNotNull(obj.week)) {
if(BI.parseInt(obj.week) !== 0) { if (BI.parseInt(obj.week) !== 0) {
value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
} }
endText = getPositionText(BI.i18nText("BI-Basic_Week"), obj.position); endText = getPositionText(BI.i18nText("BI-Basic_Week"), obj.position);
} }
if(BI.isNotNull(obj.day)) { if (BI.isNotNull(obj.day)) {
if(BI.parseInt(obj.day) !== 0) { if (BI.parseInt(obj.day) !== 0) {
value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
} }
endText = BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : ""; endText = BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : "";
} }
if(BI.isNotNull(obj.workDay) && BI.parseInt(obj.workDay) !== 0) { if (BI.isNotNull(obj.workDay) && BI.parseInt(obj.workDay) !== 0) {
value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")); value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
} }
return value + endText; return value + endText;
function getPositionText (baseText, position) { function getPositionText(baseText, position) {
switch (position) { switch (position) {
case BI.DynamicDateCard.OFFSET.BEGIN: case BI.DynamicDateCard.OFFSET.BEGIN:
return baseText + BI.i18nText("BI-Basic_Begin_Start"); return baseText + BI.i18nText("BI-Basic_Begin_Start");

3
src/widget/time/time.trigger.js

@ -157,6 +157,9 @@
_getTitle: function () { _getTitle: function () {
var storeValue = this.storeValue || {}; var storeValue = this.storeValue || {};
if (BI.isEmptyObject(storeValue)) {
return this.options.watermark;
}
var date = BI.getDate(); var date = BI.getDate();
return BI.print(BI.getDate(date.getFullYear(), 0, 1, storeValue.hour, storeValue.minute, storeValue.second), this._getFormatString()); return BI.print(BI.getDate(date.getFullYear(), 0, 1, storeValue.hour, storeValue.minute, storeValue.second), this._getFormatString());
}, },

2
src/widget/yearquarter/trigger.yearquarter.js

@ -249,9 +249,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
value = value || {}; value = value || {};
var quarter = BI.isNull(value.quarter) ? null : value.quarter; var quarter = BI.isNull(value.quarter) ? null : value.quarter;
this.yearEditor.setValue(value.year); this.yearEditor.setValue(value.year);
this.yearEditor.setTitle(value.year);
this.quarterEditor.setValue(quarter); this.quarterEditor.setValue(quarter);
this.quarterEditor.setTitle(quarter);
this.setTitle(this._getStaticTitle(value)); this.setTitle(this._getStaticTitle(value));
break; break;
} }

Loading…
Cancel
Save