From 721b8fa5311f9f65a376d2e7478ce5bf32217a25 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 27 Feb 2023 20:04:33 +0800 Subject: [PATCH 01/18] auto upgrade version to 2.0.20230227200417 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b28390b2a..ca6000754 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230227095536", + "version": "2.0.20230227200417", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 3189721aa4cac725e522f97be21ceb3b4c3e4870 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 2 Mar 2023 10:48:26 +0800 Subject: [PATCH 02/18] auto upgrade version to 2.0.20230302104808 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca6000754..bbad93843 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230227200417", + "version": "2.0.20230302104808", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 2772ef6d1404c9d0634a3e1fe7c65d46b816f48f Mon Sep 17 00:00:00 2001 From: Lee94 Date: Thu, 2 Mar 2023 12:25:07 +0800 Subject: [PATCH 03/18] =?UTF-8?q?JSY-27224=20=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/structure/tree.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/structure/tree.js b/src/core/structure/tree.js index 32e7665b4..839b51bec 100644 --- a/src/core/structure/tree.js +++ b/src/core/structure/tree.js @@ -127,7 +127,9 @@ continue; } if (temp != null) { - queue = queue.concat(temp.getChildren()); + BI.each(temp.getChildren(), function(_i, t) { + queue.push(t); + }) } } }, From 7370795c8e35da7627dac230d2de4a8dab6649c5 Mon Sep 17 00:00:00 2001 From: Lee94 Date: Thu, 2 Mar 2023 13:44:37 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20es6?= =?UTF-8?q?=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/structure/tree.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/structure/tree.js b/src/core/structure/tree.js index 839b51bec..d79ac99ef 100644 --- a/src/core/structure/tree.js +++ b/src/core/structure/tree.js @@ -127,9 +127,7 @@ continue; } if (temp != null) { - BI.each(temp.getChildren(), function(_i, t) { - queue.push(t); - }) + queue.push(...temp.getChildren()); } } }, From 29bbfb015d82352a7a2760afc7a0371a747d459b Mon Sep 17 00:00:00 2001 From: data Date: Thu, 2 Mar 2023 14:03:54 +0800 Subject: [PATCH 05/18] auto upgrade version to 2.0.20230302140341 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbad93843..3cee0d04e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230302104808", + "version": "2.0.20230302140341", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From a50d1d19c49c87827361910e4e7e3f59eeac54c5 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 3 Mar 2023 15:45:41 +0800 Subject: [PATCH 06/18] auto upgrade version to 2.0.20230303154526 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cee0d04e..269e2a004 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230302140341", + "version": "2.0.20230303154526", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 064747bbc0487e07c00fb738bbaf609037d46b52 Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Tue, 7 Mar 2023 20:29:10 +0800 Subject: [PATCH 07/18] =?UTF-8?q?REPORT-89705=20feat:=E4=BC=A0defaultText?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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", From 66ea45c9f9852c3f79a9aeadf90287fd0f6e69e7 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Thu, 9 Mar 2023 10:20:27 +0800 Subject: [PATCH 08/18] =?UTF-8?q?REPORT-90850=20fix:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8D=EF=BC=8C=E9=98=B2=E6=AD=A2=E4=B8=8E?= =?UTF-8?q?=E7=88=B6=E7=BB=84=E4=BB=B6=E9=AB=98=E5=BA=A6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.timeselect.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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, }] }] }; From c5977ea4eac34a8ef11734142cbfaea5f6ee4932 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 9 Mar 2023 14:06:17 +0800 Subject: [PATCH 09/18] auto upgrade version to 2.0.20230309140610 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 269e2a004..a5a1decce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230303154526", + "version": "2.0.20230309140610", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 49366d10fdf7d2a4d49f2b735eb404409b4c5689 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 10 Mar 2023 17:15:58 +0800 Subject: [PATCH 10/18] auto upgrade version to 2.0.20230310171548 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5a1decce..963abe7f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230309140610", + "version": "2.0.20230310171548", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 83c541d552387dfdfcf570334f86b87e98293570 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Mon, 13 Mar 2023 19:28:01 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20fix:?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=8C=89=E9=92=AE=E8=AE=BE=E7=BD=AEonce?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=A7=A6=E5=8F=91=E4=BA=8B=E4=BB=B6=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E4=BE=9D=E7=84=B6=E5=8F=AF=E4=BB=A5=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/item.singleselect.radio.js | 1 + 1 file changed, 1 insertion(+) 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; }, From 5d036b50f96f20ec424d47676cc1b74711ab9ee9 Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 14 Mar 2023 11:24:51 +0800 Subject: [PATCH 12/18] =?UTF-8?q?BI-123240=20fix:=20=E3=80=906.0.7crm?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=A8=A1=E5=9E=8B=E3=80=91=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8D=87=E7=BA=A7=E5=90=8E=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=A4=8D=E5=88=B6=E5=AD=97=E6=AE=B5=E5=A4=AA?= =?UTF-8?q?=E5=A4=9A=E5=89=8D=E7=AB=AF=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 963abe7f8..785d4fa2e 100644 --- a/package.json +++ b/package.json @@ -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", From 7c109cb4de619465370ddac272fcb2790e7fae5e Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 14 Mar 2023 11:24:51 +0800 Subject: [PATCH 13/18] =?UTF-8?q?BI-123240=20fix:=20=E3=80=906.0.7crm?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=A8=A1=E5=9E=8B=E3=80=91=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8D=87=E7=BA=A7=E5=90=8E=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=A4=8D=E5=88=B6=E5=AD=97=E6=AE=B5=E5=A4=AA?= =?UTF-8?q?=E5=A4=9A=E5=89=8D=E7=AB=AF=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5d036b50f96f20ec424d47676cc1b74711ab9ee9) --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b28390b2a..ecc6dc51a 100644 --- a/package.json +++ b/package.json @@ -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", From 2d01e059a8dd8328874dd8fc2510dbbbe38d50a6 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 14 Mar 2023 15:10:06 +0800 Subject: [PATCH 14/18] auto upgrade version to 2.0.20230314150956 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 785d4fa2e..57d64bf34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230310171548", + "version": "2.0.20230314150956", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 6931a019f3ae3670ae810942d8bf40e8133e5ebe Mon Sep 17 00:00:00 2001 From: data Date: Tue, 14 Mar 2023 16:18:39 +0800 Subject: [PATCH 15/18] auto upgrade version to 2.0.20230314161821 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57d64bf34..5bbf796c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230314150956", + "version": "2.0.20230314161821", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 9f706dad5c75867cf8b30f1c59f5d09aacad5605 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 14 Mar 2023 17:14:59 +0800 Subject: [PATCH 16/18] auto upgrade version to 2.0.20230314171452 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bbf796c2..d46ba2d72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230314161821", + "version": "2.0.20230314171452", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From de0c11ced924d06bc54b7ef885818ac3e455c548 Mon Sep 17 00:00:00 2001 From: "Xavier.Meng" Date: Tue, 28 Mar 2023 14:30:34 +0800 Subject: [PATCH 17/18] =?UTF-8?q?KERNEL-14365=20refactor(tracker):=20?= =?UTF-8?q?=E5=A4=9A=E6=9A=B4=E9=9C=B2=E4=B8=AAevent=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/utils/events/mousemovetracker.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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); } }; })(); From 2636cb6238693687c6ecd88fdeabf7fddf66a067 Mon Sep 17 00:00:00 2001 From: "Kevin.King" Date: Wed, 29 Mar 2023 19:31:01 +0800 Subject: [PATCH 18/18] =?UTF-8?q?REPORT-92800=20fix:FR11=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?-=E6=8E=A7=E4=BB=B6-yyyy-MM=E6=A0=BC=E5=BC=8F=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=8E=A7=E4=BB=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E9=80=89?= =?UTF-8?q?=E4=B8=AD2=E6=9C=88=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/2.base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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();