From d610c352625b63c51e636808b4feebd73143ee5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 09:51:27 +0800 Subject: [PATCH 01/19] init demo1 Former-commit-id: f80b1ffa04c4751cead80e90bbd9c1f4c1913789 [formerly f80b1ffa04c4751cead80e90bbd9c1f4c1913789 [formerly f80b1ffa04c4751cead80e90bbd9c1f4c1913789 [formerly f80b1ffa04c4751cead80e90bbd9c1f4c1913789 [formerly ac4e7821263c3bd7c874569517388af4336e6e02 [formerly 368b28148e276e17fb81532baea45d077c13bfca]]]]] Former-commit-id: 5e0c1145b8a73f32312ab66125d37b46e89731fd Former-commit-id: afcd92f2b5a716041bef3393125840d420551fca Former-commit-id: aa8dad016833b0677122c47d58a3ae8a03292533 [formerly c8787d06a19140118d009820a7c6066b709a0328] Former-commit-id: bae416d70d1980e9a110c9321ea0d8ce46aeb64d Former-commit-id: c6188c15cb3deba6637e90ee93cd1551e6e2c7e9 Former-commit-id: 05623268f102305054f13a7a2b8d16490eb03a3d Former-commit-id: 0ca56fade666745a0ceb84930a3dd128fa62ec91 Former-commit-id: b6e5fb9fa02b998a87c34818d5ff2b3ce2393345 --- package.json | 2 +- src/pages/demo/d2-crud/demo1/code.js | 2 +- src/pages/demo/d2-crud/demo1/doc.md | 2 +- src/pages/demo/d2-crud/demo1/index.vue | 2 +- yarn.lock.REMOVED.git-id | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c9dd3eb0..f610ced7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { - "@d2-projects/d2-crud": "^1.3.4", + "@d2-projects/d2-crud": "^2.0.0", "@d2-projects/vue-filters-date": "^1.0.2", "@d2-projects/vue-table-export": "^1.0.1", "@d2-projects/vue-table-import": "^1.0.0", diff --git a/src/pages/demo/d2-crud/demo1/code.js b/src/pages/demo/d2-crud/demo1/code.js index 8a087f4d..e7a5d9de 100644 --- a/src/pages/demo/d2-crud/demo1/code.js +++ b/src/pages/demo/d2-crud/demo1/code.js @@ -52,7 +52,7 @@ export default { } }, mounted () { - console.log(this.$refs.d2Crud.d2Data) + console.log(this.$refs.d2Crud.d2CrudData) } } ` diff --git a/src/pages/demo/d2-crud/demo1/doc.md b/src/pages/demo/d2-crud/demo1/doc.md index e09a2f74..fc11dfbc 100644 --- a/src/pages/demo/d2-crud/demo1/doc.md +++ b/src/pages/demo/d2-crud/demo1/doc.md @@ -1 +1 @@ -在 `D2 Crud` 组件中传入 `columns` 和 `data` 对象数组,即可创建一个最基础的表格,`columns` 中的 `key` 需要与 `data` 中对象的key严格对照,可以在 `columns` 对象中传入 `width` 属性来控制列宽。当表格中的数据通过操作变化时,可以通过 `this.$refs.d2Crud.d2Data` 拿到变化后的表格数据。代码如下: +在 `D2 Crud` 组件中传入 `columns` 和 `data` 对象数组,即可创建一个最基础的表格,`columns` 中的 `key` 需要与 `data` 中对象的key严格对照,可以在 `columns` 对象中传入 `width` 属性来控制列宽。当表格中的数据通过操作变化时,可以通过 `this.$refs.d2Crud.d2CrudData` 拿到变化后的表格数据。代码如下: diff --git a/src/pages/demo/d2-crud/demo1/index.vue b/src/pages/demo/d2-crud/demo1/index.vue index c2fd092c..ce2d0e6d 100644 --- a/src/pages/demo/d2-crud/demo1/index.vue +++ b/src/pages/demo/d2-crud/demo1/index.vue @@ -68,7 +68,7 @@ export default { } }, mounted () { - console.log(this.$refs.d2Crud.d2Data) + console.log(this.$refs.d2Crud.d2CrudData) } } diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id index 926afb0b..755e2e0e 100644 --- a/yarn.lock.REMOVED.git-id +++ b/yarn.lock.REMOVED.git-id @@ -1 +1 @@ -0e17bb1ba0029ca76043e344c175a81df34fcb2c \ No newline at end of file +0112dcaa59d17f79454b15cb17a0dc1116fdeb13 \ No newline at end of file From 46ad024bdfaa7c97c677fa63d99c5e4cc7c1bc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 10:04:54 +0800 Subject: [PATCH 02/19] demo7 Former-commit-id: f4beefe1f777778b9d3271748e997476b37b335d [formerly f4beefe1f777778b9d3271748e997476b37b335d [formerly f4beefe1f777778b9d3271748e997476b37b335d [formerly f4beefe1f777778b9d3271748e997476b37b335d [formerly 615eb77a50556807780cc416ab14dcad1b773c8f [formerly f4c208f5d043f1dba590a5050e7cbc52e37c4c82]]]]] Former-commit-id: 51207b22705c09fb6e9ddbf5759ea6cb03e86253 Former-commit-id: c16927ecbc2bb823e8b5686177e3c63cc89f8d18 Former-commit-id: 927289c443ca4baefd4bf022cc964152a4468c10 [formerly 4fb498623fe0979195368082b9fc428ccff6ca91] Former-commit-id: 349c706eec638ee588c0403385c1cefd77b90bd3 Former-commit-id: e89ed866096a2efe9e8117bb202f3f973c91fc40 Former-commit-id: 9f977d211be26a3d2852abeeba3ce3cf5255419f Former-commit-id: 23e8336f4caac10d7d46d1168fa396123a71b27b Former-commit-id: db1799cd572609ca4e744c3f8b2a77865c83832b --- src/pages/demo/d2-crud/demo7/code.js | 12 +++++++++++- src/pages/demo/d2-crud/demo7/index.vue | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pages/demo/d2-crud/demo7/code.js b/src/pages/demo/d2-crud/demo7/code.js index cb4d4e2c..ea10043f 100644 --- a/src/pages/demo/d2-crud/demo7/code.js +++ b/src/pages/demo/d2-crud/demo7/code.js @@ -4,7 +4,8 @@ export default ` @@ -107,6 +108,15 @@ export default { } } } + }, + methods: { + handleRowRemove ({index, row}, done) { + this.$message({ + message: '删除成功', + type: 'success' + }) + done() + } } } ` diff --git a/src/pages/demo/d2-crud/demo7/index.vue b/src/pages/demo/d2-crud/demo7/index.vue index 3063782d..b4516957 100644 --- a/src/pages/demo/d2-crud/demo7/index.vue +++ b/src/pages/demo/d2-crud/demo7/index.vue @@ -5,7 +5,8 @@ :columns="columns" :data="data" :options="options" - :rowHandle="rowHandle"/> + :rowHandle="rowHandle" + @row-remove="handleRowRemove"/> @@ -123,6 +124,15 @@ export default { } } } + }, + methods: { + handleRowRemove ({index, row}, done) { + this.$message({ + message: '删除成功', + type: 'success' + }) + done() + } } } From 365a79f813a3044f0c6a4351e821d93f33d09581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 10:20:23 +0800 Subject: [PATCH 03/19] demo24 Former-commit-id: 9c27f9a31685f7f2bbac6753223d3cba80df5137 [formerly 9c27f9a31685f7f2bbac6753223d3cba80df5137 [formerly 9c27f9a31685f7f2bbac6753223d3cba80df5137 [formerly 9c27f9a31685f7f2bbac6753223d3cba80df5137 [formerly d1a4eeaf471e7dde786603eb5feba15d2d3a273f [formerly c07b0a08a3c2fa248ca6ff7568d45015db2d3147]]]]] Former-commit-id: f196405033174efe983252ad2f0aced44428e859 Former-commit-id: affb0b740a6120516a0207a592675b2c26607472 Former-commit-id: b6ad9a07ba29066dcc3cad28814a1b23c05d1d10 [formerly c7d64ee76aab116775b1f19540d6d67782886669] Former-commit-id: 429004729676144772d6abf85e1bb94f83877de3 Former-commit-id: 4bd505129cfb36ff4576aeeb246bd8b6b6340dcb Former-commit-id: 877886e90cc33ae1dedd23580f3ca6ffe698ad84 Former-commit-id: f1964760a2efe6edf0de208d07808e429b8d6d9c Former-commit-id: f55839b8058fbbe298e36c69936c88645fe4be0e --- src/pages/demo/d2-crud/demo24/code.js | 21 ++++---- src/pages/demo/d2-crud/demo24/doc.md | 2 +- src/pages/demo/d2-crud/demo24/index.vue | 66 ++++++++++++------------- 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/pages/demo/d2-crud/demo24/code.js b/src/pages/demo/d2-crud/demo24/code.js index 2516e5b1..8e09fc90 100644 --- a/src/pages/demo/d2-crud/demo24/code.js +++ b/src/pages/demo/d2-crud/demo24/code.js @@ -1,12 +1,16 @@ export default ` @@ -53,9 +57,6 @@ export default { } ] } - }, - mounted () { - console.log(this.$refs.d2Crud.d2Data) } } ` diff --git a/src/pages/demo/d2-crud/demo24/doc.md b/src/pages/demo/d2-crud/demo24/doc.md index fd68e284..913162f0 100644 --- a/src/pages/demo/d2-crud/demo24/doc.md +++ b/src/pages/demo/d2-crud/demo24/doc.md @@ -1 +1 @@ -`headerButton` slot 可以在表头添加自定义按钮。代码如下: +`header` slot 可以在表头添加自定义内容。代码如下: diff --git a/src/pages/demo/d2-crud/demo24/index.vue b/src/pages/demo/d2-crud/demo24/index.vue index 79918a28..30d2ec28 100644 --- a/src/pages/demo/d2-crud/demo24/index.vue +++ b/src/pages/demo/d2-crud/demo24/index.vue @@ -1,12 +1,13 @@ From 3188b0c740e0bdecdf5824e059f7679eea290838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 11:18:55 +0800 Subject: [PATCH 04/19] demo29 Former-commit-id: a9f8bbdf8b4b9f2075e005dc9a03b1171da75855 [formerly a9f8bbdf8b4b9f2075e005dc9a03b1171da75855 [formerly a9f8bbdf8b4b9f2075e005dc9a03b1171da75855 [formerly a9f8bbdf8b4b9f2075e005dc9a03b1171da75855 [formerly b3bdc87a2f18e53072592fa312e07a2ec04e719a [formerly 684b4bc4b2918167745c6f055dec0d7ccdcc4bf3]]]]] Former-commit-id: dc666ca9fa04a27c129b44ec33fb8fc423db0f15 Former-commit-id: e6d2525875d3343098fdafb1bb9c82ed88243753 Former-commit-id: d025e35937306d24ce8e699df81d5b3b1adbe238 [formerly a22591c2cedc03954f656ab4388738b1c5037304] Former-commit-id: d0c4aa7a71bc61439aac3dd0d10f1543678790bb Former-commit-id: 7e1b884f39e9f0f6e364a89ec4b1840792e18fb2 Former-commit-id: bcedb771d6808168e3746eada50483b1d9c9c765 Former-commit-id: 9d76d6a9de76e409e1f34efbd1451a9291840eec Former-commit-id: 7f6a2103013a57c5e79d8f533fff95c39e8ca7f1 --- src/pages/demo/d2-crud/demo24/index.vue | 50 ++++----- src/pages/demo/d2-crud/demo29/code.js | 134 +++++++++--------------- src/pages/demo/d2-crud/demo29/index.vue | 127 ++++++++-------------- 3 files changed, 115 insertions(+), 196 deletions(-) diff --git a/src/pages/demo/d2-crud/demo24/index.vue b/src/pages/demo/d2-crud/demo24/index.vue index 30d2ec28..051eab05 100644 --- a/src/pages/demo/d2-crud/demo24/index.vue +++ b/src/pages/demo/d2-crud/demo24/index.vue @@ -22,54 +22,54 @@ diff --git a/src/pages/demo/d2-crud/demo29/code.js b/src/pages/demo/d2-crud/demo29/code.js index a8a10b8d..3f4e3450 100644 --- a/src/pages/demo/d2-crud/demo29/code.js +++ b/src/pages/demo/d2-crud/demo29/code.js @@ -1,113 +1,73 @@ export default ` ` diff --git a/src/pages/demo/d2-crud/demo29/index.vue b/src/pages/demo/d2-crud/demo29/index.vue index 5d48fba8..525b4982 100644 --- a/src/pages/demo/d2-crud/demo29/index.vue +++ b/src/pages/demo/d2-crud/demo29/index.vue @@ -4,7 +4,9 @@ + :loading="loading" + :pagination="pagination" + @pagination-current-change="paginationCurrentChange"/> @@ -20,6 +22,7 @@ From 52d3c46da2831b8b6da73c9c275f3006c084ae3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 14:03:12 +0800 Subject: [PATCH 05/19] demo16 Former-commit-id: db05786be3e9ab66abe0b3b604d01562542cfacc [formerly db05786be3e9ab66abe0b3b604d01562542cfacc [formerly db05786be3e9ab66abe0b3b604d01562542cfacc [formerly db05786be3e9ab66abe0b3b604d01562542cfacc [formerly 2acd0640d624075a9ddc5f9a86ee5adec2b88bc0 [formerly f87fab303d38481b3aa9a8dfda9f727d4bc25904]]]]] Former-commit-id: 7030151b1f70b55f37114edc200cf3552469d190 Former-commit-id: 1b25ebdf8718b92e2b76e2d20fc75cbd79b6b9b4 Former-commit-id: 8e0c4a7c70905f515f10b7ad17077e42dbce7e4a [formerly d576cf89831968e4b6d972279add9a571f934c7c] Former-commit-id: 9508887808bd8d888911e5b801180124bad7d072 Former-commit-id: 83245f1c040f9fdaee900aee9a08efd9e40c1f8d Former-commit-id: 65380a255ed238316df9da4ec1865eaeea4ffee1 Former-commit-id: ef70b25a26296e2d17945d77175934a4e1e9e94d Former-commit-id: 40cd5c6889f026242af0508bd051d138d7d973d8 --- src/pages/demo/d2-crud/demo16/code.js | 41 +++++++++++++++++++------ src/pages/demo/d2-crud/demo16/doc.md | 2 +- src/pages/demo/d2-crud/demo16/index.vue | 38 +++++++++++++++++------ 3 files changed, 62 insertions(+), 19 deletions(-) diff --git a/src/pages/demo/d2-crud/demo16/code.js b/src/pages/demo/d2-crud/demo16/code.js index 61118115..d8904f76 100644 --- a/src/pages/demo/d2-crud/demo16/code.js +++ b/src/pages/demo/d2-crud/demo16/code.js @@ -1,15 +1,16 @@ export default ` @@ -53,11 +54,7 @@ export default { address: '上海市普陀区金沙江路 1516 弄' } ], - addButton: { - icon: 'el-icon-plus', - size: 'small' - }, - formTemplate: { + addTemplate: { date: { title: '日期', value: '2016-05-05' @@ -79,6 +76,32 @@ export default { } }, methods: { + // 普通的新增 + addRow () { + this.$refs.d2Crud.showDialog({ + mode: 'add' + }) + }, + // 传入自定义模板的新增 + addRowWithNewTemplate () { + this.$refs.d2Crud.showDialog({ + mode: 'add', + template: { + name: { + title: '姓名', + value: '' + }, + value1: { + title: '新属性1', + value: '' + }, + value2: { + title: '新属性2', + value: '' + } + } + }) + }, handleRowAdd (row, done) { this.formOptions.saveLoading = true setTimeout(() => { diff --git a/src/pages/demo/d2-crud/demo16/doc.md b/src/pages/demo/d2-crud/demo16/doc.md index 6e1e63ea..d2bc3ee5 100644 --- a/src/pages/demo/d2-crud/demo16/doc.md +++ b/src/pages/demo/d2-crud/demo16/doc.md @@ -1 +1 @@ -通过给 `D2 Crud` 传入 `add-mode` 可开启新增模式,需要传入 `form-template` 来为新增的表单添加模板,向`form-options` 中传入 `labelWidth` 和 `labelPosition` 来控制表单中label的显示, `saveLoading` 则控制保存按钮的loading状态,`addButton` 可以控制表格顶部新增按钮的样式, `row-add` 事件控制数据新增,接收两个参数: `row` 是当前新增行的数据, `done` 用于控制保存成功,可以在 `done()` 之前加入自己的逻辑代码,`done()`可以传入包含表单字段的对象来覆盖提交的数据,`done(false)` 可以取消新增。代码如下: +通过 `ref` 调用 `D2 Crud` 的 `showDialog` 方法,并传入 `mode: 'add'`属性,可开启新增模式,需要定义 `add-template` 来为新增的表单添加模板,也可以向 `showDialog` 中传入 `template`对象来灵活定义新的模板,向`form-options` 中传入 `labelWidth` 和 `labelPosition` 来控制表单中label的显示, `saveLoading` 则控制保存按钮的loading状态, `row-add` 事件控制数据新增,接收两个参数: `row` 是当前新增行的数据, `done` 用于控制保存成功,可以在 `done()` 之前加入自己的逻辑代码,`done()`可以传入包含表单字段的对象来覆盖提交的数据,`done(false)` 可以取消新增。代码如下: diff --git a/src/pages/demo/d2-crud/demo16/index.vue b/src/pages/demo/d2-crud/demo16/index.vue index a7858868..e1126c49 100644 --- a/src/pages/demo/d2-crud/demo16/index.vue +++ b/src/pages/demo/d2-crud/demo16/index.vue @@ -2,15 +2,15 @@ + 新增 + 使用自定义模板新增 @@ -70,11 +70,7 @@ export default { address: '上海市普陀区金沙江路 1516 弄' } ], - addButton: { - icon: 'el-icon-plus', - size: 'small' - }, - formTemplate: { + addTemplate: { date: { title: '日期', value: '2016-05-05' @@ -96,6 +92,30 @@ export default { } }, methods: { + addRow () { + this.$refs.d2Crud.showDialog({ + mode: 'add' + }) + }, + addRowWithNewTemplate () { + this.$refs.d2Crud.showDialog({ + mode: 'add', + template: { + name: { + title: '姓名', + value: '' + }, + value1: { + title: '新属性1', + value: '' + }, + value2: { + title: '新属性2', + value: '' + } + } + }) + }, handleRowAdd (row, done) { this.formOptions.saveLoading = true setTimeout(() => { From 86d7f32edc6c9ad66884e9780ba5e206ea3a60f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 14:06:02 +0800 Subject: [PATCH 06/19] no message Former-commit-id: 6a615e3d27fb5af0a4f2a528d4bc0404f6d93b08 [formerly 6a615e3d27fb5af0a4f2a528d4bc0404f6d93b08 [formerly 6a615e3d27fb5af0a4f2a528d4bc0404f6d93b08 [formerly 6a615e3d27fb5af0a4f2a528d4bc0404f6d93b08 [formerly eeac2dbd8728abdfbbb1e81664c3b4f99196fa7f [formerly 68163edafb6cf8d2e88e1a03b092f87bff5695e4]]]]] Former-commit-id: 6056aad39dbae0f175c96da417f720d07ae3239e Former-commit-id: 4731877ba5c4087c93af816cc82b8c72787d1be1 Former-commit-id: c4af02faeca1ad699f390f11b223f5119af73245 [formerly 98ff003bb0026fcf6ad19beaf86a9e19bfa98c36] Former-commit-id: 5aa59f358ad90ed90926dfe467c59e92b05bed63 Former-commit-id: eff84396849b3f6a3c3937d5fe3de573a569c86e Former-commit-id: 367cb8aca8dd97927404acd6dfaee12ae9224f75 Former-commit-id: 59e156f8d1f663e1813c265adfd56396de38264d Former-commit-id: 96cca44fadf03d4dec6adf118cd402befae1ea92 --- src/pages/demo/d2-crud/demo16/code.js | 2 +- src/pages/demo/d2-crud/demo29/code.js | 2 +- src/pages/demo/d2-crud/demo29/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/demo/d2-crud/demo16/code.js b/src/pages/demo/d2-crud/demo16/code.js index d8904f76..ae82850d 100644 --- a/src/pages/demo/d2-crud/demo16/code.js +++ b/src/pages/demo/d2-crud/demo16/code.js @@ -116,7 +116,7 @@ export default { address: '我是通过done事件传入的数据!' }) this.formOptions.saveLoading = false - }, 300); + }, 300) }, handleDialogCancel (done) { this.$message({ diff --git a/src/pages/demo/d2-crud/demo29/code.js b/src/pages/demo/d2-crud/demo29/code.js index 3f4e3450..ecb00f59 100644 --- a/src/pages/demo/d2-crud/demo29/code.js +++ b/src/pages/demo/d2-crud/demo29/code.js @@ -65,7 +65,7 @@ export default { this.loading = false }).catch(err => { console.log('err', err) - this.loading = falser + this.loading = false }) } } diff --git a/src/pages/demo/d2-crud/demo29/index.vue b/src/pages/demo/d2-crud/demo29/index.vue index 525b4982..724634c9 100644 --- a/src/pages/demo/d2-crud/demo29/index.vue +++ b/src/pages/demo/d2-crud/demo29/index.vue @@ -80,7 +80,7 @@ export default { this.loading = false }).catch(err => { console.log('err', err) - this.loading = falser + this.loading = false }) } } From 6afb7bd6ab92689b3f26612f3be13ef763ea42d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 24 Dec 2018 14:23:10 +0800 Subject: [PATCH 07/19] demo17 Former-commit-id: 3f8978cbce003b596c3c70cef9b5e3b7fea67919 [formerly 3f8978cbce003b596c3c70cef9b5e3b7fea67919 [formerly 3f8978cbce003b596c3c70cef9b5e3b7fea67919 [formerly 3f8978cbce003b596c3c70cef9b5e3b7fea67919 [formerly af03b248ed130578a52df68cc9f056ff74c97f84 [formerly 8571b957930a1b3f44d064d6684485ca3cbdf7f5]]]]] Former-commit-id: 29fb645bf91fbb79fa25644600a428133fc215ca Former-commit-id: d912c2fb62daf287a8127a72eb33573cc8df189a Former-commit-id: 515ff8c21c5504054a105034aa29d33e8d1fb231 [formerly 17d1479cea563999e628205edfd604fa7984a635] Former-commit-id: 15d093c854129e2dc3fd1a2c753116271953b05e Former-commit-id: 12cd7f74e5c91d9fcced2aee4e87784299e0d8f6 Former-commit-id: 002892c7df27cffcc34e68011f192b012769eca3 Former-commit-id: 821d2a86d3ac89e34294f36e096e8e8499569a68 Former-commit-id: b5057b8958e81ef6a8c12df48d425ad64629167a --- src/pages/demo/d2-crud/demo17/code.js | 38 ++++++++++++++----------- src/pages/demo/d2-crud/demo17/doc.md | 2 +- src/pages/demo/d2-crud/demo17/index.vue | 35 ++++++++++++----------- src/pages/demo/d2-crud/demo18/code.js | 1 - src/pages/demo/d2-crud/demo18/index.vue | 1 - src/pages/demo/d2-crud/demo19/code.js | 1 - src/pages/demo/d2-crud/demo19/index.vue | 1 - src/pages/demo/d2-crud/demo20/code.js | 1 - src/pages/demo/d2-crud/demo20/index.vue | 1 - src/pages/demo/d2-crud/demo21/code.js | 1 - src/pages/demo/d2-crud/demo21/index.vue | 1 - src/pages/demo/d2-crud/demo22/code.js | 1 - src/pages/demo/d2-crud/demo22/index.vue | 1 - 13 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/pages/demo/d2-crud/demo17/code.js b/src/pages/demo/d2-crud/demo17/code.js index 3d0f9a66..b27b1881 100644 --- a/src/pages/demo/d2-crud/demo17/code.js +++ b/src/pages/demo/d2-crud/demo17/code.js @@ -1,16 +1,16 @@ export default ` @@ -82,7 +82,7 @@ export default { } } }, - formTemplate: { + editTemplate: { date: { title: '日期', value: '' @@ -118,17 +118,21 @@ export default { } }, methods: { - handleRowAdd (row, done) { - this.formOptions.saveLoading = true - setTimeout(() => { - console.log(row) - this.$message({ - message: '保存成功', - type: 'success' - }) - done() - this.formOptions.saveLoading = false - }, 300) + editRowWithNewTemplate () { + this.$refs.d2Crud.showDialog({ + mode: "edit", + rowIndex: 2, + template: { + date: { + title: '日期', + value: '' + }, + name: { + title: '姓名', + value: '' + } + } + }) }, handleRowEdit ({index, row}, done) { this.formOptions.saveLoading = true diff --git a/src/pages/demo/d2-crud/demo17/doc.md b/src/pages/demo/d2-crud/demo17/doc.md index de4b3925..5943668f 100644 --- a/src/pages/demo/d2-crud/demo17/doc.md +++ b/src/pages/demo/d2-crud/demo17/doc.md @@ -1 +1 @@ -通过给 `D2 Crud` 传入 `rowHandle` 可开启表格操作列,传入 `columnHeader` 可以自定义操作列的表头,传入 `edit` 对象可以开启编辑模式,需要传入 `form-template` 来为编辑添加模板,向`form-options` 中传入 `labelWidth` 和 `labelPosition` 来控制表单中label的显示, `saveLoading` 则控制保存按钮的loading状态, `row-edit` 事件控制数据编辑,参数: `index` 是当前编辑行的索引, `row` 是当前编辑行的数据, `done` 用于控制编辑成功,可以在 `done()` 之前加入自己的逻辑代码,`done()`可以传入包含表单字段的对象来覆盖提交的数据,`done(false)` 可以取消编辑。代码如下: +通过给 `D2 Crud` 传入 `rowHandle` 可开启表格操作列,传入 `columnHeader` 可以自定义操作列的表头,传入 `edit` 对象可以开启编辑模式,需要传入 `edit-template` 来为编辑添加模板,通过 `ref` 调用 `D2 Crud` 的 `showDialog` 方法,并传入 `mode: 'edit'` 、`rowIndex` 属性和 `template`对象,可使用自定义模板编辑指定行,向`form-options` 中传入 `labelWidth` 和 `labelPosition` 来控制表单中label的显示, `saveLoading` 则控制保存按钮的loading状态, `row-edit` 事件控制数据编辑,参数: `index` 是当前编辑行的索引, `row` 是当前编辑行的数据, `done` 用于控制编辑成功,可以在 `done()` 之前加入自己的逻辑代码,`done()`可以传入包含表单字段的对象来覆盖提交的数据,`done(false)` 可以取消编辑。代码如下: diff --git a/src/pages/demo/d2-crud/demo17/index.vue b/src/pages/demo/d2-crud/demo17/index.vue index cd6b0d40..66fb32a8 100644 --- a/src/pages/demo/d2-crud/demo17/index.vue +++ b/src/pages/demo/d2-crud/demo17/index.vue @@ -2,16 +2,15 @@ + 使用自定义模板编辑第三行 @@ -99,7 +98,7 @@ export default { } } }, - formTemplate: { + editTemplate: { date: { title: '日期', value: '' @@ -135,17 +134,21 @@ export default { } }, methods: { - handleRowAdd (row, done) { - this.formOptions.saveLoading = true - setTimeout(() => { - console.log(row) - this.$message({ - message: '保存成功', - type: 'success' - }) - done() - this.formOptions.saveLoading = false - }, 300) + editRowWithNewTemplate () { + this.$refs.d2Crud.showDialog({ + mode: "edit", + rowIndex: 2, + template: { + date: { + title: '日期', + value: '' + }, + name: { + title: '姓名', + value: '' + } + } + }) }, handleRowEdit ({ index, row }, done) { this.formOptions.saveLoading = true diff --git a/src/pages/demo/d2-crud/demo18/code.js b/src/pages/demo/d2-crud/demo18/code.js index 5484cf37..6c92d4eb 100644 --- a/src/pages/demo/d2-crud/demo18/code.js +++ b/src/pages/demo/d2-crud/demo18/code.js @@ -3,7 +3,6 @@ export default `