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

Pre Merge pull request !77 from 张尧嵩/master

pull/77/MERGE
张尧嵩 2018-10-10 15:43:19 +08:00
parent 544222fabb 8b29f2cf1b
commit b4e3a79048
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/js/colResizable.min.js vendored 100644
View File

File diff suppressed because one or more lines are too long

6
public/assets/js/require-backend.js
View File

@ -20,7 +20,8 @@ require.config({
'echarts-theme': 'echarts-theme',
'adminlte': 'adminlte',
'bootstrap-table-commonsearch': 'bootstrap-table-commonsearch',
'bootstrap-table-template': 'bootstrap-table-template',
'bootstrap-table-template': 'bootstrap-table-template',
'colResizable': 'colResizable.min',
//
// 以下的包从bower的libs目录加载
'jquery': '../libs/jquery/dist/jquery.min',
@ -49,7 +50,8 @@ require.config({
'template': '../libs/art-template/dist/template-native',
'selectpage': '../libs/fastadmin-selectpage/selectpage',
'citypicker': '../libs/fastadmin-citypicker/dist/js/city-picker.min',
'citypicker-data': '../libs/fastadmin-citypicker/dist/js/city-picker.data',
'citypicker-data': '../libs/fastadmin-citypicker/dist/js/city-picker.data',
},
// shim依赖配置
shim: {

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

@ -34,7 +34,8 @@ require.config({
'echarts-theme': 'echarts-theme',
'adminlte': 'adminlte',
'bootstrap-table-commonsearch': 'bootstrap-table-commonsearch',
'bootstrap-table-template': 'bootstrap-table-template',
'bootstrap-table-template': 'bootstrap-table-template',
'colResizable': 'colResizable.min',
//
// 以下的包从bower的libs目录加载
'jquery': '../libs/jquery/dist/jquery.min',
@ -63,7 +64,8 @@ require.config({
'template': '../libs/art-template/dist/template-native',
'selectpage': '../libs/fastadmin-selectpage/selectpage',
'citypicker': '../libs/fastadmin-citypicker/dist/js/city-picker.min',
'citypicker-data': '../libs/fastadmin-citypicker/dist/js/city-picker.data',
'citypicker-data': '../libs/fastadmin-citypicker/dist/js/city-picker.data',
},
// shim依赖配置
shim: {
@ -9650,7 +9652,10 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
},
placeHolderTemplate: ""
});
});
});
require(['colResizable'], function () {
$("table").colResizable();
});
$(table).on("click", "input[data-id][name='checkbox']", function (e) {
var ids = $(this).data("id");
var row = Table.api.getrowbyid(table, ids);

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

@ -261,7 +261,10 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
},
placeHolderTemplate: ""
});
});
});
require(['colResizable'], function () {
$("table").colResizable();
});
$(table).on("click", "input[data-id][name='checkbox']", function (e) {
var ids = $(this).data("id");
var row = Table.api.getrowbyid(table, ids);