hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复Table.api.formatter.buttons和Table.api.formatter.formatter链接计算错误的BUG

pull/9/head
Karson 2017-08-18 11:43:57 +08:00
parent 07a16a6797
commit 04f4107423
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/assets/js/require-backend.min.js vendored
View File

@ -8098,6 +8098,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
buttons.push({name: 'edit', icon: 'fa fa-pencil', classname: 'btn btn-xs btn-success btn-editone'}); buttons.push({name: 'edit', icon: 'fa fa-pencil', classname: 'btn btn-xs btn-success btn-editone'});
buttons.push({name: 'del', icon: 'fa fa-trash', classname: 'btn btn-xs btn-danger btn-delone'}); buttons.push({name: 'del', icon: 'fa fa-trash', classname: 'btn btn-xs btn-danger btn-delone'});
var html = []; var html = [];
var url, classname, icon, text, title;
$.each(buttons, function (i, j) { $.each(buttons, function (i, j) {
if (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] === 'undefined') { if (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] === 'undefined') {
return true; return true;
@ -8108,8 +8109,8 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
var attr = table.data("operate-" + j.name); var attr = table.data("operate-" + j.name);
if (typeof attr === 'undefined' || attr) { if (typeof attr === 'undefined' || attr) {
//自动加上ids //自动加上ids
j.url = j.url ? j.url + (j.url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + row[options.pk] : ''; url = j.url ? j.url + (j.url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + row[options.pk] : '';
url = j.url ? Fast.api.fixurl(j.url) : 'javascript:;'; url = url ? Fast.api.fixurl(url) : 'javascript:;';
classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one'; classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one';
icon = j.icon ? j.icon : ''; icon = j.icon ? j.icon : '';
text = j.text ? j.text : ''; text = j.text ? j.text : '';

10
public/assets/js/require-table.js
View File

@ -376,6 +376,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
buttons.push({name: 'edit', icon: 'fa fa-pencil', classname: 'btn btn-xs btn-success btn-editone'}); buttons.push({name: 'edit', icon: 'fa fa-pencil', classname: 'btn btn-xs btn-success btn-editone'});
buttons.push({name: 'del', icon: 'fa fa-trash', classname: 'btn btn-xs btn-danger btn-delone'}); buttons.push({name: 'del', icon: 'fa fa-trash', classname: 'btn btn-xs btn-danger btn-delone'});
var html = []; var html = [];
var url, classname, icon, text, title;
$.each(buttons, function (i, j) { $.each(buttons, function (i, j) {
if (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] === 'undefined') { if (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] === 'undefined') {
return true; return true;
@ -386,8 +387,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
var attr = table.data("operate-" + j.name); var attr = table.data("operate-" + j.name);
if (typeof attr === 'undefined' || attr) { if (typeof attr === 'undefined' || attr) {
//自动加上ids //自动加上ids
j.url = j.url ? j.url + (j.url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + row[options.pk] : ''; url = j.url ? j.url + (j.url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + row[options.pk] : '';
url = j.url ? Fast.api.fixurl(j.url) : 'javascript:;'; url = url ? Fast.api.fixurl(url) : 'javascript:;';
classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one'; classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one';
icon = j.icon ? j.icon : ''; icon = j.icon ? j.icon : '';
text = j.text ? j.text : ''; text = j.text ? j.text : '';
@ -404,12 +405,13 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
// 默认按钮组 // 默认按钮组
var buttons = $.extend([], this.buttons || []); var buttons = $.extend([], this.buttons || []);
var html = []; var html = [];
var url, classname, icon, text, title;
$.each(buttons, function (i, j) { $.each(buttons, function (i, j) {
var attr = table.data("buttons-" + j.name); var attr = table.data("buttons-" + j.name);
if (typeof attr === 'undefined' || attr) { if (typeof attr === 'undefined' || attr) {
//自动加上ids //自动加上ids
j.url = j.url ? j.url + (j.url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + row[options.pk] : ''; url = j.url ? j.url + (j.url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + row[options.pk] : '';
url = j.url ? Fast.api.fixurl(j.url) : 'javascript:;'; url = url ? Fast.api.fixurl(url) : 'javascript:;';
classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one'; classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one';
icon = j.icon ? j.icon : ''; icon = j.icon ? j.icon : '';
text = j.text ? j.text : ''; text = j.text ? j.text : '';