From 947475bdc195d2b7c9f5d599bf71d74165e59d3c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 28 Nov 2018 16:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E7=8E=B0=E4=BA=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E7=AD=89=E5=BE=85=E7=BB=93=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly ecb763d008a589ee3b83854517804b1468ca7a09 [formerly b18b87cc41e0c54a93a2f5021fe6022a6fa2c5fb]]]]]
Former-commit-id: 51a327f9f3d7a018f099f72ad564d6604aa5e9d7
Former-commit-id: 81c578d9cef74d8513c8a3c65107cfdfd3c6dfb7
Former-commit-id: caad4b29ff03d5878996ce52ff20252336128d97 [formerly 42d8aa2c0c3332d2c07057d6f4cdf21388c08fb9]
Former-commit-id: a81ea126d2fa05ae5555f872669792a08f9f2ff0
Former-commit-id: d27d0e66ed023c621d2cd2711664f498a21bb8ad
Former-commit-id: 61e0719ea25d0c67c1c38ded8cf41be50c17d7b5
Former-commit-id: 17291fab193dcf38a91f44137fa271d8f2d4ee56
Former-commit-id: 5218d72d35fb2d088198c37187d662eca768bd7b
---
 package-lock.json.REMOVED.git-id              |  2 +-
 package.json                                  |  1 +
 src/api/demo/business/issues/142/index.js     | 11 +++
 src/menu/modules/demo-business.js             |  7 ++
 .../api/demo/business/issues/142/index.js     | 26 ++++++
 src/pages/demo/business/issues/142/edit.vue   | 80 +++++++++++++++++++
 src/pages/demo/business/issues/142/index.vue  | 60 ++++++++++++++
 .../demo/playground/store/page/index.vue      | 10 +--
 src/router/modules/business.js                | 39 ++++++++-
 9 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 src/api/demo/business/issues/142/index.js
 create mode 100644 src/mock/api/demo/business/issues/142/index.js
 create mode 100644 src/pages/demo/business/issues/142/edit.vue
 create mode 100644 src/pages/demo/business/issues/142/index.vue

diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
index 2f1b1384..7347e8cb 100644
--- a/package-lock.json.REMOVED.git-id
+++ b/package-lock.json.REMOVED.git-id
@@ -1 +1 @@
-273bfaa679d4398e12f5270f76df4e1953da170b
\ No newline at end of file
+14be1e768a4e072ad8ea5ff5bfec5535088a3e4b
\ No newline at end of file
diff --git a/package.json b/package.json
index 305788dc..a0ec1396 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "mockjs": "^1.0.1-beta3",
     "nprogress": "^0.2.0",
     "papaparse": "^4.3.6",
+    "qs": "^6.6.0",
     "quill": "^1.3.4",
     "screenfull": "^3.3.2",
     "simplemde": "^1.11.2",
diff --git a/src/api/demo/business/issues/142/index.js b/src/api/demo/business/issues/142/index.js
new file mode 100644
index 00000000..b5b4464c
--- /dev/null
+++ b/src/api/demo/business/issues/142/index.js
@@ -0,0 +1,11 @@
+import request from '@/plugin/axios'
+
+export function get (id) {
+  return request({
+    url: '/demo/business/issues/142',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
diff --git a/src/menu/modules/demo-business.js b/src/menu/modules/demo-business.js
index 78724af8..71b01f37 100644
--- a/src/menu/modules/demo-business.js
+++ b/src/menu/modules/demo-business.js
@@ -10,6 +10,13 @@ export default {
       children: [
         { path: `${pre}table/1`, title: '表格 1' }
       ]
+    },
+    {
+      title: 'ISSUES',
+      icon: 'github',
+      children: [
+        { path: `${pre}issues/142`, title: '#142' }
+      ]
     }
   ])('/demo/business/')
 }
