From d412c011b676a7bf1c4bf08f58b805109de8d1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= <yutent@doui.cc>
Date: Tue, 11 Feb 2020 00:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3todo=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.prod.js        | 10 ++++++----
 src/markd/index.wc   | 11 ++++++-----
 src/markd/parser.js  | 26 +++++++++++++-------------
 src/meditor/index.wc |  2 +-
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/build.prod.js b/build.prod.js
index c134111..3489c8b 100644
--- a/build.prod.js
+++ b/build.prod.js
@@ -71,10 +71,12 @@ const compileJs = (entry, output) => {
 // 编译样式
 function compileScss(code = '') {
   try {
-    return scss.renderSync({
-      data: BASE_SCSS + code,
-      outputStyle: 'compressed'
-    }).css
+    return (
+      scss.renderSync({
+        data: BASE_SCSS + code,
+        outputStyle: 'compressed'
+      }).css + ''
+    ).trim()
   } catch (err) {
     log(err)
   }
diff --git a/src/markd/index.wc b/src/markd/index.wc
index 506f340..d5e0261 100644
--- a/src/markd/index.wc
+++ b/src/markd/index.wc
@@ -1,5 +1,5 @@
 <template>
-  <div class="markd-box"><slot /></div>
+  <div><slot /></div>
 </template>
 
 <style lang="scss">
@@ -9,9 +9,7 @@
   color: nth($cd, 1);
   font-size: 14px;
 }
-.markd-box {
-  padding: 10px;
-}
+
 a {
   text-decoration: underline;
   color: nth($ct, 2);
@@ -257,7 +255,10 @@ import core from './core'
 import parser from './parser'
 
 export default class Markd {
-  props = {}
+  props = {
+    toc: false
+  }
+
   __init__() {
     /* render */
 
diff --git a/src/markd/parser.js b/src/markd/parser.js
index f3be4b7..e82a79f 100644
--- a/src/markd/parser.js
+++ b/src/markd/parser.js
@@ -7,7 +7,7 @@
 'use strict'
 const HR_LIST = ['=', '-', '_', '*']
 const LIST_REG = /^(([\+\-\*])|(\d+\.))\s/
-const TODO_REG = /^\[(x|\s)\]\s/
+const TODO_REG = /^\-\s\[(x|\s)\]\s/
 const log = console.log
 
 const Helper = {
@@ -36,7 +36,7 @@ const Helper = {
   isTodo(str) {
     var v = str.trim()
     if (TODO_REG.test(v)) {
-      return v[1] === 'x' ? 1 : 0
+      return v[3] === 'x' ? 1 : 0
     }
     return -1
   },
@@ -223,6 +223,17 @@ class Tool {
             continue
           }
 
+          // 任务
+          let todoChecked = Helper.isTodo(it)
+          if (~todoChecked) {
+            let word = it.replace(TODO_REG, '').trim()
+            let stat = todoChecked === 1 ? 'checked' : ''
+            let txt = todoChecked === 1 ? `<del>${word}</del>` : word
+
+            html += `<section><wc-checkbox readonly ${stat}>${txt}</wc-checkbox></section>`
+            continue
+          }
+
           // 列表
           let listChecked = Helper.isList(it)
           if (~listChecked) {
@@ -269,17 +280,6 @@ class Tool {
             continue
           }
 
-          // 任务
-          let todoChecked = Helper.isTodo(it)
-          if (~todoChecked) {
-            let word = it.replace(TODO_REG, '').trim()
-            let stat = todoChecked === 1 ? 'checked' : ''
-            let txt = todoChecked === 1 ? `<del>${word}</del>` : word
-
-            html += `<section><wc-checkbox readonly ${stat}>${txt}</wc-checkbox></section>`
-            continue
-          }
-
           // log('it => ', isParagraph, it)
           if (isParagraph) {
             html += `${it}<br>`
diff --git a/src/meditor/index.wc b/src/meditor/index.wc
index 8a68804..c54c2ba 100644
--- a/src/meditor/index.wc
+++ b/src/meditor/index.wc
@@ -9,7 +9,7 @@
 <style lang="scss"></style>
 
 <script>
-import '../markdown/index'
+import '../markd/index'
 
 export default class Meditor {
   props = {