Pull request #1649: BI-74895 文件上传数量超限toast国际化修改 && 排序问题

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'dacac8681f270d860dd9138028c933357b42ee32':
  更新
  无JIRA任务 文件上传数量超限toast国际化修改

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": "相对当前时间",

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"), { level: "error" });
                     self.fireEvent(BI.File.EVENT_ERROR, {
                         errorType: 2
                     });

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++;