浏览代码

修复Bootstrap-table引用版本

Karson 5 年之前
父节点
当前提交
0d20ce6fa9
共有 4 个文件被更改,包括 85 次插入3175 次删除
  1. 2 1
      .bowerrc
  2. 1 1
      bower.json
  3. 1 1
      public/assets/js/require-backend.js
  4. 81 3172
      public/assets/js/require-backend.min.js

+ 2 - 1
.bowerrc

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

+ 1 - 1
bower.json

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

+ 1 - 1
public/assets/js/require-backend.js

@@ -29,7 +29,7 @@ require.config({
         'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker',
         'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min',
         '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-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile',
         'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',

文件差异内容过多而无法显示
+ 81 - 3172
public/assets/js/require-backend.min.js