From be3f19fb05a07dceb4cfef77807a3eaa51b048ee Mon Sep 17 00:00:00 2001
From: suguangxu <274928232@qq.com>
Date: Thu, 24 Apr 2025 15:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=85=88=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF=E3=80=81=E7=AE=80=E6=98=93=E6=A8=A1=E6=9D=BF=EF=BC=9A?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dev/components/CodeFirstModal.vue | 38 +++++++++++++++----
.../dev/components/SimpleTemplateModal.vue | 34 ++++++++++++++---
2 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/src/views/generator/dev/components/CodeFirstModal.vue b/src/views/generator/dev/components/CodeFirstModal.vue
index 34d7603..b2816b5 100644
--- a/src/views/generator/dev/components/CodeFirstModal.vue
+++ b/src/views/generator/dev/components/CodeFirstModal.vue
@@ -25,9 +25,21 @@
{{ t('下一步') }}
-
- {{ t('完成') }}
-
+
+
+ {{ t('完成') }}
+
+
+
+
+ 打包下载
+
+
+ 生成到项目中
+
+
+
+
{{ t('关闭') }}
@@ -57,6 +69,7 @@
getCodeTemplateInfo,
saveDraftGeneratorCode,
updateDraftGeneratorCode,
+ downloadCodes,
} from '/@/api/system/generator';
import { FormProps } from '/@/components/Form';
import { buildOption } from '/@/utils/helper/designHelper';
@@ -73,6 +86,9 @@
import DesignLogo from '/@/components/ModalPanel/src/DesignLogo.vue';
import AjaxErrorIcon from '/@/components/SecondDev/AjaxErrorIcon.vue';
import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
+ import { downloadByData } from '/@/utils/file/download';
+ import { dateUtil } from '/@/utils/dateUtil';
+
const { t } = useI18n();
const StructureConfigStep = defineAsyncComponent({
loader: () => import('/@/components/CreateCodeStep/src/StructureConfigStep.vue'),
@@ -114,7 +130,6 @@
const widgetForm = ref(JSON.parse(JSON.stringify(antd.widgetForm))); //FormDesignStep -> designer和StructureConfigStep页面使用
const mainTableName = ref('table_' + random(10000, 99999));
const emit = defineEmits(['close', 'register', 'success']);
-
watch(current, () => {
isEditorOpen.value = current.value === 0;
});
@@ -245,7 +260,7 @@
handleClose();
emit('success');
}
- async function handleCodeGenerator() {
+ async function handleCodeGenerator(actionType:String) {
const isOk = await stepValidate[5]();
if (
generatorConfig.formJson?.hiddenComponent &&
@@ -268,9 +283,16 @@
// await appGeneratorCode(
// buildAppCode(generatorConfig, buildAppFormProps(generatorConfig.formJson)),
// );
-
- await codeFirstGeneratorCode(data);
-
+ data.actionType=actionType;
+ const result =await codeFirstGeneratorCode(data);
+ if(data.actionType=="packAndDownload"&&result){
+ const fileName=data.outputConfig.className+'_'+dateUtil(new Date()).format('YYYY-MM-DD_HH_mm_ss');
+ const res = await downloadCodes({uuid:result});
+ downloadByData(
+ res.data,
+ fileName+".zip"
+ );
+ }
handleClose();
emit('success');
}
diff --git a/src/views/generator/dev/components/SimpleTemplateModal.vue b/src/views/generator/dev/components/SimpleTemplateModal.vue
index 6b74f16..1fb4859 100644
--- a/src/views/generator/dev/components/SimpleTemplateModal.vue
+++ b/src/views/generator/dev/components/SimpleTemplateModal.vue
@@ -24,9 +24,21 @@
{{ t('下一步') }}
-
- {{ t('完成') }}
-
+
+
+ {{ t('完成') }}
+
+
+
+
+ 打包下载
+
+
+ 生成到项目中
+
+
+
+
{{ t('关闭') }}
@@ -57,6 +69,7 @@
saveDraftGeneratorCode,
updateDraftGeneratorCode,
getMasterInfo,
+ downloadCodes,
} from '/@/api/system/generator';
import { FormProps } from '/@/components/Form';
import { buildOption } from '/@/utils/helper/designHelper';
@@ -71,6 +84,8 @@
import { MenuConfig } from '/@/model/generator/menuConfig';
import { FormEventColumnConfig } from '/@/model/generator/formEventConfig';
import DesignLogo from '/@/components/ModalPanel/src/DesignLogo.vue';
+ import { downloadByData } from '/@/utils/file/download';
+ import { dateUtil } from '/@/utils/dateUtil';
const { t } = useI18n();
const StructureConfigStep = defineAsyncComponent({
@@ -244,7 +259,7 @@
handleClose();
emit('success');
}
- async function handleCodeGenerator() {
+ async function handleCodeGenerator(actionType:String) {
const isOk = await stepValidate[5]();
if (
generatorConfig.formJson?.hiddenComponent &&
@@ -263,7 +278,16 @@
buildOption(generatorConfig.formJson) as FormProps,
);
if (templateId.value) data.id = templateId.value;
- await codeFirstGeneratorCode(data);
+ data.actionType=actionType;
+ const result =await codeFirstGeneratorCode(data);
+ if(data.actionType=="packAndDownload"&&result){
+ const fileName=data.outputConfig.className+'_'+dateUtil(new Date()).format('YYYY-MM-DD_HH_mm_ss');
+ const res = await downloadCodes({uuid:result});
+ downloadByData(
+ res.data,
+ fileName+".zip"
+ );
+ }
handleClose();
emit('success');
}