代码生成器的下载功能，完成~

YunaiV
1 parent 6ca92b0e
Showing 4 changed files with 13 additions and 70 deletions
ruoyi-ui/src/api/tool/codegen.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/tool/gen/index.vue
@@ -30,7 +30,7 @@ export function updateCodegen(data) {
 export function previewCodegen(tableId) {
   return request({
     url: '/tool/codegen/preview?tableId=' + tableId,
-    method: 'get'
+    method: 'get',
   })
 }
  
@@ -103,23 +103,17 @@ export function download(fileName) {
  
 // 下载 Excel 方法
 export function downloadExcel(data, fileName) {
-  // 创建 blob
-  let blob = new Blob([data], {type: 'application/vnd.ms-excel'});
-  // 创建 href 超链接，点击进行下载
-  window.URL = window.URL || window.webkitURL;
-  let href = URL.createObjectURL(blob);
-  let downA = document.createElement("a");
-  downA.href =  href;
-  downA.download = fileName;
-  downA.click();
-  // 销毁超连接
-  window.URL.revokeObjectURL(href);
+  download0(data, fileName, 'application/vnd.ms-excel');
 }
  
 // 下载 Zip 方法
 export function downloadZip(data, fileName) {
+  download0(data, fileName, 'application/zip');
+}
+
+function download0(data, fileName, mineType) {
   // 创建 blob
-  let blob = new Blob([data], {type: 'application/zip'});
+  let blob = new Blob([data], {type: mineType});
   // 创建 href 超链接，点击进行下载
   window.URL = window.URL || window.webkitURL;
   let href = URL.createObjectURL(blob);
-import axios from 'axios'
-import { getToken } from '@/utils/auth'
-
-const mimeMap = {
-  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-  zip: 'application/zip'
-}
-
-const baseUrl = process.env.VUE_APP_BASE_API
-export function downLoadZip(str, filename) {
-  var url = baseUrl + str
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() }
-  }).then(res => {
-    resolveBlob(res, mimeMap.zip)
-  })
-}
-/**
- * 解析blob响应内容并下载
- * @param {*} res blob响应内容
- * @param {String} mimeType MIME类型
- */
-export function resolveBlob(res, mimeType) {
-  const aLink = document.createElement('a')
-  var blob = new Blob([res.data], { type: mimeType })
-  // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
-  var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-  var contentDisposition = decodeURI(res.headers['content-disposition'])
-  var result = patt.exec(contentDisposition)
-  var fileName = result[1]
-  fileName = fileName.replace(/\"/g, '')
-  aLink.href = URL.createObjectURL(blob)
-  aLink.setAttribute('download', fileName) // 设置下载文件名称
-  document.body.appendChild(aLink)
-  aLink.click()
-  document.body.appendChild(aLink)
-}
@@ -85,15 +85,15 @@
 </template>
  
 <script>
-import { previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
-import { getCodeGenTablePage, previewCodegen, } from "@/api/tool/codegen";
+import { delTable, synchDb } from "@/api/tool/gen";
+import { getCodeGenTablePage, previewCodegen, downloadCodegen } from "@/api/tool/codegen";
  
 import importTable from "./importTable";
-import { downLoadZip } from "@/utils/zipdownload";
 // 代码高亮插件
 import hljs from "highlight.js/lib/highlight";
 import "highlight.js/styles/github-gist.css";
 import {list} from "@/api/system/loginlog";
+import {exportOperateLog} from "@/api/system/operatelog";
 hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
 hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
 hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
@@ -167,20 +167,9 @@ export default {
     },
     /** 生成代码操作 */
     handleGenTable(row) {
-      // const tableNames = row.tableName || this.tableNames;
-      // if (tableNames === "") {
-      //   this.msgError("请选择要生成的数据");
-      //   return;
-      // }
-      // if(row.genType === "1") {
-      //   genCode(row.tableName).then(response => {
-      //     this.msgSuccess("成功生成到自定义路径：" + row.genPath);
-      //   });
-      // } else {
-      //   downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
-      // }
-
-
+      downloadCodegen(row.id).then(response => {
+        this.downloadZip(response, 'codegen-' + row.tableName + '.zip');
+      })
     },
     /** 同步数据库操作 */
     handleSynchDb(row) {