From a6018a92fd29e61ab61e01135ff4754f236ce770 Mon Sep 17 00:00:00 2001 From: iapyang Date: Mon, 8 Nov 2021 14:19:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20fix:=20?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=A4=9A=E5=87=8F=E7=9A=84=E5=AE=BD=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdate/dynamicdate.combo.js | 12 ++++++------ src/widget/dynamicdatetime/dynamicdatetime.combo.js | 10 +++++----- src/widget/year/combo.year.js | 8 ++++---- src/widget/yearmonth/combo.yearmonth.js | 8 ++++---- src/widget/yearquarter/combo.yearquarter.js | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index ef010b87f..c587425cb 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -30,7 +30,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { this.storeTriggerValue = ""; var date = BI.getDate(); this.storeValue = opts.value; - + return { type: "bi.absolute", items: [{ @@ -250,10 +250,10 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { self.comboWrapper = _ref; } }, - top: 1, - left: 1, - right: 1, - bottom: 1 + top: 0, + left: 0, + right: 0, + bottom: 0 }] }; }, @@ -289,7 +289,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { return BI.isNotEmptyObject(v.value); case BI.DynamicDateCombo.Static: var value = v.value || {}; - + return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0]; default: return true; diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index bc0f71c44..ae201b041 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -30,7 +30,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { this.storeTriggerValue = ""; var date = BI.getDate(); this.storeValue = opts.value; - + return { type: "bi.absolute", items: [{ @@ -259,10 +259,10 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { self.comboWrapper = _ref; } }, - top: 1, - left: 1, - right: 1, - bottom: 1 + top: 0, + left: 0, + right: 0, + bottom: 0 }] }; }, diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index b23b660e4..eb94f34b9 100644 --- a/src/widget/year/combo.year.js +++ b/src/widget/year/combo.year.js @@ -141,10 +141,10 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { width: o.height - 2 }, this.combo] }, - top: 1, - left: 1, - right: 1, - bottom: 1 + top: 0, + left: 0, + right: 0, + bottom: 0 }] }); this._checkDynamicValue(o.value); diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index 761760e1a..4986f7928 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -145,10 +145,10 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { width: o.height - 2 }, this.combo] }, - top: 1, - left: 1, - right: 1, - bottom: 1 + top: 0, + left: 0, + right: 0, + bottom: 0 }] }); this._checkDynamicValue(o.value); diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js index 83c973702..85f093e69 100644 --- a/src/widget/yearquarter/combo.yearquarter.js +++ b/src/widget/yearquarter/combo.yearquarter.js @@ -145,10 +145,10 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { width: o.height - 2 }, this.combo] }, - top: 1, - left: 1, - right: 1, - bottom: 1 + top: 0, + left: 0, + right: 0, + bottom: 0 }] }); this._checkDynamicValue(o.value); From 7d66fb9ae8250a1ba5d86789fb103b664ea6a570 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 8 Nov 2021 15:31:52 +0800 Subject: [PATCH 2/5] auto upgrade version to 2.0.20211108153147 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13ede08ac..0d3cd947b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211107204304", + "version": "2.0.20211108153147", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 22778d8eef349f0a04613419b6ccda6e4d4017f5 Mon Sep 17 00:00:00 2001 From: Kira Date: Mon, 8 Nov 2021 15:52:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20refactor:?= =?UTF-8?q?=20=E8=A1=A5=E5=85=85=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/single/button/listitem/icontextitem.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/typescript/base/single/button/listitem/icontextitem.ts b/typescript/base/single/button/listitem/icontextitem.ts index cde508fe8..5e3f3d6e9 100644 --- a/typescript/base/single/button/listitem/icontextitem.ts +++ b/typescript/base/single/button/listitem/icontextitem.ts @@ -10,6 +10,7 @@ export declare class IconTextItem extends BasicButton { dynamic: boolean; }; iconWrapperWidth?: number; + iconCls?: string; iconHeight?: number; iconWidth?: number; textHgap?: number; From 5eac89921342234d06bb14f27de4e343b95cee96 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 8 Nov 2021 16:34:42 +0800 Subject: [PATCH 4/5] auto upgrade version to 2.0.20211108163432 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d3cd947b..2306f4d20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211108153147", + "version": "2.0.20211108163432", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 416ab1edd32820ec34a2ba86de93b6e44317b537 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 8 Nov 2021 19:14:04 +0800 Subject: [PATCH 5/5] auto upgrade version to 2.0.20211108191350 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2306f4d20..1b7fe5515 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211108163432", + "version": "2.0.20211108191350", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",