Skip to content

Commit

Permalink
Merge pull request #1 from d2-projects/master
Browse files Browse the repository at this point in the history
update
  • Loading branch information
rongxingsun authored Sep 10, 2018
2 parents c9a4549 + 51f73d2 commit 651deaa
Show file tree
Hide file tree
Showing 24 changed files with 951 additions and 30 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<p align="center">
<a><img src="https://img.shields.io/github/release/d2-projects/d2-admin.svg"/></a>
<a><img src="https://badge.fury.io/js/%40d2-admin%2Fice-scaffold.svg"/></a>
<a><img src="https://img.shields.io/npm/v/@d2-admin/ice-scaffold.svg"/></a>
<a href="https://www.travis-ci.org/d2-projects/d2-admin"><img src="https://www.travis-ci.org/d2-projects/d2-admin.svg?branch=master"/></a>
<a><img src="https://img.shields.io/github/last-commit/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg"/></a>
Expand Down
2 changes: 1 addition & 1 deletion doc/CH.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<p align="center">
<a><img src="https://img.shields.io/github/release/d2-projects/d2-admin.svg"/></a>
<a><img src="https://badge.fury.io/js/%40d2-admin%2Fice-scaffold.svg"/></a>
<a><img src="https://img.shields.io/npm/v/@d2-admin/ice-scaffold.svg"/></a>
<a href="https://www.travis-ci.org/d2-projects/d2-admin"><img src="https://www.travis-ci.org/d2-projects/d2-admin.svg?branch=master"/></a>
<a><img src="https://img.shields.io/github/last-commit/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg"/></a>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@d2-projects/d2-crud": "^1.0.2",
"@d2-projects/d2-crud": "^1.1.0",
"axios": "^0.17.1",
"babel-polyfill": "^6.26.0",
"better-scroll": "^1.12.1",
Expand Down
4 changes: 3 additions & 1 deletion src/menu/modules/demo-d2-crud.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export default {
{ path: `${pre}demo20`, title: '表单组件渲染' },
{ path: `${pre}demo21`, title: '表单布局' },
{ path: `${pre}demo22`, title: '表单校验' },
{ path: `${pre}demo23`, title: '表格内编辑' }
{ path: `${pre}demo23`, title: '表格内编辑' },
{ path: `${pre}demo25`, title: '表格自定义组件' },
{ path: `${pre}demo26`, title: '表单自定义组件' }
]
}
])('/demo/d2-crud/')
Expand Down
29 changes: 24 additions & 5 deletions src/pages/demo/d2-crud/demo17/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,30 @@ export default {
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
address: '上海市普陀区金沙江路 1518 弄',
forbidEdit: true,
showEditButton: true
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
address: '上海市普陀区金沙江路 1517 弄',
forbidEdit: false,
showEditButton: true
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
address: '上海市普陀区金沙江路 1519 弄',
forbidEdit: false,
showEditButton: false
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
address: '上海市普陀区金沙江路 1516 弄',
forbidEdit: false,
showEditButton: true
}
],
rowHandle: {
Expand All @@ -58,7 +66,18 @@ export default {
icon: 'el-icon-edit',
text: '点我进行编辑',
size: 'small',
fixed: 'right'
show (index, row) {
if (row.showEditButton) {
return true
}
return false
},
disabled (index, row) {
if (row.forbidEdit) {
return true
}
return false
}
}
},
formTemplate: {
Expand Down
29 changes: 24 additions & 5 deletions src/pages/demo/d2-crud/demo17/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,30 @@ export default {
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
address: '上海市普陀区金沙江路 1518 弄',
forbidEdit: true,
showEditButton: true
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
address: '上海市普陀区金沙江路 1517 弄',
forbidEdit: false,
showEditButton: true
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
address: '上海市普陀区金沙江路 1519 弄',
forbidEdit: false,
showEditButton: false
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
address: '上海市普陀区金沙江路 1516 弄',
forbidEdit: false,
showEditButton: true
}
],
rowHandle: {
Expand All @@ -74,7 +82,18 @@ export default {
icon: 'el-icon-edit',
text: '点我进行编辑',
size: 'small',
fixed: 'right'
show (index, row) {
if (row.showEditButton) {
return true
}
return false
},
disabled (index, row) {
if (row.forbidEdit) {
return true
}
return false
}
}
},
formTemplate: {
Expand Down
30 changes: 25 additions & 5 deletions src/pages/demo/d2-crud/demo18/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,50 @@ export default {
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
address: '上海市普陀区金沙江路 1518 弄',
forbidRemove: true,
showRemoveButton: true
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
address: '上海市普陀区金沙江路 1517 弄',
forbidRemove: false,
showRemoveButton: true
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
address: '上海市普陀区金沙江路 1519 弄',
forbidRemove: false,
showRemoveButton: false
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
address: '上海市普陀区金沙江路 1516 弄',
forbidRemove: false,
showRemoveButton: true
}
],
rowHandle: {
remove: {
icon: 'el-icon-delete',
size: 'small',
fixed: 'right',
confirm: true
confirm: true,
show (index, row) {
if (row.showRemoveButton) {
return true
}
return false
},
disabled (index, row) {
if (row.forbidRemove) {
return true
}
return false
}
}
}
}
Expand Down
30 changes: 25 additions & 5 deletions src/pages/demo/d2-crud/demo18/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,50 @@ export default {
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
address: '上海市普陀区金沙江路 1518 弄',
forbidRemove: true,
showRemoveButton: true
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
address: '上海市普陀区金沙江路 1517 弄',
forbidRemove: false,
showRemoveButton: true
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
address: '上海市普陀区金沙江路 1519 弄',
forbidRemove: false,
showRemoveButton: false
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
address: '上海市普陀区金沙江路 1516 弄',
forbidRemove: false,
showRemoveButton: true
}
],
rowHandle: {
remove: {
icon: 'el-icon-delete',
size: 'small',
fixed: 'right',
confirm: true
confirm: true,
show (index, row) {
if (row.showRemoveButton) {
return true
}
return false
},
disabled (index, row) {
if (row.forbidRemove) {
return true
}
return false
}
}
}
}
Expand Down
29 changes: 29 additions & 0 deletions src/pages/demo/d2-crud/demo25/MyTag.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<template>
<div style="cursor: pointer">
<el-tag :type="type" @click.native="handleClick">{{ text }}</el-tag>
</div>
</template>

