From 8e5b42f88c077984dfb3a1556ccedb264b2ba790 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Tue, 13 Mar 2018 00:40:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20bower.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bower.json | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/bower.json b/bower.json
index cc44bd437..106519215 100644
--- a/bower.json
+++ b/bower.json
@@ -9,26 +9,26 @@
     "jquery": "^2.1.4",
     "bootstrap": "^3.3.7",
     "font-awesome": "^4.6.1",
-    "bootstrap-table": "^1.11.0",
+    "bootstrap-table": "~1.11.0",
     "layer": "^3.0",
-    "jstree": "^3.3.2",
-    "moment": "^2.15.2",
-    "plupload": "^2.2.0",
-    "toastr": "^2.1.3",
-    "jcrop": "^2.0.4",
-    "eonasdan-bootstrap-datetimepicker": "^4.17.43",
-    "bootstrap-select": "^1.11.2",
-    "require-css": "^0.1.8",
-    "less": "^2.7.1",
-    "tableExport.jquery.plugin": "^1.9.0",
-    "jquery-slimscroll": "^1.3.8",
-    "jquery.cookie": "^1.4.1",
-    "Sortable": "^1.5.0",
-    "nice-validator": "^1.1.1",
-    "art-template": "^3.0.1",
-    "requirejs-plugins": "^1.0.3",
-    "bootstrap-daterangepicker": "^2.1.25",
-    "city-picker": "^1.1.0",
+    "jstree": "~3.3.2",
+    "moment": "~2.15.2",
+    "plupload": "~2.2.0",
+    "toastr": "~2.1.3",
+    "jcrop": "~2.0.4",
+    "eonasdan-bootstrap-datetimepicker": "~4.17.43",
+    "bootstrap-select": "~1.11.2",
+    "require-css": "~0.1.8",
+    "less": "~2.7.1",
+    "tableExport.jquery.plugin": "~1.9.0",
+    "jquery-slimscroll": "~1.3.8",
+    "jquery.cookie": "~1.4.1",
+    "Sortable": "~1.5.0",
+    "nice-validator": "~1.1.1",
+    "art-template": "~3.0.1",
+    "requirejs-plugins": "~1.0.3",
+    "bootstrap-daterangepicker": "~2.1.25",
+    "city-picker": "~1.1.0",
     "fastadmin-cxselect": "~1.4.0",
     "fastadmin-dragsort": "~1.0.0",
     "fastadmin-addtabs": "~1.0.0",
-- 
Gitee


From 0c3e087f094b60fc7e2d9cd0cc17c37d64324736 Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Wed, 14 Mar 2018 10:53:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E7=94=9F=E6=88=90CRUD=E6=97=B6admin=5Fids=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=8E=A7=E5=88=B6=E5=99=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         | 1 +
 application/admin/command/Crud.php | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1962050f5..e04395f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ composer.lock
 *.css.map
 !.gitkeep
 .env
+/.svn
diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 94e3c2665..3ba5c2046 100644
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -580,8 +580,8 @@ class Crud extends Command
                         }
                         $formAddElement = $formEditElement = Form::hidden($fieldName, $no, array_merge(['checked' => ''], $attrArr));
                         $attrArr['id'] = $fieldName . "-switch";
-                        $formAddElement .= sprintf(Form::label("{$attrArr['id']}", "%s {:__('Yes')}", ['class'=>'control-label']), Form::checkbox($fieldName, $yes, $defaultValue === $yes, $attrArr));
-                        $formEditElement .= sprintf(Form::label("{$attrArr['id']}", "%s {:__('Yes')}", ['class'=>'control-label']), Form::checkbox($fieldName, $yes, 0, $attrArr));
+                        $formAddElement .= sprintf(Form::label("{$attrArr['id']}", "%s {:__('Yes')}", ['class' => 'control-label']), Form::checkbox($fieldName, $yes, $defaultValue === $yes, $attrArr));
+                        $formEditElement .= sprintf(Form::label("{$attrArr['id']}", "%s {:__('Yes')}", ['class' => 'control-label']), Form::checkbox($fieldName, $yes, 0, $attrArr));
                         $formEditElement = str_replace('type="checkbox"', 'type="checkbox" {in name="' . "\$row.{$field}" . '" value="' . $yes . '"}checked{/in}', $formEditElement);
                     }
                     else if ($inputType == 'citypicker')
@@ -611,6 +611,10 @@ class Crud extends Command
                                 $search = '"##replacetext##"';
                                 $replace = '\'{"custom[type]":"' . $table . '"}\'';
                             }
+                            elseif ($selectpageController == 'admin')
+                            {
+                                $attrArr['data-source'] = 'auth/admin';
+                            }
                             if ($this->isMatchSuffix($field, $this->selectpagesSuffix))
                             {
                                 $attrArr['data-multiple'] = 'true';
-- 
Gitee