Merge pull request #10799 from abpframework/auto-merge/rel-5-0/666

Merge branch dev with rel-5.0
4 years ago · d19491ed1e
1 changed files with 6 additions and 4 deletions
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@ -366,10 +366,12 @@ var abp = abp || {};
                }

                //Text filter
-                if (requestData.search && requestData.search.value !== "") {
-                    input.filter = requestData.search.value;
-                } else {
-                    input.filter = null;       
+                if(settings.oInit.searching){
+                    if (requestData.search && requestData.search.value !== "") {
+                        input.filter = requestData.search.value;
+                    } else {
+                        input.filter = null;
+                    }
                }

                if (callback) {