From 784b2400215859ac2458ffe86934bc842acdcd54 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 14 Sep 2022 13:37:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvalue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 7637773f2..f6794f7bd 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -116,7 +116,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { }, { eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: (...args) => { - if (changeTag) { + if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_SINGLE && changeTag) { this.fireEvent(BI.TextValueCombo.EVENT_CHANGE, ...args); } } From 06d0c160058b994ac229ac92a5735ed9786152e1 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 14 Sep 2022 13:57:56 +0800 Subject: [PATCH 2/6] auto upgrade version to 2.0.20220914135738 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c536412f4..bdd4e659f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220914100333", + "version": "2.0.20220914135738", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 2d9f9db71570626a938d6ba2974c21f44e45177e Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 14 Sep 2022 15:36:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?REPORT-80245=20fix:=20jquery=E4=BD=8E?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=BC=8F=E6=B4=9E,"=E6=8F=90=E5=8D=87"?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/platform/web/jquery/_jquery.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/core/platform/web/jquery/_jquery.js b/src/core/platform/web/jquery/_jquery.js index 8c83f4356..2d8c7ddd2 100644 --- a/src/core/platform/web/jquery/_jquery.js +++ b/src/core/platform/web/jquery/_jquery.js @@ -1,5 +1,5 @@ /*! - * jQuery JavaScript Library v1.12.4 + * jQuery JavaScript Library v3.6.1 * http://jquery.com/ * * Includes Sizzle.js @@ -63,16 +63,15 @@ var support = {}; - var - version = "1.12.4", + version = "3.6.1", // Define a local copy of jQuery - jQuery = function( selector, context ) { + jQuery = function (selector, context) { // The jQuery object is actually just the init constructor 'enhanced' // Need init if jQuery is called (just allow error to be thrown if not included) - return new jQuery.fn.init( selector, context ); + return new jQuery.fn.init(selector, context); }, // Support: Android<4.1, IE<9 From c6c757a07df520b4dd3724c6880e28ee08d55c5f Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 14 Sep 2022 16:40:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?REPORT-73206=20feat:=20=E6=8A=8ABI=E5=92=8C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BD=BF=E7=94=A8=E7=9A=84=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85=E6=88=90cbb=20-=20bi.icon?= =?UTF-8?q?=5Fchange=5Fbutton=E7=9A=84=E5=9B=BE=E6=A0=87=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/icon/icon.change.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/case/button/icon/icon.change.js b/src/case/button/icon/icon.change.js index 8790008e2..e65160879 100644 --- a/src/case/button/icon/icon.change.js +++ b/src/case/button/icon/icon.change.js @@ -31,8 +31,11 @@ BI.IconChangeButton = BI.inherit(BI.Single, { }, _init: function () { - BI.IconChangeButton.superclass._init.apply(this, arguments); var self = this, o = this.options; + o.iconCls = BI.isFunction(o.iconCls) ? this.__watch(o.iconCls, function (context, newValue) { + self.setIcon(newValue); + }) : o.iconCls; + BI.IconChangeButton.superclass._init.apply(this, arguments); this.button = BI.createWidget({ type: "bi.icon_button", element: this, @@ -80,4 +83,4 @@ BI.IconChangeButton = BI.inherit(BI.Single, { } }); BI.IconChangeButton.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.icon_change_button", BI.IconChangeButton); \ No newline at end of file +BI.shortcut("bi.icon_change_button", BI.IconChangeButton); From cf16f5615e9f7c3dac0d9aa41e23d81ee8c04b1e Mon Sep 17 00:00:00 2001 From: data Date: Wed, 14 Sep 2022 16:55:47 +0800 Subject: [PATCH 5/6] auto upgrade version to 2.0.20220914165519 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bdd4e659f..314e487f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220914135738", + "version": "2.0.20220914165519", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 5090c17a9a34dbf19568432addd4836787179c91 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 14 Sep 2022 17:25:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=97=A0JIRA=20demo=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack/attachments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/attachments.js b/webpack/attachments.js index bf16b1505..94274e1b3 100644 --- a/webpack/attachments.js +++ b/webpack/attachments.js @@ -233,13 +233,13 @@ const demo = [].concat( basicAttachmentMap.polyfill, basicAttachmentMap.core, basicAttachmentMap.fix, + basicAttachmentMap.config, basicAttachmentMap.base, basicAttachmentMap.case, basicAttachmentMap.widget, basicAttachmentMap.router, sync(["public/less/app.less", "public/less/**/*.less"]), [fixCompact, workerCompact], - basicAttachmentMap.config, basicAttachmentMap.ts, sync(["demo/less/*.less", "demo/less/**/*.less", "demo/app.js", "demo/js/**/*.js", "demo/config.js"]), );