From 60035767ad4967d44103ce49eed17aace272f1b0 Mon Sep 17 00:00:00 2001
From: H0nGzA1 <2505811377@qq.com>
Date: Wed, 17 May 2023 23:34:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20keepAlive=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/utils/menu.ts                         |   5 +-
 web/src/views/system/areas/index.vue          |   2 +-
 web/src/views/system/config/index.vue         |   2 +-
 web/src/views/system/dept/index.vue           |   2 +-
 web/src/views/system/dictionary/index.vue     |   2 +-
 web/src/views/system/fileList/in1dex1.vue     |  18 -
 web/src/views/system/fileList/index.vue       |   2 +-
 web/src/views/system/log/loginLog/index.vue   |   2 +-
 .../views/system/log/operationLog/index.vue   |  19 +-
 web/src/views/system/menu/index.vue           |  11 +-
 web/src/views/system/messageCenter/index.vue  |   2 +-
 web/src/views/system/role/index.vue           |   2 +-
 web/src/views/system/rolePermission/index.vue | 623 +++++++++---------
 web/src/views/system/user/index.vue           |   2 +-
 web/src/views/system/whiteList/index.vue      |  18 +-
 15 files changed, 352 insertions(+), 360 deletions(-)
 delete mode 100644 web/src/views/system/fileList/in1dex1.vue

diff --git a/web/src/utils/menu.ts b/web/src/utils/menu.ts
index c37dd98..8afd40e 100644
--- a/web/src/utils/menu.ts
+++ b/web/src/utils/menu.ts
@@ -18,7 +18,7 @@ export const handleMenu = (menuData: Array<any>) => {
             roles: ['admin'],
             icon: item.icon
         }
-
+        item.name = item.component_name
         return item
     }
     menuData.forEach((val) => {
@@ -45,5 +45,6 @@ export const handleMenu = (menuData: Array<any>) => {
         },
         ...data
     ]
+    console.log(menu)
     return menu
-}
\ No newline at end of file
+}
diff --git a/web/src/views/system/areas/index.vue b/web/src/views/system/areas/index.vue
index 58c0331..51c6c77 100644
--- a/web/src/views/system/areas/index.vue
+++ b/web/src/views/system/areas/index.vue
@@ -4,7 +4,7 @@
 	</fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="areas">
 import { ref, onMounted } from 'vue';
 import { useFs } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
diff --git a/web/src/views/system/config/index.vue b/web/src/views/system/config/index.vue
index cb66dc2..c0bfb7c 100644
--- a/web/src/views/system/config/index.vue
+++ b/web/src/views/system/config/index.vue
@@ -39,7 +39,7 @@
 	</el-card>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="config">
 import { Edit, FolderAdd } from '@element-plus/icons-vue';
 import * as api from './api';
 import addTabs from './components/addTabs.vue';
diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue
index 9402f45..c63d7d4 100644
--- a/web/src/views/system/dept/index.vue
+++ b/web/src/views/system/dept/index.vue
@@ -98,7 +98,7 @@
     </fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="dept">
 import {Splitpanes, Pane} from 'splitpanes';
 import 'splitpanes/dist/splitpanes.css';
 import * as api from './api';
diff --git a/web/src/views/system/dictionary/index.vue b/web/src/views/system/dictionary/index.vue
index b62a48c..17338d3 100644
--- a/web/src/views/system/dictionary/index.vue
+++ b/web/src/views/system/dictionary/index.vue
@@ -5,7 +5,7 @@
 	</fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="dictionary">
 import { ref, onMounted, defineAsyncComponent } from 'vue';
 import { useFs } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
