修复Bootstrap-table引用版本

pull/158/MERGE
Karson 2019-11-28 18:34:21 +08:00
parent 2b60921cf3
commit 0d20ce6fa9
4 changed files with 85 additions and 3175 deletions

View File

@ -1,6 +1,7 @@
{ {
"directory" : "public/assets/libs", "directory": "public/assets/libs",
"ignoredDependencies": [ "ignoredDependencies": [
"es6-promise",
"file-saver", "file-saver",
"html2canvas", "html2canvas",
"jspdf", "jspdf",

View File

@ -9,7 +9,7 @@
"jquery": "^2.1.4", "jquery": "^2.1.4",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"font-awesome": "^4.6.1", "font-awesome": "^4.6.1",
"bootstrap-table": "~1.11.0", "bootstrap-table": "fastadmin-bootstraptable#~1.11.3",
"jstree": "~3.3.2", "jstree": "~3.3.2",
"moment": "^2.20.1", "moment": "^2.20.1",
"plupload": "~2.2.0", "plupload": "~2.2.0",

View File

@ -29,7 +29,7 @@ require.config({
'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker', 'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker',
'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min', 'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min',
'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN', 'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN',
'bootstrap-table': '../libs/bootstrap-table/dist/bootstrap-table', 'bootstrap-table': '../libs/bootstrap-table/dist/bootstrap-table.min',
'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min', 'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min',
'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile', 'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile',
'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN', 'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',

File diff suppressed because one or more lines are too long