chore: 🔨 合并冲突解决

This commit is contained in:
ray
2024-08-02 00:47:49 +08:00
2 changed files with 28 additions and 6 deletions

View File

@@ -38,12 +38,24 @@ class GeneratorAPI {
method: "get",
});
}
/** 重置代码配置 */
static resetGenConfig(tableName: string) {
/**
* 下载 ZIP 文件
* @param url
* @param fileName
*/
static downloadZip(tableName: string, fileName?: string) {
return request({
url: `${GENERATOR_BASE_URL}/${tableName}/config`,
method: "delete",
url: `${GENERATOR_BASE_URL}/${tableName}/downloadZip`,
method: "get",
responseType: "blob",
}).then((res) => {
const blob = new Blob([res.data], { type: "application/zip" });
const a = document.createElement("a");
const url = window.URL.createObjectURL(blob);
a.href = url;
a.download = fileName || "下载文件.zip";
a.click();
window.URL.revokeObjectURL(url);
});
}
}

View File

@@ -447,7 +447,17 @@ function handleNextClick() {
loadingText.value = "loading...";
});
} else {
if (active.value++ >= 2) active.value = 2;
if (active.value++ >= 2) {
active.value = 2;
}
if (active.value === 2) {
const tableName = formData.value.tableName;
if (!tableName) {
ElMessage.error("表名不能为空");
return;
}
GeneratorAPI.downloadZip(tableName, "youlai-admin-code.zip");
}
}
}