Merge branch 'main' into pages

2025-12-15 14:50:29 +08:00 · 2024-08-13 10:28:40 +08:00
parent c0d683c9b1 5fbb664da7
commit 190c3c6123
38 changed files with 1561 additions and 1224 deletions
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -456,7 +456,9 @@ function onSureBtnLoading() {
    sureBtnLoading: true,
    title: "点击底部确定按钮可开启按钮动画",
    contentRenderer: () => <p>弹框内容-点击底部确定按钮可开启按钮动画</p>,
-    beforeSure: done => {
+    beforeSure: (done, { closeLoading }) => {
+      // closeLoading() // 关闭确定按钮动画，不关闭弹框
+      // done() // 关闭确定按钮动画并关闭弹框
      setTimeout(() => done(), 800);
    }
  });
--- a/src/views/monitor/logs/login/index.vue
+++ b/src/views/monitor/logs/login/index.vue
@@ -133,8 +133,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/monitor/logs/operation/index.vue
+++ b/src/views/monitor/logs/operation/index.vue
@@ -133,8 +133,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/monitor/logs/system/index.vue
+++ b/src/views/monitor/logs/system/index.vue
@@ -125,8 +125,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -74,8 +74,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/permission/button/index.vue
+++ b/src/views/permission/button/index.vue
@@ -2,7 +2,7 @@
 import { hasAuth, getAuths } from "@/router/utils";

 defineOptions({
-  name: "PermissionButton"
+  name: "PermissionButtonRouter"
 });
 </script>

