This commit is contained in:
@@ -28,9 +28,7 @@ export const useAuth = () => {
|
||||
|
||||
if (Array.isArray(permission)) {
|
||||
// 多个权限(满足任意一个即可)
|
||||
return permission.some(
|
||||
(perm) => userStore.hasPermission(perm) || userStore.hasButton(perm)
|
||||
)
|
||||
return permission.some((perm) => userStore.hasPermission(perm) || userStore.hasButton(perm))
|
||||
}
|
||||
|
||||
return false
|
||||
@@ -45,9 +43,7 @@ export const useAuth = () => {
|
||||
if (!permissions || !Array.isArray(permissions)) return false
|
||||
|
||||
// 需要全部满足
|
||||
return permissions.every(
|
||||
(perm) => userStore.hasPermission(perm) || userStore.hasButton(perm)
|
||||
)
|
||||
return permissions.every((perm) => userStore.hasPermission(perm) || userStore.hasButton(perm))
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -94,7 +94,10 @@ export function useCheckedColumns(columnsFactory: () => ColumnOption[]) {
|
||||
|
||||
cols.forEach((column) => {
|
||||
// 为普通列添加空值处理
|
||||
if (!column.type || (column.type !== 'selection' && column.type !== 'expand' && column.type !== 'index')) {
|
||||
if (
|
||||
!column.type ||
|
||||
(column.type !== 'selection' && column.type !== 'expand' && column.type !== 'index')
|
||||
) {
|
||||
const originalFormatter = column.formatter
|
||||
|
||||
// 包装原有的 formatter,在其基础上添加空值处理
|
||||
|
||||
@@ -21,12 +21,7 @@ export function useTableContextMenu() {
|
||||
/**
|
||||
* 单元格鼠标进入事件处理
|
||||
*/
|
||||
const handleCellMouseEnter = (
|
||||
row: any,
|
||||
column: any,
|
||||
cell: HTMLElement,
|
||||
event: MouseEvent
|
||||
) => {
|
||||
const handleCellMouseEnter = (row: any, column: any, cell: HTMLElement, event: MouseEvent) => {
|
||||
// 清除之前的定时器
|
||||
if (hintTimer) {
|
||||
clearTimeout(hintTimer)
|
||||
|
||||
Reference in New Issue
Block a user