v1.9 发布,详情查看发行版说明

This commit is contained in:
zhengjie
2019-05-18 12:22:50 +08:00
parent f0255b5e33
commit 98fa128eda
56 changed files with 454 additions and 258 deletions

View File

@@ -2,17 +2,17 @@
<div class="app-container">
<eHeader :query="query"/>
<!--表格渲染-->
<tree-table v-loading="loading" :data="data" :expand-all="true" :columns="columns" size="small">
<tree-table v-loading="loading" :data="data" :expand-all="expand" :columns="columns" size="small">
<el-table-column prop="createTime" label="创建日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['ADMIN','PERMISSION_ALL','PERMISSION_EDIT','PERMISSION_DELETE'])" label="操作" width="130px" align="center">
<template slot-scope="scope">
<edit v-if="checkPermission(['ADMIN','PERMISSION_ALL','PERMISSION_EDIT'])" :data="scope.row" :sup_this="sup_this"/>
<edit v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_EDIT']" :data="scope.row" :sup_this="sup_this"/>
<el-popover
v-if="checkPermission(['ADMIN','PERMISSION_ALL','PERMISSION_DELETE'])"
v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_DELETE']"
:ref="scope.row.id"
placement="top"
width="200">
@@ -21,7 +21,7 @@
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" size="mini">删除</el-button>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
</el-popover>
</template>
</el-table-column>
@@ -52,7 +52,7 @@ export default {
value: 'alias'
}
],
delLoading: false, sup_this: this
delLoading: false, sup_this: this, expand: true
}
},
created() {

View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-button size="mini" type="success" @click="to">编辑</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
<eForm ref="form" :sup_this="sup_this" :is-add="false"/>
</div>
</template>

View File

@@ -2,11 +2,11 @@
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-search" @click="toQuery">搜索</el-button>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-if="checkPermission(['ADMIN','PERMISSION_ALL','PERMISSION_CREATE'])"
v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']"
class="filter-item"
size="mini"
type="primary"
@@ -14,11 +14,19 @@
@click="add">新增</el-button>
<eForm ref="form" :is-add="true"/>
</div>
<div style="display: inline-block;margin: 0px 2px;">
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-more"
@click="expand">展开/折叠</el-button>
<eForm ref="form" :is-add="true"/>
</div>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import eForm from './form'
export default {
components: { eForm },
@@ -34,7 +42,6 @@ export default {
}
},
methods: {
checkPermission,
toQuery() {
this.$parent.page = 0
this.$parent.init()
@@ -42,6 +49,10 @@ export default {
add() {
this.$refs.form.getPermissions()
this.$refs.form.dialog = true
},
expand() {
this.$parent.expand = !this.$parent.expand
this.$parent.init()
}
}
}