Merge branch 'develop'

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

@@ -7,7 +7,7 @@ body:
     id: affected-versions
     attributes:
       label: Bootstraptable version(s) affected
-      placeholder: 1.22.6
+      placeholder: 1.23.0
     validations:
       required: true
   - type: textarea

.github/dependabot.yml

@@ -6,10 +6,3 @@ updates:
     interval: daily
     time: "21:00"
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: rollup-plugin-vue
-    versions:
-    - ">= 6.a, < 7"
-  - dependency-name: clean-css-cli
-    versions:
-    - 5.0.0

.ncurc.json

@@ -1,3 +1,3 @@
 {
-  "reject": "rollup-plugin-vue"
+  "reject": "eslint"
 }

CHANGELOG.md

@@ -1,6 +1,23 @@
 ChangeLog
 ---------
 
+### 1.23.0
+
+#### Core
+
+- **New:** Add support for vue3 instead of vue2.
+- **Update:** Fixed `getData` with `formatted` data bug when a column is missing.
+- **Update:** Fixed `toggleColumn` exception when the field does not exist.
+- **Update:** Fixed vue component init twice when options and columns both changed.
+
+#### Extensions
+
+- **New(addrbar):** Added `addrCustomParams` option for custom parameters.
+- **New(filter-control):** Added `filterControlSearchClear` option to stop clearing the filters when using `showSearchButton` option.
+- **Update(filter-control):** Fixed error with clear filters button when not enabled cookie extension.
+- **Update(filter-control):** Fixed bug with enabled cookie extension using `localStorage`.
+- **Update(multiple-sort):** Fixed not trigger event bug when using server-side pagination.
+
 ### 1.22.6
 
 #### Extensions

_config.yml

@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.22.6
+current_version:  1.23.0
 title:            "Bootstrap Table"
 description:      "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
 authors:          "Zhixin Wen, and Bootstrap Table contributors"

bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.22.6",
+  "version": "1.23.0",
   "title": "Bootstrap Table",
   "description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
   "author": {

dist/bootstrap-table-vue.esm.js

@@ -1,209 +0,0 @@
-//
-//
-//
-//
-
-const $ = window.jQuery;
-const deepCopy = arg => {
-  if (arg === undefined) {
-    return arg
-  }
-  return $.fn.bootstrapTable.utils.extend(true, Array.isArray(arg) ? [] : {}, arg)
-};
-
-var script = {
-  name: 'BootstrapTable',
-  props: {
-    columns: {
-      type: Array,
-      require: true
-    },
-    data: {
-      type: [Array, Object],
-      default () {
-        return undefined
-      }
-    },
-    options: {
-      type: Object,
-      default () {
-        return {}
-      }
-    }
-  },
-  mounted () {
-    this.$table = $(this.$el);
-
-    this.$table.on('all.bs.table', (e, name, args) => {
-      let eventName = $.fn.bootstrapTable.events[name];
-      eventName = eventName.replace(/([A-Z])/g, '-$1').toLowerCase();
-      this.$emit('on-all', ...args);
-      this.$emit(eventName, ...args);
-    });
-
-    this._initTable();
-  },
-  methods: {
-    _initTable () {
-      const options = {
-        ...deepCopy(this.options),
-        columns: deepCopy(this.columns),
-        data: deepCopy(this.data)
-      };
-      if (!this._hasInit) {
-        this.$table.bootstrapTable(options);
-        this._hasInit = true;
-      } else {
-        this.refreshOptions(options);
-      }
-    },
-    ...(() => {
-      const res = {};
-      for (const method of $.fn.bootstrapTable.methods) {
-        res[method] = function (...args) {
-          return this.$table.bootstrapTable(method, ...args)
-        };
-      }
-      return res
-    })()
-  },
-  watch: {
-    options: {
-      handler () {
-        this._initTable();
-      },
-      deep: true
-    },
-    columns: {
-      handler () {
-        this._initTable();
-      },
-      deep: true
-    },
-    data: {
-      handler () {
-        this.load(deepCopy(this.data));
-      },
-      deep: true
-    }
-  }
-};
-
-function normalizeComponent(template, style, script, scopeId, isFunctionalTemplate, moduleIdentifier /* server only */, shadowMode, createInjector, createInjectorSSR, createInjectorShadow) {
-    if (typeof shadowMode !== 'boolean') {
-        createInjectorSSR = createInjector;
-        createInjector = shadowMode;
-        shadowMode = false;
-    }
-    // Vue.extend constructor export interop.
-    const options = typeof script === 'function' ? script.options : script;
-    // render functions
-    if (template && template.render) {
-        options.render = template.render;
-        options.staticRenderFns = template.staticRenderFns;
-        options._compiled = true;
-        // functional template
-        if (isFunctionalTemplate) {
-            options.functional = true;
-        }
-    }
-    // scopedId
-    if (scopeId) {
-        options._scopeId = scopeId;
-    }
-    let hook;
-    if (moduleIdentifier) {
-        // server build
-        hook = function (context) {
-            // 2.3 injection
-            context =
-                context || // cached call
-                    (this.$vnode && this.$vnode.ssrContext) || // stateful
-                    (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext); // functional
-            // 2.2 with runInNewContext: true
-            if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
-                context = __VUE_SSR_CONTEXT__;
-            }
-            // inject component styles
-            if (style) {
-                style.call(this, createInjectorSSR(context));
-            }
-            // register component module identifier for async chunk inference
-            if (context && context._registeredComponents) {
-                context._registeredComponents.add(moduleIdentifier);
-            }
-        };
-        // used by ssr in case component is cached and beforeCreate
-        // never gets called
-        options._ssrRegister = hook;
-    }
-    else if (style) {
-        hook = shadowMode
-            ? function (context) {
-                style.call(this, createInjectorShadow(context, this.$root.$options.shadowRoot));
-            }
-            : function (context) {
-                style.call(this, createInjector(context));
-            };
-    }
-    if (hook) {
-        if (options.functional) {
-            // register for functional component in vue file
-            const originalRender = options.render;
-            options.render = function renderWithStyleInjection(h, context) {
-                hook.call(context);
-                return originalRender(h, context);
-            };
-        }
-        else {
-            // inject component registration as beforeCreate hook
-            const existing = options.beforeCreate;
-            options.beforeCreate = existing ? [].concat(existing, hook) : [hook];
-        }
-    }
-    return script;
-}
-
-/* script */
-const __vue_script__ = script;
-
-/* template */
-var __vue_render__ = function () {
-  var _vm = this;
-  var _h = _vm.$createElement;
-  var _c = _vm._self._c || _h;
-  return _c("table")
-};
-var __vue_staticRenderFns__ = [];
-__vue_render__._withStripped = true;
-
-  /* style */
-  const __vue_inject_styles__ = undefined;
-  /* scoped */
-  const __vue_scope_id__ = undefined;
-  /* module identifier */
-  const __vue_module_identifier__ = undefined;
-  /* functional template */
-  const __vue_is_functional_template__ = false;
-  /* style inject */
-  
-  /* style inject SSR */
-  
-  /* style inject shadow dom */
-  
-
-  
-  const __vue_component__ = /*#__PURE__*/normalizeComponent(
-    { render: __vue_render__, staticRenderFns: __vue_staticRenderFns__ },
-    __vue_inject_styles__,
-    __vue_script__,
-    __vue_scope_id__,
-    __vue_is_functional_template__,
-    __vue_module_identifier__,
-    false,
-    undefined,
-    undefined,
-    undefined
-  );
-
-export { __vue_component__ as default };

dist/extensions/filter-control/bootstrap-table-filter-control.css

@@ -1,20 +1 @@
-@charset "UTF-8";
-/**
- * @author: Dennis Hernández
- * @version: v2.1.1
- */
-.no-filter-control {
-  height: 40px;
-}
-
-.filter-control {
-  margin: 0 2px 2px;
-}
-
-.ms-choice {
-  border: 0;
-}
-
-.ms-parent > button:focus {
-  outline: 0;
-}
+.no-filter-control{height:40px}.filter-control{margin:0 2px 2px}.ms-choice{border:0}.ms-parent>button:focus{outline:0}

dist/extensions/filter-control/bootstrap-table-filter-control.min.css

@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.22.6
+  * @version v1.23.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-@charset "UTF-8";.no-filter-control{height:40px}.filter-control{margin:0 2px 2px}.ms-choice{border:0}.ms-parent>button:focus{outline:0}
+.no-filter-control{height:40px}.filter-control{margin:0 2px 2px}.ms-choice{border:0}.ms-parent>button:focus{outline:0}

dist/extensions/fixed-columns/bootstrap-table-fixed-columns.css

