Merge branch 'hotfix/filename' into develop

Former-commit-id: 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly feedfcba6fea93e9ca82911f586c73e0fbd4b041 [formerly c68b2d5e6dc5dfb6ee75d97ffbf7520d060a448f]]]]]
Former-commit-id: 1aeb991435afc53135bb2aa115454a438a218f41
Former-commit-id: df1208898cd1ea8bf9b5f1188845c47bcaae93dc
Former-commit-id: c505b2be3cc68c21d16df1d6556ce981211f4006 [formerly 99585e0dc55b78ce79110b1de07fa1c41fecd8fc]
Former-commit-id: 7057f09b61edfc6ff9b561f61435cdc65ec547cc
Former-commit-id: d89eccce8671cc3c1e5edd1b20c2927a1945768d
Former-commit-id: 79384a9cabff63136ed616c91d26c8ecc0a23e8c
Former-commit-id: eea7eab821e2143fce6b864205f9ade03d7d5a24
Former-commit-id: d6229a3a199390d6665db39578652911aed17f96
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' },