Quellcode durchsuchen

批量操作按钮下拉菜单样式显示异常bug修复以及兼容action改动

jqh vor 5 Jahren
Ursprung
Commit
99674ad37c

+ 3 - 1
resources/views/grid/batch-actions.blade.php

@@ -7,7 +7,9 @@
     </button>
     <ul class="dropdown-menu" role="menu">
         @foreach($actions as $action)
-            {!! $action->render() !!}
+            <li class="dropdown-item">
+                {!! $action->render() !!}
+            </li>
         @endforeach
     </ul>
 </div>

+ 6 - 2
src/Grid/BatchAction.php

@@ -12,18 +12,22 @@ abstract class BatchAction extends GridAction
     /**
      * {@inheritdoc}
      */
-    public function actionScript()
+    protected function actionScript()
     {
         $warning = __('No data selected!');
 
         return <<<JS
+function (data, target, action) { 
     var key = {$this->getSelectedKeysScript()}
     
     if (key.length === 0) {
         Dcat.warning('{$warning}');
         return ;
     }
-    Object.assign(data, {_key:key});
+    
+    // 设置主键为复选框选中的行ID数组
+    action.options.key = key;
+}
 JS;
     }
 

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

@@ -14,7 +14,7 @@ class BatchDelete extends BatchAction
     public function render()
     {
         return <<<HTML
-<li class="dropdown-item"><a href="#" data-name="{$this->parent->getName()}" data-action="batch-delete" data-url="{$this->resource()}">{$this->title}</a></li>
+<a href="#" data-name="{$this->parent->getName()}" data-action="batch-delete" data-url="{$this->resource()}">{$this->title}</a>
 HTML;
     }
 }