renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/0902_antd组件替换' into test

Browse Source 
# Conflicts:
#	src/App.vue
#	src/components/common-select/index.vue
#	src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue
#	src/views/components/login/index.vue
#	src/views/home/components/history-conversation-drawer/index.vue
#	src/views/login/style.scss
#	src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
This commit is contained in:
rd
2025-09-10 16:13:54 +08:00
parent 55dfa8d8f7 98e6d1194d
commit 2ddc552213
233 changed files with 5624 additions and 6240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/stores/modules/app/index.ts
View File

@ -3,7 +3,7 @@
* @Date: 2025-06-23 03:56:22
*/
import { defineStore } from 'pinia';
import type { AppState, RouteRecordNormalized, NotificationReturn } from './types';
import type { AppState, RouteRecordNormalized } from './types';
import defaultSettings from '@/config/settings.json';
import type { AppRouteRecordRaw } from '@/router/routes/types';

3
src/stores/modules/app/types.ts
View File

@ -1,8 +1,7 @@
import type { RouteRecordNormalized } from 'vue-router';
import type { NotificationReturn } from '@arco-design/web-vue/es/notification/interface';
import type { AppRouteRecordRaw } from '@/router/routes/types';
export { RouteRecordNormalized, NotificationReturn };
export { RouteRecordNormalized };
export interface AppState {
theme: string;