diff --git a/src/mock/api/demo/business/issues/142/index.js b/src/mock/api/demo/business/issues/142/index.js
new file mode 100644
index 00000000..0c8933d8
--- /dev/null
+++ b/src/mock/api/demo/business/issues/142/index.js
@@ -0,0 +1,26 @@
+import Mock from 'mockjs'
+import qs from 'qs'
+
+const db = [
+  { id: '1', name: '王小虎1', address: '上海市普陀区金沙江路 1518 弄' },
+  { id: '2', name: '王小虎2', address: '上海市普陀区金沙江路 1517 弄' },
+  { id: '3', name: '王小虎3', address: '上海市普陀区金沙江路 1519 弄' },
+  { id: '4', name: '王小虎4', address: '上海市普陀区金沙江路 1516 弄' }
+]
+
+Mock.mock(RegExp('/api/demo/business/issues/142' + '.*'), 'get', ({ url, type, body }) => {
+  // 解析
+  const options = {
+    params: qs.parse(url.split('?').length > 1 ? url.split('?')[1] : ''),
+    body: qs.parse(body),
+    url: qs.parse(url.split('?')[0])
+  }
+  // 返回数据
+  return Mock.mock(
+    {
+      code: 0,
+      msg: '获取数据成功',
+      data: db.find(e => e.id === options.params.id)
+    }
+  )
+})
diff --git a/src/pages/demo/business/issues/142/edit.vue b/src/pages/demo/business/issues/142/edit.vue
new file mode 100644
index 00000000..79fe15c0
--- /dev/null
+++ b/src/pages/demo/business/issues/142/edit.vue
@@ -0,0 +1,80 @@
+<template>
+  <d2-container
+    type="card"
+    class="demo-business-issues-142-edit">
+    <template slot="header">编辑 id: {{id}}</template>
+    <el-form ref="form" :model="form" label-width="80px" class="demo-business-issues-142-edit--form">
+      <el-form-item label="姓名">
+        <el-input v-model="form.name"/>
+      </el-form-item>
+      <el-form-item label="地址">
+        <el-input type="textarea" v-model="form.address"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSubmit">修改</el-button>
+        <el-button @click="handleCancel">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </d2-container>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+import { get } from '@/api/demo/business/issues/142'
+export default {
+  props: {
+    id: {
+      type: String,
+      required: true
+    }
+  },
+  data () {
+    return {
+      form: {
+        name: '',
+        address: ''
+      }
+    }
+  },
+  created () {
+    // 自动加载一次表单数据
+    this.getFormData()
+  },
+  methods: {
+    ...mapActions('d2admin/page', [
+      'close'
+    ]),
+    // 根据 id 获取数据
+    getFormData () {
+      get(this.id)
+        .then(res => {
+          this.form.name = res.name
+          this.form.address = res.address
+        })
+        .catch(err => {
+          console.log('err', err)
+        })
+    },
+    // 提交
+    handleSubmit () {
+      console.log('submit!')
+    },
+    // 取消编辑
+    handleCancel () {
+      this.close({
+        tagName: this.$route.fullPath,
+        vm: this
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.demo-business-issues-142-edit {
+  .demo-business-issues-142-edit--form {
+    max-width: 460px;
+    margin: 0px auto;
+  }
+}
+</style>
diff --git a/src/pages/demo/business/issues/142/index.vue b/src/pages/demo/business/issues/142/index.vue
new file mode 100644
index 00000000..a1df4a94
--- /dev/null
+++ b/src/pages/demo/business/issues/142/index.vue
@@ -0,0 +1,60 @@
+<template>
+  <d2-container type="card">
+    <d2-crud
+      v-bind="crud"
+      @edit="handleEdit"
+      style="margin: -15px 0;"/>
+    <template slot="footer">
+      <d2-link-btn
+        title="issue #142"
+        link="https://github.com/d2-projects/d2-admin/issues/142"/>
+    </template>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      crud: {
+        columns: [
+          { title: '姓名', key: 'name' },
+          { title: '地址', key: 'address' }
+        ],
+        data: [
+          { id: '1', name: '王小虎1', address: '上海市普陀区金沙江路 1518 弄' },
+          { id: '2', name: '王小虎2', address: '上海市普陀区金沙江路 1517 弄' },
+          { id: '3', name: '王小虎3', address: '上海市普陀区金沙江路 1519 弄' },
+          { id: '4', name: '王小虎4', address: '上海市普陀区金沙江路 1516 弄' }
+        ],
+        options: {
+          border: true,
+          size: 'mini'
+        },
+        rowHandle: {
+          width: 80,
+          align: 'center',
+          custom: [
+            {
+              text: '编辑',
+              type: 'primary',
+              size: 'mini',
+              emit: 'edit'
+            }
+          ]
+        }
+      }
+    }
+  },
+  methods: {
+    handleEdit ({ index, row }) {
+      this.$router.push({
+        name: 'demo-business-issues-142-edit',
+        params: {
+          id: row.id
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/playground/store/page/index.vue b/src/pages/demo/playground/store/page/index.vue
index 813dec42..c100055e 100644
--- a/src/pages/demo/playground/store/page/index.vue
+++ b/src/pages/demo/playground/store/page/index.vue
@@ -61,28 +61,28 @@ export default {
     // 关闭当前
     handleCloseCurrent () {
       this.close({
-        tagName: this.$route.name,
+        tagName: this.$route.fullPath,
         vm: this
       })
     },
     // 关闭左侧
     handleCloseLeft () {
       this.closeLeft({
-        tagName: this.$route.name,
+        tagName: this.$route.fullPath,
         vm: this
       })
     },
     // 关闭右侧
     handleCloseRight () {
       this.closeRight({
-        tagName: this.$route.name,
+        tagName: this.$route.fullPath,
         vm: this
       })
     },
     // 关闭其他
     handleCloseOther () {
       this.closeOther({
-        tagName: this.$route.name,
+        tagName: this.$route.fullPath,
         vm: this
       })
     },
@@ -92,7 +92,7 @@ export default {
     },
     // 清空当前页缓存并刷新此页面
     handleCleanCacheAndRefreshCurrent () {
-      this.keepAliveRemove(this.$route.name)
+      this.keepAliveRemove(this.$route.fullPath)
       this.$nextTick(this.$router.replace('/refresh'))
     },
     // 清空所有的缓存并刷新此页面
diff --git a/src/router/modules/business.js b/src/router/modules/business.js
index 7b8ad0c5..3454c547 100644
--- a/src/router/modules/business.js
+++ b/src/router/modules/business.js
@@ -9,7 +9,42 @@ export default {
   redirect: { name: 'demo-business-index' },
   component: layoutHeaderAside,
   children: (pre => [
-    { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index'), meta: { ...meta, title: '示例首页' } },
-    { path: 'table/1', name: `${pre}table-1`, component: () => import('@/pages/demo/business/table/1'), meta: { ...meta, title: '表格 1' } }
+    {
+      path: 'index',
+      name: `${pre}index`,
+      component: () => import('@/pages/demo/business/index'),
+      meta: {
+        ...meta,
+        title: '示例首页'
+      }
+    },
+    {
+      path: 'table/1',
+      name: `${pre}table-1`,
+      component: () => import('@/pages/demo/business/table/1'),
+      meta: {
+        ...meta,
+        title: '表格 1'
+      }
+    },
+    {
+      path: 'issues/142',
+      name: `${pre}issues-142`,
+      component: () => import('@/pages/demo/business/issues/142'),
+      meta: {
+        ...meta,
+        title: 'issue #142'
+      }
+    },
+    {
+      path: 'issues/142/edit/:id',
+      name: `${pre}issues-142-edit`,
+      component: () => import('@/pages/demo/business/issues/142/edit'),
+      props: true,
+      meta: {
+        ...meta,
+        title: 'issue #142 Edit'
+      }
+    }
   ])('demo-business-')
 }