@neatui/vue 2.7.0 → 2.7.2

package/src/components/tools/Pagination@a.vue

@@ -3,7 +3,7 @@
     <div class="ml-sl ar mob-ac" ui-flex="row rm">
       <div class="mx-ss-sub" ui-flex="row">
         <div v-if="state.showTotal" ui-flex="row cm" ui-hide="<pad">共 {{ data[defined.total || 'total'] || 0 }} 条</div>
-        <button :ui-btn="`@a s read :border :square ${data[defined.current || 'current'] > 1 ? '' : ':disabled'}`" @click="prev">
+        <button :ui-btn="`@a s read :border :square ${data[defined.page || 'page'] > 1 ? '' : ':disabled'}`" @click="prev">
           <svg
             style="width: 1em; height: 1em"
             t="1701228540398"
@@ -23,7 +23,7 @@
         </button>
         <div ui-tips="@a co:well ux:hover">
           <div ui-btn="@a s read :border">
-            <code>{{ data[defined.current || 'current'] || 0 }}/{{ data[defined.totalPages || 'totalPages'] || 0 }}</code>
+            <code>{{ data[defined.page || 'page'] || 0 }}/{{ data[defined.totalPages || 'totalPages'] || 0 }}</code>
             <svg
               style="width: 1em; height: 1em"
               t="1701229420486"
@@ -45,7 +45,7 @@
             <div class="w-mm max-h-ls" ui-scroll=":y s">
               <ul class="n-sl n-ss-sub dib-sub">
                 <li v-for="item in state.lists" :key="item">
-                  <button :ui-btn="`@a s ${item === data[defined.current || 'current'] ? 'main' : 'read :border'}`" @click="page(item)">
+                  <button :ui-btn="`@a s ${item === data[defined.page || 'page'] ? 'main' : 'read :border'}`" @click="page(item)">
                     <code>{{ item }}</code>
                   </button>
                 </li>
@@ -53,7 +53,7 @@
             </div>
           </div>
         </div>
-        <button :ui-btn="`@a s read :border :square ${data[defined.current || 'current'] < data[defined.totalPages || 'totalPages'] ? '' : ':disabled'}`" @click="next">
+        <button :ui-btn="`@a s read :border :square ${data[defined.page || 'page'] < data[defined.totalPages || 'totalPages'] ? '' : ':disabled'}`" @click="next">
           <svg style="width: 1em; height: 1em" class="icon co-read" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2426" width="64" height="64">
             <path
               d="M341.63640988 781.41564784c20.63742578 21.22981847 54.12571728 21.22981847 74.81456101 0l265.95100164-273.75421824c20.62728703-21.26747667 20.62728703-55.75008988 0-76.97556317l-265.95100164-273.74407946c-20.68449855-21.26747667-54.17423844-21.26747667-74.81456101 0-20.67291141 21.23706043-20.67291142 55.71170748 0 76.98497771l228.55639458 235.24869384-228.55567038 235.22117436c-20.67218722 21.26747667-20.67146302 55.74357212 0 77.02263594l0 0z"
@@ -111,23 +111,22 @@
 <script setup lang="ts">
   import { reactive, computed, watch } from 'vue';
   import { useRoute } from 'vue-router';
-  import { isObject } from '@fekit/utils';
 
   interface ModelValueProps {
     pageSize?: number;
-    current?: number;
+    page?: number;
     [key: string]: any;
   }
 
   interface DataProps {
     total?: number;
     totalPages?: number;
-    current?: number;
+    page?: number;
     [key: string]: any;
   }
   interface DefinedProps {
     // 当前页
-    current?: string;
+    page?: string;
     // 总页数
     totalPages?: string;
     // 总条数
@@ -149,7 +148,7 @@
     id: '',
     modelValue: () => ({}),
     data: () => ({}),
-    defined: () => ({})
+    defined: () => ({}),
   });
 
   const emits = defineEmits(['update:modelValue', 'page', 'size']);
@@ -157,7 +156,7 @@
     id: computed(() => (props.id || 'PAGINATION' + route.path?.replace(/\//g, '_')).toUpperCase()),
     showTotal: true,
     list: computed(() => {
-      const _page = Number(props.data[props.defined.current || 'current'] || 1);
+      const _page = Number(props.data[props.defined.page || 'page'] || 1);
       const list = [_page];
       if (_page > 1) {
         list.unshift(_page - 1);
@@ -185,26 +184,26 @@
         _lists.push(i);
       }
       return _lists;
-    })
+    }),
   });
 
   const prev = () => {
-    const _page = Number(props.data[props.defined.current || 'current']) - 1 < 1 ? 1 : Number(props.data[props.defined.current || 'current']) - 1;
-    emits('update:modelValue', { ...props.modelValue, ...{ [props.defined.current || 'current']: _page } });
+    const _page = Number(props.data[props.defined.page || 'page']) - 1 < 1 ? 1 : Number(props.data[props.defined.page || 'page']) - 1;
+    emits('update:modelValue', { ...props.modelValue, ...{ [props.defined.page || 'page']: _page } });
     emits('page', _page);
   };
 
   const next = () => {
     const _page =
-      Number(props.data[props.defined.current || 'current']) + 1 > props.data[props.defined.totalPages || 'totalPages']
+      Number(props.data[props.defined.page || 'page']) + 1 > props.data[props.defined.totalPages || 'totalPages']
         ? props.data[props.defined.totalPages || 'totalPages']
-        : Number(props.data[props.defined.current || 'current']) + 1;
-    emits('update:modelValue', { ...props.modelValue, ...{ [props.defined.current || 'current']: _page } });
+        : Number(props.data[props.defined.page || 'page']) + 1;
+    emits('update:modelValue', { ...props.modelValue, ...{ [props.defined.page || 'page']: _page } });
     emits('page', _page);
   };
 
   const page = (idx: any) => {
-    emits('update:modelValue', { ...props.modelValue, ...{ [props.defined.current || 'current']: idx } });
+    emits('update:modelValue', { ...props.modelValue, ...{ [props.defined.page || 'page']: idx } });
     emits('page', idx);
   };
 

