From b5684d1d597536bfa1d53fbc5f3b51ffba5f957c Mon Sep 17 00:00:00 2001
From: zouzhibing <zouzhibing@anthead.cn>
Date: Thu, 2 Mar 2023 10:52:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=A1=A3:=20readme=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ea7231..baa0826 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ vue-element-perfect 是一个后台前端解决方案,它使用了最新的前
 ### git仓库(欢迎 Star⭐)
 - Gitee： —— [https://gitee.com/yuanzbz/vue-admin-perfect](https://gitee.com/yuanzbz/vue-admin-perfect)
 - GitHub： —— [https://github.com/zouzhibin/vue-admin-perfect](https://github.com/zouzhibin/vue-admin-perfect)
-- 基础功能版本： —— [https://gitee.com/yuanzbz/vue-admin-perfect](https://gitee.com/yuanzbz/vue-admin-perfect)
+- 基础功能版本： —— [https://gitee.com/yuanzbz/vue-admin-simple](https://gitee.com/yuanzbz/vue-admin-simple)
 
 ## 项目功能
 - 使用Vue3.0开发，单文件组件采用＜script setup＞

From 3baf83c09b83ef06e90f1d9f5586f9a4fd1b4eb7 Mon Sep 17 00:00:00 2001
From: BaobeierB <2533875871@qq.com>
Date: Thu, 17 Aug 2023 10:00:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5pageSize=E6=97=A0=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/PropTable/index.vue | 359 ++++++++++++-----------
 1 file changed, 182 insertions(+), 177 deletions(-)

diff --git a/src/components/Table/PropTable/index.vue b/src/components/Table/PropTable/index.vue
index ccdb913..2f5909d 100644
--- a/src/components/Table/PropTable/index.vue
+++ b/src/components/Table/PropTable/index.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="zb-pro-table">
     <div class="header">
-      <el-form :inline="true"
-               class="search-form"
-               :model="formInline"  ref="ruleFormRef" >
+      <el-form :inline="true" class="search-form" :model="formInline" ref="ruleFormRef">
         <template v-for="(item, index) in formSearchData" :key="index">
           <el-form-item :label="item.label" v-show="isExpand ? isExpand : index < 2">
             <template v-if="item.valueType === 'input'">
@@ -11,13 +9,15 @@
             </template>
             <template v-if="item.valueType === 'select'">
               <el-select
-                  style="width: 100%"
-                  v-model="formInline[item.name]" :placeholder="`请选择${item.label}`">
+                style="width: 100%"
+                v-model="formInline[item.name]"
+                :placeholder="`请选择${item.label}`"
+              >
                 <el-option
-                    v-for="ite in item.options"
-                    :key="ite.value"
-                    :label="ite.label"
-                    :value="ite.value"
+                  v-for="ite in item.options"
+                  :key="ite.value"
+                  :label="ite.label"
+                  :value="ite.value"
                 />
               </el-select>
             </template>
@@ -25,11 +25,13 @@
         </template>
       </el-form>
       <div class="search">
-        <el-button type="primary" @click="onSubmit"  :icon="Search">查询</el-button>
+        <el-button type="primary" @click="onSubmit" :icon="Search">查询</el-button>
         <el-button @click="reset(ruleFormRef)">重置</el-button>
-        <el-button link type="primary" @click="isExpand = !isExpand">{{ isExpand ? '合并' : '展开'}}<el-icon>
-          <arrow-down v-if="!isExpand" />
-          <arrow-up v-else /> </el-icon
+        <el-button link type="primary" @click="isExpand = !isExpand"
+          >{{ isExpand ? '合并' : '展开'
+          }}<el-icon>
+            <arrow-down v-if="!isExpand" />
+            <arrow-up v-else /> </el-icon
         ></el-button>
       </div>
     </div>
@@ -42,28 +44,28 @@
       <!-- ------------表格--------------->
       <div class="table">
         <el-table
-            class="zb-table"
-            v-loading="loading"
-            @selection-change="(val) => emit('selection-change', val)"
-            :data="list"
-            :border="true"
+          class="zb-table"
+          v-loading="loading"
+          @selection-change="(val) => emit('selection-change', val)"
+          :data="list"
+          :border="true"
         >
           <template v-for="item in columns">
             <el-table-column
-                v-if="item.type"
-                :type="item.type"
-                :width="item.width"
-                :align="item.align!=null?item.align:'center'"
-                :fixed="item.fixed"
-                :label="item.label"
+              v-if="item.type"
+              :type="item.type"
+              :width="item.width"
+              :align="item.align != null ? item.align : 'center'"
+              :fixed="item.fixed"
+              :label="item.label"
             />
             <el-table-column
-                v-else
-                :prop="item.name"
-                :width="item.width"
-                :align="item.align!=null?item.align:'center'"
-                :fixed="item.fixed"
-                :label="item.label"
+              v-else
+              :prop="item.name"
+              :width="item.width"
+              :align="item.align != null ? item.align : 'center'"
+              :fixed="item.fixed"
+              :label="item.label"
             >
               <template #default="scope">
                 <span v-if="!item.slot">{{ scope.row[item.name] }}</span>
@@ -76,174 +78,177 @@
       <!-- ------------分页--------------->
       <div class="pagination">
         <el-pagination
-            v-model:currentPage="currentPage1"
-            :page-size="10"
-            background
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="data.length"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
+          v-model:currentPage="currentPage1"
+          :page-sizes="[10, 20, 30, 40, 50, 100]"
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="data.length"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
         />
       </div>
     </div>
   </div>
 </template>
 <script lang="ts" setup>
-import { computed, ref } from 'vue'
-import {Search } from '@element-plus/icons-vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-const ruleFormRef = ref<FormInstance>()
-const emit = defineEmits(['reset', 'onSubmit', 'selection-change'])
-let props = defineProps({
-  columns: {
-    type: Array,
-    default: () => [],
-  },
-  data: {
-    type: Array,
-    default: () => [],
-  },
-  loading: {
-    type: Boolean,
-    default: false,
-  },
-})
-
-const currentPage1 = ref(1)
-// 收缩展开
-const isExpand = ref(false)
-const handleSizeChange = (val: number) => {
-  console.log(`${val} items per page`)
-}
-const handleCurrentChange = (val: number) => {
-  console.log(`current page: ${val}`)
-  currentPage1.value = val
-}
-
-const list = computed(() => {
-  let arr = JSON.parse(JSON.stringify(props.data))
-  return arr.splice((currentPage1.value - 1) * 10, 10)
-})
-
-const listLoading = ref(false)
-const confirmEdit = (row) => {
-  row.edit = false
-}
-const cancelEdit = (row) => {
-  row.edit = false
-}
-
-import { reactive } from 'vue'
-
-let obj = {}
-let search = []
-for (let item of props.columns) {
-  if (item.inSearch) {
-    obj[item.name] = null
-  }
-  if (item.inSearch) {
-    search.push(item)
-  }
-}
-const formSearchData = ref(search)
-const formInline = reactive(obj)
-
-const onSubmit = () => {
-  console.log('submit!', formInline)
-  emit('onSubmit', formInline)
-}
-
-const reset = (formEl: FormInstance | undefined) => {
-  formSearchData.value.forEach((item) => {
-    formInline[item.name] = null
+  import { computed, ref } from 'vue'
+  import { Search } from '@element-plus/icons-vue'
+  import { ElMessage, ElMessageBox } from 'element-plus'
+  import type { FormInstance } from 'element-plus'
+  const ruleFormRef = ref<FormInstance>()
+  const emit = defineEmits(['reset', 'onSubmit', 'selection-change'])
+  let props = defineProps({
+    columns: {
+      type: Array<any>,
+      default: () => [],
+    },
+    data: {
+      type: Array<any>,
+      default: () => [],
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
   })
-  emit('reset')
-}
-const deleteAction = (row) => {
-  ElMessageBox.confirm('你确定要删除当前项吗?', '温馨提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-    draggable: true,
+
+  const currentPage1 = ref(1)
+  // 收缩展开
+  const isExpand = ref(false)
+  // 每页显示几个数据
+  const pageSize = ref(10)
+  const handleSizeChange = (val: number) => {
+    console.log(`${val} items per page`)
+    pageSize.value = val
+  }
+  const handleCurrentChange = (val: number) => {
+    console.log(`current page: ${val}`)
+    currentPage1.value = val
+  }
+
+  const list = computed(() => {
+    let arr = JSON.parse(JSON.stringify(props.data))
+    return arr.splice((currentPage1.value - 1) * pageSize.value, pageSize.value)
   })
+
+  const listLoading = ref(false)
+  const confirmEdit = (row) => {
+    row.edit = false
+  }
+  const cancelEdit = (row) => {
+    row.edit = false
+  }
+
+  import { reactive } from 'vue'
+
+  let obj = {}
+  let search = []
+  for (let item of props.columns) {
+    if (item.inSearch) {
+      obj[item.name] = null
+    }
+    if (item.inSearch) {
+      search.push(item)
+    }
+  }
+  const formSearchData = ref(search)
+  const formInline = reactive(obj)
+
+  const onSubmit = () => {
+    console.log('submit!', formInline)
+    emit('onSubmit', formInline)
+  }
+
+  const reset = (formEl: FormInstance | undefined) => {
+    formSearchData.value.forEach((item) => {
+      formInline[item.name] = null
+    })
+    emit('reset')
+  }
+  const deleteAction = (row) => {
+    ElMessageBox.confirm('你确定要删除当前项吗?', '温馨提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      draggable: true,
+    })
       .then(() => {
         list.value = list.value.filter((item) => item.id !== row.id)
         ElMessage.success('删除成功')
       })
       .catch(() => {})
-}
+  }
 </script>
 <style scoped lang="scss">
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-.zb-pro-table {
-  width: 100%;
-  height: 100%;
-  display:flex;
-  flex-direction:column;
-
-  .header{
+  .edit-input {
+    padding-right: 100px;
+  }
+  .cancel-btn {
+    position: absolute;
+    right: 15px;
+    top: 10px;
+  }
+  .zb-pro-table {
+    width: 100%;
+    height: 100%;
     display: flex;
-    padding: 16px 16px 0 16px;
-    margin-bottom: 16px;
-    border-radius: 4px;
-    background: white;
-    box-shadow: 0 0 12px rgb(0 0 0 / 5%);
-    .search-form{
-      flex: 1;
-      ::v-deep{
-        .el-input--default{
-          width: 200px;
+    flex-direction: column;
+
+    .header {
+      display: flex;
+      padding: 16px 16px 0 16px;
+      margin-bottom: 16px;
+      border-radius: 4px;
+      background: white;
+      box-shadow: 0 0 12px rgb(0 0 0 / 5%);
+      .search-form {
+        flex: 1;
+        ::v-deep {
+          .el-input--default {
+            width: 200px;
+          }
         }
       }
+      .search {
+        flex-shrink: 0;
+        white-space: nowrap;
+      }
     }
-    .search{
-      flex-shrink: 0;
-      white-space: nowrap;
-    }
-  }
-  .footer{
-    flex: 1;
-    display: flex;
-    padding: 16px;
-    flex-direction: column;
-    border-radius: 4px;
-    overflow: hidden;
-    background: white;
-    box-shadow: 0 0 12px rgb(0 0 0 / 5%);
-    min-height: 300px;
-    .operator{
-      margin-bottom: 15px
-    }
-    .table{
-      position: relative;
+    .footer {
       flex: 1;
+      display: flex;
+      padding: 16px;
+      flex-direction: column;
+      border-radius: 4px;
+      overflow: hidden;
+      background: white;
+      box-shadow: 0 0 12px rgb(0 0 0 / 5%);
+      min-height: 300px;
+      .operator {
+        margin-bottom: 15px;
+      }
+      .table {
+        position: relative;
+        flex: 1;
+      }
+      .zb-table {
+        position: absolute;
+        height: 100%;
+      }
     }
-    .zb-table{
-      position: absolute;
-      height: 100%;
+    ::v-deep {
+      .el-table__header th {
+        font-size: 15px;
+        font-weight: 700;
+        color: #252525;
+      }
+    }
+    .pagination {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      padding-top: 20px;
+      box-sizing: border-box;
     }
   }
-  ::v-deep{
-    .el-table__header th{
-      font-size: 15px;
-      font-weight: 700;
-      color: #252525;
-    }
-  }
-  .pagination{
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    padding-top: 20px;
-    box-sizing: border-box;
-  }
-}
 </style>