From f03430ccb7517b6ac6b8f82dcd15ee9248c62413 Mon Sep 17 00:00:00 2001
From: Ivan <1073477805@qq.com>
Date: Fri, 12 Jul 2019 11:06:37 +0800
Subject: [PATCH] 更新 require-table.js 自定义按钮的confirm不生效bug修改

---
 public/assets/js/require-table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 65478f4..94b3bfa 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -642,7 +642,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                         text = typeof j.text === 'function' ? j.text.call(table, row, j) : j.text ? j.text : '';
                         title = typeof j.title === 'function' ? j.title.call(table, row, j) : j.title ? j.title : text;
                         refresh = j.refresh ? 'data-refresh="' + j.refresh + '"' : '';
-                        confirm = typeof j.confirm === 'function' ? j.confirm.call(table, row, j) : (typeof j.confirm !== 'undefined' ? j.disable : false);
+                        confirm = typeof j.confirm === 'function' ? j.confirm.call(table, row, j) : (typeof j.confirm !== 'undefined' ? j.confirm : false);
                         confirm = confirm ? 'data-confirm="' + confirm + '"' : '';
                         extend = j.extend ? j.extend : '';
                         disable = typeof j.disable === 'function' ? j.disable.call(table, row, j) : (typeof j.disable !== 'undefined' ? j.disable : false);
--
libgit2 0.24.0