From 59029262705bea8352814ee03e5b895443e48519 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 14 Dec 2020 14:42:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=95=B0=E9=87=8F=E8=B6=85=E9=99=90?= =?UTF-8?q?toast=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/i18n.cn.js | 2 +- src/base/single/input/file.js | 2 +- src/widget/multitree/trigger/searcher.multi.tree.js | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/i18n/i18n.cn.js b/i18n/i18n.cn.js index c1c9bf316..ab83491bc 100644 --- a/i18n/i18n.cn.js +++ b/i18n/i18n.cn.js @@ -91,7 +91,7 @@ BI.i18n = { "BI-Summary_Values": "汇总", "BI-Basic_Clear": "清除", "BI-Upload_File_Size_Error": "文件大小不支持", - "BI-Upload_File_Count_Error": "超出上传数量上限,请重新上传", + "BI-Upload_File_Count_Error": "超出上传数量上限{R1},请重新上传", "BI-Up_Page": "向上翻页", "BI-Basic_Simple_Sunday": "日", "BI-Multi_Date_Relative_Current_Time": "相对当前时间", diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index 9f99b5179..75b4c7fe3 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -551,7 +551,7 @@ var input = wrap.dom.input.cloneNode(true); var files = F(wrap.dom.input); if (wrap.maxLength !== -1 && wrap.maxLength < files.length) { - BI.Msg.toast(BI.i18nText("BI-Upload_File_Count_Error"), { level: "error" }); + BI.Msg.toast(BI.i18nText("BI-Upload_File_Count_Error", wrap.maxLength), { level: "error" }); self.fireEvent(BI.File.EVENT_ERROR, { errorType: 2 }); diff --git a/src/widget/multitree/trigger/searcher.multi.tree.js b/src/widget/multitree/trigger/searcher.multi.tree.js index d0b9afac9..bf1ba235b 100644 --- a/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.multi.tree.js @@ -132,8 +132,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { this.editor.setState(BI.Selection.None); } else { var text = ""; - BI.each(ob.value, function (name, children) { - var childNodes = getChildrenNode(children); + var value = ob.value; + var names = BI.Func.getSortedResult(BI.keys(value)); + BI.each(names, function (idx, name) { + var childNodes = getChildrenNode(value[name]); text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; "; if (childNodes === "") { count++; From dacac8681f270d860dd9138028c933357b42ee32 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 14 Dec 2020 19:21:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/input/file.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index 75b4c7fe3..98918bd3d 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -551,7 +551,6 @@ var input = wrap.dom.input.cloneNode(true); var files = F(wrap.dom.input); if (wrap.maxLength !== -1 && wrap.maxLength < files.length) { - BI.Msg.toast(BI.i18nText("BI-Upload_File_Count_Error", wrap.maxLength), { level: "error" }); self.fireEvent(BI.File.EVENT_ERROR, { errorType: 2 });