Эх сурвалжийг харах

Merge branch 'dev/v4.9.16_cyl' of qmx/jy into feature/v4.9.16

cuiyalong 1 жил өмнө
parent
commit
d2fa1119a1

+ 3 - 0
src/web/staticres/js/common.js

@@ -314,6 +314,9 @@ function keyWordHighlight (value, oldChars, newChar) {
   if(typeof(oldChars) == "undefined" || oldChars == null || typeof(newChar) == "undefined" || newChar == null || newChar == "" || oldChars == '略'){
   if(typeof(oldChars) == "undefined" || oldChars == null || typeof(newChar) == "undefined" || newChar == null || newChar == "" || oldChars == '略'){
     return value;
     return value;
   }
   }
+  if (!value) {
+    return value || ''
+  }
   var array = [];
   var array = [];
   if(oldChars instanceof Array){
   if(oldChars instanceof Array){
     array = oldChars.concat();
     array = oldChars.concat();

+ 3 - 1
src/web/templates/pc/supsearch.html

@@ -4864,7 +4864,9 @@ function checkTagDisabled () {
         // 如果有nostore参数,则不进行默认恢复
         // 如果有nostore参数,则不进行默认恢复
         if (getParam('nostore')) return
         if (getParam('nostore')) return
         if (!window.goTemplateData.inIframe) return
         if (!window.goTemplateData.inIframe) return
-        if (searchvalue) return
+        if (searchvalue) {
+          return saveFiltersToStorageWithPower()
+        }
         // 尝试取缓存中数据,取不到.则取已存筛选第1项,如果还取不到,则不做任何操作.
         // 尝试取缓存中数据,取不到.则取已存筛选第1项,如果还取不到,则不做任何操作.
         var lastFilters = getFilterFromStorageWithPower()
         var lastFilters = getFilterFromStorageWithPower()
         if (lastFilters) {
         if (lastFilters) {