From 363789d22787206581573728efb5380a5e7dabb6 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Mon, 3 Mar 2025 16:11:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AEdetail=20=E5=BF=BD=E7=95=A5detail=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/helper/generatorHelper.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index fb79b06..a48d5d6 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -434,7 +434,7 @@ export function buildListCode(model: GeneratorConfig): string { }); let btnEvent = `{`; model.listConfig.buttonConfigs - .filter((x) => x.isUse && x.isDefault) + .filter((x) => x.isUse && x.isDefault && x.code != 'detail') .forEach((x) => { btnEvent += `${x.code} : handle${upperFirst(x.code)},`; }); @@ -451,6 +451,11 @@ export function buildListCode(model: GeneratorConfig): string { buttonConfigs.push(item); return; } + if (item.code === 'detail') { + //detail按钮 只作为权限处理 + buttonConfigs.splice(index, 1); + return; + } }); const hasAddButton = hasButton(buttonConfigs, 'add'); const hasEditButton = hasButton(buttonConfigs, 'edit'); From 8b38cd8a0c9672dbd50050bba87e8b9d67aef1f8 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Mon, 3 Mar 2025 18:01:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=9D=83=E9=99=90=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=201.=20detail=20list=20=E7=A1=AC=E5=A1=9E=E8=BF=9Bmen?= =?UTF-8?q?u=E2=80=94=E2=80=94button=202.=E6=A8=A1=E6=9D=BF=20controller?= =?UTF-8?q?=20page=20=E5=92=8Clist=20=E6=9D=83=E9=99=90=E6=94=B9=E6=88=90?= =?UTF-8?q?=20:list=203.=20list=20index=20=E7=9A=84=E5=8F=8C=E5=87=BB?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=20=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8Cview?= =?UTF-8?q?=20button=20=E6=9D=A5return=20=E8=A1=A5=E5=85=A8=E6=97=A7?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6.=20=E5=89=8D=E7=AB=AF=20button=20configs=20l?= =?UTF-8?q?ist=E5=88=A0=E9=99=A4detail=20=EF=BC=8C=20=E4=BB=8A=E5=A4=A9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=83=A8=E5=88=86=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CreateCodeStep/src/ViewDesignStep.vue | 7 ------- src/utils/helper/generatorHelper.ts | 10 ++++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/components/CreateCodeStep/src/ViewDesignStep.vue b/src/components/CreateCodeStep/src/ViewDesignStep.vue index 75c154d..b2c95ad 100644 --- a/src/components/CreateCodeStep/src/ViewDesignStep.vue +++ b/src/components/CreateCodeStep/src/ViewDesignStep.vue @@ -683,13 +683,6 @@ icon: 'ant-design:delete-outlined', isDefault: true, }, - { - isUse: true, - name: t('查看详情'), - code: 'detail', - icon: 'ant-design:eye-outlined', - isDefault: true, - }, { isUse: false, name: t('批量删除'), diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index a48d5d6..01d54eb 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -434,7 +434,7 @@ export function buildListCode(model: GeneratorConfig): string { }); let btnEvent = `{`; model.listConfig.buttonConfigs - .filter((x) => x.isUse && x.isDefault && x.code != 'detail') + .filter((x) => x.isUse && x.isDefault) .forEach((x) => { btnEvent += `${x.code} : handle${upperFirst(x.code)},`; }); @@ -451,11 +451,6 @@ export function buildListCode(model: GeneratorConfig): string { buttonConfigs.push(item); return; } - if (item.code === 'detail') { - //detail按钮 只作为权限处理 - buttonConfigs.splice(index, 1); - return; - } }); const hasAddButton = hasButton(buttonConfigs, 'add'); const hasEditButton = hasButton(buttonConfigs, 'edit'); @@ -955,6 +950,9 @@ ${hasTemplatePrint ? ' reactive ' : ''} }); function dbClickRow(record) { + if (!actionButtonConfig?.value.some(element => element.code == 'view')) { + return; + } const { processId, taskIds, schemaId } = record.workflowData || {}; if (taskIds && taskIds.length) { router.push({ From 078825a20608a511ec0c25987192f5e8f48281a7 Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Tue, 4 Mar 2025 12:24:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=8D=E5=AD=97=E5=85=A8=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=201.=20=E9=A9=BC=E5=B3=B0=E5=A4=84=E7=90=86c?= =?UTF-8?q?lassName=20=E6=9D=A5=E5=AE=9A=E4=B9=89=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=202.=20=E5=89=8D=E7=AB=AF=E6=8E=A7=E5=88=B6=09?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=90=8D=E7=A7=B0=E5=BF=85=E9=A1=BB=E6=97=B6?= =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D=E5=A4=A7=E5=86=99=E7=9A=84=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=95=B0=E5=AD=97=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CreateCodeStep/src/TableConfigStep.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/CreateCodeStep/src/TableConfigStep.vue b/src/components/CreateCodeStep/src/TableConfigStep.vue index 0f26ae4..c09696b 100644 --- a/src/components/CreateCodeStep/src/TableConfigStep.vue +++ b/src/components/CreateCodeStep/src/TableConfigStep.vue @@ -426,10 +426,10 @@ }); //提示消息 return false; } - if (!/^[a-zA-Z][a-zA-Z0-9]*$/.test(outputConfig.className!)) { + if (!/^[A-Z][a-zA-Z0-9]*$/.test(outputConfig.className!)) { notification.error({ message: t('提示'), - description: t('功能名称只能是数字和字母组成，必须以英文字母开头'), + description: t('功能名称只能是数字和字母组成，必须以英文字母大写开头'), }); //提示消息 return false; }