From 2f2c003f65ceb6878bdbc39ea58a31dd79ecc8b9 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 18 Dec 2017 11:03:38 +0800
Subject: [PATCH] 修复commonsearch在多表格下datetimerange可能出现的BUG 新增Table.api.getrowdata通过行索引获取行数据
---
public/assets/js/bootstrap-table-commonsearch.js | 2 +-
public/assets/js/require-backend.min.js | 10 ++++++++--
public/assets/js/require-table.js | 8 +++++++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index b7b7e7f..d7c3927 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -73,7 +73,7 @@
};
var column, index;
require(['bootstrap-daterangepicker'], function () {
- $(".datetimerange").each(function () {
+ $(".datetimerange", form).each(function () {
$(this).on('apply.daterangepicker', function (ev, picker) {
callback.call(picker, picker.startDate, picker.endDate);
});
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 1c7224b..841c2a7 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -9126,7 +9126,7 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
};
var column, index;
require(['bootstrap-daterangepicker'], function () {
- $(".datetimerange").each(function () {
+ $(".datetimerange", form).each(function () {
$(this).on('apply.daterangepicker', function (ev, picker) {
callback.call(picker, picker.startDate, picker.endDate);
});
@@ -10007,7 +10007,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
title = j.title ? j.title : text;
confirm = j.confirm ? 'data-confirm="' + j.confirm + '"' : '';
extend = j.extend ? j.extend : '';
- html.push('<a href="' + url + '" class="' + classname + '" ' + (confirm ? confirm + ' ' : '') + extend + ' title="' + title + '" data-table-id="' + (table ? table.attr("id") : '') + '" data-column-index="' + columnIndex + '" data-button-index="' + i + '"><i class="' + icon + '"></i>' + (text ? ' ' + text : '') + '</a>');
+ html.push('<a href="' + url + '" class="' + classname + '" ' + (confirm ? confirm + ' ' : '') + extend + ' title="' + title + '" data-table-id="' + (table ? table.attr("id") : '') + '" data-column-index="' + columnIndex + '" data-row-index="' + index + '" data-button-index="' + i + '"><i class="' + icon + '"></i>' + (text ? ' ' + text : '') + '</a>');
}
});
return html.join(' ');
@@ -10053,6 +10053,12 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
// 切换复选框状态
toggleattr: function (table) {
$("input[type='checkbox']", table).trigger('click');
+ },
+ // 根据行索引获取行数据
+ getrowdata: function (table, index) {
+ index = parseInt(index);
+ var data = table.bootstrapTable('getData');
+ return typeof data[index] !== 'undefined' ? data[index] : null;
}
},
};
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 150f152..94c84cc 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -438,7 +438,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
title = j.title ? j.title : text;
confirm = j.confirm ? 'data-confirm="' + j.confirm + '"' : '';
extend = j.extend ? j.extend : '';
- html.push('<a href="' + url + '" class="' + classname + '" ' + (confirm ? confirm + ' ' : '') + extend + ' title="' + title + '" data-table-id="' + (table ? table.attr("id") : '') + '" data-column-index="' + columnIndex + '" data-button-index="' + i + '"><i class="' + icon + '"></i>' + (text ? ' ' + text : '') + '</a>');
+ html.push('<a href="' + url + '" class="' + classname + '" ' + (confirm ? confirm + ' ' : '') + extend + ' title="' + title + '" data-table-id="' + (table ? table.attr("id") : '') + '" data-column-index="' + columnIndex + '" data-row-index="' + index + '" data-button-index="' + i + '"><i class="' + icon + '"></i>' + (text ? ' ' + text : '') + '</a>');
}
});
return html.join(' ');
@@ -484,6 +484,12 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
// 切换复选框状态
toggleattr: function (table) {
$("input[type='checkbox']", table).trigger('click');
+ },
+ // 根据行索引获取行数据
+ getrowdata: function (table, index) {
+ index = parseInt(index);
+ var data = table.bootstrapTable('getData');
+ return typeof data[index] !== 'undefined' ? data[index] : null;
}
},
};
--
libgit2 0.24.0