Ver código fonte

修复action确认弹窗设置空字符串或去除弹窗方法报错问题

jqh 5 anos atrás
pai
commit
68ccc31180

+ 1 - 1
src/Actions/HasActionHandler.php

@@ -76,7 +76,7 @@ trait HasActionHandler
     {
         $data = json_encode($this->parameters());
         $confirm = $this->confirm();
-        $confirm = $confirm ? json_encode($confirm) : null;
+        $confirm = $confirm ? json_encode((array) $confirm) : 'false';
 
         $script = <<<JS
 Dcat.Action({

+ 3 - 0
src/Controllers/UserController.php

@@ -2,6 +2,7 @@
 
 namespace Dcat\Admin\Controllers;
 
+use App\Admin\Actions\Copy;
 use Dcat\Admin\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -37,6 +38,8 @@ class UserController extends AdminController
             $grid->name;
             $grid->roles->pluck('name')->label('primary', 3);
 
+            $grid->actions(new Copy());
+
             $permissionModel = config('admin.database.permissions_model');
             $roleModel = config('admin.database.roles_model');
             $nodes = (new $permissionModel())->allNodes();

+ 1 - 1
src/Grid/Tools/QuickSearch.php

@@ -130,7 +130,7 @@ class QuickSearch extends AbstractTool
     
     var submit = Dcat.helpers.debounce(function (input) {
         inputting || $(input).parents('form').submit()
-    }, 1000);
+    }, 1200);
     
     function toggleBtn() {
         var t = $(this),