package/src/components/tools/Pagination@b.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="ml-sl ar mob-ac">
       <div class="fr mob-fn m-ss-sub" ui-flex="row rm">
-        <button class="flex-fixed" :ui-btn="`@a s read :border :square ${data.current > 1 ? '' : ':disabled'}`" @click="prev">
+        <button class="flex-fixed" :ui-btn="`@a s read :border :square ${data.page > 1 ? '' : ':disabled'}`" @click="prev">
           <svg
             style="width: 1em; height: 1em"
             t="1701228540398"
@@ -32,15 +32,15 @@
           </svg>
         </button>
 
-        <button class="flex-fixed" v-for="idx in state.list" :key="idx" :ui-btn="`@a s ${idx === data.current ? 'main' : 'read :border'}`" ui-hide="<pad" @click="page(idx)">
+        <button class="flex-fixed" v-for="idx in state.list" :key="idx" :ui-btn="`@a s ${idx === data.page ? 'main' : 'read :border'}`" ui-hide="<pad" @click="page(idx)">
           <code>{{ idx }}</code>
         </button>
         <button class="flex-fixed" ui-btn="@a s read :border" ui-hide=">mob">
           <span>当前第</span>
-          <code class="nx-ss">{{ data.current || 1 }}</code>
+          <code class="nx-ss">{{ data.page || 1 }}</code>
           <span>页</span>
         </button>
-        <button class="flex-fixed" :ui-btn="`@a s read :border :square ${data.current < data.totalPages ? '' : ':disabled'}`" @click="next">
+        <button class="flex-fixed" :ui-btn="`@a s read :border :square ${data.page < data.totalPages ? '' : ':disabled'}`" @click="next">
           <svg style="width: 1em; height: 1em" class="icon co-read" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2426" width="64" height="64">
             <path
               d="M341.63640988 781.41564784c20.63742578 21.22981847 54.12571728 21.22981847 74.81456101 0l265.95100164-273.75421824c20.62728703-21.26747667 20.62728703-55.75008988 0-76.97556317l-265.95100164-273.74407946c-20.68449855-21.26747667-54.17423844-21.26747667-74.81456101 0-20.67291141 21.23706043-20.67291142 55.71170748 0 76.98497771l228.55639458 235.24869384-228.55567038 235.22117436c-20.67218722 21.26747667-20.67146302 55.74357212 0 77.02263594l0 0z"
@@ -133,13 +133,13 @@
 
   interface ModelValueProps {
     pageSize: number;
-    current: number;
+    page: number;
   }
 
   interface DataProps {
     total: number;
     totalPages: number;
-    current: number;
+    page: number;
   }
   // 类型
   interface Props {
@@ -155,15 +155,15 @@
     id: '',
     modelValue: () => ({
       pageSize: 0,
-      current: 0
+      page: 0,
     }),
     data: () => {
       return {
         total: 0,
         totalPages: 0,
-        current: 0
+        page: 0,
       };
-    }
+    },
   });
 
   const emits = defineEmits(['update:modelValue', 'page', 'size']);
@@ -172,7 +172,7 @@
     showTotal: true,
     id: computed(() => (props.id || 'PAGINATION' + route.path?.replace(/\//g, '_')).toUpperCase()),
     list: computed(() => {
-      const _page = Number(props.data.current || 1);
+      const _page = Number(props.data.page || 1);
       const list = [_page];
       if (_page > 1) {
         list.unshift(_page - 1);
@@ -193,23 +193,23 @@
         }
       }
       return list;
-    })
+    }),
   });
 
   const prev = () => {
-    const _page = Number(props.data.current) - 1 < 1 ? 1 : Number(props.data.current) - 1;
-    emits('update:modelValue', { ...props.modelValue, ...{ current: _page } });
+    const _page = Number(props.data.page) - 1 < 1 ? 1 : Number(props.data.page) - 1;
+    emits('update:modelValue', { ...props.modelValue, ...{ page: _page } });
     emits('page', _page);
   };
 
   const next = () => {
-    const _page = Number(props.data.current) + 1 > props.data.totalPages ? props.data.totalPages : Number(props.data.current) + 1;
-    emits('update:modelValue', { ...props.modelValue, ...{ current: _page } });
+    const _page = Number(props.data.page) + 1 > props.data.totalPages ? props.data.totalPages : Number(props.data.page) + 1;
+    emits('update:modelValue', { ...props.modelValue, ...{ page: _page } });
     emits('page', _page);
   };
 
   const page = (idx: any) => {
-    emits('update:modelValue', { ...props.modelValue, ...{ current: idx } });
+    emits('update:modelValue', { ...props.modelValue, ...{ page: idx } });
     emits('page', idx);
   };