diff --git a/web/src/views/system/fileList/in1dex1.vue b/web/src/views/system/fileList/in1dex1.vue
deleted file mode 100644
index 58c0331..0000000
--- a/web/src/views/system/fileList/in1dex1.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-	<fs-page>
-		<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-	</fs-page>
-</template>
-
-<script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import { useFs } from '@fast-crud/fast-crud';
-import { createCrudOptions } from './crud';
-
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
-
-// 页面打开后获取列表数据
-onMounted(() => {
-	crudExpose.doRefresh();
-});
-</script>
diff --git a/web/src/views/system/fileList/index.vue b/web/src/views/system/fileList/index.vue
index ae24dcf..5f04111 100644
--- a/web/src/views/system/fileList/index.vue
+++ b/web/src/views/system/fileList/index.vue
@@ -79,7 +79,7 @@
   </fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="fileList">
 import {DelObj, GetList} from "./api";
 import {ref, onMounted,reactive} from "vue";
 import {getBaseURL} from "/@/utils/baseUrl";
diff --git a/web/src/views/system/log/loginLog/index.vue b/web/src/views/system/log/loginLog/index.vue
index 58c0331..618e6cf 100644
--- a/web/src/views/system/log/loginLog/index.vue
+++ b/web/src/views/system/log/loginLog/index.vue
@@ -4,7 +4,7 @@
 	</fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="loginLog">
 import { ref, onMounted } from 'vue';
 import { useFs } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
diff --git a/web/src/views/system/log/operationLog/index.vue b/web/src/views/system/log/operationLog/index.vue
index 58c0331..c760f96 100644
--- a/web/src/views/system/log/operationLog/index.vue
+++ b/web/src/views/system/log/operationLog/index.vue
@@ -1,18 +1,19 @@
 <template>
-	<fs-page>
-		<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-	</fs-page>
+    <fs-page>
+        <fs-crud ref="crudRef" v-bind="crudBinding"></fs-crud>
+    </fs-page>
 </template>
 
-<script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import { useFs } from '@fast-crud/fast-crud';
-import { createCrudOptions } from './crud';
+<script lang="ts" setup name="operationLog">
+import {ref, onMounted} from 'vue';
+import {useFs} from '@fast-crud/fast-crud';
+import {createCrudOptions} from './crud';
 
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
+const {crudBinding, crudRef, crudExpose} = useFs({createCrudOptions});
 
 // 页面打开后获取列表数据
 onMounted(() => {
-	crudExpose.doRefresh();
+    crudExpose.doRefresh();
 });
+
 </script>
diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index 1ed8a2c..95dcf75 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -1,7 +1,7 @@
 <template>
     <fs-page>
         <splitpanes>
-            <pane max-size="20" min-size="16" >
+            <pane max-size="20" min-size="16">
                 <el-card :body-style="{ height: '100%' }">
                     <p class="font-mono font-black text-center text-xl pb-5">
                         菜单列表
@@ -29,7 +29,7 @@
                     </el-tree>
                 </el-card>
             </pane>
-            <pane min-size="30" >
+            <pane min-size="30">
                 <el-card :body-style="{ height: '100%' }">
                     <el-form ref="formRef" :rules="rules" :model="form" label-width="80px"
                              label-position="right">
@@ -96,13 +96,13 @@
     </fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="menu">
 import {Splitpanes, Pane} from 'splitpanes';
 import 'splitpanes/dist/splitpanes.css';
 import * as api from './api';
 import * as menuButoonApi from './components/menuButton/api';
 import {ElForm, ElTree, FormRules, ElMessageBox} from 'element-plus';
-import {ref, onMounted, watch, reactive, toRaw, defineAsyncComponent, nextTick, shallowRef} from 'vue';
+import {ref, onMounted, watch, reactive, toRaw, defineAsyncComponent, nextTick, shallowRef, onActivated} from 'vue';
 import XEUtils from 'xe-utils';
 import {errorMessage, successMessage} from '../../../utils/message';
 
