@varlet/ui 2.9.5 → 2.9.6-alpha.1680971883189

package/lib/varlet.cjs.js

@@ -17138,12 +17138,12 @@ function __render__$v(_ctx, _cache) {
       [vue.createVNode(
         _component_var_input,
         {
-          modelValue: _ctx.simpleValue,
-          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.simpleValue = $event),
+          modelValue: _ctx.simpleCurrentValue,
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.simpleCurrentValue = $event),
           disabled: _ctx.disabled,
           "var-pagination-cover": "",
-          onBlur: _cache[2] || (_cache[2] = ($event) => _ctx.setPage("simple", _ctx.simpleValue, $event)),
-          onKeydown: _cache[3] || (_cache[3] = vue.withKeys(($event) => _ctx.setPage("simple", _ctx.simpleValue, $event), ["enter"]))
+          onBlur: _cache[2] || (_cache[2] = ($event) => _ctx.setPage("simple", _ctx.simpleCurrentValue, $event)),
+          onKeydown: _cache[3] || (_cache[3] = vue.withKeys(($event) => _ctx.setPage("simple", _ctx.simpleCurrentValue, $event), ["enter"]))
         },
         null,
         8,
@@ -17294,12 +17294,12 @@ function __render__$v(_ctx, _cache) {
       ), vue.createVNode(
         _component_var_input,
         {
-          modelValue: _ctx.inputValue,
-          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.inputValue = $event),
+          modelValue: _ctx.quickJumperValue,
+          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.quickJumperValue = $event),
           disabled: _ctx.disabled,
           "var-pagination-cover": "",
-          onBlur: _cache[8] || (_cache[8] = ($event) => _ctx.setPage("quick", _ctx.inputValue, $event)),
-          onKeydown: _cache[9] || (_cache[9] = vue.withKeys(($event) => _ctx.setPage("quick", _ctx.inputValue, $event), ["enter"]))
+          onBlur: _cache[8] || (_cache[8] = ($event) => _ctx.setPage("quick", _ctx.quickJumperValue, $event)),
+          onKeydown: _cache[9] || (_cache[9] = vue.withKeys(($event) => _ctx.setPage("quick", _ctx.quickJumperValue, $event), ["enter"]))
         },
         null,
         8,
