Skip to content

Commit

Permalink
fix: 🐛 修复刷新页面后,选中菜单无法保持展开状态的问题
Browse files Browse the repository at this point in the history
1.父级菜单也必须存在 name 属性,父级菜单 name 属性,在很早之前曾考虑过移除,后来发现会引起
Bug,于是没有改动。但前段时间调整动态路由时没有想起该情况,一时疏忽移除了,所幸发现问题不晚,现在及时恢复回来
2.优化实时监控示例的相关变量命名
  • Loading branch information
Charles7c committed Sep 5, 2023
1 parent 10ca5d8 commit 3fc7adb
Show file tree
Hide file tree
Showing 31 changed files with 193 additions and 184 deletions.
4 changes: 2 additions & 2 deletions continew-admin-ui/src/locale/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import locale404 from '@/views/demo/exception/404/locale/en-US';
import locale500 from '@/views/demo/exception/500/locale/en-US';
import localeDataAnalysis from '@/views/demo/visualization/data-analysis/locale/en-US';
import localeMultiDAnalysis from '@/views/demo/visualization/multi-dimension-data-analysis/locale/en-US';
import localeMonitor from '@/views/demo/visualization/monitor/locale/en-US';
import localeRealTimeMonitor from '@/views/demo/visualization/real-time-monitor/locale/en-US';

