Merge branch 'master' of https://gitcode.net/dcloud/unidocs-zh

README.md

@@ -60,6 +60,32 @@
     ```html
     <img src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni-app-multiport.jpg" class="zooming" data="abc" width="100" height="100" />
     ```
+
+12. md 表格支持行、列合并，支持无表头表格
+    - 行列合并
+        ```md
+        |Stage | Direct Products | ATP Yields|
+        |----: | --------------: | ---------:|
+        |Glycolysis | 2 ATP ||
+        |^^ | 2 NADH | 3--5 ATP |
+        |Pyruvaye oxidation | 2 NADH | 5 ATP |
+        |Citric acid cycle | 2 ATP ||
+        |^^ | 6 NADH | 15 ATP |
+        |^^ | 2 FADH2 | 3 ATP |
+        |**30--32** ATP |||
+        ```
+    - 无表头表格
+        ```md
+        |--|--|--|--|--|--|--|--|
+        |♜|  |♝|♛|♚|♝|♞|♜|
+        |  |♟|♟|♟|  |♟|♟|♟|
+        |♟|  |♞|  |  |  |  |  |
+        |  |♗|  |  |♟|  |  |  |
+        |  |  |  |  |♙|  |  |  |
+        |  |  |  |  |  |♘|  |  |
+        |♙|♙|♙|♙|  |♙|♙|♙|
+        |♖|♘|♗|♕|♔|  |  |♖|
+        ```
 ## 文档 Algolia 使用限额
 Included Quota:
 - Records: 1,000,000

docs/.vuepress/config.js

@@ -96,6 +96,17 @@ const config = {
         .end()
         .plugin('inject-json-to-md')
         .use(require('./markdown/inject-json-to-md'))
+        .end()
+        .plugin('multimd-table')
+        .use(require('markdown-it-multimd-table'), [
+					{
+						multiline: false,
+						rowspan: true,
+						headerless: true,
+						multibody: false,
+						aotolabel: false,
+					},
+				])
     }
   },
   chainWebpack (config, isServer) {

package.json

@@ -29,6 +29,7 @@
     "glob": "^7.1.7",
     "htmlparser2": "^9.0.0",
     "markdown-it-attrs": "^4.1.6",
+    "markdown-it-multimd-table": "^4.2.3",
     "markdown-it-task-lists": "^2.1.1",
     "vuepress-theme-uni-app-test": "^1.3.12"
   },

yarn.lock

@@ -6489,6 +6489,11 @@ markdown-it-emoji@^1.4.0:
   resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"
   integrity sha1-m+4OmpkKljupbfaYDE/dsF37Tcw=
 
+markdown-it-multimd-table@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmmirror.com/markdown-it-multimd-table/-/markdown-it-multimd-table-4.2.3.tgz#b81ac1f6c26482ddf0504c9e25583ad126c03dec"
+  integrity sha512-KepCr2OMJqm7IT6sOIbuqHGe+NERhgy66XMrc5lo6dHW7oaPzMDtYwR1EGwK16/blb6mCSg4jqityOe0o/H7HA==
+
 markdown-it-table-of-contents@^0.4.0:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz#3dc7ce8b8fc17e5981c77cc398d1782319f37fbc"