From 72303ee5e73ea8cc7f85759955d3e91928c5b09b Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Fri, 15 Aug 2025 18:46:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=92=8C=E5=9B=9E=E8=BD=A6=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/license/license/index.ts | 1 + apps/web-antd/src/locales/langs/en-US/license.json | 3 ++- apps/web-antd/src/locales/langs/zh-CN/license.json | 3 ++- apps/web-antd/src/views/license/customer/index.vue | 1 + .../src/views/license/license/components/ne-code.vue | 2 +- apps/web-antd/src/views/license/license/data.ts | 5 +++++ apps/web-antd/src/views/license/license/index.vue | 1 + apps/web-antd/src/views/license/project/data.ts | 5 +++++ apps/web-antd/src/views/license/project/index.vue | 1 + 9 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/web-antd/src/api/license/license/index.ts b/apps/web-antd/src/api/license/license/index.ts index 7f1b1fc..1158465 100644 --- a/apps/web-antd/src/api/license/license/index.ts +++ b/apps/web-antd/src/api/license/license/index.ts @@ -27,6 +27,7 @@ export namespace LicenseApi { neCodeList: NeCode[]; // 操作 oldLicense: License; hasHistory: boolean; + applyCount: number; // 申请次数 showUpload?: boolean; // 是否显示上传按钮 customerName?: string; // 客户名称 projectName?: string; // 项目名称 diff --git a/apps/web-antd/src/locales/langs/en-US/license.json b/apps/web-antd/src/locales/langs/en-US/license.json index 15a254c..c7201bf 100644 --- a/apps/web-antd/src/locales/langs/en-US/license.json +++ b/apps/web-antd/src/locales/langs/en-US/license.json @@ -34,5 +34,6 @@ "downloadAll": "Download All", "reapply": "Reapply", "reapplyAction": "Reapply For {0}", - "history": "History" + "history": "History", + "applyCount": "Application Count" } diff --git a/apps/web-antd/src/locales/langs/zh-CN/license.json b/apps/web-antd/src/locales/langs/zh-CN/license.json index 26154fa..19f2d19 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/license.json +++ b/apps/web-antd/src/locales/langs/zh-CN/license.json @@ -34,5 +34,6 @@ "downloadAll": "全部下载", "reapply": "重新申请", "reapplyAction": "重新申请{0}", - "history": "历史" + "history": "历史", + "applyCount": "申请次数" } diff --git a/apps/web-antd/src/views/license/customer/index.vue b/apps/web-antd/src/views/license/customer/index.vue index 129718b..6e78654 100644 --- a/apps/web-antd/src/views/license/customer/index.vue +++ b/apps/web-antd/src/views/license/customer/index.vue @@ -78,6 +78,7 @@ function handleImport() { const [Grid, gridApi] = useVbenVxeGrid({ formOptions: { schema: useGridFormSchema(), + submitOnEnter: true, }, gridOptions: { columns: useGridColumns(), diff --git a/apps/web-antd/src/views/license/license/components/ne-code.vue b/apps/web-antd/src/views/license/license/components/ne-code.vue index 8032e19..61fb206 100644 --- a/apps/web-antd/src/views/license/license/components/ne-code.vue +++ b/apps/web-antd/src/views/license/license/components/ne-code.vue @@ -17,7 +17,7 @@ const props = withDefaults( neCodeList?: LicenseApi.NeCode[]; }>(), { - neCodeList: () => [{ neList: [], activationCode: '', id: 1 }], + neCodeList: () => [{ neList: [], activationCode: '', id: 1, fileUrl: '' }], }, ); diff --git a/apps/web-antd/src/views/license/license/data.ts b/apps/web-antd/src/views/license/license/data.ts index 5d80ff7..c751f74 100644 --- a/apps/web-antd/src/views/license/license/data.ts +++ b/apps/web-antd/src/views/license/license/data.ts @@ -361,6 +361,11 @@ export function useGridColumns(): VxeTableGridOptions['colum minWidth: 120, formatter: 'formatDateTime', }, + { + field: 'applyCount', + title: $t('license.applyCount'), + minWidth: 70, + }, { field: 'operation', title: $t('license.operation'), diff --git a/apps/web-antd/src/views/license/license/index.vue b/apps/web-antd/src/views/license/license/index.vue index 7d85cf8..475567b 100644 --- a/apps/web-antd/src/views/license/license/index.vue +++ b/apps/web-antd/src/views/license/license/index.vue @@ -124,6 +124,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ collapsed: true, collapsedRows: 2, schema: useGridFormSchema(), + submitOnEnter: true, }, gridOptions: { columns: useGridColumns(), diff --git a/apps/web-antd/src/views/license/project/data.ts b/apps/web-antd/src/views/license/project/data.ts index 92f310c..b7e76b3 100644 --- a/apps/web-antd/src/views/license/project/data.ts +++ b/apps/web-antd/src/views/license/project/data.ts @@ -514,6 +514,11 @@ export function useGridColumns( title: $t('project.commentNum'), minWidth: 70, }, + { + field: 'applyCount', + title: $t('license.applyCount'), + minWidth: 70, + }, { field: 'updateTime', title: $t('project.updateTime'), diff --git a/apps/web-antd/src/views/license/project/index.vue b/apps/web-antd/src/views/license/project/index.vue index a1e4ab7..4a44bd9 100644 --- a/apps/web-antd/src/views/license/project/index.vue +++ b/apps/web-antd/src/views/license/project/index.vue @@ -112,6 +112,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ collapsed: true, collapsedRows: 2, schema: useGridFormSchema(), + submitOnEnter: true, }, gridOptions: { columns: useGridColumns(onActionClick),