diff --git a/package.json b/package.json index 93ac554b..97041907 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { - "@d2-projects/d2-crud": "^1.1.0", + "@d2-projects/d2-crud": "^1.2.0", "axios": "^0.17.1", "babel-polyfill": "^6.26.0", "better-scroll": "^1.12.1", diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 6eed0d36..1d86836a 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -8,6 +8,8 @@ export default { title: '基础功能', children: [ { path: `${pre}demo1`, title: '基础表格' }, + { path: `${pre}demo27`, title: '加载状态' }, + { path: `${pre}demo28`, title: '自定义加载状态' }, { path: `${pre}demo2`, title: '带斑马纹表格' }, { path: `${pre}demo3`, title: '带边框表格' }, { path: `${pre}demo4`, title: '带状态表格' }, @@ -28,6 +30,7 @@ export default { { title: '数据操作', children: [ + { path: `${pre}demo29`, title: '分页' }, { path: `${pre}demo16`, title: '新增数据' }, { path: `${pre}demo17`, title: '修改数据' }, { path: `${pre}demo18`, title: '删除数据' }, diff --git a/src/pages/demo/d2-crud/demo27/code.js b/src/pages/demo/d2-crud/demo27/code.js new file mode 100644 index 00000000..4045eed0 --- /dev/null +++ b/src/pages/demo/d2-crud/demo27/code.js @@ -0,0 +1,54 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo27/doc.md b/src/pages/demo/d2-crud/demo27/doc.md new file mode 100644 index 00000000..b256dd9a --- /dev/null +++ b/src/pages/demo/d2-crud/demo27/doc.md @@ -0,0 +1 @@ +在 `D2 Crud` 组件中传入 `loading` ,即可控制表格加载状态,`loading` 的可选值为 `true` 和 `false`。代码如下: diff --git a/src/pages/demo/d2-crud/demo27/index.vue b/src/pages/demo/d2-crud/demo27/index.vue new file mode 100644 index 00000000..41b0f7c7 --- /dev/null +++ b/src/pages/demo/d2-crud/demo27/index.vue @@ -0,0 +1,76 @@ + + + diff --git a/src/pages/demo/d2-crud/demo28/code.js b/src/pages/demo/d2-crud/demo28/code.js new file mode 100644 index 00000000..c606ecc3 --- /dev/null +++ b/src/pages/demo/d2-crud/demo28/code.js @@ -0,0 +1,60 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo28/doc.md b/src/pages/demo/d2-crud/demo28/doc.md new file mode 100644 index 00000000..da309d42 --- /dev/null +++ b/src/pages/demo/d2-crud/demo28/doc.md @@ -0,0 +1 @@ +在 `D2 Crud` 组件中传入 `loading-options` ,即可自定义表格加载状态。代码如下: diff --git a/src/pages/demo/d2-crud/demo28/index.vue b/src/pages/demo/d2-crud/demo28/index.vue new file mode 100644 index 00000000..6105df68 --- /dev/null +++ b/src/pages/demo/d2-crud/demo28/index.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/pages/demo/d2-crud/demo29/code.js b/src/pages/demo/d2-crud/demo29/code.js new file mode 100644 index 00000000..a8a10b8d --- /dev/null +++ b/src/pages/demo/d2-crud/demo29/code.js @@ -0,0 +1,113 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo29/doc.md b/src/pages/demo/d2-crud/demo29/doc.md new file mode 100644 index 00000000..f5ccb271 --- /dev/null +++ b/src/pages/demo/d2-crud/demo29/doc.md @@ -0,0 +1 @@ +在 `D2 Crud` 组件中传入 `pagination` 对象,即可开启分页。代码如下: diff --git a/src/pages/demo/d2-crud/demo29/index.vue b/src/pages/demo/d2-crud/demo29/index.vue new file mode 100644 index 00000000..b543e7e5 --- /dev/null +++ b/src/pages/demo/d2-crud/demo29/index.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 3d2a77b8..fdb073b8 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -c62802e4146a602e5c498cdb99205b56768d4047 \ No newline at end of file +b2bf5f06d7bc6fbdb1464a1eea0e2eae737ea6af \ No newline at end of file diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id index f27b6ed1..6be17d28 100644 --- a/yarn.lock.REMOVED.git-id +++ b/yarn.lock.REMOVED.git-id @@ -1 +1 @@ -98d7a73c1fb484dbcca94b8f6a41f916b8a30c20 \ No newline at end of file +9f0de1b1283741f3ab3b7a925f9b96808cfb51e5 \ No newline at end of file