From b1afe31a051d235e8b7e45353fce58db29254252 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 12 Dec 2018 22:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0mock=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly ac1af8ddc9819b789fd70b8da10ee223faed6e69 [formerly 22a45253b3ddb18715a39500f9bf5b56e1b37c6e]]]]] Former-commit-id: acba007c5344dce6a0122676027ba0266c5636b0 Former-commit-id: 33b90caaf8810a029cf1f051b4b0f30f7c328309 Former-commit-id: 6d602d737c16c5eda5f8e2448acb7c83c8df8c4c [formerly 415683706be473d2888806175eec075c57798e0e] Former-commit-id: c5285636ff550374708ba4346fc6e98eb08d32e3 Former-commit-id: 0ed99aac2efee06256bc94d52eac820ca24dda35 Former-commit-id: d8a75b3f1da2a75645e0965f2b278bde10ef16cb Former-commit-id: 8b424ac8ef5df06cb89d76e4ba3a3fcdeb34f113 Former-commit-id: 93f866cbfcf129ed0f0393c4bf567a45c6a17568 --- src/mock/api/demo.business.issues.142.js | 4 +- src/mock/api/demo.business.table.1.js | 38 +++++++++---------- src/mock/index.js | 5 +-- .../table/1/componnets/PageFooter/index.vue | 2 +- src/pages/demo/business/table/1/index.vue | 2 +- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/mock/api/demo.business.issues.142.js b/src/mock/api/demo.business.issues.142.js index 9098c95e..e342b517 100644 --- a/src/mock/api/demo.business.issues.142.js +++ b/src/mock/api/demo.business.issues.142.js @@ -6,9 +6,9 @@ const db = [ ] export default { - path: RegExp('/api/demo/business/issues/142' + '.*'), + path: RegExp('/api/demo/business/issues/142.*'), method: 'get', - handle ({ method, url, params, body, Mock, Random, Generator, Repeat }) { + handle ({ params }) { return { code: 0, msg: '获取数据成功', diff --git a/src/mock/api/demo.business.table.1.js b/src/mock/api/demo.business.table.1.js index b6cb6074..66b638ce 100644 --- a/src/mock/api/demo.business.table.1.js +++ b/src/mock/api/demo.business.table.1.js @@ -1,29 +1,25 @@ export default { path: RegExp('/api/demo/business/table/1'), method: 'post', - handle ({ method, url, params, body, Mock, Random, Generator, Repeat }) { + handle ({ body, Repeat }) { const { page } = body page.total = 1000 - return Mock.mock( - { - code: 0, - msg: '获取数据成功', - data: { - page, - 'list|20': [ - { - 'key': '@guid', - 'value|1': [10, 100, 200, 500], - 'type': '@boolean', - 'admin': '@cname', - 'adminNote': '@cparagraph(0.5)', - 'dateTimeCreat': '@datetime', - 'used': '@boolean', - 'dateTimeUse': '@datetime' - } - ] - } + return { + code: 0, + msg: '获取数据成功', + data: { + page, + list: Repeat(page.size, { + 'key': '@guid', + 'value|1': [10, 100, 200, 500], + 'type': '@boolean', + 'admin': '@cname', + 'adminNote': '@cparagraph(0.5)', + 'dateTimeCreat': '@datetime', + 'used': '@boolean', + 'dateTimeUse': '@datetime' + }) } - ) + } } } diff --git a/src/mock/index.js b/src/mock/index.js index 4d7c7eca..ed02bfe2 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -1,9 +1,8 @@ import d2Mock from './d2-mock' -// 导入所有的接口 const req = context => context.keys().map(context) -const arr = req(require.context('./api/', true, /\.js$/)) +const options = req(require.context('./api/', true, /\.js$/)) .filter(e => e.default) .map(e => e.default) -d2Mock.load(arr) +d2Mock.load(options) diff --git a/src/pages/demo/business/table/1/componnets/PageFooter/index.vue b/src/pages/demo/business/table/1/componnets/PageFooter/index.vue index 46df4540..31ac9067 100644 --- a/src/pages/demo/business/table/1/componnets/PageFooter/index.vue +++ b/src/pages/demo/business/table/1/componnets/PageFooter/index.vue @@ -3,7 +3,7 @@ :current-page="current" :page-size="size" :total="total" - :page-sizes="[100, 200, 300, 400]" + :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" style="margin: -10px;" @size-change="handleSizeChange" diff --git a/src/pages/demo/business/table/1/index.vue b/src/pages/demo/business/table/1/index.vue index ac1b5fe6..c0ce9668 100644 --- a/src/pages/demo/business/table/1/index.vue +++ b/src/pages/demo/business/table/1/index.vue @@ -33,7 +33,7 @@ export default { loading: false, page: { current: 1, - size: 100, + size: 10, total: 0 } }