fix: 下拉展开取消悬浮,支持点击

This commit is contained in:
TsMask
2024-04-10 19:52:12 +08:00
parent 070f77d3b8
commit 6ba695ceaf
9 changed files with 26 additions and 26 deletions

View File

@@ -107,7 +107,7 @@ function fnChangeLocale(e: any) {
<a-dropdown
placement="bottom"
:trigger="['click', 'hover']"
trigger="click"
v-if="appStore.i18nOpen && hasPermissions(['system:setting:i18n'])"
>
<a-button size="small" type="default">
@@ -123,7 +123,7 @@ function fnChangeLocale(e: any) {
</template>
</a-dropdown>
<a-dropdown placement="bottomRight" :trigger="['click', 'hover']">
<a-dropdown placement="bottomRight" trigger="click">
<div class="user">
<a-avatar
shape="circle"

View File

@@ -95,7 +95,7 @@ function fnTabClose(path: string) {
/**
* 国际化翻译转换
*/
function fnLocale(title: string) {
function fnLocale(title: string) {
if (title.indexOf('router.') !== -1) {
title = t(title);
}
@@ -150,7 +150,7 @@ watch(router.currentRoute, v => tabsStore.tabOpen(v), { immediate: true });
</a-tooltip>
<a-tooltip placement="topRight">
<template #title>{{ t('loayouts.tabs.more') }}</template>
<a-dropdown :trigger="['click', 'hover']" placement="bottomRight">
<a-dropdown trigger="click" placement="bottomRight">
<a-button type="ghost" shape="circle" size="small">
<template #icon><DownOutlined /></template>
</a-button>

View File

@@ -227,7 +227,11 @@ function fnGetList(pageNum?: number) {
}
tablePagination.total = res.total;
tableState.data = res.rows;
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
if (
tablePagination.total <=
(queryParams.pageNum - 1) * tablePagination.pageSize &&
queryParams.pageNum !== 1
) {
tableState.loading = false;
fnGetList(queryParams.pageNum - 1);
}

View File

@@ -141,7 +141,11 @@ function fnGetList(pageNum?: number) {
}
tablePagination.total = res.total;
tableState.data = res.rows;
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
if (
tablePagination.total <=
(queryParams.pageNum - 1) * tablePagination.pageSize &&
queryParams.pageNum !== 1
) {
tableState.loading = false;
fnGetList(queryParams.pageNum - 1);
}

View File

@@ -913,10 +913,7 @@ onMounted(() => {
</a-tooltip>
<a-tooltip placement="left">
<template #title>{{ t('common.moreText') }}</template>
<a-dropdown
placement="bottomRight"
:trigger="['hover', 'click']"
>
<a-dropdown placement="bottomRight" trigger="click">
<a-button type="link">
<template #icon><EllipsisOutlined /> </template>
</a-button>

View File

@@ -892,10 +892,7 @@ onMounted(() => {
</a-tooltip>
<a-tooltip placement="left">
<template #title>{{ t('common.moreText') }}</template>
<a-dropdown
placement="bottomRight"
:trigger="['hover', 'click']"
>
<a-dropdown placement="bottomRight" trigger="click">
<a-button type="link">
<template #icon><EllipsisOutlined /> </template>
</a-button>

View File

@@ -311,7 +311,7 @@ function fnClickHelpDoc(language?: string) {
v-if="appStore.i18nOpen"
>
<a-col :offset="18" :span="6">
<a-dropdown :trigger="['click', 'hover']">
<a-dropdown trigger="click">
<a-button size="small" type="default">
{{ t('i18n') }}
<DownOutlined />

View File

@@ -228,7 +228,11 @@ function fnGetList(pageNum?: number) {
}
tablePagination.total = res.total;
tableState.data = res.rows;
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
if (
tablePagination.total <=
(queryParams.pageNum - 1) * tablePagination.pageSize &&
queryParams.pageNum !== 1
) {
tableState.loading = false;
fnGetList(queryParams.pageNum - 1);
}
@@ -490,8 +494,8 @@ function fnModalVisibleByEdit(id?: string) {
}
modalState.neType = [res.data.neType, JSON.parse(res.data.neIds)[0]];
fnSelectPerformanceInit(res.data.neType) //初始性能测量数据
modalState.from.neId=JSON.parse(res.data.neIds)[0];
fnSelectPerformanceInit(res.data.neType); //初始性能测量数据
modalState.from.neId = JSON.parse(res.data.neIds)[0];
modalState.timeRangePicker = [res.data.startTime, res.data.endTime];
modalState.from = Object.assign(modalState.from, res.data);
@@ -849,10 +853,7 @@ onMounted(() => {
</a-tooltip>
<a-tooltip>
<template #title>{{ t('common.moreText') }}</template>
<a-dropdown
placement="bottomRight"
:trigger="['hover', 'click']"
>
<a-dropdown placement="bottomRight" trigger="click">
<a-button type="link">
<template #icon><EllipsisOutlined /> </template>
</a-button>

View File

@@ -353,10 +353,7 @@ function fnTabClose(id: string) {
<template #title>
{{ t('views.tool.terminal.more') }}
</template>
<a-dropdown
:trigger="['click', 'hover']"
placement="bottomRight"
>
<a-dropdown trigger="click" placement="bottomRight">
<a-button type="ghost" shape="circle">
<template #icon><EllipsisOutlined /></template>
</a-button>