From b4c92b2065984fe48853d6ea5db39874422a2abf Mon Sep 17 00:00:00 2001
From: F4NNIU <sparkamax@gmail.com>
Date: Fri, 2 Mar 2018 11:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20CRUD=20=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E7=8A=B6=E6=80=81=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 65740eee4..5c63cb172 100644
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -1004,7 +1004,7 @@ EOD;
         $langArr = [];
         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;
     }
@@ -1245,7 +1245,7 @@ EOD;
                 $v = "__('" . $v . "')";
         }
         unset($v);
-        $searchList = json_encode($itemArr);
+        $searchList = json_encode($itemArr, JSON_FORCE_OBJECT);
         $searchList = str_replace(['":"', '"}', ')","'], ['":', '}', '),"'], $searchList);
         if ($itemArr && !$extend)
         {
-- 
Gitee