@@ -17335,8 +17335,8 @@ var __sfc__$w = vue.defineComponent({
   props: props$p,
   setup(props2) {
     var menuVisible = vue.ref(false);
-    var inputValue = vue.ref("");
-    var simpleValue = vue.ref("1");
+    var quickJumperValue = vue.ref("");
+    var simpleCurrentValue = vue.ref("1");
     var isHideEllipsisHead = vue.ref(false);
     var isHideEllipsisTail = vue.ref(false);
     var current = vue.ref(toNumber(props2.current) || 1);
@@ -17365,50 +17365,55 @@ var __sfc__$w = vue.defineComponent({
       return index === 1 ? "head" : "tail";
     };
     var clickItem = (item, index) => {
-      if (item === current.value || props2.disabled)
+      if (item === current.value || props2.disabled) {
         return;
-      if (isNumber(item))
+      }
+      if (item === "...") {
+        current.value = index === 1 ? Math.max(current.value - props2.maxPagerCount, 1) : Math.min(current.value + props2.maxPagerCount, pageCount.value);
+        return;
+      }
+      if (item === "prev") {
+        current.value = ensureCurrentBoundary(current.value - 1);
+        return;
+      }
+      if (item === "next") {
+        current.value = ensureCurrentBoundary(current.value + 1);
+        return;
+      }
+      if (isNumber(item)) {
         current.value = item;
-      else if (item === "prev")
-        current.value > 1 && (current.value -= 1);
-      else if (item === "next")
-        current.value < pageCount.value && (current.value += 1);
-      else if (item === "...") {
-        if (index === 1) {
-          current.value = Math.max(current.value - props2.maxPagerCount, 1);
-        } else {
-          current.value = Math.min(current.value + props2.maxPagerCount, pageCount.value);
-        }
       }
     };
     var showMenu = () => {
-      if (props2.disabled)
+      if (props2.disabled) {
         return;
+      }
       menuVisible.value = true;
     };
     var clickSize = (option2) => {
       size.value = option2;
       menuVisible.value = false;
+      var targetCurrent = ensureCurrentBoundary(current.value);
+      simpleCurrentValue.value = String(targetCurrent);
+      current.value = targetCurrent;
     };
-    var isValidatePage = (value) => {
-      var pattern = /^[1-9][0-9]*$/;
-      return pattern.test(value);
+    var ensureCurrentBoundary = (targetCurrent) => {
+      if (targetCurrent > pageCount.value) {
+        return pageCount.value;
+      }
+      if (targetCurrent < 1) {
+        return 1;
+      }
+      return targetCurrent;
     };
-    var setPage = (type, value, event) => {
+    var setPage = (type, page, event) => {
       event.target.blur();
-      if (isValidatePage(value)) {
-        var valueNum = toNumber(value);
-        if (valueNum > pageCount.value) {
-          valueNum = pageCount.value;
-          simpleValue.value = "" + valueNum;
-        }
-        if (valueNum !== current.value)
-          current.value = valueNum;
+      var targetCurrent = ensureCurrentBoundary(toNumber(page));
+      simpleCurrentValue.value = String(targetCurrent);
+      current.value = targetCurrent;
+      if (type === "quick") {
+        quickJumperValue.value = "";
       }
-      if (type === "quick")
-        inputValue.value = "";
-      if (type === "simple" && !isValidatePage(value))
-        simpleValue.value = "" + current.value;
     };
     vue.watch([() => props2.current, () => props2.size], (_ref) => {
       var [newCurrent, newSize] = _ref;
@@ -17426,7 +17431,7 @@ var __sfc__$w = vue.defineComponent({
       } = props2;
       var oldCount = Math.ceil(toNumber(total) / toNumber(oldSize));
       var rEllipseSign = newCount - (maxPagerCount - activePosition.value) - 1;
-      simpleValue.value = "" + newCurrent;
+      simpleCurrentValue.value = "" + newCurrent;
       if (newCount - 2 > maxPagerCount) {
         if (oldCurrent === void 0 || newCount !== oldCount) {
           for (var i = 2; i < maxPagerCount + 2; i++) {
@@ -17464,7 +17469,7 @@ var __sfc__$w = vue.defineComponent({
         }
       }
       pageList.value = list2;
-      if (oldCurrent !== void 0 && newCount > 0) {
+      if (oldCurrent != null && newCount > 0) {
         call(onChange, newCurrent, newSize);
       }
       call(props2["onUpdate:current"], newCurrent);
@@ -17481,8 +17486,8 @@ var __sfc__$w = vue.defineComponent({
       size,
       pageCount,
       pageList,
-      inputValue,
-      simpleValue,
+      quickJumperValue,
+      simpleCurrentValue,
       totalText,
       getMode,
       isHideEllipsis,
@@ -25098,7 +25103,7 @@ const TimePickerSfc = "";
 const TooltipSfc = "";
 const uploader = "";
 const UploaderSfc = "";
-const version = "2.9.5";
+const version = "2.9.6-alpha.1680971883189";
 function install(app) {
   ActionSheet.install && app.use(ActionSheet);
   AppBar.install && app.use(AppBar);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "2.9.5",
+  "version": "2.9.6-alpha.1680971883189",
   "description": "A material like components library",
   "main": "lib/varlet.cjs.js",
   "module": "es/index.mjs",
@@ -46,9 +46,9 @@
     "@popperjs/core": "^2.11.6",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1",
-    "@varlet/icons": "2.9.5",
-    "@varlet/use": "2.9.5",
-    "@varlet/shared": "2.9.5"
+    "@varlet/icons": "2.9.6-alpha.1680971883189",
+    "@varlet/shared": "2.9.6-alpha.1680971883189",
+    "@varlet/use": "2.9.6-alpha.1680971883189"
   },
   "devDependencies": {
     "@types/jest": "^26.0.15",
@@ -63,8 +63,8 @@
     "typescript": "^4.4.4",
     "vue": "3.2.47",
     "vue-router": "4.1.6",
-    "@varlet/cli": "2.9.5",
-    "@varlet/touch-emulator": "2.9.5"
+    "@varlet/cli": "2.9.6-alpha.1680971883189",
+    "@varlet/touch-emulator": "2.9.6-alpha.1680971883189"
   },
   "browserslist": [
     "Chrome >= 54",