import localeMessageBox from '@/components/message-box/locale/en-US';
import localeLogin from '@/views/login/locale/en-US';
Expand Down Expand Up @@ -80,7 +80,7 @@ export default {
...locale500,
...localeDataAnalysis,
...localeMultiDAnalysis,
...localeMonitor,
...localeRealTimeMonitor,

...localeMessageBox,
...localeLogin,
Expand Down
4 changes: 2 additions & 2 deletions continew-admin-ui/src/locale/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import locale404 from '@/views/demo/exception/404/locale/zh-CN';
import locale500 from '@/views/demo/exception/500/locale/zh-CN';
import localeDataAnalysis from '@/views/demo/visualization/data-analysis/locale/zh-CN';
import localeMultiDAnalysis from '@/views/demo/visualization/multi-dimension-data-analysis/locale/zh-CN';
import localeMonitor from '@/views/demo/visualization/monitor/locale/zh-CN';
import localeRealTimeMonitor from '@/views/demo/visualization/real-time-monitor/locale/zh-CN';

import localeMessageBox from '@/components/message-box/locale/zh-CN';
import localeLogin from '@/views/login/locale/zh-CN';
Expand Down Expand Up @@ -80,7 +80,7 @@ export default {
...locale500,
...localeDataAnalysis,
...localeMultiDAnalysis,
...localeMonitor,
...localeRealTimeMonitor,

...localeMessageBox,
...localeLogin,
Expand Down
2 changes: 1 addition & 1 deletion continew-admin-ui/src/mock/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import './message-box';

import '@/views/dashboard/workplace/mock';

import '@/views/demo/visualization/monitor/mock';
import '@/views/demo/visualization/real-time-monitor/mock';

import '@/views/demo/list/card/mock';
import '@/views/demo/list/search-table/mock';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const EXCEPTION: AppRouteRecordRaw = {
name: 'Exception',
path: '/demo/exception',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
1 change: 1 addition & 0 deletions continew-admin-ui/src/router/routes/modules/demo/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const FORM: AppRouteRecordRaw = {
name: 'Form',
path: '/demo/form',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
1 change: 1 addition & 0 deletions continew-admin-ui/src/router/routes/modules/demo/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const LIST: AppRouteRecordRaw = {
name: 'List',
path: '/demo/list',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const PROFILE: AppRouteRecordRaw = {
name: 'Profile',
path: '/demo/profile',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
1 change: 1 addition & 0 deletions continew-admin-ui/src/router/routes/modules/demo/result.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const RESULT: AppRouteRecordRaw = {
name: 'Result',
path: '/demo/result',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const VISUALIZATION: AppRouteRecordRaw = {
name: 'Visualization',
path: '/demo/visualization',
component: DEFAULT_LAYOUT,
meta: {
Expand Down Expand Up @@ -36,12 +37,12 @@ const VISUALIZATION: AppRouteRecordRaw = {
},
},
{
name: 'Monitor',
path: 'monitor',
name: 'RealTimeMonitor',
path: 'real-time-monitor',
component: () =>
import('@/views/demo/visualization/monitor/index.vue'),
import('@/views/demo/visualization/real-time-monitor/index.vue'),
meta: {
locale: 'menu.dashboard.monitor',
locale: 'menu.dashboard.realTimeMonitor',
requiresAuth: true,
roles: ['*'],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { DEFAULT_LAYOUT } from '../../base';
import { AppRouteRecordRaw } from '../../types';

const DASHBOARD: AppRouteRecordRaw = {
path: '/dashboard',
name: 'Dashboard',
path: '/dashboard',
component: DEFAULT_LAYOUT,
redirect: '/dashboard/workplace',
meta: {
Expand Down
1 change: 1 addition & 0 deletions continew-admin-ui/src/router/routes/modules/monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const Monitor: AppRouteRecordRaw = {
name: 'Monitor',
path: '/monitor',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
1 change: 1 addition & 0 deletions continew-admin-ui/src/router/routes/modules/system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const System: AppRouteRecordRaw = {
name: 'System',
path: '/system',
component: DEFAULT_LAYOUT,
meta: {
Expand Down
1 change: 1 addition & 0 deletions continew-admin-ui/src/router/routes/modules/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const Tool: AppRouteRecordRaw = {
name: 'Tool',
path: '/tool',
component: DEFAULT_LAYOUT,
meta: {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<a-card
class="general-card chat-panel"
:title="$t('monitor.title.chatPanel')"
:title="$t('realTimeMonitor.title.chatPanel')"
:bordered="false"
:header-style="{ paddingBottom: '0' }"
:body-style="{
Expand All @@ -14,11 +14,11 @@
<a-space :size="8">
<a-select style="width: 86px" default-value="all">
<a-option value="all">
{{ $t('monitor.chat.options.all') }}
{{ $t('realTimeMonitor.chat.options.all') }}
</a-option>
</a-select>
<a-input-search
:placeholder="$t('monitor.chat.placeholder.searchCategory')"
:placeholder="$t('realTimeMonitor.chat.placeholder.searchCategory')"
/>
<a-button type="text">
<icon-download />
Expand All @@ -36,7 +36,7 @@
<icon-face-smile-fill />
</template>
</a-Input>
<a-button type="primary">{{ $t('monitor.chat.update') }}</a-button>
<a-button type="primary">{{ $t('realTimeMonitor.chat.update') }}</a-button>
</a-space>
</div>
</a-card>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
:pagination="false"
/>
<a-typography-text type="secondary" class="data-statistic-list-tip">
{{ $t('monitor.list.tip.rotations') }} {{ data.length }}
{{ $t('monitor.list.tip.rest') }}
{{ $t('realTimeMonitor.list.tip.rotations') }} {{ data.length }}
{{ $t('realTimeMonitor.list.tip.rest') }}
</a-typography-text>
</div>
</template>
Expand Down Expand Up @@ -47,7 +47,7 @@
const renderTag = (status: number) => {
if (status === -1) {
return `<a-tag color="red" class='data-statistic-list-cover-tag'>
${t('monitor.list.tag.auditFailed')}
${t('realTimeMonitor.list.tag.auditFailed')}
</a-tag>`;
}
return '';
Expand All @@ -58,7 +58,7 @@
const columns = computed(() => {
return [
{
title: t('monitor.list.title.order'),
title: t('realTimeMonitor.list.title.order'),
render({
rowIndex,
}: {
Expand All @@ -71,7 +71,7 @@
},
},
{
title: t('monitor.list.title.cover'),
title: t('realTimeMonitor.list.title.cover'),
render({
record,
}: {
Expand All @@ -87,16 +87,16 @@
},
},
{
title: t('monitor.list.title.name'),
title: t('realTimeMonitor.list.title.name'),
dataIndex: 'name',
},
{
dataIndex: 'duration',
title: t('monitor.list.title.duration'),
title: t('realTimeMonitor.list.title.duration'),
},
{
dataIndex: 'id',
title: t('monitor.list.title.id'),
title: t('realTimeMonitor.list.title.id'),
},
];
});
Expand Down
Loading

0 comments on commit 3fc7adb

Please sign in to comment.