element-plus-secondary 0.4.3 → 0.4.4

package/es/components/pagination/src/components/jumper.mjs

@@ -1,14 +1,64 @@
-import '../../../../utils/index.mjs';
-import '../../../../constants/index.mjs';
-import { buildProps } from '../../../../utils/vue/props/runtime.mjs';
-import { componentSizes } from '../../../../constants/size.mjs';
+import { defineComponent, ref, computed, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, toDisplayString, createVNode } from 'vue';
+import '../../../../hooks/index.mjs';
+import { ElInput } from '../../../input/index.mjs';
+import { usePagination } from '../usePagination.mjs';
+import { paginationJumperProps } from './jumper2.mjs';
+import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.mjs';
+import { useLocale } from '../../../../hooks/use-locale/index.mjs';
+import { useNamespace } from '../../../../hooks/use-namespace/index.mjs';
 
-const paginationJumperProps = buildProps({
-  size: {
-    type: String,
-    values: componentSizes
+const _hoisted_1 = ["disabled"];
+const __default__ = defineComponent({
+  name: "ElPaginationJumper"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: paginationJumperProps,
+  setup(__props) {
+    const { t } = useLocale();
+    const ns = useNamespace("pagination");
+    const { pageCount, disabled, currentPage, changeEvent } = usePagination();
+    const userInput = ref();
+    const innerValue = computed(() => {
+      var _a;
+      return (_a = userInput.value) != null ? _a : currentPage == null ? void 0 : currentPage.value;
+    });
+    function handleInput(val) {
+      userInput.value = +val;
+    }
+    function handleChange(val) {
+      val = Math.trunc(+val);
+      changeEvent == null ? void 0 : changeEvent(+val);
+      userInput.value = void 0;
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("span", {
+        class: normalizeClass(unref(ns).e("jump")),
+        disabled: unref(disabled)
+      }, [
+        createElementVNode("span", {
+          class: normalizeClass([unref(ns).e("goto")])
+        }, toDisplayString(unref(t)("el.pagination.goto")), 3),
+        createVNode(unref(ElInput), {
+          size: _ctx.size,
+          class: normalizeClass([unref(ns).e("editor"), unref(ns).is("in-pagination")]),
+          min: 1,
+          max: unref(pageCount),
+          disabled: unref(disabled),
+          "model-value": unref(innerValue),
+          "validate-event": false,
+          type: "number",
+          "onUpdate:modelValue": handleInput,
+          onChange: handleChange
+        }, null, 8, ["size", "class", "max", "disabled", "model-value"]),
+        createElementVNode("span", {
+          class: normalizeClass([unref(ns).e("classifier")])
+        }, toDisplayString(unref(t)("el.pagination.pageClassifier")), 3)
+      ], 10, _hoisted_1);
+    };
   }
 });
+var Jumper = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/pagination/src/components/jumper.vue"]]);
 
-export { paginationJumperProps };
+export { Jumper as default };
 //# sourceMappingURL=jumper.mjs.map

package/es/components/pagination/src/components/jumper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"jumper.mjs","sources":["../../../../../../../packages/components/pagination/src/components/jumper.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\nimport { componentSizes } from '@element-plus/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type Jumper from './jumper.vue'\n\nexport const paginationJumperProps = buildProps({\n  size: {\n    type: String,\n    values: componentSizes,\n  },\n} as const)\n\nexport type PaginationJumperProps = ExtractPropTypes<\n  typeof paginationJumperProps\n>\n\nexport type PaginationJumperInstance = InstanceType<typeof Jumper>\n"],"names":[],"mappings":";;;;;AAEY,MAAC,qBAAqB,GAAG,UAAU,CAAC;AAChD,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,cAAc;AAC1B,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"jumper.mjs","sources":["../../../../../../../packages/components/pagination/src/components/jumper.vue"],"sourcesContent":["<template>\n  <span :class=\"ns.e('jump')\" :disabled=\"disabled\">\n    <span :class=\"[ns.e('goto')]\">{{ t('el.pagination.goto') }}</span>\n    <el-input\n      :size=\"size\"\n      :class=\"[ns.e('editor'), ns.is('in-pagination')]\"\n      :min=\"1\"\n      :max=\"pageCount\"\n      :disabled=\"disabled\"\n      :model-value=\"innerValue\"\n      :validate-event=\"false\"\n      type=\"number\"\n      @update:model-value=\"handleInput\"\n      @change=\"handleChange\"\n    />\n    <span :class=\"[ns.e('classifier')]\">{{\n      t('el.pagination.pageClassifier')\n    }}</span>\n  </span>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref } from 'vue'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport ElInput from '@element-plus/components/input'\nimport { usePagination } from '../usePagination'\nimport { paginationJumperProps } from './jumper'\n\ndefineOptions({\n  name: 'ElPaginationJumper',\n})\n\ndefineProps(paginationJumperProps)\nconst { t } = useLocale()\nconst ns = useNamespace('pagination')\nconst { pageCount, disabled, currentPage, changeEvent } = usePagination()\nconst userInput = ref<number>()\nconst innerValue = computed(() => userInput.value ?? currentPage?.value)\n\nfunction handleInput(val: number | string) {\n  userInput.value = +val\n}\n\nfunction handleChange(val: number | string) {\n  val = Math.trunc(+val)\n  changeEvent?.(+val)\n  userInput.value = undefined\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;;;mCA4Bc,CAAA;AAAA,EACZ,IAAM,EAAA,oBAAA;AACR,CAAA,CAAA,CAAA;;;;;AAGA,IAAM,MAAA,EAAE,MAAM,SAAU,EAAA,CAAA;AACxB,IAAM,MAAA,EAAA,GAAK,aAAa,YAAY,CAAA,CAAA;AACpC,IAAA,MAAM,EAAE,SAAA,EAAW,QAAU,EAAA,WAAA,EAAa,gBAAgB,aAAc,EAAA,CAAA;AACxE,IAAA,MAAM,YAAY,GAAY,EAAA,CAAA;AAC9B,IAAA,MAAM,aAAa,QAAS,CAAA,MAAM;AAElC,MAAA,IAAA,EAAA,CAAA;AACE,MAAA,OAAA,CAAA,EAAU,YAAS,CAAA,KAAA,KAAA,IAAA,GAAA,EAAA,GAAA,WAAA,IAAA,IAAA,GAAA,KAAA,CAAA,GAAA,WAAA,CAAA,KAAA,CAAA;AAAA,KACrB,CAAA,CAAA;AAEA,IAAA,SAAA,WAAA,CAAA,GAA4C,EAAA;AAC1C,MAAM,SAAA,CAAA,KAAW,GAAC,CAAG,GAAA,CAAA;AACrB,KAAA;AACA,IAAA,SAAA,YAAkB,CAAA,GAAA,EAAA;AAAA,MACpB,GAAA,GAAA,IAAA,CAAA,KAAA,CAAA,CAAA,GAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/pagination/src/components/jumper.vue.d.ts

@@ -189,20 +189,20 @@ declare const _default: import("vue").DefineComponent<{
             readonly validateEvent: import("../../../../utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
             readonly inputStyle: import("../../../../utils").EpPropFinalized<(new (...args: any[]) => import("vue").StyleValue & {}) | (() => import("vue").StyleValue) | ((new (...args: any[]) => import("vue").StyleValue & {}) | (() => import("vue").StyleValue))[], unknown, unknown, () => import("../../../../utils").Mutable<{}>, boolean>;
         }>> & {
-            onChange?: ((value: string) => any) | undefined;
             "onUpdate:modelValue"?: ((value: string) => any) | undefined;
+            onChange?: ((value: string) => any) | undefined;
+            onClear?: (() => any) | undefined;
             onInput?: ((value: string) => any) | undefined;
             onFocus?: ((evt: FocusEvent) => any) | undefined;
             onBlur?: ((evt: FocusEvent) => any) | undefined;
-            onClear?: (() => any) | undefined;
-            onMouseleave?: ((evt: MouseEvent) => any) | undefined;
-            onMouseenter?: ((evt: MouseEvent) => any) | undefined;
-            onKeydown?: ((evt: Event | KeyboardEvent) => any) | undefined;
+            onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
             onCompositionstart?: ((evt: CompositionEvent) => any) | undefined;
             onCompositionupdate?: ((evt: CompositionEvent) => any) | undefined;
-            onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
+            onKeydown?: ((evt: Event | KeyboardEvent) => any) | undefined;
+            onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+            onMouseleave?: ((evt: MouseEvent) => any) | undefined;
         }>>;
-        emit: ((event: "update:modelValue", value: string) => void) & ((event: "change", value: string) => void) & ((event: "input", value: string) => void) & ((event: "focus", evt: FocusEvent) => void) & ((event: "blur", evt: FocusEvent) => void) & ((event: "clear") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "keydown", evt: Event | KeyboardEvent) => void) & ((event: "compositionstart", evt: CompositionEvent) => void) & ((event: "compositionupdate", evt: CompositionEvent) => void) & ((event: "compositionend", evt: CompositionEvent) => void);
+        emit: ((event: "update:modelValue", value: string) => void) & ((event: "change", value: string) => void) & ((event: "input", value: string) => void) & ((event: "focus", evt: FocusEvent) => void) & ((event: "blur", evt: FocusEvent) => void) & ((event: "compositionend", evt: CompositionEvent) => void) & ((event: "compositionstart", evt: CompositionEvent) => void) & ((event: "compositionupdate", evt: CompositionEvent) => void) & ((event: "keydown", evt: Event | KeyboardEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "clear") => void);
         rawAttrs: {
             [x: string]: unknown;
         };
@@ -456,18 +456,18 @@ declare const _default: import("vue").DefineComponent<{
         readonly validateEvent: import("../../../../utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
         readonly inputStyle: import("../../../../utils").EpPropFinalized<(new (...args: any[]) => import("vue").StyleValue & {}) | (() => import("vue").StyleValue) | ((new (...args: any[]) => import("vue").StyleValue & {}) | (() => import("vue").StyleValue))[], unknown, unknown, () => import("../../../../utils").Mutable<{}>, boolean>;
     }>> & {
-        onChange?: ((value: string) => any) | undefined;
         "onUpdate:modelValue"?: ((value: string) => any) | undefined;
+        onChange?: ((value: string) => any) | undefined;
+        onClear?: (() => any) | undefined;
         onInput?: ((value: string) => any) | undefined;
         onFocus?: ((evt: FocusEvent) => any) | undefined;
         onBlur?: ((evt: FocusEvent) => any) | undefined;
-        onClear?: (() => any) | undefined;
-        onMouseleave?: ((evt: MouseEvent) => any) | undefined;
-        onMouseenter?: ((evt: MouseEvent) => any) | undefined;
-        onKeydown?: ((evt: Event | KeyboardEvent) => any) | undefined;
+        onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
         onCompositionstart?: ((evt: CompositionEvent) => any) | undefined;
         onCompositionupdate?: ((evt: CompositionEvent) => any) | undefined;
-        onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
+        onKeydown?: ((evt: Event | KeyboardEvent) => any) | undefined;
+        onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+        onMouseleave?: ((evt: MouseEvent) => any) | undefined;
     }, {
         readonly type: string;
         readonly disabled: boolean;

package/es/components/pagination/src/components/jumper2.mjs

@@ -1,64 +1,14 @@
-import { defineComponent, ref, computed, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, toDisplayString, createVNode } from 'vue';
-import '../../../../hooks/index.mjs';
-import { ElInput } from '../../../input/index.mjs';
-import { usePagination } from '../usePagination.mjs';
-import { paginationJumperProps } from './jumper.mjs';
-import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.mjs';
-import { useLocale } from '../../../../hooks/use-locale/index.mjs';
-import { useNamespace } from '../../../../hooks/use-namespace/index.mjs';
+import '../../../../utils/index.mjs';
+import '../../../../constants/index.mjs';
+import { buildProps } from '../../../../utils/vue/props/runtime.mjs';
+import { componentSizes } from '../../../../constants/size.mjs';
 
-const _hoisted_1 = ["disabled"];
-const __default__ = defineComponent({
-  name: "ElPaginationJumper"
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: paginationJumperProps,
-  setup(__props) {
-    const { t } = useLocale();
-    const ns = useNamespace("pagination");
-    const { pageCount, disabled, currentPage, changeEvent } = usePagination();
-    const userInput = ref();
-    const innerValue = computed(() => {
-      var _a;
-      return (_a = userInput.value) != null ? _a : currentPage == null ? void 0 : currentPage.value;
-    });
-    function handleInput(val) {
-      userInput.value = +val;
-    }
-    function handleChange(val) {
-      val = Math.trunc(+val);
-      changeEvent == null ? void 0 : changeEvent(+val);
-      userInput.value = void 0;
-    }
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("span", {
-        class: normalizeClass(unref(ns).e("jump")),
-        disabled: unref(disabled)
-      }, [
-        createElementVNode("span", {
-          class: normalizeClass([unref(ns).e("goto")])
-        }, toDisplayString(unref(t)("el.pagination.goto")), 3),
-        createVNode(unref(ElInput), {
-          size: _ctx.size,
-          class: normalizeClass([unref(ns).e("editor"), unref(ns).is("in-pagination")]),
-          min: 1,
-          max: unref(pageCount),
-          disabled: unref(disabled),
-          "model-value": unref(innerValue),
-          "validate-event": false,
-          type: "number",
-          "onUpdate:modelValue": handleInput,
-          onChange: handleChange
-        }, null, 8, ["size", "class", "max", "disabled", "model-value"]),
-        createElementVNode("span", {
-          class: normalizeClass([unref(ns).e("classifier")])
-        }, toDisplayString(unref(t)("el.pagination.pageClassifier")), 3)
-      ], 10, _hoisted_1);
-    };
+const paginationJumperProps = buildProps({
+  size: {
+    type: String,
+    values: componentSizes
   }
 });
-var Jumper = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/pagination/src/components/jumper.vue"]]);
 
-export { Jumper as default };
+export { paginationJumperProps };
 //# sourceMappingURL=jumper2.mjs.map

package/es/components/pagination/src/components/jumper2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"jumper2.mjs","sources":["../../../../../../../packages/components/pagination/src/components/jumper.vue"],"sourcesContent":["<template>\n  <span :class=\"ns.e('jump')\" :disabled=\"disabled\">\n    <span :class=\"[ns.e('goto')]\">{{ t('el.pagination.goto') }}</span>\n    <el-input\n      :size=\"size\"\n      :class=\"[ns.e('editor'), ns.is('in-pagination')]\"\n      :min=\"1\"\n      :max=\"pageCount\"\n      :disabled=\"disabled\"\n      :model-value=\"innerValue\"\n      :validate-event=\"false\"\n      type=\"number\"\n      @update:model-value=\"handleInput\"\n      @change=\"handleChange\"\n    />\n    <span :class=\"[ns.e('classifier')]\">{{\n      t('el.pagination.pageClassifier')\n    }}</span>\n  </span>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref } from 'vue'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport ElInput from '@element-plus/components/input'\nimport { usePagination } from '../usePagination'\nimport { paginationJumperProps } from './jumper'\n\ndefineOptions({\n  name: 'ElPaginationJumper',\n})\n\ndefineProps(paginationJumperProps)\nconst { t } = useLocale()\nconst ns = useNamespace('pagination')\nconst { pageCount, disabled, currentPage, changeEvent } = usePagination()\nconst userInput = ref<number>()\nconst innerValue = computed(() => userInput.value ?? currentPage?.value)\n\nfunction handleInput(val: number | string) {\n  userInput.value = +val\n}\n\nfunction handleChange(val: number | string) {\n  val = Math.trunc(+val)\n  changeEvent?.(+val)\n  userInput.value = undefined\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;;;mCA4Bc,CAAA;AAAA,EACZ,IAAM,EAAA,oBAAA;AACR,CAAA,CAAA,CAAA;;;;;AAGA,IAAM,MAAA,EAAE,MAAM,SAAU,EAAA,CAAA;AACxB,IAAM,MAAA,EAAA,GAAK,aAAa,YAAY,CAAA,CAAA;AACpC,IAAA,MAAM,EAAE,SAAA,EAAW,QAAU,EAAA,WAAA,EAAa,gBAAgB,aAAc,EAAA,CAAA;AACxE,IAAA,MAAM,YAAY,GAAY,EAAA,CAAA;AAC9B,IAAA,MAAM,aAAa,QAAS,CAAA,MAAM;AAElC,MAAA,IAAA,EAAA,CAAA;AACE,MAAA,OAAA,CAAA,EAAU,YAAS,CAAA,KAAA,KAAA,IAAA,GAAA,EAAA,GAAA,WAAA,IAAA,IAAA,GAAA,KAAA,CAAA,GAAA,WAAA,CAAA,KAAA,CAAA;AAAA,KACrB,CAAA,CAAA;AAEA,IAAA,SAAA,WAAA,CAAA,GAA4C,EAAA;AAC1C,MAAM,SAAA,CAAA,KAAW,GAAC,CAAG,GAAA,CAAA;AACrB,KAAA;AACA,IAAA,SAAA,YAAkB,CAAA,GAAA,EAAA;AAAA,MACpB,GAAA,GAAA,IAAA,CAAA,KAAA,CAAA,CAAA,GAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"jumper2.mjs","sources":["../../../../../../../packages/components/pagination/src/components/jumper.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\nimport { componentSizes } from '@element-plus/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type Jumper from './jumper.vue'\n\nexport const paginationJumperProps = buildProps({\n  size: {\n    type: String,\n    values: componentSizes,\n  },\n} as const)\n\nexport type PaginationJumperProps = ExtractPropTypes<\n  typeof paginationJumperProps\n>\n\nexport type PaginationJumperInstance = InstanceType<typeof Jumper>\n"],"names":[],"mappings":";;;;;AAEY,MAAC,qBAAqB,GAAG,UAAU,CAAC;AAChD,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,cAAc;AAC1B,GAAG;AACH,CAAC;;;;"}

package/es/components/pagination/src/components/pager.mjs

@@ -1,21 +1,211 @@
-import '../../../../utils/index.mjs';
-import { buildProps } from '../../../../utils/vue/props/runtime.mjs';
+import { defineComponent, ref, computed, watchEffect, openBlock, createElementBlock, normalizeClass, unref, withKeys, createCommentVNode, createBlock, Fragment, renderList, toDisplayString } from 'vue';
+import { DArrowLeft, MoreFilled, DArrowRight } from '@element-plus/icons-vue';
+import '../../../../hooks/index.mjs';
+import { paginationPagerProps } from './pager2.mjs';
+import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../../hooks/use-namespace/index.mjs';
 
-const paginationPagerProps = buildProps({
-  currentPage: {
-    type: Number,
-    default: 1
-  },
-  pageCount: {
-    type: Number,
-    required: true
-  },
-  pagerCount: {
-    type: Number,
-    default: 7
-  },
-  disabled: Boolean
+const _hoisted_1 = ["onKeyup"];
+const _hoisted_2 = ["aria-current", "tabindex"];
+const _hoisted_3 = ["tabindex"];
+const _hoisted_4 = ["aria-current", "tabindex"];
+const _hoisted_5 = ["tabindex"];
+const _hoisted_6 = ["aria-current", "tabindex"];
+const __default__ = defineComponent({
+  name: "ElPaginationPager"
 });
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: paginationPagerProps,
+  emits: ["change"],
+  setup(__props, { emit }) {
+    const props = __props;
+    const nsPager = useNamespace("pager");
+    const nsIcon = useNamespace("icon");
+    const showPrevMore = ref(false);
+    const showNextMore = ref(false);
+    const quickPrevHover = ref(false);
+    const quickNextHover = ref(false);
+    const quickPrevFocus = ref(false);
+    const quickNextFocus = ref(false);
+    const pagers = computed(() => {
+      const pagerCount = props.pagerCount;
+      const halfPagerCount = (pagerCount - 1) / 2;
+      const currentPage = Number(props.currentPage);
+      const pageCount = Number(props.pageCount);
+      let showPrevMore2 = false;
+      let showNextMore2 = false;
+      if (pageCount > pagerCount) {
+        if (currentPage > pagerCount - halfPagerCount) {
+          showPrevMore2 = true;
+        }
+        if (currentPage < pageCount - halfPagerCount) {
+          showNextMore2 = true;
+        }
+      }
+      const array = [];
+      if (showPrevMore2 && !showNextMore2) {
+        const startPage = pageCount - (pagerCount - 2);
+        for (let i = startPage; i < pageCount; i++) {
+          array.push(i);
+        }
+      } else if (!showPrevMore2 && showNextMore2) {
+        for (let i = 2; i < pagerCount; i++) {
+          array.push(i);
+        }
+      } else if (showPrevMore2 && showNextMore2) {
+        const offset = Math.floor(pagerCount / 2) - 1;
+        for (let i = currentPage - offset; i <= currentPage + offset; i++) {
+          array.push(i);
+        }
+      } else {
+        for (let i = 2; i < pageCount; i++) {
+          array.push(i);
+        }
+      }
+      return array;
+    });
+    const tabindex = computed(() => props.disabled ? -1 : 0);
+    watchEffect(() => {
+      const halfPagerCount = (props.pagerCount - 1) / 2;
+      showPrevMore.value = false;
+      showNextMore.value = false;
+      if (props.pageCount > props.pagerCount) {
+        if (props.currentPage > props.pagerCount - halfPagerCount) {
+          showPrevMore.value = true;
+        }
+        if (props.currentPage < props.pageCount - halfPagerCount) {
+          showNextMore.value = true;
+        }
+      }
+    });
+    function onMouseEnter(forward = false) {
+      if (props.disabled)
+        return;
+      if (forward) {
+        quickPrevHover.value = true;
+      } else {
+        quickNextHover.value = true;
+      }
+    }
+    function onFocus(forward = false) {
+      if (forward) {
+        quickPrevFocus.value = true;
+      } else {
+        quickNextFocus.value = true;
+      }
+    }
+    function onEnter(e) {
+      const target = e.target;
+      if (target.tagName.toLowerCase() === "li" && Array.from(target.classList).includes("number")) {
+        const newPage = Number(target.textContent);
+        if (newPage !== props.currentPage) {
+          emit("change", newPage);
+        }
+      } else if (target.tagName.toLowerCase() === "li" && Array.from(target.classList).includes("more")) {
+        onPagerClick(e);
+      }
+    }
+    function onPagerClick(event) {
+      const target = event.target;
+      if (target.tagName.toLowerCase() === "ul" || props.disabled) {
+        return;
+      }
+      let newPage = Number(target.textContent);
+      const pageCount = props.pageCount;
+      const currentPage = props.currentPage;
+      const pagerCountOffset = props.pagerCount - 2;
+      if (target.className.includes("more")) {
+        if (target.className.includes("quickprev")) {
+          newPage = currentPage - pagerCountOffset;
+        } else if (target.className.includes("quicknext")) {
+          newPage = currentPage + pagerCountOffset;
+        }
+      }
+      if (!Number.isNaN(+newPage)) {
+        if (newPage < 1) {
+          newPage = 1;
+        }
+        if (newPage > pageCount) {
+          newPage = pageCount;
+        }
+      }
+      if (newPage !== currentPage) {
+        emit("change", newPage);
+      }
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("ul", {
+        class: normalizeClass(unref(nsPager).b()),
+        onClick: onPagerClick,
+        onKeyup: withKeys(onEnter, ["enter"])
+      }, [
+        _ctx.pageCount > 0 ? (openBlock(), createElementBlock("li", {
+          key: 0,
+          class: normalizeClass([[
+            unref(nsPager).is("active", _ctx.currentPage === 1),
+            unref(nsPager).is("disabled", _ctx.disabled)
+          ], "number"]),
+          "aria-current": _ctx.currentPage === 1,
+          tabindex: unref(tabindex)
+        }, " 1 ", 10, _hoisted_2)) : createCommentVNode("v-if", true),
+        showPrevMore.value ? (openBlock(), createElementBlock("li", {
+          key: 1,
+          class: normalizeClass([
+            "more",
+            "btn-quickprev",
+            unref(nsIcon).b(),
+            unref(nsPager).is("disabled", _ctx.disabled)
+          ]),
+          tabindex: unref(tabindex),
+          onMouseenter: _cache[0] || (_cache[0] = ($event) => onMouseEnter(true)),
+          onMouseleave: _cache[1] || (_cache[1] = ($event) => quickPrevHover.value = false),
+          onFocus: _cache[2] || (_cache[2] = ($event) => onFocus(true)),
+          onBlur: _cache[3] || (_cache[3] = ($event) => quickPrevFocus.value = false)
+        }, [
+          (quickPrevHover.value || quickPrevFocus.value) && !_ctx.disabled ? (openBlock(), createBlock(unref(DArrowLeft), { key: 0 })) : (openBlock(), createBlock(unref(MoreFilled), { key: 1 }))
+        ], 42, _hoisted_3)) : createCommentVNode("v-if", true),
+        (openBlock(true), createElementBlock(Fragment, null, renderList(unref(pagers), (pager) => {
+          return openBlock(), createElementBlock("li", {
+            key: pager,
+            class: normalizeClass([[
+              unref(nsPager).is("active", _ctx.currentPage === pager),
+              unref(nsPager).is("disabled", _ctx.disabled)
+            ], "number"]),
+            "aria-current": _ctx.currentPage === pager,
+            tabindex: unref(tabindex)
+          }, toDisplayString(pager), 11, _hoisted_4);
+        }), 128)),
+        showNextMore.value ? (openBlock(), createElementBlock("li", {
+          key: 2,
+          class: normalizeClass([
+            "more",
+            "btn-quicknext",
+            unref(nsIcon).b(),
+            unref(nsPager).is("disabled", _ctx.disabled)
+          ]),
+          tabindex: unref(tabindex),
+          onMouseenter: _cache[4] || (_cache[4] = ($event) => onMouseEnter()),
+          onMouseleave: _cache[5] || (_cache[5] = ($event) => quickNextHover.value = false),
+          onFocus: _cache[6] || (_cache[6] = ($event) => onFocus()),
+          onBlur: _cache[7] || (_cache[7] = ($event) => quickNextFocus.value = false)
+        }, [
+          (quickNextHover.value || quickNextFocus.value) && !_ctx.disabled ? (openBlock(), createBlock(unref(DArrowRight), { key: 0 })) : (openBlock(), createBlock(unref(MoreFilled), { key: 1 }))
+        ], 42, _hoisted_5)) : createCommentVNode("v-if", true),
+        _ctx.pageCount > 1 ? (openBlock(), createElementBlock("li", {
+          key: 3,
+          class: normalizeClass([[
+            unref(nsPager).is("active", _ctx.currentPage === _ctx.pageCount),
+            unref(nsPager).is("disabled", _ctx.disabled)
+          ], "number"]),
+          "aria-current": _ctx.currentPage === _ctx.pageCount,
+          tabindex: unref(tabindex)
+        }, toDisplayString(_ctx.pageCount), 11, _hoisted_6)) : createCommentVNode("v-if", true)
+      ], 42, _hoisted_1);
+    };
+  }
+});
+var Pager = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/pagination/src/components/pager.vue"]]);
 
-export { paginationPagerProps };
+export { Pager as default };
 //# sourceMappingURL=pager.mjs.map

package/es/components/pagination/src/components/pager.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"pager.mjs","sources":["../../../../../../../packages/components/pagination/src/components/pager.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\nimport type { ExtractPropTypes } from 'vue'\nimport type Pager from './pager.vue'\n\nexport const paginationPagerProps = buildProps({\n  currentPage: {\n    type: Number,\n    default: 1,\n  },\n  pageCount: {\n    type: Number,\n    required: true,\n  },\n  pagerCount: {\n    type: Number,\n    default: 7,\n  },\n  disabled: Boolean,\n} as const)\n\nexport type PaginationPagerProps = ExtractPropTypes<typeof paginationPagerProps>\n\nexport type PagerInstance = InstanceType<typeof Pager>\n"],"names":[],"mappings":";;;AACY,MAAC,oBAAoB,GAAG,UAAU,CAAC;AAC/C,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,QAAQ,EAAE,IAAI;AAClB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,QAAQ,EAAE,OAAO;AACnB,CAAC;;;;"}
+{"version":3,"file":"pager.mjs","sources":["../../../../../../../packages/components/pagination/src/components/pager.vue"],"sourcesContent":["<template>\n  <ul :class=\"nsPager.b()\" @click=\"onPagerClick\" @keyup.enter=\"onEnter\">\n    <li\n      v-if=\"pageCount > 0\"\n      :class=\"[\n        nsPager.is('active', currentPage === 1),\n        nsPager.is('disabled', disabled),\n      ]\"\n      class=\"number\"\n      :aria-current=\"currentPage === 1\"\n      :tabindex=\"tabindex\"\n    >\n      1\n    </li>\n    <li\n      v-if=\"showPrevMore\"\n      :class=\"[\n        'more',\n        'btn-quickprev',\n        nsIcon.b(),\n        nsPager.is('disabled', disabled),\n      ]\"\n      :tabindex=\"tabindex\"\n      @mouseenter=\"onMouseEnter(true)\"\n      @mouseleave=\"quickPrevHover = false\"\n      @focus=\"onFocus(true)\"\n      @blur=\"quickPrevFocus = false\"\n    >\n      <d-arrow-left v-if=\"(quickPrevHover || quickPrevFocus) && !disabled\" />\n      <more-filled v-else />\n    </li>\n    <li\n      v-for=\"pager in pagers\"\n      :key=\"pager\"\n      :class=\"[\n        nsPager.is('active', currentPage === pager),\n        nsPager.is('disabled', disabled),\n      ]\"\n      class=\"number\"\n      :aria-current=\"currentPage === pager\"\n      :tabindex=\"tabindex\"\n    >\n      {{ pager }}\n    </li>\n    <li\n      v-if=\"showNextMore\"\n      :class=\"[\n        'more',\n        'btn-quicknext',\n        nsIcon.b(),\n        nsPager.is('disabled', disabled),\n      ]\"\n      :tabindex=\"tabindex\"\n      @mouseenter=\"onMouseEnter()\"\n      @mouseleave=\"quickNextHover = false\"\n      @focus=\"onFocus()\"\n      @blur=\"quickNextFocus = false\"\n    >\n      <d-arrow-right v-if=\"(quickNextHover || quickNextFocus) && !disabled\" />\n      <more-filled v-else />\n    </li>\n    <li\n      v-if=\"pageCount > 1\"\n      :class=\"[\n        nsPager.is('active', currentPage === pageCount),\n        nsPager.is('disabled', disabled),\n      ]\"\n      class=\"number\"\n      :aria-current=\"currentPage === pageCount\"\n      :tabindex=\"tabindex\"\n    >\n      {{ pageCount }}\n    </li>\n  </ul>\n</template>\n<script lang=\"ts\" setup>\nimport { computed, ref, watchEffect } from 'vue'\nimport { DArrowLeft, DArrowRight, MoreFilled } from '@element-plus/icons-vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { paginationPagerProps } from './pager'\ndefineOptions({\n  name: 'ElPaginationPager',\n})\nconst props = defineProps(paginationPagerProps)\nconst emit = defineEmits(['change'])\nconst nsPager = useNamespace('pager')\nconst nsIcon = useNamespace('icon')\nconst showPrevMore = ref(false)\nconst showNextMore = ref(false)\nconst quickPrevHover = ref(false)\nconst quickNextHover = ref(false)\nconst quickPrevFocus = ref(false)\nconst quickNextFocus = ref(false)\nconst pagers = computed(() => {\n  const pagerCount = props.pagerCount\n  const halfPagerCount = (pagerCount - 1) / 2\n  const currentPage = Number(props.currentPage)\n  const pageCount = Number(props.pageCount)\n  let showPrevMore = false\n  let showNextMore = false\n  if (pageCount > pagerCount) {\n    if (currentPage > pagerCount - halfPagerCount) {\n      showPrevMore = true\n    }\n    if (currentPage < pageCount - halfPagerCount) {\n      showNextMore = true\n    }\n  }\n  const array: number[] = []\n  if (showPrevMore && !showNextMore) {\n    const startPage = pageCount - (pagerCount - 2)\n    for (let i = startPage; i < pageCount; i++) {\n      array.push(i)\n    }\n  } else if (!showPrevMore && showNextMore) {\n    for (let i = 2; i < pagerCount; i++) {\n      array.push(i)\n    }\n  } else if (showPrevMore && showNextMore) {\n    const offset = Math.floor(pagerCount / 2) - 1\n    for (let i = currentPage - offset; i <= currentPage + offset; i++) {\n      array.push(i)\n    }\n  } else {\n    for (let i = 2; i < pageCount; i++) {\n      array.push(i)\n    }\n  }\n  return array\n})\nconst tabindex = computed(() => (props.disabled ? -1 : 0))\nwatchEffect(() => {\n  const halfPagerCount = (props.pagerCount - 1) / 2\n  showPrevMore.value = false\n  showNextMore.value = false\n  if (props.pageCount! > props.pagerCount) {\n    if (props.currentPage > props.pagerCount - halfPagerCount) {\n      showPrevMore.value = true\n    }\n    if (props.currentPage < props.pageCount! - halfPagerCount) {\n      showNextMore.value = true\n    }\n  }\n})\nfunction onMouseEnter(forward = false) {\n  if (props.disabled) return\n  if (forward) {\n    quickPrevHover.value = true\n  } else {\n    quickNextHover.value = true\n  }\n}\nfunction onFocus(forward = false) {\n  if (forward) {\n    quickPrevFocus.value = true\n  } else {\n    quickNextFocus.value = true\n  }\n}\nfunction onEnter(e: UIEvent) {\n  const target = e.target as HTMLElement\n  if (\n    target.tagName.toLowerCase() === 'li' &&\n    Array.from(target.classList).includes('number')\n  ) {\n    const newPage = Number(target.textContent)\n    if (newPage !== props.currentPage) {\n      emit('change', newPage)\n    }\n  } else if (\n    target.tagName.toLowerCase() === 'li' &&\n    Array.from(target.classList).includes('more')\n  ) {\n    onPagerClick(e)\n  }\n}\nfunction onPagerClick(event: UIEvent) {\n  const target = event.target as HTMLElement\n  if (target.tagName.toLowerCase() === 'ul' || props.disabled) {\n    return\n  }\n  let newPage = Number(target.textContent)\n  const pageCount = props.pageCount!\n  const currentPage = props.currentPage\n  const pagerCountOffset = props.pagerCount - 2\n  if (target.className.includes('more')) {\n    if (target.className.includes('quickprev')) {\n      newPage = currentPage - pagerCountOffset\n    } else if (target.className.includes('quicknext')) {\n      newPage = currentPage + pagerCountOffset\n    }\n  }\n  if (!Number.isNaN(+newPage)) {\n    if (newPage < 1) {\n      newPage = 1\n    }\n    if (newPage > pageCount) {\n      newPage = pageCount\n    }\n  }\n  if (newPage !== currentPage) {\n    emit('change', newPage)\n  }\n}\n</script>\n"],"names":[],"mappings":"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"}