Merge branch 'hotfix/filename'

Former-commit-id: 68018585c7e714ed1f34a9d724098a135ee843df [formerly 68018585c7e714ed1f34a9d724098a135ee843df [formerly 68018585c7e714ed1f34a9d724098a135ee843df [formerly 68018585c7e714ed1f34a9d724098a135ee843df [formerly 392ccd1d794efa1d2889171b3361a5e3a308f7b8 [formerly 6b1308e9aa93690c3ff47ee6e76e4bd3de0b5221]]]]]
Former-commit-id: 7cb998be55945671c1651492b4d462ba7345c63f
Former-commit-id: 30322a8fc03b28df45cb7787c0d39a5a234cde64
Former-commit-id: 288dde9afab6bf3dcb0e7e15e1b06de4a69571a9 [formerly 0f929557369af143620e0753a57d0120549a1dd7]
Former-commit-id: 73ee3f1fb69aeed9b4b2328b7965359824133528
Former-commit-id: 49155c6ff49b80edf9524268915ee571893d7798
Former-commit-id: d0a727f5d55ed7861e51a5913f6d96198318f543
Former-commit-id: 9eed6eafe82db5ab8fd4dce98ef307a6789fd512
Former-commit-id: 6daff6abc5ee7e73c3f6936ce38bba15a2661c52
This commit is contained in:
liyang
2018-11-29 10:59:10 +08:00
3 changed files with 14 additions and 1 deletions

View File

@@ -1,5 +1,6 @@
<template>
<d2-container
:filename="filename"
type="card"
class="page">
<el-form
@@ -27,6 +28,11 @@ export default {
mixins: [
base
],
data () {
return {
filename: __filename
}
},
// 第一次进入或从其他组件对应路由进入时触发
beforeRouteEnter (to, from, next) {
const id = to.params.id

View File

@@ -1,5 +1,6 @@
<template>
<d2-container
:filename="filename"
type="card"
class="page">
<el-form
@@ -26,6 +27,11 @@ export default {
mixins: [
base
],
data () {
return {
filename: __filename
}
},
// 第一次进入或从其他组件对应路由进入时触发
beforeRouteEnter (to, from, next) {
const id = to.params.id

View File

@@ -1,5 +1,5 @@
<template>
<d2-container type="card">
<d2-container :filename="filename" type="card">
<d2-crud
v-bind="crud"
@edit="({ index, row }) => goToEditPage('demo-business-issues-142-edit', row.id)"
@@ -17,6 +17,7 @@
export default {
data () {
return {
filename: __filename,
crud: {
columns: [
{ title: '姓名', key: 'name' },