diff --git a/package.json b/package.json index b28390b2a..d46ba2d72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230227095536", + "version": "2.0.20230314171452", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", @@ -9,7 +9,7 @@ }, "devDependencies": { "@babel/core": "^7.17.4", - "@fui/babel-preset-fineui": "^3.0.0", + "@fui/babel-preset-fineui": "3.0.1", "@fui/eslint-plugin": "^1.0.19", "@types/node": "15.6.1", "@typescript-eslint/eslint-plugin": "2.33.0", @@ -18,7 +18,7 @@ "babel-loader": "8.0.6", "chai": "4.2.0", "concat": "1.0.3", - "core-js": "3.3.2", + "core-js": "3.29.1", "cross-env": "6.0.0", "css-loader": "3.0.0", "es6-promise": "4.2.8", @@ -43,7 +43,6 @@ "optimize-css-assets-webpack-plugin": "5.0.3", "postcss-loader": "3.0.0", "postcss-simple-vars": "5.0.2", - "puppeteer": "^13.3.0", "rimraf": "3.0.2", "script-loader": "0.7.2", "source-map-loader": "0.2.4", diff --git a/src/case/button/item.singleselect.radio.js b/src/case/button/item.singleselect.radio.js index 74ebe49c9..92058b476 100644 --- a/src/case/button/item.singleselect.radio.js +++ b/src/case/button/item.singleselect.radio.js @@ -25,6 +25,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, { type: "bi.center_adapt", items: [{ type: "bi.radio", + once: o.once, ref: function (_ref) { self.radio = _ref; }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js index 9c5f0d0fc..dd5013eba 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js @@ -29,7 +29,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, { items: o.items, height: BI.toPix(o.height, 2), text: o.text, - value: o.value + value: o.value, + defaultText: o.defaultText }); this.popup = BI.createWidget({ type: "bi.text_value_check_combo_popup", diff --git a/src/core/2.base.js b/src/core/2.base.js index d8b9bd6d4..8f05642be 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -1130,7 +1130,7 @@ m = today.getMonth(); } if (isNaN(d)) { - d = today.getDate(); + d = Math.min(BI.getMonthDays(BI.getDate(y, m)), today.getDate()); } if (isNaN(hr)) { hr = today.getHours(); diff --git a/src/core/utils/events/mousemovetracker.js b/src/core/utils/events/mousemovetracker.js index 212072ebc..8b8936e76 100644 --- a/src/core/utils/events/mousemovetracker.js +++ b/src/core/utils/events/mousemovetracker.js @@ -82,7 +82,7 @@ // The mouse may move faster then the animation frame does. // Use `requestAnimationFrame` to avoid over-updating. this._animationFrameID = - requestAnimationFrame(this._didMouseMove); + requestAnimationFrame(() => this._didMouseMove(event)); } this._x = x; @@ -90,18 +90,18 @@ event.preventDefault ? event.preventDefault() : (event.returnValue = false); }, - _didMouseMove: function () { + _didMouseMove: function (event) { this._animationFrameID = null; - this._onMove(this._deltaX, this._deltaY); + this._onMove(this._deltaX, this._deltaY, event); this._deltaX = 0; this._deltaY = 0; }, - _onMouseUp: function () { + _onMouseUp: function (event) { if (this._animationFrameID) { - this._didMouseMove(); + this._didMouseMove(event); } - this._onMoveEnd(); + this._onMoveEnd(event); } }; })(); diff --git a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js index 857fc368f..0599042cd 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js @@ -3,7 +3,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { props: function () { return { baseCls: "bi-date-time-select", - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + editorHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, }; }, @@ -46,7 +46,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: o.height, + height: o.editorHeight, } }, { type: "bi.label", @@ -82,7 +82,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: o.height, + height: o.editorHeight, }, { type: "bi.label", text: ":", @@ -111,7 +111,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: o.height, + height: o.editorHeight, }] }] };