--- a/src/views/permission/button/perms.vue
+++ b/src/views/permission/button/perms.vue
@@ -0,0 +1,116 @@
+<script setup lang="ts">
+import { hasPerms } from "@/utils/auth";
+import { useUserStoreHook } from "@/store/modules/user";
+
+const { permissions } = useUserStoreHook();
+
+defineOptions({
+  name: "PermissionButtonLogin"
+});
+</script>
+
+<template>
+  <div>
+    <p class="mb-2">当前拥有的code列表：{{ permissions }}</p>
+    <p v-show="permissions?.[0] === '*:*:*'" class="mb-2">
+      *:*:* 代表拥有全部按钮级别权限
+    </p>
+
+    <el-card shadow="never" class="mb-2">
+      <template #header>
+        <div class="card-header">组件方式判断权限</div>
+        <el-link
+          class="mt-2"
+          href="https://github.com/pure-admin/vue-pure-admin/blob/main/src/views/permission/button/perms.vue"
+          target="_blank"
+        >
+          代码位置 src/views/permission/button/perms.vue
+        </el-link>
+      </template>
+      <el-space wrap>
+        <Perms value="permission:btn:add">
+          <el-button plain type="warning">
+            拥有code：'permission:btn:add' 权限可见
+          </el-button>
+        </Perms>
+        <Perms :value="['permission:btn:edit']">
+          <el-button plain type="primary">
+            拥有code：['permission:btn:edit'] 权限可见
+          </el-button>
+        </Perms>
+        <Perms
+          :value="[
+            'permission:btn:add',
+            'permission:btn:edit',
+            'permission:btn:delete'
+          ]"
+        >
+          <el-button plain type="danger">
+            拥有code：['permission:btn:add', 'permission:btn:edit',
+            'permission:btn:delete'] 权限可见
+          </el-button>
+        </Perms>
+      </el-space>
+    </el-card>
+
+    <el-card shadow="never" class="mb-2">
+      <template #header>
+        <div class="card-header">函数方式判断权限</div>
+      </template>
+      <el-space wrap>
+        <el-button v-if="hasPerms('permission:btn:add')" plain type="warning">
+          拥有code：'permission:btn:add' 权限可见
+        </el-button>
+        <el-button
+          v-if="hasPerms(['permission:btn:edit'])"
+          plain
+          type="primary"
+        >
+          拥有code：['permission:btn:edit'] 权限可见
+        </el-button>
+        <el-button
+          v-if="
+            hasPerms([
+              'permission:btn:add',
+              'permission:btn:edit',
+              'permission:btn:delete'
+            ])
+          "
+          plain
+          type="danger"
+        >
+          拥有code：['permission:btn:add', 'permission:btn:edit',
+          'permission:btn:delete'] 权限可见
+        </el-button>
+      </el-space>
+    </el-card>
+
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          指令方式判断权限（该方式不能动态修改权限）
+        </div>
+      </template>
+      <el-space wrap>
+        <el-button v-perms="'permission:btn:add'" plain type="warning">
+          拥有code：'permission:btn:add' 权限可见
+        </el-button>
+        <el-button v-perms="['permission:btn:edit']" plain type="primary">
+          拥有code：['permission:btn:edit'] 权限可见
+        </el-button>
+        <el-button
+          v-perms="[
+            'permission:btn:add',
+            'permission:btn:edit',
+            'permission:btn:delete'
+          ]"
+          plain
+          type="danger"
+        >
+          拥有code：['permission:btn:add', 'permission:btn:edit',
+          'permission:btn:delete'] 权限可见
+        </el-button>
+      </el-space>
+    </el-card>
+  </div>
+</template>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -173,8 +173,7 @@ onMounted(() => {
            :adaptiveConfig="{ offsetBottom: 108 }"
            :data="dataList"
            :columns="dynamicColumns"
-            :pagination="pagination"
-            :paginationSmall="size === 'small' ? true : false"
+            :pagination="{ ...pagination, size }"
            :header-cell-style="{
              background: 'var(--el-fill-color-light)',
              color: 'var(--el-text-color-primary)'
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -160,8 +160,7 @@ const {
            :size="size"
            :data="dataList"
            :columns="dynamicColumns"
-            :pagination="pagination"
-            :paginationSmall="size === 'small' ? true : false"
+            :pagination="{ ...pagination, size }"
            :header-cell-style="{
              background: 'var(--el-fill-color-light)',
              color: 'var(--el-text-color-primary)'
--- a/src/views/table/base/tree.vue
+++ b/src/views/table/base/tree.vue
@@ -116,7 +116,11 @@ const columns: TableColumnList = [
      border
      lazy
      :load="load"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      :tree-props="{
+        hasChildren: 'hasChildren',
+        children: 'children',
+        checkStrictly: false
+      }"
    />
  </div>
 </template>
--- a/src/views/table/high/adaptive/columns.tsx
+++ b/src/views/table/high/adaptive/columns.tsx
@@ -33,7 +33,7 @@ export function useColumns() {
    total: 0,
    align: "right",
    background: true,
-    small: false
+    size: "default"
  });

  /** 加载动画配置 */
--- a/src/views/table/high/page/columns.tsx
+++ b/src/views/table/high/page/columns.tsx
@@ -9,7 +9,6 @@ export function useColumns() {
  const select = ref("no");
  const hideVal = ref("nohide");
  const tableSize = ref("default");
-  const paginationSmall = ref(false);
  const paginationAlign = ref("right");
  const columns: TableColumnList = [
    {
@@ -43,7 +42,7 @@ export function useColumns() {
    total: 0,
    align: "right",
    background: true,
-    small: false
+    size: "default"
  });

  /** 加载动画配置 */
@@ -65,7 +64,7 @@ export function useColumns() {
  });

  function onChange(val) {
-    pagination.small = val;
+    pagination.size = val;
  }

  function onSizeChange(val) {
@@ -108,7 +107,6 @@ export function useColumns() {
    pagination,
    loadingConfig,
    paginationAlign,
-    paginationSmall,
    onChange,
    onSizeChange,
    onCurrentChange
--- a/src/views/table/high/page/index.vue
+++ b/src/views/table/high/page/index.vue
@@ -11,7 +11,6 @@ const {
  pagination,
  loadingConfig,
  paginationAlign,
-  paginationSmall,
  onChange,
  onSizeChange,
  onCurrentChange
@@ -43,9 +42,10 @@ const {
      </el-radio-group>
      <el-divider direction="vertical" />
      <p class="text-sm">分页大小：</p>
-      <el-radio-group v-model="paginationSmall" size="small" @change="onChange">
-        <el-radio-button :value="false">no small</el-radio-button>
-        <el-radio-button :value="true">small</el-radio-button>
+      <el-radio-group v-model="pagination.size" size="small" @change="onChange">
+        <el-radio-button value="large">large</el-radio-button>
+        <el-radio-button value="default">default</el-radio-button>
+        <el-radio-button value="small">small</el-radio-button>
      </el-radio-group>
      <el-divider direction="vertical" />
      <p class="text-sm">分页的对齐方式：</p>
--- a/src/views/table/high/table-select/multiple/columns.tsx
+++ b/src/views/table/high/table-select/multiple/columns.tsx
@@ -59,7 +59,7 @@ export function useColumns(selectRef: Ref, formRef: Ref, tableRef: Ref) {
    layout: "prev, pager, next",
    total: tableData.value.length,
    background: true,
-    small: true
+    size: "small"
  });

  const handleSelectionChange = val => {
--- a/src/views/table/high/table-select/radio/columns.tsx
+++ b/src/views/table/high/table-select/radio/columns.tsx
@@ -33,7 +33,7 @@ export function useColumns(selectRef: Ref) {
    layout: "prev, pager, next",
    total: tableDataEdit.length,
    background: true,
-    small: true
+    size: "small"
  });

  /** 高亮当前选中行 */