何书鹏 / anttest · 提交

转到一个项目

作者 Karson
提交 0d20ce6fa9b9084febf617d418d5348e3f6ea276 1 个父辈 2b60921c

修复Bootstrap-table引用版本

内嵌 并排对比
正在显示 4 个修改的文件 包含 4 行增加 和 3 行删除
1 { 1 {
2 - "directory" : "public/assets/libs", 2 + "directory": "public/assets/libs",
3 "ignoredDependencies": [ 3 "ignoredDependencies": [
  4 + "es6-promise",
4 "file-saver", 5 "file-saver",
5 "html2canvas", 6 "html2canvas",
6 "jspdf", 7 "jspdf",
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 "jquery": "^2.1.4", 9 "jquery": "^2.1.4",
10 "bootstrap": "^3.3.7", 10 "bootstrap": "^3.3.7",
11 "font-awesome": "^4.6.1", 11 "font-awesome": "^4.6.1",
12 - "bootstrap-table": "~1.11.0", 12 + "bootstrap-table": "fastadmin-bootstraptable#~1.11.3",
13 "jstree": "~3.3.2", 13 "jstree": "~3.3.2",
14 "moment": "^2.20.1", 14 "moment": "^2.20.1",
15 "plupload": "~2.2.0", 15 "plupload": "~2.2.0",
@@ -29,7 +29,7 @@ require.config({ @@ -29,7 +29,7 @@ require.config({
29 'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker', 29 'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker',
30 'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min', 30 'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min',
31 'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN', 31 'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN',
32 - 'bootstrap-table': '../libs/bootstrap-table/dist/bootstrap-table', 32 + 'bootstrap-table': '../libs/bootstrap-table/dist/bootstrap-table.min',
33 'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min', 33 'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min',
34 'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile', 34 'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile',
35 'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN', 35 'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',