作者 F4NNIU

修复 CRUD 高级搜索中状态的值不正确的问题

@@ -1004,7 +1004,7 @@ EOD; @@ -1004,7 +1004,7 @@ EOD;
1004 $langArr = []; 1004 $langArr = [];
1005 foreach ($arr as $k => $v) 1005 foreach ($arr as $k => $v)
1006 { 1006 {
1007 - $langArr[(is_numeric($k) ? $v : $k)] = is_numeric($k) ? ($withTpl ? "{:" : "") . "__('" . mb_ucfirst($v) . "')" . ($withTpl ? "}" : "") : $v; 1007 + $langArr[$k] = is_numeric($k) ? ($withTpl ? "{:" : "") . "__('" . mb_ucfirst($v) . "')" . ($withTpl ? "}" : "") : $v;
1008 } 1008 }
1009 return $langArr; 1009 return $langArr;
1010 } 1010 }
@@ -1245,7 +1245,7 @@ EOD; @@ -1245,7 +1245,7 @@ EOD;
1245 $v = "__('" . $v . "')"; 1245 $v = "__('" . $v . "')";
1246 } 1246 }
1247 unset($v); 1247 unset($v);
1248 - $searchList = json_encode($itemArr); 1248 + $searchList = json_encode($itemArr, JSON_FORCE_OBJECT);
1249 $searchList = str_replace(['":"', '"}', ')","'], ['":', '}', '),"'], $searchList); 1249 $searchList = str_replace(['":"', '"}', ')","'], ['":', '}', '),"'], $searchList);
1250 if ($itemArr && !$extend) 1250 if ($itemArr && !$extend)
1251 { 1251 {