首页 发现 帮助
登录
githab
/
bootstrap-table
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'develop' into feature/multiselect-filtercontrol

Dennis Hernández 4 年之前
父节点
3bbccf13c6 8db4dc821b
当前提交
40b21fed7c
共有 18 个文件被更改，包括 67 次插入 和 27 次删除
分列视图 显示文件统计
  1. 16 0
      README.md
  2. 1 1
      package.json
  3. 2 0
      rollup.config.js
  4. 3 3
      site/_includes/scripts.html
  5. 2 2
      site/_themes/public/index.html
  6. 2 2
      site/docs/getting-started/introduction.md
  7. 3 3
      site/docs/vuejs/browser.md
  8. 1 1
      site/themes/bootstrap-table.md
  9. 1 1
      site/themes/bootstrap3.md
  10. 1 1
      site/themes/bootstrap5.md
  11. 2 2
      site/themes/bulma.md
  12. 1 1
      site/themes/foundation.md
  13. 3 3
      site/themes/materialize.md
  14. 3 3
      site/themes/semantic.md
  15. 1 0
      src/bootstrap-table.js
  16. 7 3
      src/extensions/page-jump-to/bootstrap-table-page-jump-to.scss
  17. 2 1
      src/extensions/print/bootstrap-table-print.js
  18. 16 0
      src/extensions/reorder-rows/bootstrap-table-reorder-rows.js

+ 16 - 0
README.md
查看文件 