@@ -370,6 +370,9 @@ const drawerClose = () => {
 onMounted(() => {
     getData();
 });
+onActivated(() => {
+    console.log('keep-alive成功')
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/views/system/messageCenter/index.vue b/web/src/views/system/messageCenter/index.vue
index 4a9972b..54aec43 100644
--- a/web/src/views/system/messageCenter/index.vue
+++ b/web/src/views/system/messageCenter/index.vue
@@ -12,7 +12,7 @@
   </fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="messageCenter">
 import {ref, onMounted} from 'vue';
 import {useExpose, useCrud} from '@fast-crud/fast-crud';
 import {createCrudOptions} from './crud';
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 12c06d7..fafdb61 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -9,7 +9,7 @@
 	</fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="role">
 import { ref, onMounted } from 'vue';
 import { useExpose, useCrud, dict } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue
index 724d5a5..a46d241 100644
--- a/web/src/views/system/rolePermission/index.vue
+++ b/web/src/views/system/rolePermission/index.vue
@@ -1,154 +1,159 @@
 <template>
-  <el-drawer
-      size="70%"
-      v-model="drawer"
-      direction="rtl"
-      destroy-on-close
-      :before-close="handleClose"
-  >
-    <template #header>
-      <div>
-        <el-tag size="large" type="primary">当前角色:{{ editedRoleInfo.name }}</el-tag>
-      </div>
-    </template>
-    <div style="padding: 1em">
-      <el-row :gutter="10">
-        <el-col :xs="24" :sm="24" :md="8" :lg="6" :xl="6">
-          <el-card header="菜单页面授权">
-            <template #header>
-              <div class="card-header">
-                <el-tooltip effect="dark" content="点击菜单项,可对菜单下的按钮/接口授权" placement="right">
-                  <div>
-                    <span>菜单页面</span>
-                    <el-icon>
-                      <QuestionFilled/>
-                    </el-icon>
-                  </div>
-                </el-tooltip>
-                <el-button size="mini" type="primary" @click="onSaveAuth">保存菜单授权</el-button>
-              </div>
-            </template>
-            <el-tree :data="menuData"
-                     ref="menuTree"
-                     show-checkbox
-                     node-key="id"
-                     highlight-current
-                     :expand-on-click-node="false"
-                     :check-on-click-node="true"
-                     :props="defaultProps"
-                     @node-click="menuNodeClick"
-            />
-          </el-card>
-        </el-col>
-        <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="18">
-          <!--          <el-alert title="对页面菜单下按钮授权"  description="新增或删除对菜单下的按钮/接口授权" type="warning" />-->
-          <el-card v-if="isBtnPermissionShow">
-            <template #header>
-              <div class="card-header">
-                <el-tooltip effect="dark" content="新增或删除对菜单下的按钮/接口授权" placement="right">
-                  <div>
-                    <span>按钮/接口授权</span>
-                    <el-icon>
-                      <QuestionFilled/>
-                    </el-icon>
-                  </div>
-                </el-tooltip>
-              </div>
-            </template>
+    <el-drawer
+        size="70%"
+        v-model="drawer"
+        direction="rtl"
+        destroy-on-close
+        :before-close="handleClose"
+    >
+        <template #header>
             <div>
-              <el-divider content-position="left">{{ editedMenuInfo.name }}</el-divider>
-              <el-button type="primary" size="small" style="margin-bottom: 0.5em" @click="createBtnPermission">新增
-              </el-button>
-              <el-table size="small" :data="buttonPermissionData" border style="width: 100%">
-                <el-table-column prop="menu_button" label="权限名称" width="100">
-                  <template #default="scope">
-                    <div>{{ formatMenuBtn(scope.row.menu_button) }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="data_range" label="权限范围" width="140">
-                  <template #default="scope">
-                    <div>{{ formatDataRange(scope.row.data_range) }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dept" label="权限涉及部门"/>
-                <el-table-column fixed="right" label="操作" width="120">
-                  <template #default="scope">
-                    <el-button type="danger" size="small" @click="onDeleteBtn(scope)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
+                <el-tag size="large" type="primary">当前角色:{{ editedRoleInfo.name }}</el-tag>
             </div>
+        </template>
+        <div style="padding: 1em">
+            <el-row :gutter="10">
+                <el-col :xs="24" :sm="24" :md="8" :lg="6" :xl="6">
+                    <el-card header="菜单页面授权">
+                        <template #header>
+                            <div class="card-header">
+                                <el-tooltip effect="dark" content="点击菜单项,可对菜单下的按钮/接口授权"
+                                            placement="right">
+                                    <div>
+                                        <span>菜单页面</span>
+                                        <el-icon>
+                                            <QuestionFilled/>
+                                        </el-icon>
+                                    </div>
+                                </el-tooltip>
+                                <el-button size="mini" type="primary" @click="onSaveAuth">保存菜单授权</el-button>
+                            </div>
+                        </template>
+                        <el-tree :data="menuData"
+                                 ref="menuTree"
+                                 show-checkbox
+                                 node-key="id"
+                                 highlight-current
+                                 :expand-on-click-node="false"
+                                 :check-on-click-node="true"
+                                 :props="defaultProps"
+                                 @node-click="menuNodeClick"
+                        />
+                    </el-card>
+                </el-col>
+                <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="18">
+                    <!--          <el-alert title="对页面菜单下按钮授权"  description="新增或删除对菜单下的按钮/接口授权" type="warning" />-->
+                    <el-card v-if="isBtnPermissionShow">
+                        <template #header>
+                            <div class="card-header">
+                                <el-tooltip effect="dark" content="新增或删除对菜单下的按钮/接口授权" placement="right">
+                                    <div>
+                                        <span>按钮/接口授权</span>
+                                        <el-icon>
+                                            <QuestionFilled/>
+                                        </el-icon>
+                                    </div>
+                                </el-tooltip>
+                            </div>
+                        </template>
+                        <div>
+                            <el-divider content-position="left">{{ editedMenuInfo.name }}</el-divider>
+                            <el-button type="primary" size="small" style="margin-bottom: 0.5em"
+                                       @click="createBtnPermission">新增
+                            </el-button>
+                            <el-table size="small" :data="buttonPermissionData" border style="width: 100%">
+                                <el-table-column prop="menu_button" label="权限名称" width="100">
+                                    <template #default="scope">
+                                        <div>{{ formatMenuBtn(scope.row.menu_button) }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="data_range" label="权限范围" width="140">
+                                    <template #default="scope">
+                                        <div>{{ formatDataRange(scope.row.data_range) }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column prop="dept" label="权限涉及部门"/>
+                                <el-table-column fixed="right" label="操作" width="120">
+                                    <template #default="scope">
+                                        <el-button type="danger" size="small" @click="onDeleteBtn(scope)">删除
+                                        </el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
 
 
-            <!--          <el-divider content-position="left">字段授权</el-divider>-->
-            <!--          <el-table size="small" :data="crudPermissionData" border style="width: 100%">-->
-            <!--            <el-table-column prop="field" label="字段"></el-table-column>-->
-            <!--            <el-table-column prop="table" label="列表显示">-->
-            <!--              <template #default="scope">-->
-            <!--                <div>-->
-            <!--                  <el-switch size="mini" v-model="scope.row.table"/>-->
-            <!--                </div>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column prop="view" label="表单查看">-->
-            <!--              <template #default="scope">-->
-            <!--                <div>-->
-            <!--                  <el-switch size="mini" v-model="scope.row.view"/>-->
-            <!--                </div>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column prop="edit" label="表单编辑">-->
-            <!--              <template #default="scope">-->
-            <!--                <div>-->
-            <!--                  <el-switch size="mini" v-model="scope.row.edit"/>-->
-            <!--                </div>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <!--          </el-table>-->
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-dialog v-model="dialogFormVisible" width="400px" title="配置按钮权限">
-        <el-form ref="buttonFormRef" :model="buttonForm" :rules="buttonRules" label-width="120px">
-          <el-form-item label="按钮" prop="menu_button">
-            <el-select v-model="buttonForm.menu_button" placeholder="请选择按钮" @change="onChangeButton">
-              <el-option v-for="(item,index) in buttonOptions" :key="index" :label="item.name" :value="item.id"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="权限范围" prop="data_range">
-            <el-select v-model="buttonForm.data_range" placeholder="请选择按钮">
-              <el-option v-for="(item,index) in dataScopeOptions" :key="index" :label="item.label" :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="数据部门" prop="dept" v-show="buttonForm.data_range === 4">
-            <div class="dept-tree">
-              <el-tree
-                  :data="deptOptions"
-                  show-checkbox
-                  default-expand-all
-                  :default-checked-keys="deptCheckedKeys"
-                  ref="deptTree"
-                  node-key="id"
-                  :check-strictly="true"
-                  :props="{ label: 'name' }"
-              ></el-tree>
-            </div>
-          </el-form-item>
-        </el-form>
-        <template #footer>
+                        <!--          <el-divider content-position="left">字段授权</el-divider>-->
+                        <!--          <el-table size="small" :data="crudPermissionData" border style="width: 100%">-->
+                        <!--            <el-table-column prop="field" label="字段"></el-table-column>-->
+                        <!--            <el-table-column prop="table" label="列表显示">-->
+                        <!--              <template #default="scope">-->
+                        <!--                <div>-->
+                        <!--                  <el-switch size="mini" v-model="scope.row.table"/>-->
+                        <!--                </div>-->
+                        <!--              </template>-->
+                        <!--            </el-table-column>-->
+                        <!--            <el-table-column prop="view" label="表单查看">-->
+                        <!--              <template #default="scope">-->
+                        <!--                <div>-->
+                        <!--                  <el-switch size="mini" v-model="scope.row.view"/>-->
+                        <!--                </div>-->
+                        <!--              </template>-->
+                        <!--            </el-table-column>-->
+                        <!--            <el-table-column prop="edit" label="表单编辑">-->
+                        <!--              <template #default="scope">-->
+                        <!--                <div>-->
+                        <!--                  <el-switch size="mini" v-model="scope.row.edit"/>-->
+                        <!--                </div>-->
+                        <!--              </template>-->
+                        <!--            </el-table-column>-->
+                        <!--          </el-table>-->
+                    </el-card>
+                </el-col>
+            </el-row>
+            <el-dialog v-model="dialogFormVisible" width="400px" title="配置按钮权限">
+                <el-form ref="buttonFormRef" :model="buttonForm" :rules="buttonRules" label-width="120px">
+                    <el-form-item label="按钮" prop="menu_button">
+                        <el-select v-model="buttonForm.menu_button" placeholder="请选择按钮" @change="onChangeButton">
+                            <el-option v-for="(item,index) in buttonOptions" :key="index" :label="item.name"
+                                       :value="item.id"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="权限范围" prop="data_range">
+                        <el-select v-model="buttonForm.data_range" placeholder="请选择按钮">
+                            <el-option v-for="(item,index) in dataScopeOptions" :key="index" :label="item.label"
+                                       :value="item.value"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="数据部门" prop="dept" v-show="buttonForm.data_range === 4">
+                        <div class="dept-tree">
+                            <el-tree
+                                :data="deptOptions"
+                                show-checkbox
+                                default-expand-all
+                                :default-checked-keys="deptCheckedKeys"
+                                ref="deptTree"
+                                node-key="id"
+                                :check-strictly="true"
+                                :props="{ label: 'name' }"
+                            ></el-tree>
+                        </div>
+                    </el-form-item>
+                </el-form>
+                <template #footer>
       <span class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取消</el-button>
         <el-button type="primary" @click="onSaveButtonForm">
           确定
         </el-button>
       </span>
-        </template>
-      </el-dialog>
-    </div>
-  </el-drawer>
+                </template>
+            </el-dialog>
+        </div>
+    </el-drawer>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="rolePermission">
 import {ref, defineExpose, reactive, toRefs} from 'vue'
 import {ElMessageBox} from 'element-plus'
 import * as api from './api'
@@ -162,40 +167,40 @@ const editedRoleInfo = ref({})
 
 //抽屉关闭确认
 const handleClose = (done: () => void) => {
-  ElMessageBox.confirm('您确定要关闭?', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-      .then(() => {
-        done()
-      })
-      .catch(() => {
-        // catch error
-      })
+    ElMessageBox.confirm('您确定要关闭?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    })
+        .then(() => {
+            done()
+        })
+        .catch(() => {
+            // catch error
+        })
 }
 
 /*****菜单的配置项***/
 const defaultProps = {
-  children: 'children',
-  label: 'name',
-  isLeaf: 'hasChild'
+    children: 'children',
+    label: 'name',
+    isLeaf: 'hasChild'
 }
 
 interface Tree {
-  name: string
-  children?: Tree[],
-  id: number
+    name: string
+    children?: Tree[],
+    id: number
 }
 
 let menuData = ref<Tree>()
 //获取菜单
 const getMenuData = () => {
-  api.GetMenu({}).then((res: any) => {
-    const {data} = res
-    const list = XEUtils.toArrayTree(data, {parentKey: "parent", strict: true})
-    menuData.value = list
-  })
+    api.GetMenu({}).then((res: any) => {
+        const {data} = res
+        const list = XEUtils.toArrayTree(data, {parentKey: "parent", strict: true})
+        menuData.value = list
+    })
 }
 
 let isBtnPermissionShow = ref(false)
@@ -203,19 +208,19 @@ let buttonOptions = ref<[]>()
 let editedMenuInfo = ref()
 //菜单节点点击事件
 const menuNodeClick = (node: any, obj: any) => {
-  isBtnPermissionShow.value = !node.is_catalog
-  if (!node.is_catalog) {
-    buttonOptions.value = []
-    editedMenuInfo.value = node
-    api.GetMenuButton({menu: node.id}).then((res: any) => {
-      const {data} = res
-      buttonOptions.value = data
-    })
-    api.getObj({menu: node.id, role: editedRoleInfo.value.id}).then((res: any) => {
-      const {data} = res
-      buttonPermissionData.value = data
-    })
-  }
+    isBtnPermissionShow.value = !node.is_catalog
+    if (!node.is_catalog) {
+        buttonOptions.value = []
+        editedMenuInfo.value = node
+        api.GetMenuButton({menu: node.id}).then((res: any) => {
+            const {data} = res
+            buttonOptions.value = data
+        })
+        api.getObj({menu: node.id, role: editedRoleInfo.value.id}).then((res: any) => {
+            const {data} = res
+            buttonPermissionData.value = data
+        })
+    }
 
 }
 const menuTree = ref()
@@ -231,173 +236,173 @@ const deptOptions = ref()
 const deptCheckedKeys = []
 //按钮表单
 const buttonForm = reactive({
-  menu_button: null,
-  role: null,
-  menu: null,
-  data_range: null,
-  dept: []
+    menu_button: null,
+    role: null,
+    menu: null,
+    data_range: null,
+    dept: []
 })
 //按钮表格数据
 let buttonPermissionData = ref([])
 //按钮表单验证
 const buttonRules = reactive<FormRules>({
-  menu_button: [
-    {required: true, message: '必填项'}
-  ],
-  data_range: [
-    {required: true, message: '必填项'}
-  ]
+    menu_button: [
+        {required: true, message: '必填项'}
+    ],
+    data_range: [
+        {required: true, message: '必填项'}
+    ]
 })
 //新增按钮
 const buttonFormRef = ref<FormInstance>()
 const createBtnPermission = () => {
-  dialogFormVisible.value = true
-  buttonForm.menu_button = null
-  buttonForm.menu = null
-  buttonForm.role = null
-  buttonForm.data_range = null
-  buttonForm.dept = []
+    dialogFormVisible.value = true
+    buttonForm.menu_button = null
+    buttonForm.menu = null
+    buttonForm.role = null
+    buttonForm.data_range = null
+    buttonForm.dept = []
 }
 //权限范围数据
 const dataScopeOptions = ref<[]>()
 //按钮值变化事件
 const onChangeButton = (val: any) => {
-  dataScopeOptions.value = []
-  //获取权限值范围
-  api.GetDataScope({menu_button: val}).then((res: any) => {
-    dataScopeOptions.value = res.data
-  })
-  //获取权限部门值
-  api.GetDataScopeDept({menu_button: val}).then((res: any) => {
-    deptOptions.value = XEUtils.toArrayTree(res.data, {parentKey: 'parent', strict: false})
-  })
+    dataScopeOptions.value = []
+    //获取权限值范围
+    api.GetDataScope({menu_button: val}).then((res: any) => {
+        dataScopeOptions.value = res.data
+    })
+    //获取权限部门值
+    api.GetDataScopeDept({menu_button: val}).then((res: any) => {
+        deptOptions.value = XEUtils.toArrayTree(res.data, {parentKey: 'parent', strict: false})
+    })
 
 }
 //过滤按钮名称
 const formatMenuBtn = (val: any) => {
-  let obj: any = buttonOptions.value?.find((item: any) => {
-    return item.id === val
-  })
-  return obj ? obj.name : null
+    let obj: any = buttonOptions.value?.find((item: any) => {
+        return item.id === val
+    })
+    return obj ? obj.name : null
 }
 //过滤权限范围
 const formatDataRange = (val: any) => {
-  let obj: any = [
-    {
-      "value": 0,
-      "label": '仅本人数据权限'
-    },
-    {
-      "value": 1,
-      "label": '本部门及以下数据权限'
-    },
-    {
-      "value": 2,
-      "label": '本部门数据权限'
-    },
-    {
-      "value": 3,
-      "label": '全部数据权限'
-    },
-    {
-      "value": 4,
-      "label": '自定义数据权限'
-    }
-  ].find((item: any) => {
-    return item.value === val
-  })
-  return obj ? obj.label : null
+    let obj: any = [
+        {
+            "value": 0,
+            "label": '仅本人数据权限'
+        },
+        {
+            "value": 1,
+            "label": '本部门及以下数据权限'
+        },
+        {
+            "value": 2,
+            "label": '本部门数据权限'
+        },
+        {
+            "value": 3,
+            "label": '全部数据权限'
+        },
+        {
+            "value": 4,
+            "label": '自定义数据权限'
+        }
+    ].find((item: any) => {
+        return item.value === val
+    })
+    return obj ? obj.label : null
 }
 //保存按钮表单
 
 const onSaveButtonForm = async () => {
-  const {id: roleId} = editedRoleInfo.value
-  const {id: menuId} = editedMenuInfo.value
-  const form: any = Object.assign({}, buttonForm)
-  form.role = roleId
-  form.menu = menuId
-  //选中的部门
-  const checkedList = deptTree.value.getCheckedKeys()
-  form.dept = checkedList
-  if (!buttonFormRef.value) return
-  await buttonFormRef.value.validate((valid, fields) => {
-    if (valid) {
-      api.CreatePermission(form).then((res: any) => {
-        const {data} = res
-        buttonPermissionData.value.push(data)
-        dialogFormVisible.value = false
-        ElMessage({
-          type: 'success',
-          message: res.msg,
-        })
-      })
-    } else {
-      ElMessage({
-        type: 'error',
-        title: '提交错误',
-        message: 'F12控制台看详情',
-      })
-      console.log('提交错误', fields)
-    }
-  })
+    const {id: roleId} = editedRoleInfo.value
+    const {id: menuId} = editedMenuInfo.value
+    const form: any = Object.assign({}, buttonForm)
+    form.role = roleId
+    form.menu = menuId
+    //选中的部门
+    const checkedList = deptTree.value.getCheckedKeys()
+    form.dept = checkedList
+    if (!buttonFormRef.value) return
+    await buttonFormRef.value.validate((valid, fields) => {
+        if (valid) {
+            api.CreatePermission(form).then((res: any) => {
+                const {data} = res
+                buttonPermissionData.value.push(data)
+                dialogFormVisible.value = false
+                ElMessage({
+                    type: 'success',
+                    message: res.msg,
+                })
+            })
+        } else {
+            ElMessage({
+                type: 'error',
+                title: '提交错误',
+                message: 'F12控制台看详情',
+            })
+            console.log('提交错误', fields)
+        }
+    })
 
 }
 //删除按钮权限
 const onDeleteBtn = (scope: any) => {
-  const {row, $index} = scope
-  ElMessageBox.confirm(
-      '您是否要删除数据?',
-      '温馨提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-  ).then(() => {
-    api.DeletePermission({id: row.id}).then((res:any) => {
-      buttonPermissionData.value.splice($index, 1)
-      ElMessage({
-        type: 'success',
-        message: res.msg,
-      })
-    })
-  })
-      .catch(() => {
-        ElMessage({
-          type: 'info',
-          message: '取消删除',
+    const {row, $index} = scope
+    ElMessageBox.confirm(
+        '您是否要删除数据?',
+        '温馨提示',
+        {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        }
+    ).then(() => {
+        api.DeletePermission({id: row.id}).then((res: any) => {
+            buttonPermissionData.value.splice($index, 1)
+            ElMessage({
+                type: 'success',
+                message: res.msg,
+            })
+        })
+    })
+        .catch(() => {
+            ElMessage({
+                type: 'info',
+                message: '取消删除',
+            })
         })
-      })
 
 }
 /***按钮授权的弹窗****/
 //初始化数据
 const initGet = () => {
-  getMenuData()
+    getMenuData()
 }
 
 /**
  * 保存授权
  */
 const onSaveAuth = () => {
-  //选中的菜单
-  const checkedList = menuTree.value.getCheckedKeys()
-  //半选中的菜单
-  const halfCheckedList = menuTree.value.getHalfCheckedKeys()
-  //合并的菜单数据
-  const menuIdList = [...checkedList, ...halfCheckedList]
-  // console.log(menuIdList)
-  const {id: roleId} = editedRoleInfo.value
-  const data = {
-    role: roleId,
-    menu: menuIdList
-  }
-  api.SaveMenuPermission(data).then((res: any) => {
-    ElMessage({
-      message: res.msg,
-      type: 'success',
+    //选中的菜单
+    const checkedList = menuTree.value.getCheckedKeys()
+    //半选中的菜单
+    const halfCheckedList = menuTree.value.getHalfCheckedKeys()
+    //合并的菜单数据
+    const menuIdList = [...checkedList, ...halfCheckedList]
+    // console.log(menuIdList)
+    const {id: roleId} = editedRoleInfo.value
+    const data = {
+        role: roleId,
+        menu: menuIdList
+    }
+    api.SaveMenuPermission(data).then((res: any) => {
+        ElMessage({
+            message: res.msg,
+            type: 'success',
+        })
     })
-  })
 }
 
 
@@ -406,22 +411,22 @@ defineExpose({drawer, editedRoleInfo, initGet})
 
 <style scoped>
 .card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 
 .dept-tree::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
+    display: none; /* Chrome Safari */
 }
 
 .dept-tree {
-  height: 160px;
-  overflow-y: scroll;
-  scrollbar-width: none; /* firefox */
-  -ms-overflow-style: none; /* IE 10+ */
-  border: 1px solid #e1e1e1;
-  width: 16em;
-  border-radius: 2px;
+    height: 160px;
+    overflow-y: scroll;
+    scrollbar-width: none; /* firefox */
+    -ms-overflow-style: none; /* IE 10+ */
+    border: 1px solid #e1e1e1;
+    width: 16em;
+    border-radius: 2px;
 }
 </style>
diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue
index 28c0fbf..d0ac9d8 100644
--- a/web/src/views/system/user/index.vue
+++ b/web/src/views/system/user/index.vue
@@ -42,7 +42,7 @@
 	</fs-page>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="user">
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
 import * as api from './api';
diff --git a/web/src/views/system/whiteList/index.vue b/web/src/views/system/whiteList/index.vue
index 58c0331..561a063 100644
--- a/web/src/views/system/whiteList/index.vue
+++ b/web/src/views/system/whiteList/index.vue
@@ -1,18 +1,18 @@
 <template>
-	<fs-page>
-		<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-	</fs-page>
+    <fs-page>
+        <fs-crud ref="crudRef" v-bind="crudBinding"></fs-crud>
+    </fs-page>
 </template>
 
-<script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import { useFs } from '@fast-crud/fast-crud';
-import { createCrudOptions } from './crud';
+<script lang="ts" setup name="whiteList">
+import {ref, onMounted} from 'vue';
+import {useFs} from '@fast-crud/fast-crud';
+import {createCrudOptions} from './crud';
 
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
+const {crudBinding, crudRef, crudExpose} = useFs({createCrudOptions});
 
 // 页面打开后获取列表数据
 onMounted(() => {
-	crudExpose.doRefresh();
+    crudExpose.doRefresh();
 });
 </script>