diff --git a/apps/vue/src/locales/lang/en/routes/basic.ts b/apps/vue/src/locales/lang/en/routes/basic.ts index b6faa00ef..693e2394c 100644 --- a/apps/vue/src/locales/lang/en/routes/basic.ts +++ b/apps/vue/src/locales/lang/en/routes/basic.ts @@ -1,4 +1,6 @@ export default { login: 'Login', errorLogList: 'Error Log', + accountSetting: 'Account Setting', + accountCenter: 'Account Center' }; diff --git a/apps/vue/src/locales/lang/zh-CN/routes/basic.ts b/apps/vue/src/locales/lang/zh-CN/routes/basic.ts index 3d03e8ef1..85357ee33 100644 --- a/apps/vue/src/locales/lang/zh-CN/routes/basic.ts +++ b/apps/vue/src/locales/lang/zh-CN/routes/basic.ts @@ -1,4 +1,6 @@ export default { login: '登录', errorLogList: '错误日志列表', + accountSetting: '个人设置', + accountCenter: '个人中心' }; diff --git a/apps/vue/src/router/routes/basic.ts b/apps/vue/src/router/routes/basic.ts index 58db49448..01ad0504c 100644 --- a/apps/vue/src/router/routes/basic.ts +++ b/apps/vue/src/router/routes/basic.ts @@ -76,3 +76,38 @@ export const ERROR_LOG_ROUTE: AppRouteRecordRaw = { }, ], }; + +export const ACCOUNT_CENTER_ROUTE: AppRouteRecordRaw = { + path: '/account', + name: 'Account', + component: LAYOUT, + redirect: '/account/center', + meta: { + title: 'Account', + hideMenu: true, + ignoreAuth: true, + }, + children: [ + { + path: 'settings', + name: 'ASettings', + component: () => import('/@/views/account/setting/index.vue'), + meta: { + title: t('routes.basic.accountSetting'), + hideMenu: true, + ignoreAuth: true, + }, + }, + { + path: 'center', + name: 'ACenter', + component: () => import('/@/views/account/center/index.vue'), + meta: { + title: t('routes.basic.accountCenter'), + hideMenu: true, + ignoreAuth: true, + }, + }, + ], +}; + diff --git a/apps/vue/src/router/routes/index.ts b/apps/vue/src/router/routes/index.ts index 149ec42a0..a50217d46 100644 --- a/apps/vue/src/router/routes/index.ts +++ b/apps/vue/src/router/routes/index.ts @@ -1,6 +1,6 @@ import type { AppRouteRecordRaw, AppRouteModule } from '/@/router/types'; -import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '/@/router/routes/basic'; +import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE, ACCOUNT_CENTER_ROUTE } from '/@/router/routes/basic'; import { mainOutRoutes } from './mainOut'; import { PageEnum } from '/@/enums/pageEnum'; @@ -40,6 +40,7 @@ export const LoginRoute: AppRouteRecordRaw = { export const basicRoutes = [ LoginRoute, RootRoute, + ACCOUNT_CENTER_ROUTE, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, diff --git a/apps/vue/src/views/platform/dataDic/components/DataItemTable.vue b/apps/vue/src/views/platform/dataDic/components/DataItemTable.vue index 80697d4c4..0408e7c8f 100644 --- a/apps/vue/src/views/platform/dataDic/components/DataItemTable.vue +++ b/apps/vue/src/views/platform/dataDic/components/DataItemTable.vue @@ -104,7 +104,7 @@ }); }, handleAppendItem() { - this.openModal(true, {} as DataItem, true); + this.openModal(true, {}, true); }, handleEdit(record: Recordable) { // 克隆对象过去,解决清除表单值后再次编辑为空值 diff --git a/apps/vue/src/views/platform/dataDic/components/DataTree.vue b/apps/vue/src/views/platform/dataDic/components/DataTree.vue index 3af16b25b..f8dece6d0 100644 --- a/apps/vue/src/views/platform/dataDic/components/DataTree.vue +++ b/apps/vue/src/views/platform/dataDic/components/DataTree.vue @@ -23,7 +23,7 @@ diff --git a/apps/vue/src/views/platform/menu/hooks/useMenuFormContext.ts b/apps/vue/src/views/platform/menu/hooks/useMenuFormContext.ts index 22fa4d1c4..b2474f50f 100644 --- a/apps/vue/src/views/platform/menu/hooks/useMenuFormContext.ts +++ b/apps/vue/src/views/platform/menu/hooks/useMenuFormContext.ts @@ -23,7 +23,8 @@ export function useMenuFormContext({ menuModel, formElRef }: UseMenuFormContext) const { L } = useLocalization('AppPlatform'); function getMetaFormSchemas(meta: DataItem[]): TabFormSchema[] { - return meta.map((item) => { + return meta.sort((pre, next) => pre.name.localeCompare(next.name)) + .map((item) => { const schema: TabFormSchema = { tab: L('DisplayName:Meta'), field: 'meta.'.concat(item.name), @@ -31,6 +32,11 @@ export function useMenuFormContext({ menuModel, formElRef }: UseMenuFormContext) colProps: { span: 24 }, required: !item.allowBeNull, component: 'Input', + componentProps: { + style: { + width: '100%', + }, + } }; switch (item.valueType) { case ValueType.Boolean: @@ -46,7 +52,7 @@ export function useMenuFormContext({ menuModel, formElRef }: UseMenuFormContext) onChange: (e: ChangeEvent) => { model[field] = e.target.checked.toString(); }, - }); + }, () => item.displayName); }; break; case ValueType.Date: diff --git a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue new file mode 100644 index 000000000..018a7cdb7 --- /dev/null +++ b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue @@ -0,0 +1,120 @@ + + + diff --git a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue index c9467fc15..bb54fdc5c 100644 --- a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue +++ b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue @@ -26,6 +26,9 @@ +