From 2caae1e2e4e68beac1fe62fcc13ec1a4d8ca8d3c Mon Sep 17 00:00:00 2001 From: yulixing Date: Wed, 30 Oct 2019 11:20:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=9B=98=E7=BC=96=E8=BE=91=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/open/zp.js | 52 +++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/src/controllers/open/zp.js b/src/controllers/open/zp.js index ee6bdb3..ad2e4b8 100644 --- a/src/controllers/open/zp.js +++ b/src/controllers/open/zp.js @@ -6,21 +6,38 @@ import ZpText from '../../models/mp_zp/ZpText' import cors from 'cors' const router = new Router() -// const text = `$0 level1 A::剧情A -// $1 level2 A-1::剧情A-1 -// $1 level2 A-2::剧情A-2 -// $1 level2 A-3::剧情A-3 -// $0 level1 B::剧情B -// $1 level2 B-1::剧情B-1 -// $1 level2 B-2::剧情B-2 -// $1 level2 B-3::剧情B-3 -// $0 level1 C::剧情C -// $1 level2 C-1::剧情C-1 -// $1 level2 C-2::剧情C-2 -// $2 level3 C-2-1::剧情C-2-1 -// $2 level3 C-2-2::剧情C-2-2 -// $2 level3 C-2-3::剧情C-2-3 -// $2 level2 C-3::剧情C-3` +// const text = ` +// # 目录组织图 + +// ## A1::1 + +// ### A2::2 + +// #### A3::3 + +// ##### A4::4 + +// ###### A5::5 + +// ####### A6::6 + +// ######## A7::7 + +// ## B1::8 + +// ### B2::9 + +// #### B3::10 + +// ##### B4::11 + +// ###### B5::12 + +// ####### B6::13 + +// ######## B7::14 + +// ` // 获取转盘数据 router.get('/text', async (req, res, next) => { @@ -59,7 +76,7 @@ router.get('/text', async (req, res, next) => { function parseText(text) { const result = [] const textArr = text.split('\n') - const textReg = /^\$(\d+) (.*)::(.*)$/ + const textReg = /^(#+) (.*)::(.*)$/ let lastLevel = 0 let lastIdx = 0 const posArr = [result] @@ -67,7 +84,8 @@ function parseText(text) { textArr.map(item => { const execRes = textReg.exec(item) if (!execRes) return - const curLevel = parseInt(execRes[1]) + const curLevel = execRes[1].split('').length - 2 + if (curLevel < 0) return const text = execRes[2] const content = execRes[3] if (curLevel === lastLevel) {