修复filter-control组件渲染未转义问题

Author: karsonzhang

composer.json

@@ -1,9 +1,9 @@
 {
-    "name": "karsonzhang/fastadmin-bootstraptable",
+    "name": "fastadminnet/fastadmin-bootstraptable",
     "description": "An extended Bootstrap table with radio, checkbox, sort, pagination and other features.",
     "keywords": ["bootstrap","table","tablesort","pagination"],
     "type": "component",
-    "homepage": "https://github.com/karsonzhang/fastadmin-bootstraptable",
+    "homepage": "https://github.com/fastadminnet/fastadmin-bootstraptable",
     "license": "MIT",
     "require": {
         "twitter/bootstrap": ">=3.3.0"

dist/bootstrap-table.js

@@ -3088,7 +3088,8 @@
         calculateObjectValue: calculateObjectValue,
         getItemField: getItemField,
         objectKeys: objectKeys,
-        isIEBrowser: isIEBrowser
+        isIEBrowser: isIEBrowser,
+        escapeHTML: escapeHTML
     };
 
     // BOOTSTRAP TABLE INIT

dist/bootstrap-table.min.js

@@ -9,7 +9,8 @@
     'use strict';
 
     var sprintf = $.fn.bootstrapTable.utils.sprintf,
-        objectKeys = $.fn.bootstrapTable.utils.objectKeys;
+        objectKeys = $.fn.bootstrapTable.utils.objectKeys,
+        escapeHTML = $.fn.bootstrapTable.utils.escapeHTML;
 
     var getOptionsFromSelectControl = function (selectControl) {
         return selectControl.get(selectControl.length - 1).options;
@@ -30,12 +31,12 @@
     };
 
     var addOptionToSelectControl = function (selectControl, value, text) {
-        value = $.trim(value);
+        value = escapeHTML($.trim(value));
+        text = escapeHTML(text);
         selectControl = $(selectControl.get(selectControl.length - 1));
         if (!existOptionInSelectControl(selectControl, value)) {
-            selectControl.append($("<option></option>")
-                .attr("value", value)
-                .text($('<div />').html(text).text()));
+            const option = $(`<option value="${value}">${text}</option>`);
+            selectControl.append(option);
         }
     };
 

dist/extensions/filter-control/bootstrap-table-filter-control.js

@@ -1,7 +1,7 @@
 {
   "name": "fastadmin-bootstraptable",
   "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features. (supports twitter bootstrap v2 and v3).",
-  "version": "1.11.12",
+  "version": "1.11.13",
   "main": "./dist/bootstrap-table.js",
   "devDependencies": {
     "cz-conventional-changelog": "^1.1.5",
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/karsonzhang/fastadmin-bootstraptable.git"
+    "url": "https://github.com/fastadminnet/fastadmin-bootstraptable.git"
   },
   "keywords": [
     "bootstrap",
@@ -29,9 +29,9 @@
   "author": "wenzhixin <[email protected]> (http://wenzhixin.net.cn/)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/karsonzhang/fastadmin-bootstraptable/issues"
+    "url": "https://github.com/fastadminnet/fastadmin-bootstraptable/issues"
   },
-  "homepage": "https://github.com/karsonzhang/fastadmin-bootstraptable",
+  "homepage": "https://github.com/fastadminnet/fastadmin-bootstraptable",
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"

dist/extensions/filter-control/bootstrap-table-filter-control.min.js

@@ -3088,7 +3088,8 @@
         calculateObjectValue: calculateObjectValue,
         getItemField: getItemField,
         objectKeys: objectKeys,
-        isIEBrowser: isIEBrowser
+        isIEBrowser: isIEBrowser,
+        escapeHTML: escapeHTML
     };
 
     // BOOTSTRAP TABLE INIT

package.json

@@ -9,7 +9,8 @@
     'use strict';
 
     var sprintf = $.fn.bootstrapTable.utils.sprintf,
-        objectKeys = $.fn.bootstrapTable.utils.objectKeys;
+        objectKeys = $.fn.bootstrapTable.utils.objectKeys,
+        escapeHTML = $.fn.bootstrapTable.utils.escapeHTML;
 
     var getOptionsFromSelectControl = function (selectControl) {
         return selectControl.get(selectControl.length - 1).options;
@@ -30,12 +31,12 @@
     };
 
     var addOptionToSelectControl = function (selectControl, value, text) {
-        value = $.trim(value);
+        value = escapeHTML($.trim(value));
+        text = escapeHTML(text);
         selectControl = $(selectControl.get(selectControl.length - 1));
         if (!existOptionInSelectControl(selectControl, value)) {
-            selectControl.append($("<option></option>")
-                .attr("value", value)
-                .text($('<div />').html(text).text()));
+            const option = $(`<option value="${value}">${text}</option>`);
+            selectControl.append(option);
         }
     };