Skip to content

Commit 793b16e

Browse files
Azir-11honghuangdc
authored andcommitted
feat(projects): make branch main tiny & modify request retry times to 0
1 parent cf9fc7d commit 793b16e

File tree

40 files changed

+19
-3544
lines changed

40 files changed

+19
-3544
lines changed

build/plugins/router.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,6 @@ export function setupElegantRouter() {
88
base: 'src/layouts/base-layout/index.vue',
99
blank: 'src/layouts/blank-layout/index.vue'
1010
},
11-
customRoutes: {
12-
names: [
13-
'exception_403',
14-
'exception_404',
15-
'exception_500',
16-
'document_project',
17-
'document_project-link',
18-
'document_vue',
19-
'document_vite',
20-
'document_unocss',
21-
'document_naive',
22-
'document_antd'
23-
]
24-
},
2511
routePathTransformer(routeName, routePath) {
2612
const key = routeName as RouteKey;
2713

packages/axios/src/options.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function createDefaultOptions<ResponseData = any>(options?: Partial<Reque
2020

2121
export function createRetryOptions(config?: Partial<CreateAxiosDefaults>) {
2222
const retryConfig: IAxiosRetryConfig = {
23-
retries: 3
23+
retries: 0
2424
};
2525

2626
Object.assign(retryConfig, config);

src/constants/business.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/layouts/modules/global-header/components/user-avatar.vue

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function loginOrRegister() {
1818
toLogin();
1919
}
2020
21-
type DropdownKey = 'user-center' | 'logout';
21+
type DropdownKey = 'logout';
2222
2323
type DropdownOption =
2424
| {
@@ -33,15 +33,6 @@ type DropdownOption =
3333
3434
const options = computed(() => {
3535
const opts: DropdownOption[] = [
36-
{
37-
label: $t('common.userCenter'),
38-
key: 'user-center',
39-
icon: SvgIconVNode({ icon: 'ph:user-circle', fontSize: 18 })
40-
},
41-
{
42-
type: 'divider',
43-
key: 'divider'
44-
},
4536
{
4637
label: $t('common.logout'),
4738
key: 'logout',
@@ -68,6 +59,7 @@ function handleDropdown(key: DropdownKey) {
6859
if (key === 'logout') {
6960
logout();
7061
} else {
62+
// If your other options are jumps from other routes, they will be directly supported here
7163
routerPushByKey(key);
7264
}
7365
}

src/locales/langs/en-us.ts

Lines changed: 4 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const local: App.I18n.Schema = {
2323
deleteSuccess: 'Delete Success',
2424
confirmDelete: 'Are you sure you want to delete?',
2525
edit: 'Edit',
26+
warning: 'Warning',
2627
error: 'Error',
2728
index: 'Index',
2829
keywordSearch: 'Please enter keyword',
@@ -147,42 +148,7 @@ const local: App.I18n.Schema = {
147148
404: 'Page Not Found',
148149
500: 'Server Error',
149150
'iframe-page': 'Iframe',
150-
home: 'Home',
151-
document: 'Document',
152-
document_project: 'Project Document',
153-
'document_project-link': 'Project Document(External Link)',
154-
document_vue: 'Vue Document',
155-
document_vite: 'Vite Document',
156-
document_unocss: 'UnoCSS Document',
157-
document_naive: 'Naive UI Document',
158-
document_antd: 'Ant Design Vue Document',
159-
'user-center': 'User Center',
160-
about: 'About',
161-
function: 'System Function',
162-
function_tab: 'Tab',
163-
'function_multi-tab': 'Multi Tab',
164-
'function_hide-child': 'Hide Child',
165-
'function_hide-child_one': 'Hide Child',
166-
'function_hide-child_two': 'Two',
167-
'function_hide-child_three': 'Three',
168-
function_request: 'Request',
169-
'function_toggle-auth': 'Toggle Auth',
170-
'function_super-page': 'Super Admin Visible',
171-
manage: 'System Manage',
172-
manage_user: 'User Manage',
173-
'manage_user-detail': 'User Detail',
174-
manage_role: 'Role Manage',
175-
manage_menu: 'Menu Manage',
176-
'multi-menu': 'Multi Menu',
177-
'multi-menu_first': 'Menu One',
178-
'multi-menu_first_child': 'Menu One Child',
179-
'multi-menu_second': 'Menu Two',
180-
'multi-menu_second_child': 'Menu Two Child',
181-
'multi-menu_second_child_home': 'Menu Two Child Home',
182-
exception: 'Exception',
183-
exception_403: '403',
184-
exception_404: '404',
185-
exception_500: '500'
151+
home: 'Home'
186152
},
187153
page: {
188154
login: {
@@ -231,20 +197,9 @@ const local: App.I18n.Schema = {
231197
title: 'Bind WeChat'
232198
}
233199
},
234-
about: {
235-
title: 'About',
236-
introduction: `SoybeanAdmin is an elegant and powerful admin template, based on the latest front-end technology stack, including Vue3, Vite5, TypeScript, Pinia and UnoCSS. It has built-in rich theme configuration and components, strict code specifications, and an automated file routing system. In addition, it also uses the online mock data solution based on ApiFox. SoybeanAdmin provides you with a one-stop admin solution, no additional configuration, and out of the box. It is also a best practice for learning cutting-edge technologies quickly.`,
237-
projectInfo: {
238-
title: 'Project Info',
239-
version: 'Version',
240-
latestBuildTime: 'Latest Build Time',
241-
githubLink: 'Github Link',
242-
previewLink: 'Preview Link'
243-
},
244-
prdDep: 'Production Dependency',
245-
devDep: 'Development Dependency'
246-
},
247200
home: {
201+
branchDesc:
202+
'For the convenience of everyone in developing and updating the merge, we have streamlined the code of the main branch, only retaining the homepage menu, and the rest of the content has been moved to the example branch for maintenance. The preview address displays the content of the example branch.',
248203
greeting: 'Good morning, {userName}, today is another day full of vitality!',
249204
weatherDesc: 'Today is cloudy to clear, 20℃ - 25℃!',
250205
projectCount: 'Project Count',
@@ -270,163 +225,6 @@ const local: App.I18n.Schema = {
270225
desc5: 'Soybean just wrote some of the workbench pages casually, and it was enough to see!'
271226
},
272227
creativity: 'Creativity'
273-
},
274-
function: {
275-
tab: {
276-
tabOperate: {
277-
title: 'Tab Operation',
278-
addTab: 'Add Tab',
279-
addTabDesc: 'To about page',
280-
closeTab: 'Close Tab',
281-
closeCurrentTab: 'Close Current Tab',
282-
closeAboutTab: 'Close "About" Tab',
283-
addMultiTab: 'Add Multi Tab',
284-
addMultiTabDesc1: 'To MultiTab page',
285-
addMultiTabDesc2: 'To MultiTab page(with query params)'
286-
},
287-
tabTitle: {
288-
title: 'Tab Title',
289-
changeTitle: 'Change Title',
290-
change: 'Change',
291-
resetTitle: 'Reset Title',
292-
reset: 'Reset'
293-
}
294-
},
295-
multiTab: {
296-
routeParam: 'Route Param',
297-
backTab: 'Back function_tab'
298-
},
299-
toggleAuth: {
300-
toggleAccount: 'Toggle Account',
301-
authHook: 'Auth Hook Function `hasAuth`',
302-
superAdminVisible: 'Super Admin Visible',
303-
adminVisible: 'Admin Visible',
304-
adminOrUserVisible: 'Admin and User Visible'
305-
},
306-
request: {
307-
repeatedErrorOccurOnce: 'Repeated Request Error Occurs Once',
308-
repeatedError: 'Repeated Request Error',
309-
repeatedErrorMsg1: 'Custom Request Error 1',
310-
repeatedErrorMsg2: 'Custom Request Error 2'
311-
}
312-
},
313-
manage: {
314-
common: {
315-
status: {
316-
enable: 'Enable',
317-
disable: 'Disable'
318-
}
319-
},
320-
role: {
321-
title: 'Role List',
322-
roleName: 'Role Name',
323-
roleCode: 'Role Code',
324-
roleStatus: 'Role Status',
325-
roleDesc: 'Role Description',
326-
menuAuth: 'Menu Auth',
327-
buttonAuth: 'Button Auth',
328-
form: {
329-
roleName: 'Please enter role name',
330-
roleCode: 'Please enter role code',
331-
roleStatus: 'Please select role status',
332-
roleDesc: 'Please enter role description'
333-
},
334-
addRole: 'Add Role',
335-
editRole: 'Edit Role'
336-
},
337-
user: {
338-
title: 'User List',
339-
userName: 'User Name',
340-
userGender: 'Gender',
341-
nickName: 'Nick Name',
342-
userPhone: 'Phone Number',
343-
userEmail: 'Email',
344-
userStatus: 'User Status',
345-
userRole: 'User Role',
346-
form: {
347-
userName: 'Please enter user name',
348-
userGender: 'Please select gender',
349-
nickName: 'Please enter nick name',
350-
userPhone: 'Please enter phone number',
351-
userEmail: 'Please enter email',
352-
userStatus: 'Please select user status',
353-
userRole: 'Please select user role'
354-
},
355-
addUser: 'Add User',
356-
editUser: 'Edit User',
357-
gender: {
358-
male: 'Male',
359-
female: 'Female'
360-
}
361-
},
362-
menu: {
363-
home: 'Home',
364-
title: 'Menu List',
365-
id: 'ID',
366-
parentId: 'Parent ID',
367-
menuType: 'Menu Type',
368-
menuName: 'Menu Name',
369-
routeName: 'Route Name',
370-
routePath: 'Route Path',
371-
pathParam: 'Path Param',
372-
layout: 'Layout Component',
373-
page: 'Page Component',
374-
i18nKey: 'I18n Key',
375-
icon: 'Icon',
376-
localIcon: 'Local Icon',
377-
iconTypeTitle: 'Icon Type',
378-
order: 'Order',
379-
constant: 'Constant',
380-
keepAlive: 'Keep Alive',
381-
href: 'Href',
382-
hideInMenu: 'Hide In Menu',
383-
activeMenu: 'Active Menu',
384-
multiTab: 'Multi Tab',
385-
fixedIndexInTab: 'Fixed Index In Tab',
386-
query: 'Query Params',
387-
button: 'Button',
388-
buttonCode: 'Button Code',
389-
buttonDesc: 'Button Desc',
390-
menuStatus: 'Menu Status',
391-
form: {
392-
home: 'Please select home',
393-
menuType: 'Please select menu type',
394-
menuName: 'Please enter menu name',
395-
routeName: 'Please enter route name',
396-
routePath: 'Please enter route path',
397-
pathParam: 'Please enter path param',
398-
page: 'Please select page component',
399-
layout: 'Please select layout component',
400-
i18nKey: 'Please enter i18n key',
401-
icon: 'Please enter iconify name',
402-
localIcon: 'Please enter local icon name',
403-
order: 'Please enter order',
404-
keepAlive: 'Please select whether to cache route',
405-
href: 'Please enter href',
406-
hideInMenu: 'Please select whether to hide menu',
407-
activeMenu: 'Please select route name of the highlighted menu',
408-
multiTab: 'Please select whether to support multiple tabs',
409-
fixedInTab: 'Please select whether to fix in the tab',
410-
fixedIndexInTab: 'Please enter the index fixed in the tab',
411-
queryKey: 'Please enter route parameter Key',
412-
queryValue: 'Please enter route parameter Value',
413-
button: 'Please select whether it is a button',
414-
buttonCode: 'Please enter button code',
415-
buttonDesc: 'Please enter button description',
416-
menuStatus: 'Please select menu status'
417-
},
418-
addMenu: 'Add Menu',
419-
editMenu: 'Edit Menu',
420-
addChildMenu: 'Add Child Menu',
421-
type: {
422-
directory: 'Directory',
423-
menu: 'Menu'
424-
},
425-
iconType: {
426-
iconify: 'Iconify Icon',
427-
local: 'Local Icon'
428-
}
429-
}
430228
}
431229
},
432230
form: {

0 commit comments

Comments
 (0)