From 03c3b054e3de19a2270203c6557131a1b7bc1a5f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 30 Aug 2022 21:32:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/module/FormHandleModule.php        | 12 ++++++++++--
 public/static/admin/default/js/role.js |  1 -
 public/static/common/css/common.css    |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php
index a31546006..6e6fdce99 100644
--- a/app/module/FormHandleModule.php
+++ b/app/module/FormHandleModule.php
@@ -236,6 +236,14 @@ class FormHandleModule
         $this->controller_name = RequestController();
         $this->action_name = RequestAction();
 
+        // 是否开启删除
+        $is_delete = isset($this->form_data['base']['is_delete']) && $this->form_data['base']['is_delete'] == 1;
+        // 删除数据key默认ids
+        if($is_delete && empty($this->form_data['base']['delete_key']))
+        {
+            $this->form_data['base']['delete_key'] = 'ids';
+        }
+
         // 当前插件操作名称, 兼容插件模块名称
         if(empty($this->out_params['pluginsname']))
         {
@@ -248,7 +256,7 @@ class FormHandleModule
             $this->page_url = MyUrl($this->module_name.'/'.$this->controller_name.'/'.$this->action_name);
 
             // 已开启删除功能未配置删除数据地址
-            if(isset($this->form_data['base']['is_delete']) && $this->form_data['base']['is_delete'] == 1 && empty($this->form_data['base']['delete_url']))
+            if($is_delete && empty($this->form_data['base']['delete_url']))
             {
                 $this->form_data['base']['delete_url'] = MyUrl($this->module_name.'/'.$this->controller_name.'/delete');
             }
@@ -267,7 +275,7 @@ class FormHandleModule
             }
 
             // 已开启删除功能未配置删除数据地址
-            if(isset($this->form_data['base']['is_delete']) && $this->form_data['base']['is_delete'] == 1 && empty($this->form_data['base']['delete_url']))
+            if($is_delete && empty($this->form_data['base']['delete_url']))
             {
                 if($this->module_name == 'admin')
                 {
diff --git a/public/static/admin/default/js/role.js b/public/static/admin/default/js/role.js
index ba14aa02d..655b9c9cc 100755
--- a/public/static/admin/default/js/role.js
+++ b/public/static/admin/default/js/role.js
@@ -3,7 +3,6 @@ $(function()
 	/**
 	 * 全选/取消
 	 */
-
 	$('.node-choice').on('click', function()
 	{
 		var state = $(this).is(':checked');
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 99ee16b01..94573f374 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -109,7 +109,7 @@ form.am-form .am-form-group-refreshing,
     form.am-form-full-screen .plug-file-upload-view,
     form.am-form-full-screen .business-form-group,
     form.am-form-full-screen .business-form-block {
-        padding-right: 5px !important;
+        padding-right: 5px;
     }
 }