@@ -96,6 +96,22 @@ This project exists thanks to all the people who contribute. [[Contribute](CONTR
 
 
 Look at the [Change Log](https://github.com/wenzhixin/bootstrap-table/blob/master/CHANGELOG.md)
 
 
+## Local develop
 
+
 
+To develop bootstrap-table locally please run:
 
+
 
+```bash
 
+mkdir bootstrap-table-dev
 
+cd bootstrap-table-dev
 
+git clone https://github.com/wenzhixin/bootstrap-table
 
+git clone https://github.com/wenzhixin/bootstrap-table-examples
 
+
 
+yarn add http-server
 
+npx http-server
 
+```
 
+
 
+And then open: http://localhost:8081/bootstrap-table-examples
 
+
 
 ## Local build
 
 
 To build bootstrap-table locally please run:

+ 1 - 1
package.json
查看文件 

@@ -28,7 +28,7 @@
 
     "rollup-plugin-multi-entry": "^2.1.0",
 
     "rollup-plugin-node-resolve": "^5.0.4",
 
     "rollup-plugin-terser": "^7.0.0",
 
-    "rollup-plugin-vue": "6.0.0",
 
+    "rollup-plugin-vue": "5.1.9",
 
     "stylelint": "^13.3.3",
 
     "stylelint-config-standard": "^21.0.0",
 
     "vue-template-compiler": "^2.6.10"

+ 2 - 0
rollup.config.js
查看文件 

@@ -51,6 +51,7 @@ if (process.env.NODE_ENV === 'production') {
 
 
 for (const file of files) {
 
   let out = `dist/${file.replace('src/', '')}`
 
+
 
   if (process.env.NODE_ENV === 'production') {
 
     out = out.replace(/.js$/, '.min.js')
 
   }
 
@@ -68,6 +69,7 @@ for (const file of files) {
 
 }
 
 
 let out = 'dist/bootstrap-table-locale-all.js'
 
+
 
 if (process.env.NODE_ENV === 'production') {
 
   out = out.replace(/.js$/, '.min.js')
 
 }

+ 3 - 3
site/_includes/scripts.html
查看文件 

@@ -1,5 +1,5 @@
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
 
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
 <script async defer src="https://buttons.github.io/buttons.js"></script>
 
 
@@ -13,7 +13,7 @@ $(function () {
 
 {%- endif -%}
 
 
 {%- if page.layout == "home" -%}
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js"></script>
 
 <script src="{{ site.baseurl }}/assets/js/supports.js?m=5"></script>
 
 
 <script async src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>

+ 2 - 2
site/_themes/public/index.html
查看文件 

@@ -10,8 +10,8 @@
 
     <link rel="stylesheet" href="/assets/css/docs.min.css">
 
     <link rel="stylesheet" href="/assets/css/style.css?m=2">
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
 
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
   </head>
 
   <body>

+ 2 - 2
site/docs/getting-started/introduction.md
查看文件 

@@ -74,8 +74,8 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
 
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
   </body>

+ 3 - 3
site/docs/vuejs/browser.md
查看文件 

@@ -77,10 +77,10 @@ In addition to the files that [Quick start](/docs/getting-started/introduction/#
 
       <bootstrap-table :columns="columns" :data="data" :options="options"></bootstrap-table>
 
     </div>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
 
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
-    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12/dist/vue.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table-vue.min.js"></script>
 
     <script>

+ 1 - 1
site/themes/bootstrap-table.md
查看文件 

@@ -68,7 +68,7 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/bootstrap-table/bootstrap-table.min.js"></script>
 
   </body>

+ 1 - 1
site/themes/bootstrap3.md
查看文件 

@@ -68,7 +68,7 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
   </body>

+ 1 - 1
site/themes/bootstrap5.md
查看文件 

@@ -68,7 +68,7 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
   </body>

+ 2 - 2
site/themes/bulma.md
查看文件 

@@ -43,7 +43,7 @@ Put it all together and your pages should look like this:
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css">
 
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.2/css/bulma.min.css">
 
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
 
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/bulma/bootstrap-table-bulma.min.css">
 
 
@@ -72,7 +72,7 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/bulma/bootstrap-table-bulma.min.js"></script>
 
   </body>

+ 1 - 1
site/themes/foundation.md
查看文件 

@@ -72,7 +72,7 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
     <script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.5.3/dist/js/foundation.min.js" integrity="sha256-/PFxCnsMh+nTuM0k3VJCRch1gwnCfKjaP8rJNq5SoBg= sha384-9ksAFjQjZnpqt6VtpjMjlp2S0qrGbcwF/rvrLUg2vciMhwc1UJJeAAOLuJ96w+Nj sha512-UMSn6RHqqJeJcIfV1eS2tPKCjzaHkU/KqgAnQ7Nzn0mLicFxaVhm9vq7zG5+0LALt15j1ljlg8Fp9PT1VGNmDw==" crossorigin="anonymous"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/foundation/bootstrap-table-foundation.min.js"></script>

+ 3 - 3
site/themes/materialize.md
查看文件 

@@ -43,7 +43,7 @@ Put it all together and your pages should look like this:
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
 
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/materialize-css@1.0.0/dist/css/materialize.min.css">
 
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/materialize/bootstrap-table-materialize.min.css">
 
 
@@ -72,8 +72,8 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/materialize-css@1.0.0/dist/js/materialize.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/materialize/bootstrap-table-materialize.min.js"></script>
 
   </body>

+ 3 - 3
site/themes/semantic.md
查看文件 

@@ -43,7 +43,7 @@ Put it all together and your pages should look like this:
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css">
 
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css">
 
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
 
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/semantic/bootstrap-table-semantic.min.css">
 
 
@@ -72,8 +72,8 @@ Put it all together and your pages should look like this:
 
       </tbody>
 
     </table>
 
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
 
+    <script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
 
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/themes/semantic/bootstrap-table-semantic.min.js"></script>
 
   </body>

+ 1 - 0
src/bootstrap-table.js
查看文件 

@@ -1943,6 +1943,7 @@ class BootstrapTable {
 
 
         if (
 
           this.options.sidePagination === 'server' &&
 
+          this.options.pageNumber > 1 &&
 
           res[this.options.totalField] > 0 &&
 
           !res[this.options.dataField].length
 
         ) {

+ 7 - 3
src/extensions/page-jump-to/bootstrap-table-page-jump-to.scss
查看文件 

@@ -1,6 +1,10 @@
 
-.bootstrap-table.bootstrap3 .fixed-table-pagination > .pagination ul.pagination,
 
-.bootstrap-table.bootstrap3 .fixed-table-pagination > .pagination .page-jump-to {
 
-  display: inline;
 
+.bootstrap-table.bootstrap3 .fixed-table-pagination > .pagination {
 
+  .page-jump-to {
 
+    display: inline-block;
 
+  }
 
+  .input-group-btn {
 
+    width: auto;
 
+  }
 
 }
 
 
 .bootstrap-table .fixed-table-pagination > .pagination .page-jump-to input {

+ 2 - 1
src/extensions/print/bootstrap-table-print.js
查看文件 

@@ -134,7 +134,8 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
 
   doPrint (data) {
 
     const formatValue = (row, i, column) => {
 
-      const value = Utils.calculateObjectValue(column, column.printFormatter,
 
+      const value = Utils.calculateObjectValue(column,
 
+        column.printFormatter || column.formatter,
 
         [row[column.field], row, i], row[column.field])
 
 
       return typeof value === 'undefined' || value === null ?

+ 16 - 0
src/extensions/reorder-rows/bootstrap-table-reorder-rows.js
查看文件 

@@ -93,10 +93,26 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
     this.options.data.splice(this.options.data.indexOf(draggingRow), 1)
 
     this.options.data.splice(index, 0, draggingRow)
 
 
+    this.initSearch()
 
+
 
     // Call the user defined function
 
     this.options.onReorderRowsDrop(droppedRow)
 
 
     // Call the event reorder-row
 
     this.trigger('reorder-row', newData, draggingRow, droppedRow)
 
   }
 
+
 
+  initSearch () {
 
+    this.ignoreInitSort = true
 
+    super.initSearch()
 
+  }
 
+
 
+  initSort () {
 
+    if (this.ignoreInitSort) {
 
+      this.ignoreInitSort = false
 
+      return
 
+    }
 
+
 
+    super.initSort()
 
+  }
 
 }