Merge pull request #179590 in DEC/fineui from master to feature/x

* commit 'e51823bec7a7ee76464e11e98ab2a58423c6f21f':
  REPORT-80245 fix: jquery低版本漏洞
  无JIRA feat: 处理单选和复选场景valueFormatter统一

src/case/trigger/trigger.text.select.js

@@ -52,17 +52,18 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
     _digest: function (val, items) {
         var o = this.options;
 
-        //  提升valueFormatter的优先级
-        if (o.valueFormatter !== BI.emptyFn && BI.isFunction(o.valueFormatter)) {
-            return {
-                text: o.valueFormatter(val),
-            };
-        }
-
         val = BI.isArray(val) ? val.slice() : [val];
 
         var result = [];
 
+        //  提升valueFormatter的优先级
+        if (o.valueFormatter !== BI.emptyFn && BI.isFunction(o.valueFormatter)) {
+            BI.each(val, function (index, v) {
+                result.push(o.valueFormatter(v));
+            });
+            return result.join(",");
+        }
+
         var formatItems = BI.Tree.transformToArrayFormat(items);
         BI.each(formatItems, function (i, item) {
             if (BI.contains(val, item.value) && !BI.contains(result, item.text || item.value)) {

src/core/platform/web/jquery/_jquery.js

@@ -10357,20 +10357,27 @@
 	function createStandardXHR() {
 		try {
 			return new window.XMLHttpRequest();
-		} catch ( e ) {}
+		} catch (e) {
+		}
 	}
 
 	function createActiveXHR() {
 		try {
-			return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-		} catch ( e ) {}
+			return new window.ActiveXObject("Microsoft.XMLHTTP");
+		} catch (e) {
+		}
 	}
 
 
-
+// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
+	jQuery.ajaxPrefilter(function (s) {
+		if (s.crossDomain) {
+			s.contents.script = false;
+		}
+	});
 
 // Install script dataType
-	jQuery.ajaxSetup( {
+	jQuery.ajaxSetup({
 		accepts: {
 			script: "text/javascript, application/javascript, " +
 				"application/ecmascript, application/x-ecmascript"