diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js
index c0a064c7..9a392617 100644
--- a/src/menu/modules/demo-d2-crud.js
+++ b/src/menu/modules/demo-d2-crud.js
@@ -9,6 +9,7 @@ export default {
     { path: `${pre}demo3`, title: '带边框表格' },
     { path: `${pre}demo4`, title: '带状态表格' },
     { path: `${pre}demo5`, title: '固定表头' },
-    { path: `${pre}demo6`, title: '固定列' }
+    { path: `${pre}demo6`, title: '固定列' },
+    { path: `${pre}demo7`, title: '流体高度' }
   ])('/demo/d2-crud/')
 }
diff --git a/src/pages/demo/d2-crud/demo7/code.js b/src/pages/demo/d2-crud/demo7/code.js
new file mode 100644
index 00000000..cb4d4e2c
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo7/code.js
@@ -0,0 +1,112 @@
+export default `<template>
+  <div>
+    <d2-crud
+      :columns="columns"
+      :data="data"
+      :options="options"
+      :rowHandle="rowHandle"/>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      columns: [
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '省份',
+          key: 'province'
+        },
+        {
+          title: '市区',
+          key: 'city'
+        },
+        {
+          title: '地址',
+          key: 'address',
+          width: '300'
+        },
+        {
+          title: '邮编',
+          key: 'zip'
+        }
+      ],
+      data: [
+        {
+          date: '2016-05-03',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-08',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-06',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-07',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        }
+      ],
+      options: {
+        maxHeight: '250'
+      },
+      rowHandle: {
+        remove: {
+          size: 'mini',
+          confirm: false
+        }
+      }
+    }
+  }
+}
+</script>`
diff --git a/src/pages/demo/d2-crud/demo7/doc.md b/src/pages/demo/d2-crud/demo7/doc.md
new file mode 100644
index 00000000..264dba3b
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo7/doc.md
@@ -0,0 +1 @@
+通过在 `options` 对象设置 `maxHeight` 属性为 `D2 Crud` 指定最大高度。此时若表格所需的高度大于最大高度，则会显示一个滚动条。代码如下：
\ No newline at end of file
diff --git a/src/pages/demo/d2-crud/demo7/index.vue b/src/pages/demo/d2-crud/demo7/index.vue
new file mode 100644
index 00000000..8a0547d3
--- /dev/null
+++ b/src/pages/demo/d2-crud/demo7/index.vue
@@ -0,0 +1,137 @@
+<template>
+  <d2-container>
+    <template slot="header">流体高度</template>
+    <d2-crud
+      :columns="columns"
+      :data="data"
+      :options="options"
+      :rowHandle="rowHandle"/>
+    <el-card shadow="never" class="d2-mb">
+      <d2-markdown :source="doc"/>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <d2-highlight :code="code"/>
+    </el-card>
+    <template slot="footer">
+      <d2-link-btn title="D2 CRUD" link="https://github.com/d2-projects/d2-crud"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+import doc from './doc.md'
+import code from './code.js'
+
+export default {
+  data () {
+    return {
+      doc,
+      code,
+      columns: [
+        {
+          title: '日期',
+          key: 'date'
+        },
+        {
+          title: '姓名',
+          key: 'name'
+        },
+        {
+          title: '省份',
+          key: 'province'
+        },
+        {
+          title: '市区',
+          key: 'city'
+        },
+        {
+          title: '地址',
+          key: 'address',
+          width: '300'
+        },
+        {
+          title: '邮编',
+          key: 'zip'
+        }
+      ],
+      data: [
+        {
+          date: '2016-05-03',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-04',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-01',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-08',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-06',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        },
+        {
+          date: '2016-05-07',
+          name: '王小虎',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: 200333
+        }
+      ],
+      options: {
+        maxHeight: '250'
+      },
+      rowHandle: {
+        remove: {
+          size: 'mini',
+          confirm: false
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.el-table .warning-row {
+  background: oldlace;
+}
+
+.el-table .success-row {
+  background: #f0f9eb;
+}
+</style>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index b6ed8a9a..77481676 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-acdde45a330bcab093eb4d812dc4966c000537f1
\ No newline at end of file
+be070eaabb8ab1511f21970333d6d65ecf391e10
\ No newline at end of file