@@ -1,25 +1 @@
-.fixed-columns,
-.fixed-columns-right {
-  position: absolute;
-  top: 0;
-  height: 100%;
-  background-color: #fff;
-  box-sizing: border-box;
-  z-index: 1;
-}
-
-.fixed-columns {
-  left: 0;
-}
-
-.fixed-columns .fixed-table-body {
-  overflow: hidden !important;
-}
-
-.fixed-columns-right {
-  right: 0;
-}
-
-.fixed-columns-right .fixed-table-body {
-  overflow-x: hidden !important;
-}
+.fixed-columns,.fixed-columns-right{position:absolute;top:0;height:100%;background-color:#fff;box-sizing:border-box;z-index:1}.fixed-columns{left:0}.fixed-columns .fixed-table-body{overflow:hidden !important}.fixed-columns-right{right:0}.fixed-columns-right .fixed-table-body{overflow-x:hidden !important}

dist/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css

@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.22.6
+  * @version v1.23.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT

dist/extensions/group-by-v2/bootstrap-table-group-by.css

@@ -1,8 +1 @@
-.bootstrap-table .table > tbody > tr.group-by.expanded,
-.bootstrap-table .table > tbody > tr.group-by.collapsed {
-  cursor: pointer;
-}
-
-.bootstrap-table .table > tbody > tr.hidden {
-  display: none;
-}
+.bootstrap-table .table>tbody>tr.group-by.expanded,.bootstrap-table .table>tbody>tr.group-by.collapsed{cursor:pointer}.bootstrap-table .table>tbody>tr.hidden{display:none}

dist/extensions/group-by-v2/bootstrap-table-group-by.min.css

@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.22.6
+  * @version v1.23.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT

dist/extensions/page-jump-to/bootstrap-table-page-jump-to.css

@@ -1,14 +1 @@
-.bootstrap-table.bootstrap3 .fixed-table-pagination > .pagination .page-jump-to {
-  display: inline-block;
-}
-
-.bootstrap-table.bootstrap3 .fixed-table-pagination > .pagination .input-group-btn {
-  width: auto;
-}
-
-.bootstrap-table .fixed-table-pagination > .pagination .page-jump-to input {
-  width: 70px;
-  margin-left: 5px;
-  text-align: center;
-  float: left;
-}
+.bootstrap-table.bootstrap3 .fixed-table-pagination>.pagination .page-jump-to{display:inline-block}.bootstrap-table.bootstrap3 .fixed-table-pagination>.pagination .input-group-btn{width:auto}.bootstrap-table .fixed-table-pagination>.pagination .page-jump-to input{width:70px;margin-left:5px;text-align:center;float:left}

dist/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css

@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.22.6
+  * @version v1.23.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT

dist/extensions/reorder-rows/bootstrap-table-reorder-rows.css

@@ -1,10 +1 @@
-.reorder-rows-on-drag-class td {
-  background-color: #eee;
-  box-shadow: 6px 4px 5px 1px #555, 0 1px 0 #ccc inset, 0 -1px 0 #ccc inset;
-  -box-shadow: 6px 4px 5px 1px #555, 0 1px 0 #ccc inset, 0 -1px 0 #ccc inset;
-}
-
-.reorder-rows-on-drag-class td:last-child {
-  box-shadow: 0 9px 4px -4px #555, 0 1px 0 #ccc inset, 0 -1px 0 #ccc inset, -1px 0 0 #ccc inset;
-  -box-shadow: 0 9px 4px -4px #555, 0 1px 0 #ccc inset, 0 -1px 0 #ccc inset, -1px 0 0 #ccc inset;
-}
+.reorder-rows-on-drag-class td{background-color:#eee;box-shadow:6px 4px 5px 1px #555,0 1px 0 #ccc inset,0 -1px 0 #ccc inset;-box-shadow:6px 4px 5px 1px #555,0 1px 0 #ccc inset,0 -1px 0 #ccc inset}.reorder-rows-on-drag-class td:last-child{box-shadow:0 9px 4px -4px #555,0 1px 0 #ccc inset,0 -1px 0 #ccc inset,-1px 0 0 #ccc inset;-box-shadow:0 9px 4px -4px #555,0 1px 0 #ccc inset,0 -1px 0 #ccc inset,-1px 0 0 #ccc inset}

dist/extensions/reorder-rows/bootstrap-table-reorder-rows.min.css

@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.22.6
+  * @version v1.23.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT

dist/extensions/sticky-header/bootstrap-table-sticky-header.css

@@ -1,21 +1 @@
-/**
- * @author vincent loh <vincent.ml@gmail.com>
- * @update zhixin wen <wenzhixin2010@gmail.com>
- */
-.fix-sticky {
-  position: fixed !important;
-  overflow: hidden;
-  z-index: 100;
-}
-
-.fix-sticky table thead {
-  background: #fff;
-}
-
-.fix-sticky table thead.thead-light {
-  background: #e9ecef;
-}
-
-.fix-sticky table thead.thead-dark {
-  background: #212529;
-}
+.fix-sticky{position:fixed !important;overflow:hidden;z-index:100}.fix-sticky table thead{background:#fff}.fix-sticky table thead.thead-light{background:#e9ecef}.fix-sticky table thead.thead-dark{background:#212529}

dist/extensions/sticky-header/bootstrap-table-sticky-header.min.css

@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.22.6
+  * @version v1.23.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT