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

Pull request #214887: Release/11.0 

Merge in DEC/fineui from ~DAILER/fineui-decision:release/11.0 to release/11.0

* commit '7ee10f2794e686648357cf241887d65b9b1dfa70':
  auto upgrade version to 2.0.20221230161545
  ESIGN-110 feat: 反馈-tooltip
  BI-119217 fix: 【6.0.6冒烟】等比自适应-高清屏-宽度自适应预览，下拉树查看已选展示异常
  JSY-25726 fix: 【冒烟】年季度/年月/年月区间筛选器，输入非法值后清空，设置框仍然标红
  auto upgrade version to 2.0.20221230101648
  KERNEL-13948 docs: 修复combo_group demo接口错误
  auto upgrade version to 2.0.20221228163952
  REPORT-85533 fix: BI.parseDateTime方法对%l:%M:%S %P这种格式的日期如果带有秒数解析出错
  auto upgrade version to 2.0.20221226102617
  auto upgrade version to 2.0.20221223112542
  auto upgrade version to 2.0.20221223092552
  auto upgrade version to 2.0.20221221181657
  auto upgrade version to 2.0.20221221100651
research/test
Dailer-刘荣歆 2 years ago
parent
4cc3afa25c 7ee10f2794
commit
c02c27bf01
7 changed files with 147 additions and 119 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. 3
      bi.lessconfig.json
  2. 4
      demo/js/core/abstract/combination/demo.combo_group.js
  3. 2
      package.json
  4. 13
      src/core/2.base.js
  5. 2
      src/core/platform/web/dom.js
  6. 120
      src/widget/yearmonth/combo.yearmonth.js
  7. 122
      src/widget/yearquarter/combo.yearquarter.js

3
bi.lessconfig.json
Unescape View File

@ -29,7 +29,8 @@
"@color-bi-background-disabled-active-radio-content-theme-dark": "#606479", "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
"@color-bi-background-disabled-active-checkbox-content": "#FFFFFF", "@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
"@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479", "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
"@color-bi-background-tooltip-success": "#2E3A4D", "@color-bi-background-tooltip-success": "#3F506A",
"@color-bi-background-tooltip-failure": "#E65251",
"@color-bi-border-tooltip-success": "#2E3A4D", "@color-bi-border-tooltip-success": "#2E3A4D",
"@color-bi-background-toast-success": "#FFFFFF", "@color-bi-background-toast-success": "#FFFFFF",
"@color-bi-background-toast-warning": "#FFFFFF", "@color-bi-background-toast-warning": "#FFFFFF",

4
demo/js/core/abstract/combination/demo.combo_group.js
Unescape View File

