From f6209b947670d0fb83dfa9138fb524cae6edf291 Mon Sep 17 00:00:00 2001 From: yaoyn Date: Wed, 29 May 2024 09:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BD=93=E7=BB=84=E4=BB=B6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6=E9=83=A8=E9=97=A8=20tab=E6=A0=87=E9=A2=98=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BA=BF=E5=90=8D=E7=A7=B0=E5=8F=AF=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=20=E8=A1=A8=E5=8D=95=E6=B5=81=E7=A8=8B=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E8=B7=B3=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateCodeStep/src/ViewDesignStep.vue | 29 +++++++-------- .../Form/src/components/CommonInfo.vue | 12 ++++--- .../FormTable/src/hooks/useColumns.ts | 2 +- src/components/Table/src/hooks/useColumns.ts | 2 +- src/hooks/web/useTitle.ts | 3 +- .../default/tabs/components/TabContent.vue | 3 +- src/model/generator/listConfig.ts | 2 ++ src/router/routes/basic.ts | 10 +++--- src/utils/helper/generatorHelper.ts | 35 ++++++++++++------- .../components/ViewDesignStep.vue | 29 +++++++-------- src/views/secondDev/createFlow.vue | 6 ++++ .../database/components/CreateModal.vue | 29 +++++++-------- .../components/parameters/FormTargetItem.vue | 8 +++++ .../workflow/design/bpmn/config/property.ts | 11 +++--- .../design/bpmn/config/propertyConfig.ts | 6 ++-- src/views/workflow/design/bpmn/index.vue | 4 +-- 16 files changed, 113 insertions(+), 78 deletions(-) diff --git a/src/components/CreateCodeStep/src/ViewDesignStep.vue b/src/components/CreateCodeStep/src/ViewDesignStep.vue index 8355535..2d6265d 100644 --- a/src/components/CreateCodeStep/src/ViewDesignStep.vue +++ b/src/components/CreateCodeStep/src/ViewDesignStep.vue @@ -647,6 +647,21 @@ generatorConfig.listConfig.buttonConfigs.length === 0 ) { generatorConfig.listConfig.buttonConfigs = [ + { + isUse: true, + name: t('新增'), + code: 'add', + icon: 'ant-design:plus-outlined', + isDefault: true, + type: 'primary' + }, + { + isUse: true, + name: t('编辑'), + code: 'edit', + icon: 'ant-design:form-outlined', + isDefault: true, + }, { isUse: true, name: t('刷新'), @@ -661,20 +676,6 @@ icon: 'ant-design:eye-outlined', isDefault: true, }, - { - isUse: true, - name: t('新增'), - code: 'add', - icon: 'ant-design:plus-outlined', - isDefault: true, - }, - { - isUse: true, - name: t('编辑'), - code: 'edit', - icon: 'ant-design:form-outlined', - isDefault: true, - }, { isUse: true, name: t('删除'), diff --git a/src/components/Form/src/components/CommonInfo.vue b/src/components/Form/src/components/CommonInfo.vue index ee52086..ea06b22 100644 --- a/src/components/Form/src/components/CommonInfo.vue +++ b/src/components/Form/src/components/CommonInfo.vue @@ -41,13 +41,15 @@ import {inject, ref, watchEffect} from 'vue'; if (props && props.value) { //当前用户 if (props.infoType === 0) { - let deptId=formModel![props.deptField]; - let deptName=deptId?await getDepartment(deptId):""; + const deptId=formModel?.[props.deptField]; + const dept=deptId?await getDepartment(deptId):null; + const deptName=dept?.name||""; //判断传入的值 是不是当前登录人 或需要二次加载 就不需要发请求获取用户信息了 if (props.value === userStore.getUserInfo.id || props.loadAgain) { name.value = userStore.getUserInfo.name+(props.userNameWithDepartment&&(deptName||userStore.getUserInfo.departmentName)?("/"+(deptName||userStore.getUserInfo.departmentName)):""); emit('update:value', userStore.getUserInfo.id); } else { + name.value = props.value; //如果不是当前登陆人 需要用户id 查询当前用户信息 const userInfo = await getUser(props.value); name.value = userInfo.name; @@ -61,6 +63,7 @@ import {inject, ref, watchEffect} from 'vue'; name.value = userStore.getUserInfo.departmentName; emit('update:value', userStore.getUserInfo.departmentId); } else { + name.value = props.value; //如果不是当前登陆人 需要用户id 查询当前用户信息 const dept = await getDepartment(props.value); name.value = dept.name; @@ -78,8 +81,9 @@ import {inject, ref, watchEffect} from 'vue'; } else { //当前用户 if (props.infoType === 0) { - let deptId=formModel![props.deptField]; - let deptName=deptId?await getDepartment(deptId):""; + const deptId=formModel?.[props.deptField]; + const dept=deptId?await getDepartment(deptId):null; + const deptName=dept?.name||""; //判断传入的值 是不是当前登录人 就不需要发请求获取用户信息了 name.value = userStore.getUserInfo.name+(props.userNameWithDepartment&&(deptName||userStore.getUserInfo.departmentName)?("/"+(deptName||userStore.getUserInfo.departmentName)):""); emit('update:value', userStore.getUserInfo.id); diff --git a/src/components/FormTable/src/hooks/useColumns.ts b/src/components/FormTable/src/hooks/useColumns.ts index 911c616..eb26646 100644 --- a/src/components/FormTable/src/hooks/useColumns.ts +++ b/src/components/FormTable/src/hooks/useColumns.ts @@ -67,7 +67,7 @@ function handleIndexColumn( flag: INDEX_COLUMN_FLAG, width: 50, title: t('序号'), - align: 'center', + align: 'right', customRender: ({ index }) => { const getPagination = unref(getPaginationRef); if (isBoolean(getPagination)) { diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts index 32e18f7..5c108dd 100644 --- a/src/components/Table/src/hooks/useColumns.ts +++ b/src/components/Table/src/hooks/useColumns.ts @@ -67,7 +67,7 @@ function handleIndexColumn( flag: INDEX_COLUMN_FLAG, width: 50, title: t('序号'), - align: 'center', + align: 'right', customRender: ({ index }) => { const getPagination = unref(getPaginationRef); if (isBoolean(getPagination)) { diff --git a/src/hooks/web/useTitle.ts b/src/hooks/web/useTitle.ts index 46517ca..bed310c 100644 --- a/src/hooks/web/useTitle.ts +++ b/src/hooks/web/useTitle.ts @@ -27,7 +27,8 @@ export function useTitle() { return; } - const tTitle = t(route?.meta?.title as string); + const metaTitle=typeof route?.meta?.title=='function'?route.meta.title(route):route?.meta?.title; + const tTitle = t(metaTitle); pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; diff --git a/src/layouts/default/tabs/components/TabContent.vue b/src/layouts/default/tabs/components/TabContent.vue index aa6aef3..79eb152 100644 --- a/src/layouts/default/tabs/components/TabContent.vue +++ b/src/layouts/default/tabs/components/TabContent.vue @@ -45,7 +45,8 @@ const getTitle = computed(() => { const tabItem = props.tabItem as any; const meta = tabItem.meta || {}; - return tabItem.tabTitle || (meta && t(meta.title as string)); + const metaTitle=typeof meta?.title=='function'?meta.title(tabItem):meta?.title; + return tabItem.tabTitle || (meta && t(metaTitle as string)); }); const getIsTabs = computed(() => !props.isExtra); diff --git a/src/model/generator/listConfig.ts b/src/model/generator/listConfig.ts index 4917f12..4757466 100644 --- a/src/model/generator/listConfig.ts +++ b/src/model/generator/listConfig.ts @@ -126,6 +126,8 @@ export interface ButtonConfig { icon: string; //是否新增 isDefault: boolean; + //按钮类型 + type: string; } /** diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts index e40e01c..0de6e4c 100644 --- a/src/router/routes/basic.ts +++ b/src/router/routes/basic.ts @@ -138,7 +138,7 @@ export const FLOW_ROUTE: AppRouteRecordRaw[] = [{ name: 'CreateFlow', component: () => import('/@/views/secondDev/createFlow.vue'), meta: { - title: '新建流程' + title: (route) => '新建'+(route.query.formName||'流程') } }, { @@ -146,7 +146,7 @@ export const FLOW_ROUTE: AppRouteRecordRaw[] = [{ name: 'ApproveFlow', component: () => import('/@/views/secondDev/approveFlowPage.vue'), meta: { - title: '审批流程' + title: (route) => '审批'+(route.query.formName||'流程') } } ] @@ -197,7 +197,7 @@ export const FLOW_ROUTE: AppRouteRecordRaw[] = [{ name: 'createForm', component: () => import('/@/views/secondDev/formCreatePage.vue'), meta: { - title: '新建表单' + title: (route) => '新建'+(route.query.formName||'表单') } }, { @@ -205,7 +205,7 @@ export const FLOW_ROUTE: AppRouteRecordRaw[] = [{ name: 'updateForm', component: () => import('/@/views/secondDev/formCreatePage.vue'), meta: { - title: '更新表单' + title: (route) => '更新'+(route.query.formName||'表单') } }, { @@ -213,7 +213,7 @@ export const FLOW_ROUTE: AppRouteRecordRaw[] = [{ name: 'viewForm', component: () => import('/@/views/secondDev/formCreatePage.vue'), meta: { - title: '查看表单' + title: (route) => '查看'+(route.query.formName||'表单') } } ] diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index 0fc7e49..1167b13 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -534,11 +534,11 @@ export function buildListCode(model: GeneratorConfig): string { }