From e199d83c79dd35043240b65d0e32d76c4440d779 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 7 Aug 2018 13:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=A4=BA=E4=BE=8B=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly fcef20ff04bd08ab432bc47ac75fb4e6483c2851 [formerly fa46aa095a6a2e8317207d6ab9862cc7f4b56339]]]]] Former-commit-id: 12745f3af51dabcf235c449e6f8b47ea0658b4c2 Former-commit-id: 020118a1c207454660f1e83e35dd834ac9493b74 Former-commit-id: d205e48a791b6afe1222c08943206ee238e92de8 [formerly dc747e67590f1042a5ac7b01ee86d4a9509cd920] Former-commit-id: 867a148b7da027dc469ef8e1964f593e6abfe86b Former-commit-id: d348819675978bf97305d79863fd72de108adad3 Former-commit-id: 8c8bcd05152b184547b8903de19a63ef262ed12c Former-commit-id: 375bf4f1cbce6b86e82e86bedf7951d0d800f97f Former-commit-id: 4b70e86cd638b19ed13371c86fa4b7be17528ae7 --- src/mock/demo/business/table/1/index.js | 2 +- .../table/1/componnets/PageHeader/index.vue | 22 +- .../table/1/componnets/PageMain/index.vue | 254 ++++++++++++------ src/pages/demo/business/table/1/index.vue | 17 +- src/pages/demo/playground/env/index.vue | 1 - src/pages/error-page-404/page.vue | 2 +- 6 files changed, 191 insertions(+), 107 deletions(-) diff --git a/src/mock/demo/business/table/1/index.js b/src/mock/demo/business/table/1/index.js index b5d9a37e..7c8d2621 100644 --- a/src/mock/demo/business/table/1/index.js +++ b/src/mock/demo/business/table/1/index.js @@ -8,7 +8,7 @@ Mock.mock('/api/demo/business/table/1', ({ body }) => { return Mock.mock( { page, - 'list|30': [{ + 'list|20': [{ 'key': '@guid', 'value|1': [10, 100, 200, 500], 'type': '@boolean', diff --git a/src/pages/demo/business/table/1/componnets/PageHeader/index.vue b/src/pages/demo/business/table/1/componnets/PageHeader/index.vue index 4cc94a5c..2cd13cac 100644 --- a/src/pages/demo/business/table/1/componnets/PageHeader/index.vue +++ b/src/pages/demo/business/table/1/componnets/PageHeader/index.vue @@ -6,17 +6,17 @@ ref="form" size="mini" style="margin-bottom: -18px;"> - + - - - - - + + + + + @@ -24,7 +24,7 @@ + style="width: 100px;"/> @@ -44,7 +44,7 @@ + @click="handleFormSubmit"> 查询 @@ -52,7 +52,7 @@ + @click="handleFormReset"> 重置 @@ -78,7 +78,7 @@ export default { } }, methods: { - submitForm () { + handleFormSubmit () { this.$refs.form.validate((valid) => { if (valid) { this.$emit('submit', this.form) @@ -91,7 +91,7 @@ export default { } }) }, - resetForm () { + handleFormReset () { this.$refs.form.resetFields() } } diff --git a/src/pages/demo/business/table/1/componnets/PageMain/index.vue b/src/pages/demo/business/table/1/componnets/PageMain/index.vue index a522b78f..922db145 100644 --- a/src/pages/demo/business/table/1/componnets/PageMain/index.vue +++ b/src/pages/demo/business/table/1/componnets/PageMain/index.vue @@ -1,99 +1,149 @@ - diff --git a/src/pages/demo/business/table/1/index.vue b/src/pages/demo/business/table/1/index.vue index 0e8b370e..0bd5cd09 100644 --- a/src/pages/demo/business/table/1/index.vue +++ b/src/pages/demo/business/table/1/index.vue @@ -5,7 +5,8 @@ @submit="handleSubmit" ref="header"/> + :table-data="table" + :loading="loading"/> { - this.$refs.header.submitForm() + this.$refs.header.handleFormSubmit() }) }, handleSubmit (form) { + this.loading = true this.$notify({ - title: '开始请求表格数据' + title: '开始请求模拟表格数据' }) this.$axios.post('/api/demo/business/table/1', { ...form, page: this.page }) .then(res => { - console.log('res', res) + this.loading = false this.$notify({ - title: '表格数据请求完毕' + title: '模拟表格数据请求完毕' }) this.table = res.list this.page = res.page }) .catch(err => { + this.loading = false this.$notify({ - title: '表格数据请求异常' + title: '模拟表格数据请求异常' }) console.log('err', err) }) diff --git a/src/pages/demo/playground/env/index.vue b/src/pages/demo/playground/env/index.vue index 8ed20ace..1da4ba51 100644 --- a/src/pages/demo/playground/env/index.vue +++ b/src/pages/demo/playground/env/index.vue @@ -18,4 +18,3 @@ export default { } } - diff --git a/src/pages/error-page-404/page.vue b/src/pages/error-page-404/page.vue index d8f1215e..a1c7843a 100644 --- a/src/pages/error-page-404/page.vue +++ b/src/pages/error-page-404/page.vue @@ -10,7 +10,7 @@