@ -12,7 +12,7 @@ Demo.Func = BI.inherit(BI.Widget, {
height: 25, height: 25,
iconCls: "close-ha-font" iconCls: "close-ha-font"
}, },
children: [{ items: [{
type: "bi.single_select_item", type: "bi.single_select_item",
height: 25, height: 25,
text: "一月", text: "一月",
@ -63,7 +63,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, },
width: 200 width: 200
}); });
childCombo.setValue(BI.deepClone(this.child)[0].children[0].value); childCombo.setValue(BI.deepClone(this.child)[0].items[0].value);
return BI.createWidget({ return BI.createWidget({
type: "bi.left", type: "bi.left",

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20221218194544", "version": "2.0.20221230161545",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

13
src/core/2.base.js
Unescape View File

@ -1037,11 +1037,18 @@
return MM >= 1 && MM <= 12 && DD <= MD[MM - 1]; return MM >= 1 && MM <= 12 && DD <= MD[MM - 1];
}, },
/** 解析日期时间字符串
*
* @param str
* @param fmt
* @returns {Date|Date}
* 年月日缺省值为当前日期, 时分秒缺省值为0
*/
parseDateTime: function (str, fmt) { parseDateTime: function (str, fmt) {
var today = BI.getDate(); var today = BI.getDate();
var y = 0; var y;
var m = 0; var m;
var d = 1; var d;
// wei : 对于fmt为‘YYYYMM’或者‘YYYYMMdd’的格式，str的值为类似'201111'的形式，因为年月之间没有分隔符，所以正则表达式分割无效，导致bug7376。 // wei : 对于fmt为‘YYYYMM’或者‘YYYYMMdd’的格式，str的值为类似'201111'的形式，因为年月之间没有分隔符，所以正则表达式分割无效，导致bug7376。
var a = str.split(/\W+/); var a = str.split(/\W+/);
if (fmt.toLowerCase() == "%y%x" || fmt.toLowerCase() == "%y%x%d") { if (fmt.toLowerCase() == "%y%x" || fmt.toLowerCase() == "%y%x%d") {

2
src/core/platform/web/dom.js
Unescape View File

@ -710,7 +710,7 @@
break; break;
} }
if (needAdaptHeight === true) { if (needAdaptHeight === true) {
popup.resetHeight && popup.resetHeight(Math.min(viewportBounds.height - position.top + (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight)); popup.resetHeight && popup.resetHeight(Math.min(viewportBounds.height - position.top - (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
} }
return position; return position;
}, },

120
src/widget/yearmonth/combo.yearmonth.js
Unescape View File

@ -80,39 +80,45 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
ref: function () { ref: function () {
self.popup = this; self.popup = this;
}, },
listeners: [{ listeners: [
eventName: BI.DynamicYearMonthPopup.EVENT_CHANGE, {
action: function () { eventName: BI.DynamicYearMonthPopup.EVENT_CHANGE,
self.setValue(self.popup.getValue()); action: function () {
self.combo.hideView(); self.setValue(self.popup.getValue());
self.fireEvent(BI.DynamicYearMonthCombo.EVENT_CONFIRM); self.combo.hideView();
} self.fireEvent(BI.DynamicYearMonthCombo.EVENT_CONFIRM);
}, { }
eventName: BI.DynamicYearMonthPopup.BUTTON_CLEAR_EVENT_CHANGE, }, {
action: function () { eventName: BI.DynamicYearMonthPopup.BUTTON_CLEAR_EVENT_CHANGE,
self.setValue(); action: function () {
self.combo.hideView(); self.setValue();
self.fireEvent(BI.DynamicYearMonthCombo.EVENT_CONFIRM); self.comboWrapper.element.removeClass("error");
} self.combo.hideView();
}, { self.fireEvent(BI.DynamicYearMonthCombo.EVENT_CONFIRM);
eventName: BI.DynamicYearMonthPopup.BUTTON_lABEL_EVENT_CHANGE, }
action: function () { }, {
var date = BI.getDate(); eventName: BI.DynamicYearMonthPopup.BUTTON_lABEL_EVENT_CHANGE,
self.setValue({ type: BI.DynamicYearMonthCombo.Static, value: { year: date.getFullYear(), month: date.getMonth() + 1 } }); action: function () {
self.combo.hideView(); var date = BI.getDate();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.setValue({
} type: BI.DynamicYearMonthCombo.Static,
}, { value: { year: date.getFullYear(), month: date.getMonth() + 1 }
eventName: BI.DynamicYearMonthPopup.BUTTON_OK_EVENT_CHANGE, });
action: function () { self.combo.hideView();
var value = self.popup.getValue(); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
if (self._checkValue(value)) { }
self.setValue(value); }, {
eventName: BI.DynamicYearMonthPopup.BUTTON_OK_EVENT_CHANGE,
action: function () {
var value = self.popup.getValue();
if (self._checkValue(value)) {
self.setValue(value);
}
self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
}], ],
behaviors: o.behaviors, behaviors: o.behaviors,
min: o.minDate, min: o.minDate,
max: o.maxDate max: o.maxDate
@ -130,31 +136,35 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [
el: { {
type: "bi.horizontal_fill", el: {
columnSize: ["", "fill"], type: "bi.horizontal_fill",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow", columnSize: ["", "fill"],
ref: function () { cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
self.comboWrapper = this; ref: function () {
self.comboWrapper = this;
},
items: [
{
el: {
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font",
width: BI.toPix(o.height, border),
height: BI.toPix(o.height, border),
ref: function () {
self.changeIcon = this;
}
}
}, this.combo
]
}, },
items: [{ top: 0,
el: { left: 0,
type: "bi.icon_button", right: 0,
cls: "bi-trigger-icon-button date-change-h-font", bottom: 0
width: BI.toPix(o.height, border), }
height: BI.toPix(o.height, border), ]
ref: function () {
self.changeIcon = this;
}
}
}, this.combo]
},
top: 0,
left: 0,
right: 0,
bottom: 0
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },

122
src/widget/yearquarter/combo.yearquarter.js
Unescape View File

@ -1,6 +1,6 @@
BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
_consts:{ _consts: {
iconWidth: 24 iconWidth: 24
}, },
props: { props: {
@ -83,39 +83,45 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
ref: function () { ref: function () {
self.popup = this; self.popup = this;
}, },
listeners: [{ listeners: [
eventName: BI.DynamicYearQuarterPopup.EVENT_CHANGE, {
action: function () { eventName: BI.DynamicYearQuarterPopup.EVENT_CHANGE,
self.setValue(self.popup.getValue()); action: function () {
self.combo.hideView(); self.setValue(self.popup.getValue());
self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_CONFIRM); self.combo.hideView();
} self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_CONFIRM);
}, { }
eventName: BI.DynamicYearQuarterPopup.BUTTON_CLEAR_EVENT_CHANGE, }, {
action: function () { eventName: BI.DynamicYearQuarterPopup.BUTTON_CLEAR_EVENT_CHANGE,
self.setValue(); action: function () {
self.combo.hideView(); self.setValue();
self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_CONFIRM); self.comboWrapper.element.removeClass("error");
} self.combo.hideView();
}, { self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_CONFIRM);
eventName: BI.DynamicYearQuarterPopup.BUTTON_lABEL_EVENT_CHANGE, }
action: function () { }, {
var date = BI.getDate(); eventName: BI.DynamicYearQuarterPopup.BUTTON_lABEL_EVENT_CHANGE,
self.setValue({ type: BI.DynamicYearMonthCombo.Static, value: { year: date.getFullYear(), quarter: BI.getQuarter(date) } }); action: function () {
self.combo.hideView(); var date = BI.getDate();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.setValue({
} type: BI.DynamicYearMonthCombo.Static,
}, { value: { year: date.getFullYear(), quarter: BI.getQuarter(date) }
eventName: BI.DynamicYearQuarterPopup.BUTTON_OK_EVENT_CHANGE, });
action: function () { self.combo.hideView();
var value = self.popup.getValue(); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
if (self._checkValue(value)) { }
self.setValue(value); }, {
eventName: BI.DynamicYearQuarterPopup.BUTTON_OK_EVENT_CHANGE,
action: function () {
var value = self.popup.getValue();
if (self._checkValue(value)) {
self.setValue(value);
}
self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
}], ],
behaviors: o.behaviors, behaviors: o.behaviors,
min: o.minDate, min: o.minDate,
max: o.maxDate max: o.maxDate
@ -133,31 +139,35 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [
el: { {
type: "bi.horizontal_fill", el: {
columnSize: ["", "fill"], type: "bi.horizontal_fill",
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow", columnSize: ["", "fill"],
ref: function () { cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
self.comboWrapper = this; ref: function () {
self.comboWrapper = this;
},
items: [
{
el: {
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font",
width: this._consts.iconWidth,
height: BI.toPix(o.height, border),
ref: function () {
self.changeIcon = this;
}
}
}, this.combo
]
}, },
items: [{ top: 0,
el: { left: 0,
type: "bi.icon_button", right: 0,
cls: "bi-trigger-icon-button date-change-h-font", bottom: 0
width: this._consts.iconWidth, }
height: BI.toPix(o.height, border), ]
ref: function () {
self.changeIcon = this;
}
}
}, this.combo]
},
top: 0,
left: 0,
right: 0,
bottom: 0
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },

Write Preview
Loading…
Cancel
Save