🔖 Merge branch 'master' into develop

Author: osindex

config/admin.php

@@ -98,7 +98,7 @@
     ],
     //操作日志
     'operation_log' => [
-        'enable' => false,
+        'enable' => true,
         /*
          * Only logging allowed methods in the list
          */

docs/components.md

@@ -284,6 +284,26 @@ $actions->add(ActionButton::make("发货")->order(4)->dialog(function (Dialog $d
 
 这里的dialog展示的是一个表单，当然你可以展示任意组件
 
+### 批量操作组件
+
+#### BatchAction
+
+可用于vue路由导航，异步请求，连接跳转 , Dialog 
+
+```php
+BatchAction::make("加入活动")
+    ->uri('...')//批量操作路径
+    ->handler(BatchAction::HANDLER_REQUEST)//批量操作响应事件类型
+    ->route('...')//vue路由快捷设置方法
+    ->requestMethod('post')//设置request模式请求类型
+    ->message('...')//确认操作提示信息
+    ->beforeEmit('name','data')//请求前出发事件
+    ->successEmit('name','data')//操作成功后触发事件
+    ->afterEmit('name','data')//操作完成后触发事件，失败成功都会触发
+    ->dialog(Dialog)//设置dialog弹窗
+
+```
+
 
 
 ### 工具栏组件
@@ -292,8 +312,6 @@ $actions->add(ActionButton::make("发货")->order(4)->dialog(function (Dialog $d
 
 可用于vue路由导航，异步请求，连接跳转 , Dialog 
 
-
-
 普通演示
 
 ```php

docs/grid.md

@@ -1,3 +1,5 @@
+
+
 # 模型表格
 
 使用[Elememt 的 Table](https://element.eleme.cn/#/zh-CN/component/table)实现，用于展示多条结构类似的数据，可对数据进行排序、筛选、对比或其他自定义操作。
@@ -726,12 +728,57 @@ $actions->deleteAction()->message("确定要删除吗，删除不可恢复？");
 $actions->add(new MyAction())
 ```
 
+## 批量操作
+
+```php
+$grid->batchActions(function (Grid\BatchActions $batchActions) {
+    $batchActions->hideDeleteAction();//隐藏批量删除操作
+    $batchActions->add(...);//添加批量操作
+});
+```
+
+#### 获取选择的keys
+
+获取批量选择的keys
+
+> 注意：获取原理为前段字符串替换，后端无法获取具体值
+
+```php
+$batchActions->getKeys();
+```
+
+可以在设置`url`时使用
+
+```php
+$url = $$batchActions->resource . '/' . $$batchActions->getKeys();
+Grid\BatchActions\BatchAction::make("批量删除")->url($url);
+```
+
+可以在设置`dialog`里的`BaseForm`的`action`时使用
+
+```php
+$grid->batchActions(function (Grid\BatchActions $batchActions) {
+        $batchActions->add(Grid\BatchActions\BatchAction::make("加入活动")->dialog(function (Dialog $dialog) use ($batchActions) {
+            $dialog->slot(function (Content $content) use ($batchActions) {
+            $form = new BaseForm();
+                
+            $actionUrl = route('activityJoin', ['keys' => $batchActions->getKeys()]);
+            $form->action($actionUrl);
+                
+            $form->item('activity_id', '活动');
+            $content->row($form);
+        });
+    }));
+});
+```
+
 
 
 ## 工具栏
 
 ```php
 $grid->toolbars(function (Grid\Toolbars $toolbars) {
+
 	$toolbars->hideCreateButton();
     $toolbars->createButton()->content("添加商品");//获取创建组件实例，修改属性
 });

resources/js/components.js

@@ -59,8 +59,8 @@ Vue.component('ColorPicker', ColorPicker);
 Vue.component('TimePicker', TimePicker);
 Vue.component('DatePicker', DatePicker);
 Vue.component('DateTimePicker', DateTimePicker);
-Vue.component('WangEditor', () => import('./components/widgets/WangEditor'));
-Vue.component('ItemSelect', () => import('./components/widgets/Form/ItemSelect'));
+Vue.component('WangEditor', () => import('@/components/widgets/WangEditor'));
+Vue.component('ItemSelect', () => import('@/components/widgets/Form/ItemSelect'));
 
 
 
@@ -101,6 +101,9 @@ Vue.component('DeleteAction', DeleteAction);
 Vue.component('VueRouteAction', VueRouteAction);
 Vue.component('ActionButton', ActionButton);
 
+//BatchAction
+Vue.component('BatchAction',require('@/components/widgets/BatchActions/BatchAction').default)
+
 //Tools
 import GridCreateButton from './components/widgets/Tools/Create'
 import ToolButton from './components/widgets/Tools/ToolButton'

resources/js/components/form/BaseForm.vue

@@ -100,7 +100,8 @@ export default {
     ItemIf
   },
   props: {
-    attrs: Object
+    attrs: Object,
+    keys:String
   },
   data() {
     return {
@@ -112,14 +113,23 @@ export default {
   mounted() {
     this.formData = this._.cloneDeep(this.attrs.formItemsValue)
   },
+  computed:{
+    actionUrl(){
+
+      const keys = this.$store.getters.thisPage.grids.selectionKeys;
+      
+
+      return this._.replace(this.attrs.action, "selectionKeys", keys);
+    }
+  },
   methods: {
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.loading = true;
 
           this.$http
-            .post(this.attrs.action, this.formData)
+            .post(this.actionUrl, this.formData)
             .then(({ data, code, message }) => {
               if (code == 200) {
                 this.attrs.emits.map(item => {

resources/js/components/grid/BatchActions/Index.vue

@@ -5,9 +5,13 @@
       <i class="el-icon-arrow-down el-icon--right"></i>
     </el-button>
     <el-dropdown-menu slot="dropdown">
-      <a @click="onBatchDelete">
-        <el-dropdown-item>批量删除</el-dropdown-item>
-      </a>
+      <component
+        v-for="(component, index) in actions"
+        :key="component.componentName + index"
+        :is="component.componentName"
+        :action="component"
+        :keys="keys"
+      />
     </el-dropdown-menu>
   </el-dropdown>
 </template>
@@ -16,31 +20,10 @@ export default {
   props: {
     rows: Array,
     routers: Object,
-    key_name: String
-  },
-  methods: {
-    onBatchDelete() {
-      this.$confirm(
-        "您确定删除这" + this.rows.length + "条数据吗？",
-        "批量删除确认"
-      )
-        .then(() => {
-          const deleteUrl = this.routers.resource + "/" + this.keys;
-
-          this.$bus.emit("tableSetLoading", true);
-
-          this.$http
-            .delete(deleteUrl)
-            .then(({ code }) => {
-              code === 200 && this.$bus.emit("tableReload");
-            })
-            .finally(() => {
-              this.$bus.emit("tableSetLoading", false);
-            });
-        })
-        .catch(() => {});
-    }
+    key_name: String,
+    actions: Array
   },
+  methods: {},
   computed: {
     keys() {
       return this.rows

resources/js/components/grid/Table.vue

@@ -13,6 +13,7 @@
             :routers="attrs.routers"
             :key_name="attrs.keyName"
             :rows="selectionRows"
+            :actions="attrs.batchActions"
             v-if="attrs.selection"
           />
           <div class="search-view mr-10" v-if="attrs.quickSearch">
@@ -387,6 +388,7 @@ export default {
     //当选择项发生变化时会触发该事件
     onTableselectionChange(selection) {
       this.selectionRows = selection;
+      this.$store.commit("setGridData", { key: "selectionKeys", data: this.keys });
     },
     //每页大小改变时
     onPageSizeChange(per_page) {
@@ -401,6 +403,13 @@ export default {
     }
   },
   computed: {
+    keys() {
+      return this.selectionRows
+        .map(item => {
+          return item[this.attrs.keyName];
+        })
+        .join(",");
+    },
     //当前路径
     path() {
       return this.$route.path;

resources/js/components/layout/Column.vue

@@ -5,6 +5,7 @@
       :key="index"
       :is="content.componentName"
       :attrs="content"
+      v-bind="$props"
     />
   </el-col>
 </template>

resources/js/components/layout/Content.vue

@@ -11,6 +11,7 @@
           :key="index"
           :is="row.componentName"
           :attrs="row"
+          v-bind="$props"
         />
       </div>
     </div>

resources/js/components/layout/Row.vue

@@ -5,6 +5,7 @@
       :key="index"
       :is="column.componentName"
       :attrs="column"
+      v-bind="$props"
     />
   </el-row>
 </template>