<script>
export default {
props: {
value: {
type: Boolean,
require: true
}
},
computed: {
type () {
return this.value ? 'success' : 'danger'
},
text () {
return this.value ? '' : ''
}
},
methods: {
handleClick () {
this.$emit('input', !this.value)
}
}
}
</script>
29 changes: 29 additions & 0 deletions src/pages/demo/d2-crud/demo25/codeComponent.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export default `<template>
<div style="cursor: pointer">
<el-tag :type="type" @click.native="handleClick">{{ text }}</el-tag>
</div>
</template>
<script>
export default {
props: {
value: {
type: Boolean,
require: true
}
},
computed: {
type () {
return this.value ? 'success' : 'danger'
},
text () {
return this.value ? '是' : '否'
}
},
methods: {
handleClick () {
this.$emit('input', !this.value)
}
}
}
</script>`
72 changes: 72 additions & 0 deletions src/pages/demo/d2-crud/demo25/codeOverall.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
export default `<template>
<div>
<d2-crud
ref="d2Crud"
:columns="columns"
:data="data"
@d2-data-change="handleDataChange"/>
</div>
</template>
<script>
export default {
data () {
return {
columns: [
{
title: '日期',
key: 'date',
width: '180'
},
{
title: '姓名',
key: 'name',
width: '180'
},
{
title: '地址',
key: 'address'
},
{
title: '检查状态(点击可修改)',
key: 'check',
component: {
name: 'my-tag'
}
}
],
data: [
{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
check: true
},
{
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄',
check: false
},
{
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄',
check: true
},
{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄',
check: true
}
]
}
},
methods: {
handleDataChange (data) {
console.log(data)
}
}
}
</script>`
Loading

0 comments on commit 651deaa

Please sign in to comment.