@mdsfe/mds-ui 0.2.9 → 0.2.10-rc.1

package/dist/mds-ui.min.js

@@ -51855,8 +51855,8 @@ var pagination_style = __webpack_require__(410);
 // style dependencies
 // import '../../select/style'
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./components/pagination/pagination.vue?vue&type=template&id=5ab300bc&
-var paginationvue_type_template_id_5ab300bc_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('ul',{class:[
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./components/pagination/pagination.vue?vue&type=template&id=59b1b122&
+var paginationvue_type_template_id_59b1b122_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('ul',{class:[
     _vm.simple ? (_vm.prefixCls + "-simple") : ("" + _vm.prefixCls),
     _vm.disabled ? (_vm.prefixCls + "-disabled") : ("" + _vm.prefixCls),
     _vm.mini ? "mini" : ''
@@ -51869,16 +51869,16 @@ var paginationvue_type_template_id_5ab300bc_render = function () {var _vm=this;v
       _vm.pageRange.length &&
       _vm.pageRange[_vm.pageRange.length - 1] !== _vm.calculatePage &&
       !_vm.simple
-    )?_c('li',{class:(_vm.prefixCls + "-item"),attrs:{"tabIndex":"0"},on:{"click":function($event){return _vm.handleChange(_vm.calculatePage)}}},[_c('a',[_vm._v(_vm._s(_vm.calculatePage))])]):_vm._e(),_vm._v(" "),_c('li',{class:("" + (_vm.hasNext ? '' : (_vm.prefixCls + "-disabled ")) + _vm.prefixCls + "-next"),attrs:{"tabIndex":"0","aria-disabled":!_vm.hasNext},on:{"click":_vm.next,"keydown":_vm.runIfEnterNext}},[_vm._t("next",[_c('mds-icon',{staticClass:"mds-pagination-item-link",attrs:{"type":"line-caret-right"}})])],2),_vm._v(" "),(_vm.showQuickJumper || _vm.showJumper)?_c('mds-page-option',{on:{"jump-to":_vm.handleQuickJump}}):_vm._e(),_vm._v(" "),(!_vm.simple && _vm.showPageNumber && !_vm.mini)?_c('li',{class:(_vm.prefixCls + "-more")},[_vm._v("\n    共 "),_c('b',[_vm._v(_vm._s(_vm.calculatePage))]),_vm._v(" 页\n  ")]):_vm._e(),_vm._v(" "),(!_vm.simple && _vm.showPageSize && !_vm.mini && _vm.pageSizesSeat==='right')?_c('change-page',{attrs:{"pageSizes":_vm.pageSizes,"pageSizeNum":_vm.pageSizeNum},on:{"changePageSize":_vm.changePageSize}}):_vm._e(),_vm._v(" "),(
+    )?_c('li',{class:(_vm.prefixCls + "-item"),attrs:{"tabIndex":"0"},on:{"click":function($event){return _vm.handleChange(_vm.calculatePage)}}},[_c('a',[_vm._v(_vm._s(_vm.calculatePage))])]):_vm._e(),_vm._v(" "),_c('li',{class:("" + (_vm.hasNext ? '' : (_vm.prefixCls + "-disabled ")) + _vm.prefixCls + "-next"),attrs:{"tabIndex":"0","aria-disabled":!_vm.hasNext},on:{"click":_vm.next,"keydown":_vm.runIfEnterNext}},[_vm._t("next",[_c('mds-icon',{staticClass:"mds-pagination-item-link",attrs:{"type":"line-caret-right"}})])],2),_vm._v(" "),(_vm.showQuickJumper || _vm.showJumper)?_c('mds-page-option',{attrs:{"current-page":_vm.currentPage,"calculate-page":_vm.calculatePage},on:{"jump-to":_vm.handleQuickJump}}):_vm._e(),_vm._v(" "),(!_vm.simple && _vm.showPageNumber && !_vm.mini)?_c('li',{class:(_vm.prefixCls + "-more")},[_vm._v("\n    共 "),_c('b',[_vm._v(_vm._s(_vm.calculatePage))]),_vm._v(" 页\n  ")]):_vm._e(),_vm._v(" "),(!_vm.simple && _vm.showPageSize && !_vm.mini && _vm.pageSizesSeat==='right')?_c('change-page',{attrs:{"pageSizes":_vm.pageSizes,"pageSizeNum":_vm.pageSizeNum},on:{"changePageSize":_vm.changePageSize}}):_vm._e(),_vm._v(" "),(
       !_vm.simple &&
       (_vm.showTotalString || _vm.showTotalSize) &&
       !_vm.mini &&
       _vm.totalSeat === 'right'
     )?_c('li',{staticClass:"total-seat-right",class:(_vm.prefixCls + "-total")},[_vm._v("\n    共 "),_c('b',[_vm._v(_vm._s(_vm.total))]),_vm._v(" 条\n  ")]):_vm._e()],2)}
-var paginationvue_type_template_id_5ab300bc_staticRenderFns = []
+var paginationvue_type_template_id_59b1b122_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./components/pagination/pagination.vue?vue&type=template&id=5ab300bc&
+// CONCATENATED MODULE: ./components/pagination/pagination.vue?vue&type=template&id=59b1b122&
 
 // CONCATENATED MODULE: ./components/pagination/locale/zh_CN.js
 /* harmony default export */ var locale_zh_CN = ({
@@ -51896,12 +51896,12 @@ var paginationvue_type_template_id_5ab300bc_staticRenderFns = []
   prev_3: '向前 3 页',
   next_3: '向后 3 页'
 });
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./components/pagination/option.vue?vue&type=template&id=2526109e&
-var optionvue_type_template_id_2526109e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('li',{class:("" + _vm.prefixCls)},[_c('div',{class:(_vm.prefixCls + "-quick-jumper")},[_vm._v("\n    "+_vm._s(_vm.locale.jump_to)+"\n    "),_c('mds-input',{attrs:{"type":"text"},on:{"press-enter":_vm.handleJump,"blur":_vm.blueJump},model:{value:(_vm.pageText),callback:function ($$v) {_vm.pageText=$$v},expression:"pageText"}}),_vm._v("\n    "+_vm._s(_vm.locale.page)+"\n  ")],1)])}
-var optionvue_type_template_id_2526109e_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./components/pagination/option.vue?vue&type=template&id=6fe1a610&
+var optionvue_type_template_id_6fe1a610_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('li',{class:("" + _vm.prefixCls)},[_c('div',{class:(_vm.prefixCls + "-quick-jumper")},[_vm._v("\n    "+_vm._s(_vm.locale.jump_to)+"\n    "),_c('mds-input',{attrs:{"type":"text"},on:{"press-enter":_vm.handleJump,"blur":_vm.blurJump},model:{value:(_vm.pageText),callback:function ($$v) {_vm.pageText=$$v},expression:"pageText"}}),_vm._v("\n    "+_vm._s(_vm.locale.page)+"\n  ")],1)])}
+var optionvue_type_template_id_6fe1a610_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./components/pagination/option.vue?vue&type=template&id=2526109e&
+// CONCATENATED MODULE: ./components/pagination/option.vue?vue&type=template&id=6fe1a610&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib?cacheDirectory=true!./node_modules/vue-loader/lib??vue-loader-options!./components/pagination/option.vue?vue&type=script&lang=js&
 //
@@ -51921,6 +51921,14 @@ var optionvue_type_template_id_2526109e_staticRenderFns = []
 /* harmony default export */ var pagination_optionvue_type_script_lang_js_ = ({
   name: 'MdsPaginationOption',
   props: {
+    calculatePage: {
+      type: Number,
+      default: 1
+    },
+    currentPage: {
+      type: Number,
+      default: 1
+    },
     prefixCls: {
       type: String,
       default: 'mds-pagination-options'
@@ -51929,29 +51937,37 @@ var optionvue_type_template_id_2526109e_staticRenderFns = []
   data: function data() {
     return {
       locale: locale_zh_CN,
-      pageText: ''
+      pageText: this.currentPage
     };
   },
 
   methods: {
+    handlPage: function handlPage() {
+      var jumpPage = parseInt(this.pageText || 1, 10);
+      return jumpPage > this.calculatePage ? this.calculatePage : jumpPage;
+    },
     handleJump: function handleJump(event) {
       if (this.disabled) {
         return;
       }
-      (event.key === 'Enter' || event.charCode === 13) && this.$emit('jump-to', this.pageText);
-      this.pageText = '';
+      (event.key === 'Enter' || event.charCode === 13) && this.$emit('jump-to', this.handlPage());
+      this.pageText = this.handlPage();
     },
-    blueJump: function blueJump() {
-      if (this.disabled || !this.pageText) {
+    blurJump: function blurJump() {
+      if (this.disabled) {
         return false;
-      } else {
-        this.$emit('jump-to', this.pageText);
-        this.pageText = '';
       }
+      this.$emit('jump-to', this.handlPage());
+      this.pageText = this.handlPage();
     }
   },
   components: {
     MdsInput: components_input
+  },
+  watch: {
+    current: function current() {
+      this.pageText = this.currentPage;
+    }
   }
 });
 // CONCATENATED MODULE: ./components/pagination/option.vue?vue&type=script&lang=js&
@@ -51966,8 +51982,8 @@ var optionvue_type_template_id_2526109e_staticRenderFns = []
 
 var pagination_option_component = normalizeComponent(
   components_pagination_optionvue_type_script_lang_js_,
-  optionvue_type_template_id_2526109e_render,
-  optionvue_type_template_id_2526109e_staticRenderFns,
+  optionvue_type_template_id_6fe1a610_render,
+  optionvue_type_template_id_6fe1a610_staticRenderFns,
   false,
   null,
   null,
@@ -52212,6 +52228,8 @@ var changePage_component = normalizeComponent(
 //
 //
 //
+//
+//
 
 
 
@@ -52401,18 +52419,19 @@ var changePage_component = normalizeComponent(
       }
     },
     handleJump: function handleJump(event) {
-      ;(event.key === 'Enter' || event.charCode === 13) && this.handleQuickJump(this.currentPage);
+      ;(event.key === 'Enter' || event.charCode === 13) && this.handleQuickJump(this.currentPage || 1);
     },
     handleQuickJump: function handleQuickJump(newPageText) {
       if (this.disabled) {
         return;
       }
-      var newPage = parseInt(newPageText, 10);
+      var newPage = parseInt(newPageText || 1, 10);
       this.currentPage = newPage;
       if (isNaN(newPage)) return false;
       if (newPage < 1) {
         this.handleChange(1);
       } else if (newPage > this.calculatePage) {
+        this.currentPage = this.calculatePage;
         this.handleChange(this.calculatePage);
       } else {
         this.handleChange(newPage);
@@ -52496,8 +52515,8 @@ var changePage_component = normalizeComponent(
 
 var pagination_component = normalizeComponent(
   pagination_paginationvue_type_script_lang_js_,
-  paginationvue_type_template_id_5ab300bc_render,
-  paginationvue_type_template_id_5ab300bc_staticRenderFns,
+  paginationvue_type_template_id_59b1b122_render,
+  paginationvue_type_template_id_59b1b122_staticRenderFns,
   false,
   null,
   null,

package/dist/pagination.js

@@ -460,7 +460,13 @@ var render = function () {
         2
       ),
       _vm.showQuickJumper || _vm.showJumper
-        ? _c("mds-page-option", { on: { "jump-to": _vm.handleQuickJump } })
+        ? _c("mds-page-option", {
+            attrs: {
+              "current-page": _vm.currentPage,
+              "calculate-page": _vm.calculatePage,
+            },
+            on: { "jump-to": _vm.handleQuickJump },
+          })
         : _vm._e(),
       !_vm.simple && _vm.showPageNumber && !_vm.mini
         ? _c("li", { class: _vm.prefixCls + "-more" }, [
@@ -538,7 +544,7 @@ var optionvue_type_template_id_1ad093df_render = function () {
         _vm._v("\n    " + _vm._s(_vm.locale.jump_to) + "\n    "),
         _c("mds-input", {
           attrs: { type: "text" },
-          on: { "press-enter": _vm.handleJump, blur: _vm.blueJump },
+          on: { "press-enter": _vm.handleJump, blur: _vm.blurJump },
           model: {
             value: _vm.pageText,
             callback: function ($$v) {
@@ -581,6 +587,14 @@ var external_input_default = /*#__PURE__*/__webpack_require__.n(external_input_)
 /* harmony default export */ var optionvue_type_script_lang_js_ = ({
   name: 'MdsPaginationOption',
   props: {
+    calculatePage: {
+      type: Number,
+      default: 1
+    },
+    currentPage: {
+      type: Number,
+      default: 1
+    },
     prefixCls: {
       type: String,
       default: 'mds-pagination-options'
@@ -589,29 +603,37 @@ var external_input_default = /*#__PURE__*/__webpack_require__.n(external_input_)
   data: function data() {
     return {
       locale: zh_CN,
-      pageText: ''
+      pageText: this.currentPage
     };
   },
 
   methods: {
+    handlPage: function handlPage() {
+      var jumpPage = parseInt(this.pageText || 1, 10);
+      return jumpPage > this.calculatePage ? this.calculatePage : jumpPage;
+    },
     handleJump: function handleJump(event) {
       if (this.disabled) {
         return;
       }
-      (event.key === 'Enter' || event.charCode === 13) && this.$emit('jump-to', this.pageText);
-      this.pageText = '';
+      (event.key === 'Enter' || event.charCode === 13) && this.$emit('jump-to', this.handlPage());
+      this.pageText = this.handlPage();
     },
-    blueJump: function blueJump() {
-      if (this.disabled || !this.pageText) {
+    blurJump: function blurJump() {
+      if (this.disabled) {
         return false;
-      } else {
-        this.$emit('jump-to', this.pageText);
-        this.pageText = '';
       }
+      this.$emit('jump-to', this.handlPage());
+      this.pageText = this.handlPage();
     }
   },
   components: {
     MdsInput: external_input_default.a
+  },
+  watch: {
+    current: function current() {
+      this.pageText = this.currentPage;
+    }
   }
 });
 // CONCATENATED MODULE: ./components/pagination/option.vue?vue&type=script&lang=js&
@@ -916,6 +938,8 @@ changePage_component.options.__file = "components/pagination/changePage.vue"
 //
 //
 //
+//
+//
 
 
 
@@ -1105,18 +1129,19 @@ changePage_component.options.__file = "components/pagination/changePage.vue"
       }
     },
     handleJump: function handleJump(event) {
-      ;(event.key === 'Enter' || event.charCode === 13) && this.handleQuickJump(this.currentPage);
+      ;(event.key === 'Enter' || event.charCode === 13) && this.handleQuickJump(this.currentPage || 1);
     },
     handleQuickJump: function handleQuickJump(newPageText) {
       if (this.disabled) {
         return;
       }
-      var newPage = parseInt(newPageText, 10);
+      var newPage = parseInt(newPageText || 1, 10);
       this.currentPage = newPage;
       if (isNaN(newPage)) return false;
       if (newPage < 1) {
         this.handleChange(1);
       } else if (newPage > this.calculatePage) {
+        this.currentPage = this.calculatePage;
         this.handleChange(this.calculatePage);
       } else {
         this.handleChange(newPage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdsfe/mds-ui",
-  "version": "0.2.9",
+  "version": "0.2.10-rc.1",
   "description": "A set of enterprise-class Vue UI components.",
   "main": "dist/index.js",
   "scripts": {
@@ -9,6 +9,7 @@
     "test": "jest ./components/",
     "test:cov": "jest ./components/ --coverage",
     "lint": "eslint components",
+    "lint:fix": "eslint --fix --ext '.js,.vue,.ts' components",
     "clean": "rimraf dist",
     "clean:site": "rimraf site/dist site/components site/docs site/router.js",
     "create:site": "node scripts/generate.js -a",