hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Merge pull request !45 from F4NNIU/fix_crud_state
pull/657632/MERGE
F4NNIU 2018-03-02 11:08:59 +08:00 committed by Karson
parent 7dfaabbbe9 b4c92b2065
commit 8de46a30e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/command/Crud.php
View File

@ -1004,7 +1004,7 @@ EOD;
$langArr = []; $langArr = [];
foreach ($arr as $k => $v) foreach ($arr as $k => $v)
{ {
$langArr[(is_numeric($k) ? $v : $k)] = is_numeric($k) ? ($withTpl ? "{:" : "") . "__('" . mb_ucfirst($v) . "')" . ($withTpl ? "}" : "") : $v; $langArr[$k] = is_numeric($k) ? ($withTpl ? "{:" : "") . "__('" . mb_ucfirst($v) . "')" . ($withTpl ? "}" : "") : $v;
} }
return $langArr; return $langArr;
} }
@ -1245,7 +1245,7 @@ EOD;
$v = "__('" . $v . "')"; $v = "__('" . $v . "')";
} }
unset($v); unset($v);
$searchList = json_encode($itemArr); $searchList = json_encode($itemArr, JSON_FORCE_OBJECT);
$searchList = str_replace(['":"', '"}', ')","'], ['":', '}', '),"'], $searchList); $searchList = str_replace(['":"', '"}', ')","'], ['":', '}', '),"'], $searchList);
if ($itemArr && !$extend) if ($itemArr && !$extend)
{ {