diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js
index 0b4d924e..6fdf75b1 100644
--- a/src/menu/modules/demo-d2-crud.js
+++ b/src/menu/modules/demo-d2-crud.js
@@ -16,6 +16,7 @@ export default {
{ path: `${pre}demo10`, title: '多选' },
{ path: `${pre}demo11`, title: '排序' },
{ path: `${pre}demo12`, title: '筛选' },
- { path: `${pre}demo13`, title: '表尾合计行' }
+ { path: `${pre}demo13`, title: '表尾合计行' },
+ { path: `${pre}demo14`, title: '合并行' }
])('/demo/d2-crud/')
}
diff --git a/src/pages/demo/d2-crud/demo14/code.js b/src/pages/demo/d2-crud/demo14/code.js
new file mode 100644
index 00000000..69caa73b
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo14/code.js
@@ -0,0 +1,88 @@
+export default `
+
+
+
+
+
+`
diff --git a/src/pages/demo/d2-crud/demo14/doc.md b/src/pages/demo/d2-crud/demo14/doc.md
new file mode 100644
index 00000000..42ef95d9
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo14/doc.md
@@ -0,0 +1 @@
+通过给 `options` 传入 `spanMethod` 方法可以实现合并行,方法的参数是一个对象,里面包含当前行 `row` 、当前列 `column` 、当前行号 `rowIndex` 、当前列号 `columnIndex` 四个属性。该函数可以返回一个包含两个元素的数组,第一个元素代表rowspan,第二个元素代表colspan。代码如下:
diff --git a/src/pages/demo/d2-crud/demo14/index.vue b/src/pages/demo/d2-crud/demo14/index.vue
new file mode 100644
index 00000000..c1c800b6
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo14/index.vue
@@ -0,0 +1,104 @@
+
+
+ 合并行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 8e62dfeb..b59c2f15 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-d83b0a5150e283432ed572257131cc3dcfadd519
\ No newline at end of file
+4e65388c5605f3cec8e0c073312fab0a4dbd14ba
\ No newline at end of file