diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index b9f0e8ab..68ef1baa 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -226,11 +226,11 @@ const local: App.I18n.Schema = { 500: 'Server Error', 'iframe-page': 'Iframe', home: 'Home', - system: 'System', - system_conf: 'Configuration', - system_conf_dictionary: 'Dictionary', - system_rbac: 'Organization', - system_rbac_region: 'Region' + sys: 'System', + sys_core: 'Configuration', + sys_core_dictionary: 'Dictionary', + sys_rbac: 'Organization', + sys_rbac_region: 'Region' }, page: { login: { @@ -308,10 +308,19 @@ const local: App.I18n.Schema = { }, creativity: 'Creativity' }, - system: { - conf: { + sys: { + core: { dictionary: { - title: 'Dictionary' + title: 'Dictionary', + fields: { + id: 'ID', + name: 'Name', + code: 'Code', + type: 'string', + description: 'Description', + createTime: 'Create Time', + updateTime: 'Update Time' + } } }, rbac: { diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index b27356c3..abc16ccc 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -223,11 +223,11 @@ const local: App.I18n.Schema = { 500: '服务器错误', 'iframe-page': '外链页面', home: '首页', - system: '系统管理', - system_conf: '系统配置', - system_conf_dictionary: '数据字典', - system_rbac: '组织架构', - system_rbac_region: '行政区划' + sys: '系统管理', + sys_core: '系统配置', + sys_core_dictionary: '数据字典', + sys_rbac: '组织架构', + sys_rbac_region: '行政区划' }, page: { login: { @@ -305,10 +305,19 @@ const local: App.I18n.Schema = { }, creativity: '创意' }, - system: { - conf: { + sys: { + core: { dictionary: { - title: '数据字典' + title: '数据字典', + fields: { + id: 'ID', + name: '名称', + code: '代码', + type: '类型', + description: '描述', + createTime: '创建时间', + updateTime: '修改时间' + } } }, rbac: { diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index fc1e69ea..809a1ad0 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -21,6 +21,6 @@ export const views: Record Promise import("@/views/_builtin/iframe-page/[url].vue"), login: () => import("@/views/_builtin/login/index.vue"), home: () => import("@/views/home/index.vue"), - system_conf_dictionary: () => import("@/views/system/conf/dictionary/index.vue"), - system_rbac_region: () => import("@/views/system/rbac/region/index.vue"), + sys_core_dictionary: () => import("@/views/sys/core/dictionary/index.vue"), + sys_rbac_region: () => import("@/views/sys/rbac/region/index.vue"), }; diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 69360ad4..930da1c5 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -76,53 +76,53 @@ export const generatedRoutes: GeneratedRoute[] = [ } }, { - name: 'system', - path: '/system', + name: 'sys', + path: '/sys', component: 'layout.base', meta: { - title: 'system', - i18nKey: 'route.system', + title: 'sys', + i18nKey: 'route.sys', icon: 'mdi:laptop-windows', order: 20 }, children: [ { - name: 'system_conf', - path: '/system/conf', + name: 'sys_core', + path: '/sys/core', meta: { - title: 'system_conf', - i18nKey: 'route.system_conf', + title: 'sys_core', + i18nKey: 'route.sys_core', icon: 'ic:round-construction' }, children: [ { - name: 'system_conf_dictionary', - path: '/system/conf/dictionary', - component: 'view.system_conf_dictionary', + name: 'sys_core_dictionary', + path: '/sys/core/dictionary', + component: 'view.sys_core_dictionary', meta: { - title: 'system_conf_dictionary', - i18nKey: 'route.system_conf_dictionary', + title: 'sys_core_dictionary', + i18nKey: 'route.sys_core_dictionary', icon: 'ic:round-list-alt' } } ] }, { - name: 'system_rbac', - path: '/system/rbac', + name: 'sys_rbac', + path: '/sys/rbac', meta: { - title: 'system_rbac', - i18nKey: 'route.system_rbac', + title: 'sys_rbac', + i18nKey: 'route.sys_rbac', icon: 'ic:outline-account-tree' }, children: [ { - name: 'system_rbac_region', - path: '/system/rbac/region', - component: 'view.system_rbac_region', + name: 'sys_rbac_region', + path: '/sys/rbac/region', + component: 'view.sys_rbac_region', meta: { - title: 'system_rbac_region', - i18nKey: 'route.system_rbac_region', + title: 'sys_rbac_region', + i18nKey: 'route.sys_rbac_region', icon: 'mdi:home-city-outline' } } diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index 8fbdb928..f910959e 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -169,11 +169,11 @@ const routeMap: RouteMap = { "home": "/home", "iframe-page": "/iframe-page/:url", "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?", - "system": "/system", - "system_conf": "/system/conf", - "system_conf_dictionary": "/system/conf/dictionary", - "system_rbac": "/system/rbac", - "system_rbac_region": "/system/rbac/region" + "sys": "/sys", + "sys_core": "/sys/core", + "sys_core_dictionary": "/sys/core/dictionary", + "sys_rbac": "/sys/rbac", + "sys_rbac_region": "/sys/rbac/region" }; /** diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 08de509b..c6c0cc81 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -546,10 +546,19 @@ declare namespace App { }; creativity: string; }; - system: { - conf: { + sys: { + core: { dictionary: { title: string; + fields: { + id: string; + name: string; + code: string; + type: string; + description: string; + createTime: string; + updateTime: string; + }; }; }; rbac: { diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts index 546cd0e9..7600ea83 100644 --- a/src/typings/elegant-router.d.ts +++ b/src/typings/elegant-router.d.ts @@ -23,11 +23,11 @@ declare module "@elegant-router/types" { "home": "/home"; "iframe-page": "/iframe-page/:url"; "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?"; - "system": "/system"; - "system_conf": "/system/conf"; - "system_conf_dictionary": "/system/conf/dictionary"; - "system_rbac": "/system/rbac"; - "system_rbac_region": "/system/rbac/region"; + "sys": "/sys"; + "sys_core": "/sys/core"; + "sys_core_dictionary": "/sys/core/dictionary"; + "sys_rbac": "/sys/rbac"; + "sys_rbac_region": "/sys/rbac/region"; }; /** @@ -65,7 +65,7 @@ declare module "@elegant-router/types" { | "home" | "iframe-page" | "login" - | "system" + | "sys" >; /** @@ -88,8 +88,8 @@ declare module "@elegant-router/types" { | "iframe-page" | "login" | "home" - | "system_conf_dictionary" - | "system_rbac_region" + | "sys_core_dictionary" + | "sys_rbac_region" >; /** diff --git a/src/views/system/conf/dictionary/index.vue b/src/views/sys/core/dictionary/index.vue similarity index 85% rename from src/views/system/conf/dictionary/index.vue rename to src/views/sys/core/dictionary/index.vue index 8f4896b8..d9e2e7ce 100644 --- a/src/views/system/conf/dictionary/index.vue +++ b/src/views/sys/core/dictionary/index.vue @@ -5,7 +5,7 @@ import { $t } from '@/locales';