From 306eca7c915c8b5c691316b39370b6e669d864a2 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Tue, 22 Mar 2022 17:32:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-68011=20fix:=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=8E=A7=E4=BB=B6=E8=81=94=E5=8A=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/date/calendar/combo.month.date.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/date/calendar/combo.month.date.js b/src/widget/date/calendar/combo.month.date.js index cb5e6f20f..82068ceac 100644 --- a/src/widget/date/calendar/combo.month.date.js +++ b/src/widget/date/calendar/combo.month.date.js @@ -59,7 +59,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this.popup.populate.apply(this.popup, arguments); }, setValue: function (v) { From c1976eb8defb98e892b3d9b54122ec017e6f42cc Mon Sep 17 00:00:00 2001 From: data Date: Tue, 22 Mar 2022 17:55:51 +0800 Subject: [PATCH 2/6] auto upgrade version to 2.0.20220322175540 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef8da5f5a..bf2d6b5c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220322093515", + "version": "2.0.20220322175540", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From fe33c703faf4ad1e9dea60e5a52ff9e3da8dbd88 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 23 Mar 2022 10:15:19 +0800 Subject: [PATCH 3/6] auto upgrade version to 2.0.20220323101508 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf2d6b5c6..045c4dc49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220322175540", + "version": "2.0.20220323101508", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 9642835ad1c93d6bb2be3470c2d24c12e813a630 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 23 Mar 2022 11:25:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96key=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/i18n.cn.js | 4 ++-- src/case/button/switch.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/i18n.cn.js b/i18n/i18n.cn.js index 74fb1e212..900ff7630 100644 --- a/i18n/i18n.cn.js +++ b/i18n/i18n.cn.js @@ -199,6 +199,6 @@ BI.i18n = { "BI-Basic_Search_And_Patch_Paste": "搜索，支持批量粘贴、粘贴值通过换行识别", "BI-Basic_Recommend_Color": "推荐色", "BI-Basic_Too_Much_Value_Get_Two_Thousand": "粘贴的值过多，只能识别出前2000个值", - "BI-Basic_Open": "开", - "BI-Basic_Close": "关", + "BI-Basic_Simple_Open": "开", + "BI-Basic_Simple_Close": "关", }; \ No newline at end of file diff --git a/src/case/button/switch.js b/src/case/button/switch.js index e88360266..0c7c199fb 100644 --- a/src/case/button/switch.js +++ b/src/case/button/switch.js @@ -39,7 +39,7 @@ BI.Switch = BI.inherit(BI.BasicButton, { left: this.options.selected ? 28 : 4 }, { type: "bi.label", - text: BI.i18nText("BI-Basic_Open"), + text: BI.i18nText("BI-Basic_Simple_Open"), cls: "content-tip", left: 8, top: tgap - 2, @@ -49,7 +49,7 @@ BI.Switch = BI.inherit(BI.BasicButton, { } }, { type: "bi.label", - text: BI.i18nText("BI-Basic_Close"), + text: BI.i18nText("BI-Basic_Simple_Close"), cls: "content-tip", right: 8, top: tgap - 2, From 1b99f0c5915a416afa018c62fef665a5b2cab899 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 23 Mar 2022 11:45:57 +0800 Subject: [PATCH 5/6] auto upgrade version to 2.0.20220323114543 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 045c4dc49..33e8c0d44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220323101508", + "version": "2.0.20220323114543", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 42c786952e337b038df949eeee4d269c89ab942b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=AC=E5=B3=A5?= Date: Wed, 23 Mar 2022 15:37:56 +0800 Subject: [PATCH 6/6] =?UTF-8?q?KERNEL-10698=20=E5=88=A0=E9=99=A4=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.js diff --git a/test.js b/test.js deleted file mode 100644 index af693120e..000000000 --- a/test.js +++ /dev/null @@ -1 +0,0 @@ -测试自动提交 \ No newline at end of file