diff --git a/package.json b/package.json index 13ede08ac..1b7fe5515 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211107204304", + "version": "2.0.20211108191350", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", 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); 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;