From b43008691633eebb541e4b241d2d286329b7c308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Wed, 15 Mar 2023 23:39:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=F0=9F=90=9B=20=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

菜单管理的按钮配置
---
 web/src/views/system/menu/components/menuButton/curd.tsx | 6 ------
 .../views/system/menu/components/menuButton/index.vue    | 7 ++++---
 web/src/views/system/menu/crud.tsx                       | 9 ++++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/web/src/views/system/menu/components/menuButton/curd.tsx b/web/src/views/system/menu/components/menuButton/curd.tsx
index d3cd886..40ed2b6 100644
--- a/web/src/views/system/menu/components/menuButton/curd.tsx
+++ b/web/src/views/system/menu/components/menuButton/curd.tsx
@@ -52,12 +52,6 @@ export const createCrudOptions = function ({
                         align: 'center',
                         width: '70px',
                         columnSetDisabled: true, //禁止在列设置中选择
-                        formatter: (context) => {
-                            //计算序号,你可以自定义计算规则，此处为翻页累加
-                            let index = context.index ?? 1;
-                            let pagination = crudExpose.crudBinding.value.pagination;
-                            return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
-                        },
                     },
                 },
                 search: {
diff --git a/web/src/views/system/menu/components/menuButton/index.vue b/web/src/views/system/menu/components/menuButton/index.vue
index d6bb14b..4e58964 100644
--- a/web/src/views/system/menu/components/menuButton/index.vue
+++ b/web/src/views/system/menu/components/menuButton/index.vue
@@ -11,11 +11,12 @@
         <el-tag>{{ selectOptions.name }}</el-tag>
       </div>
     </template>
-    <div style="position: relative">
-      <fs-page>
+    <div>
+      <fs-page style="margin-top: 60px;">
         <fs-crud ref="crudRef" v-bind="crudBinding">
         </fs-crud>
       </fs-page>
+
     </div>
   </el-drawer>
 </template>
@@ -29,7 +30,7 @@ import * as api from './api'
 // 弹窗是否显示
 const drawer = ref(false)
 // 当前选择的菜单信息
-const selectOptions = ref({name:null})
+const selectOptions:any = ref({name:null})
 
 //抽屉关闭确认
 const handleClose = (done: () => void) => {
diff --git a/web/src/views/system/menu/crud.tsx b/web/src/views/system/menu/crud.tsx
index c37516c..48c4c46 100644
--- a/web/src/views/system/menu/crud.tsx
+++ b/web/src/views/system/menu/crud.tsx
@@ -3,8 +3,7 @@ import { dict, PageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudOptions } fro
 import { dictionary } from '/@/utils/dictionary';
 import { eIconPicker, eIcon } from 'e-icon-picker';
 import { useCompute } from '@fast-crud/fast-crud';
-import { inject } from 'vue';
-import { functions } from 'lodash-es';
+import { inject,computed } from 'vue';
 import { apiPrefix as menuPrefix } from './api';
 import XEUtils from 'xe-utils';
 import { request } from '/@/utils/service';
@@ -93,10 +92,10 @@ export const createCrudOptions = function ({ crudExpose, menuButtonRef }: { crud
 							content: '按钮配置',
 						},
 						show: compute(({ row }: any) => {
-							if (row.web_path && !row.is_link) {
-								return true && hasPermissions();
+							if (row.is_catalog) {
+								return false;
 							}
-							return false;
+							return true;
 						}),
 						click: (context: any): void => {
 							const { row } = context;