From 1f5534fb99fe74b411d24dcb04101473905750c4 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 7 Jul 2022 21:01:18 +0800 Subject: [PATCH 1/3] 1.15.7 --- readme.md | 2 +- readme_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index d8b6e8db..88d4b640 100644 --- a/readme.md +++ b/readme.md @@ -62,7 +62,7 @@ docker run --name torna --restart=always \ -e MYSQL_SCHEMA="torna" \ -e MYSQL_USERNAME="root" \ -e MYSQL_PASSWORD="root" \ - -d tanghc2020/torna:latest + -d tanghc2020/torna:1.15.7 ``` Need modify： diff --git a/readme_CN.md b/readme_CN.md index 3175d668..daaf1db0 100644 --- a/readme_CN.md +++ b/readme_CN.md @@ -63,7 +63,7 @@ docker run --name torna --restart=always \ -e MYSQL_SCHEMA="torna" \ -e MYSQL_USERNAME="root" \ -e MYSQL_PASSWORD="root" \ - -d tanghc2020/torna:1.15.4 + -d tanghc2020/torna:1.15.7 ``` 需改更改的部分： -- Gitee From 4052756a2091a674265528fc6f30c7f993e46959 Mon Sep 17 00:00:00 2001 From: liu xm Date: Wed, 3 Aug 2022 12:09:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddoc=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A4=9A=E5=B1=82=E7=BA=A7=E6=97=A0=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/utils/convert-word.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/front/src/utils/convert-word.js b/front/src/utils/convert-word.js index 17646dc9..ff8f1d9c 100644 --- a/front/src/utils/convert-word.js +++ b/front/src/utils/convert-word.js @@ -40,31 +40,30 @@ export const word_wrapper = ` {body}` const WordUtil = { - toWordByData(docInfoList, title) { - // title = title || $ts('document') - const treeData = convert_tree(docInfoList, '') - const content = new StringBuilder() - const appendHtml = (doc_info) => { + handleWordData(treeData, content, level = 1) { + const appendHtml = (doc_info, level) => { init_docInfo(doc_info) - content.append(WordUtil.toWord(doc_info)) + content.append(WordUtil.toWord(doc_info, level)) } treeData.forEach(docInfo => { const children = docInfo.children if (children && children.length > 0) { - // 一级标题 - content.append(`

${docInfo.name}

`) - children.forEach(child => { - appendHtml(child) - }) + content.append(`${docInfo.name}`) + this.handleWordData(children, content, level + 1) } else { - appendHtml(docInfo) + appendHtml(docInfo, level) } }) + }, + toWordByData(docInfoList) { + const treeData = convert_tree(docInfoList, '') + const content = new StringBuilder() + this.handleWordData(treeData, content) return content.toString() }, - toWord(docInfo) { + toWord(docInfo, level = 2) { const sb = new StringBuilder() - sb.append(`

${docInfo.name}

`) + sb.append(`${docInfo.name}`) const appendCode = (str) => { sb.append('') sb.append(`\n
\n${str}\n
\n`) -- Gitee From 1969628d1f845b38a1cbfbc9bc9a2dfdad8d8ff9 Mon Sep 17 00:00:00 2001 From: liu xm Date: Wed, 3 Aug 2022 12:46:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E9=9D=A2=E5=BD=A2=E5=BC=8F=E5=A4=9A=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E6=97=A0=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/utils/export.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/front/src/utils/export.js b/front/src/utils/export.js index 6596a787..425efe09 100644 --- a/front/src/utils/export.js +++ b/front/src/utils/export.js @@ -10,15 +10,7 @@ function export_single_page(docInfo, filenameHandler, contentHandler) { download_text(`${filenameHandler(docInfo)}`, content) } -/** - * 导出多页面 - * @param docInfoList docInfoList 没有转换tree - * @param filenameHandler 构建文件名回调，参数：docInfo - * @param contentHandler 构建内容回调，参数：docInfo - */ -function do_export_multi_docs(docInfoList, filenameHandler, contentHandler) { - const zip = new JSZip() - const treeData = convert_tree(docInfoList) +function handleData(zip, treeData, filenameHandler, contentHandler) { const appendFile = (zip, doc_info) => { init_docInfo(doc_info) const markdown = contentHandler(doc_info) @@ -30,14 +22,23 @@ function do_export_multi_docs(docInfoList, filenameHandler, contentHandler) { if (isFolder) { // 创建文件夹 const folderZip = zip.folder(docInfo.name) - children.forEach(child => { - // 文件放入文件夹中 - appendFile(folderZip, child) - }) + handleData(folderZip, children, filenameHandler, contentHandler) } else { appendFile(zip, docInfo) } }) +} + +/** + * 导出多页面 + * @param docInfoList docInfoList 没有转换tree + * @param filenameHandler 构建文件名回调，参数：docInfo + * @param contentHandler 构建内容回调，参数：docInfo + */ +function do_export_multi_docs(docInfoList, filenameHandler, contentHandler) { + const zip = new JSZip() + const treeData = convert_tree(docInfoList, '') + handleData(zip, treeData, filenameHandler, contentHandler) // 下载 zip.generateAsync({ type: 'blob' }).then(function(content) { const zipFile = `export-${new Date().getTime()}.zip` -- Gitee