Merge branch 'main' into gitee

src/views/about/columns.tsx

@@ -82,10 +82,7 @@ export function useColumns() {
       className: "pure-version",
       cellRenderer: () => {
         return (
-          <a
-            href="https://yiming_chang.gitee.io/pure-admin-doc"
-            target="_blank"
-          >
+          <a href="https://pure-admin.github.io/pure-admin-doc" target="_blank">
             <span style="color: var(--el-color-primary)">文档链接</span>
           </a>
         );
@@ -97,10 +94,7 @@ export function useColumns() {
       className: "pure-version",
       cellRenderer: () => {
         return (
-          <a
-            href="https://yiming_chang.gitee.io/vue-pure-admin"
-            target="_blank"
-          >
+          <a href="https://pure-admin.github.io/vue-pure-admin" target="_blank">
             <span style="color: var(--el-color-primary)">预览链接</span>
           </a>
         );

src/views/account-settings/index.vue

@@ -8,8 +8,8 @@ import Preferences from "./components/Preferences.vue";
 import SecurityLog from "./components/SecurityLog.vue";
 import { useGlobal, deviceDetection } from "@pureadmin/utils";
 import AccountManagement from "./components/AccountManagement.vue";
-import TopCollapse from "@/layout/components/sidebar/topCollapse.vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
+import LaySidebarTopCollapse from "@/layout/components/lay-sidebar/components/SidebarTopCollapse.vue";
 
 import leftLine from "@iconify-icons/ri/arrow-left-s-line";
 import ProfileIcon from "@iconify-icons/ri/user-3-line";
@@ -115,7 +115,7 @@ getMine().then(res => {
       </el-menu>
     </el-aside>
     <el-main>
-      <TopCollapse
+      <LaySidebarTopCollapse
         v-if="deviceDetection()"
         class="px-0"
         :is-active="isOpen"

src/views/login/components/LoginPhone.vue

@@ -23,7 +23,7 @@ const { isDisabled, text } = useVerifyCode();
 const onLogin = async (formEl: FormInstance | undefined) => {
   loading.value = true;
   if (!formEl) return;
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(valid => {
     if (valid) {
       // 模拟登录请求，需根据实际开发进行修改
       setTimeout(() => {
@@ -34,7 +34,6 @@ const onLogin = async (formEl: FormInstance | undefined) => {
       }, 2000);
     } else {
       loading.value = false;
-      return fields;
     }
   });
 };

src/views/login/components/LoginRegist.vue

@@ -45,7 +45,7 @@ const repeatPasswordRule = [
 const onUpdate = async (formEl: FormInstance | undefined) => {
   loading.value = true;
   if (!formEl) return;
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(valid => {
     if (valid) {
       if (checked.value) {
         // 模拟请求，需根据实际开发进行修改
@@ -63,7 +63,6 @@ const onUpdate = async (formEl: FormInstance | undefined) => {
       }
     } else {
       loading.value = false;
-      return fields;
     }
   });
 };

src/views/login/components/LoginUpdate.vue

@@ -42,7 +42,7 @@ const repeatPasswordRule = [
 const onUpdate = async (formEl: FormInstance | undefined) => {
   loading.value = true;
   if (!formEl) return;
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(valid => {
     if (valid) {
       // 模拟请求，需根据实际开发进行修改
       setTimeout(() => {
@@ -53,7 +53,6 @@ const onUpdate = async (formEl: FormInstance | undefined) => {
       }, 2000);
     } else {
       loading.value = false;
-      return fields;
     }
   });
 };

src/views/login/index.vue

@@ -64,7 +64,7 @@ const ruleForm = reactive({
 
 const onLogin = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(valid => {
     if (valid) {
       loading.value = true;
       useUserStoreHook()
@@ -86,8 +86,6 @@ const onLogin = async (formEl: FormInstance | undefined) => {
           }
         })
         .finally(() => (loading.value = false));
-    } else {
-      return fields;
     }
   });
 };

src/views/monitor/logs/system/detail.vue

@@ -82,12 +82,7 @@ const dataList = ref([
 <template>
   <div>
     <el-scrollbar>
-      <PureDescriptions
-        border
-        :data="props.data"
-        :columns="columns"
-        :column="5"
-      />
+      <PureDescriptions border :data="data" :columns="columns" :column="5" />
     </el-scrollbar>
     <el-tabs :modelValue="'responseBody'" type="border-card" class="mt-4">
       <el-tab-pane

src/views/system/menu/README.md

@@ -8,7 +8,7 @@
 | `name`            | 路由名称（必须唯一并且和当前路由`component`字段对应的页面里用`defineOptions`包起来的`name`保持一致） |
 | `path`            | 路由路径                                                     |
 | `component`       | 组件路径（传`component`组件路径，那么`path`可以随便写，如果不传，`component`组件路径会跟`path`保持一致） |
-| `rank`            | 菜单排序（平台规定只有`home`路由的`rank`才能为`0`，所以后端在返回`rank`的时候需要从非`0`开始 [点击查看更多](https://yiming_chang.gitee.io/pure-admin-doc/pages/routerMenu/#%E8%8F%9C%E5%8D%95%E6%8E%92%E5%BA%8F-rank)） |
+| `rank`            | 菜单排序（平台规定只有`home`路由的`rank`才能为`0`，所以后端在返回`rank`的时候需要从非`0`开始 [点击查看更多](https://pure-admin.github.io/pure-admin-doc/pages/routerMenu/#%E8%8F%9C%E5%8D%95%E6%8E%92%E5%BA%8F-rank)） |
 | `redirect`        | 路由重定向                                                   |
 | `icon`            | 菜单图标                                                     |
 | `extraIcon`       | 右侧图标                                                     |
@@ -22,5 +22,5 @@
 | `hiddenTag`       | 标签页（当前菜单名称或自定义信息禁止添加到标签页）           |
 | `fixedTag`        | 固定标签页（当前菜单名称是否固定显示在标签页且不可关闭）           |
 | `showLink`        | 菜单（是否显示该菜单）                                       |
-| `showParent`      | 父级菜单（是否显示父级菜单 [点击查看更多](https://yiming_chang.gitee.io/pure-admin-doc/pages/routerMenu/#%E7%AC%AC%E4%B8%80%E7%A7%8D-%E8%AF%A5%E6%A8%A1%E5%BC%8F%E9%92%88%E5%AF%B9%E7%88%B6%E7%BA%A7%E8%8F%9C%E5%8D%95%E4%B8%8B%E5%8F%AA%E6%9C%89%E4%B8%80%E4%B8%AA%E5%AD%90%E8%8F%9C%E5%8D%95%E7%9A%84%E6%83%85%E5%86%B5-%E5%9C%A8%E5%AD%90%E8%8F%9C%E5%8D%95%E7%9A%84-meta-%E5%B1%9E%E6%80%A7%E4%B8%AD%E5%8A%A0%E4%B8%8A-showparent-true-%E5%8D%B3%E5%8F%AF)） |
+| `showParent`      | 父级菜单（是否显示父级菜单 [点击查看更多](https://pure-admin.github.io/pure-admin-doc/pages/routerMenu/#%E7%AC%AC%E4%B8%80%E7%A7%8D-%E8%AF%A5%E6%A8%A1%E5%BC%8F%E9%92%88%E5%AF%B9%E7%88%B6%E7%BA%A7%E8%8F%9C%E5%8D%95%E4%B8%8B%E5%8F%AA%E6%9C%89%E4%B8%80%E4%B8%AA%E5%AD%90%E8%8F%9C%E5%8D%95%E7%9A%84%E6%83%85%E5%86%B5-%E5%9C%A8%E5%AD%90%E8%8F%9C%E5%8D%95%E7%9A%84-meta-%E5%B1%9E%E6%80%A7%E4%B8%AD%E5%8A%A0%E4%B8%8A-showparent-true-%E5%8D%B3%E5%8F%AF)） |
 

src/views/system/user/tree.vue

@@ -17,7 +17,7 @@ interface Tree {
   children?: Tree[];
 }
 
-const props = defineProps({
+defineProps({
   treeLoading: Boolean,
   treeData: Array
 });
@@ -95,7 +95,7 @@ defineExpose({ onTreeReset });
 
 <template>
   <div
-    v-loading="props.treeLoading"
+    v-loading="treeLoading"
     class="h-full bg-bg_color overflow-auto"
     :style="{ minHeight: `calc(100vh - 141px)` }"
   >
@@ -153,7 +153,7 @@ defineExpose({ onTreeReset });
     <el-divider />
     <el-tree
       ref="treeRef"
-      :data="props.treeData"
+      :data="treeData"
       node-key="id"
       size="small"
       :props="defaultProps"

src/views/table/base/fixColumn.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { tableDataMore } from "./data";
 
-const props = withDefaults(
+withDefaults(
   defineProps<{
     height?: string;
   }>(),
@@ -62,12 +62,12 @@ function handleClick(row) {
 <template>
   <pure-table
     :data="
-      props.height
+      height
         ? tableDataMore.concat(tableDataMore).concat(tableDataMore)
         : tableDataMore
     "
     :columns="columns"
-    :height="props.height"
+    :height="height"
   >
     <template #operation="{ row }">
       <el-button link type="primary" size="small" @click="handleClick(row)">

src/views/table/base/imgPreview.vue

@@ -30,7 +30,7 @@ const columns: TableColumnList = [
     <template #video>
       <video width="180" height="180" controls>
         <source
-          src="https://yiming_chang.gitee.io/pure-admin-doc/video/url.mov"
+          src="https://pure-admin.github.io/pure-admin-doc/video/url.mov"
           type="video/mp4"
         />
       </video>

src/views/table/virtual/list.tsx

@@ -1,5 +1,6 @@
 import List from "./list.vue";
 import TreeList from "./treeList.vue";
+import PageList from "./pageList.vue";
 
 const rendContent = (val: string) =>
   `代码位置：src/views/table/virtual/${val}.vue`;
@@ -8,13 +9,19 @@ export const list = [
   {
     key: "list",
     content: rendContent("list"),
-    title: "虚拟列表",
+    title: "虚拟表格",
     component: List
   },
   {
     key: "treeList",
     content: rendContent("treeList"),
-    title: "虚拟树",
+    title: "虚拟树形表格",
     component: TreeList
+  },
+  {
+    key: "pageList",
+    content: rendContent("pageList"),
+    title: "分页表格",
+    component: PageList
   }
 ];

src/views/table/virtual/list.vue

@@ -1,9 +1,20 @@
 <script lang="ts" setup>
 import { ref } from "vue";
+import { VxeTableBar } from "@/components/ReVxeTableBar";
 
+const vxeTableRef = ref();
+const loading = ref(true);
 const tableData = ref([]);
 
-setTimeout(() => {
+const columns = [
+  { type: "seq", field: "seq", title: "序号", width: 100 },
+  { field: "name", title: "名称", sortable: true },
+  { field: "role", title: "角色" },
+  { field: "sex", title: "性别" }
+];
+
+async function onSearch() {
+  loading.value = true;
   // 模拟数据
   const mockList = [];
   for (let index = 0; index < 500; index++) {
@@ -15,21 +26,33 @@ setTimeout(() => {
     });
   }
   tableData.value = mockList;
-}, 100);
+  setTimeout(() => {
+    loading.value = false;
+  }, 500);
+}
+
+onSearch();
 </script>
 
 <template>
-  <vxe-table
-    border
-    show-overflow
-    height="500"
-    :row-config="{ isHover: true }"
-    :data="tableData"
-    :scroll-y="{ enabled: true }"
+  <VxeTableBar
+    :vxeTableRef="vxeTableRef"
+    :columns="columns"
+    title="虚拟表格"
+    @refresh="onSearch"
   >
-    <vxe-column type="seq" title="序号" width="100" />
-    <vxe-column field="name" title="名称" sortable />
-    <vxe-column field="role" title="角色" />
-    <vxe-column field="sex" title="性别" />
-  </vxe-table>
+    <template v-slot="{ size, dynamicColumns }">
+      <vxe-grid
+        ref="vxeTableRef"
+        v-loading="loading"
+        show-overflow
+        height="500"
+        :size="size"
+        :row-config="{ isHover: true }"
+        :scroll-y="{ enabled: true }"
+        :columns="dynamicColumns"
+        :data="tableData"
+      />
+    </template>
+  </VxeTableBar>
 </template>

src/views/table/virtual/pageList.vue

@@ -0,0 +1,86 @@
+<script lang="ts" setup>
+import { ref, reactive, computed } from "vue";
+import { VxeTableBar } from "@/components/ReVxeTableBar";
+
+const vxeTableRef = ref();
+const loading = ref(true);
+const tableData = ref([]);
+
+const getTableHeight = computed(() => {
+  return (size: string) => {
+    switch (size) {
+      case "medium":
+        return 531;
+      case "small":
+        return 482;
+      case "mini":
+        return 433;
+    }
+  };
+});
+
+const pagerConfig = reactive({
+  total: 0,
+  currentPage: 1,
+  pageSize: 10,
+  pageSizes: [5, 10, 15, 20]
+});
+
+const columns = [
+  { type: "seq", field: "seq", title: "序号", width: 100 },
+  { field: "name", title: "名称", sortable: true },
+  { field: "role", title: "角色" },
+  { field: "sex", title: "性别" }
+];
+
+async function onSearch() {
+  loading.value = true;
+  // 模拟数据
+  const mockList = [];
+  for (let index = 0; index < 10; index++) {
+    mockList.push({
+      id: index,
+      name: "Test" + index,
+      role: "Developer",
+      sex: "男"
+    });
+  }
+  pagerConfig.total = 20;
+  tableData.value = mockList;
+  setTimeout(() => {
+    loading.value = false;
+  }, 500);
+}
+
+const handlePageChange = ({ currentPage, pageSize }) => {
+  pagerConfig.currentPage = currentPage;
+  pagerConfig.pageSize = pageSize;
+  onSearch();
+};
+
+onSearch();
+</script>
+
+<template>
+  <VxeTableBar
+    :vxeTableRef="vxeTableRef"
+    :columns="columns"
+    title="分页表格"
+    @refresh="onSearch"
+  >
+    <template v-slot="{ size, dynamicColumns }">
+      <vxe-grid
+        ref="vxeTableRef"
+        v-loading="loading"
+        show-overflow
+        :height="getTableHeight(size)"
+        :size="size"
+        :column-config="{ resizable: true }"
+        :columns="dynamicColumns"
+        :pagerConfig="pagerConfig"
+        :data="tableData"
+        @page-change="handlePageChange"
+      />
+    </template>
+  </VxeTableBar>
+</template>

src/views/table/virtual/treeList.vue

@@ -1,56 +1,51 @@
 <script lang="ts" setup>
 import { ref } from "vue";
 import treeList from "./tree.json";
+import { VxeTableBar } from "@/components/ReVxeTableBar";
 
-const tableRef = ref();
+const vxeTableRef = ref();
 
-const loading = ref(false);
+const loading = ref(true);
 const tableData = ref([]);
 
-const loadList = () => {
+const columns = [
+  { type: "seq", field: "seq", title: "序号", width: 200, treeNode: true },
+  { field: "id", title: "Id" },
+  { field: "name", title: "地点" }
+];
+
+async function onSearch() {
   loading.value = true;
+  tableData.value = treeList;
   setTimeout(() => {
-    tableData.value = treeList;
     loading.value = false;
-  }, 200);
-};
+  }, 500);
+}
 
-const expandAllEvent = () => {
-  const $table = tableRef.value;
-  if ($table) {
-    $table.setAllTreeExpand(true);
-  }
-};
-
-const claseExpandEvent = () => {
-  const $table = tableRef.value;
-  if ($table) {
-    $table.clearTreeExpand();
-  }
-};
-
-loadList();
+onSearch();
 </script>
 
 <template>
-  <div>
-    <div class="mb-4">
-      <el-button @click="expandAllEvent">展开所有</el-button>
-      <el-button @click="claseExpandEvent">收起所有</el-button>
-    </div>
-
-    <vxe-table
-      ref="tableRef"
-      show-overflow
-      height="500"
-      :loading="loading"
-      :tree-config="{ transform: true }"
-      :scroll-y="{ enabled: true, gt: 20 }"
-      :data="tableData"
-    >
-      <vxe-column type="seq" title="序号" width="200" tree-node />
-      <vxe-column field="id" title="Id" />
-      <vxe-column field="name" title="地点" />
-    </vxe-table>
-  </div>
+  <VxeTableBar
+    tree
+    title="虚拟树形表格"
+    :isExpandAll="false"
+    :vxeTableRef="vxeTableRef"
+    :columns="columns"
+    @refresh="onSearch"
+  >
+    <template v-slot="{ size, dynamicColumns }">
+      <vxe-grid
+        ref="vxeTableRef"
+        v-loading="loading"
+        show-overflow
+        height="500"
+        :size="size"
+        :tree-config="{ transform: true }"
+        :scroll-y="{ enabled: true, gt: 20 }"
+        :columns="dynamicColumns"
+        :data="tableData"
+      />
+    </template>
+  </VxeTableBar>
 </template>