diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts index fe4ac229..c83bbbce 100644 --- a/src/hooks/common/table.ts +++ b/src/hooks/common/table.ts @@ -212,14 +212,15 @@ export function useTableOperate(data: Ref, return { drawerVisible, + openDrawer, + closeDrawer, operateType, handleAdd, editingData, handleEdit, checkedRowKeys, onBatchDeleted, - onDeleted, - closeDrawer + onDeleted }; } diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 3ffc7ebe..bd401528 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -319,8 +319,9 @@ const local: App.I18n.Schema = { menuName: 'Menu Name', routeName: 'Route Name', routePath: 'Route Path', - page: 'Page Component', + routeParams: 'Route Params', layout: 'Layout Component', + page: 'Page Component', i18nKey: 'I18n Key', icon: 'Icon', localIcon: 'Local Icon', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index d22501eb..e2b12c54 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -319,8 +319,9 @@ const local: App.I18n.Schema = { menuName: '菜单名称', routeName: '路由名称', routePath: '路由路径', - page: '页面组件', + routeParams: '路由参数', layout: '布局', + page: '页面组件', i18nKey: '国际化key', icon: '图标', localIcon: '本地图标', diff --git a/src/service/api/system-manage.ts b/src/service/api/system-manage.ts index 11891941..dca6d611 100644 --- a/src/service/api/system-manage.ts +++ b/src/service/api/system-manage.ts @@ -49,3 +49,11 @@ export function fetchGetMenuList() { method: 'get' }); } + +/** get all pages */ +export function fetchGetAllPages() { + return request({ + url: '/systemManage/getAllPages', + method: 'get' + }); +} diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 6dcf1ce0..9e93c562 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -502,8 +502,9 @@ declare namespace App { menuName: string; routeName: string; routePath: string; - page: string; + routeParams: string; layout: string; + page: string; i18nKey: string; icon: string; localIcon: string; @@ -524,8 +525,8 @@ declare namespace App { menuName: string; routeName: string; routePath: string; - page: string; layout: string; + page: string; i18nKey: string; icon: string; localIcon: string; diff --git a/src/typings/common.d.ts b/src/typings/common.d.ts index 2489bb22..06b526c9 100644 --- a/src/typings/common.d.ts +++ b/src/typings/common.d.ts @@ -14,7 +14,7 @@ declare namespace CommonType { * @property value: The option value * @property label: The option label */ - type Option = { value: K; label: string }; + type Option = { value: K; label: string }; type YesOrNo = 'Y' | 'N'; diff --git a/src/views/manage/menu/index.vue b/src/views/manage/menu/index.vue index c96fd2bd..f0f2cfd1 100644 --- a/src/views/manage/menu/index.vue +++ b/src/views/manage/menu/index.vue @@ -1,17 +1,21 @@