Former-commit-id: 71a2764ab9f9182a228b4ef2430d34ac1155ab2a [formerly 5cca526567e38ae2c56a1937d6353937556d53e9] [formerly 71a2764ab9f9182a228b4ef2430d34ac1155ab2a [formerly 5cca526567e38ae2c56a1937d6353937556d53e9] [formerly 71a2764ab9f9182a228b4ef2430d34ac1155ab2a [formerly 5cca526567e38ae2c56a1937d6353937556d53e9] [formerly 5cca526567e38ae2c56a1937d6353937556d53e9 [formerly ebf639ff4f1270d7b16839504ccf2fb597aff4e9 [formerly a735f157694d21800bfa2ecfcfea33aeea5b0d90]]]]]
Former-commit-id: 0a11111a407db759fb7be43b366176119998bd7c
Former-commit-id: ca189c6b8b2df71163e50be10371d834939f44df
Former-commit-id: 0e2dfa82b90811ba932f90ad1dbf39f5bdc7d013 [formerly c0e44e48b1cc673e0e4a0eb06a4a35af3b0aa0d7]
Former-commit-id: b0be18809df8c17804dca3a1ab595e4faef65a2a
Former-commit-id: 45fc9fd398f4e69bf7b2fcd2e5bdbb665c0789a8
Former-commit-id: 0391b056f26d709f7a4ff7ef4c6fa1662384f223
Former-commit-id: 5d8821dd3c5b432ab22565b309d55ad722584eb6
Former-commit-id: 544fddab22f387068f91ca546254dd27929c5dee
This commit is contained in:
liyang
2018-09-11 16:19:03 +08:00
parent 1343c8ed65
commit 3c45b7826b
13 changed files with 20 additions and 20 deletions

View File

@@ -74,7 +74,7 @@ export default {
return (this.baidupan && bandupan(quote, this.$baseUrl)) || `<blockquote>${quote}</blockquote>` return (this.baidupan && bandupan(quote, this.$baseUrl)) || `<blockquote>${quote}</blockquote>`
} }
return marked(data, { return marked(data, {
...this.highlight ? {highlight: (code) => highlight.highlightAuto(code).value} : {}, ...this.highlight ? { highlight: (code) => highlight.highlightAuto(code).value } : {},
renderer renderer
}) })
} }

View File

@@ -60,7 +60,7 @@ export default {
const text = this.Quill.getText() const text = this.Quill.getText()
const quill = this.Quill const quill = this.Quill
this.$emit('input', html) this.$emit('input', html)
this.$emit('change', {html, text, quill}) this.$emit('change', { html, text, quill })
}) })
this.Quill.on('text-change', (delta, oldDelta, source) => { this.Quill.on('text-change', (delta, oldDelta, source) => {
this.$emit('text-change', delta, oldDelta, source) this.$emit('text-change', delta, oldDelta, source)

View File

@@ -21,7 +21,7 @@ const userDB = [
} }
] ]
Mock.mock('/api/login', 'post', ({url, type, body}) => { Mock.mock('/api/login', 'post', ({ url, type, body }) => {
const bodyObj = JSON.parse(body) const bodyObj = JSON.parse(body)
const user = userDB.find(e => e.username === bodyObj.username && e.password === bodyObj.password) const user = userDB.find(e => e.username === bodyObj.username && e.password === bodyObj.password)
if (user) { if (user) {

View File

@@ -30,14 +30,14 @@ export default {
return { return {
layout: { layout: {
layout: [ layout: [
{'x': 0, 'y': 0, 'w': 4, 'h': 10, 'i': '0'}, { 'x': 0, 'y': 0, 'w': 4, 'h': 10, 'i': '0' },
{'x': 4, 'y': 0, 'w': 2, 'h': 5, 'i': '1'}, { 'x': 4, 'y': 0, 'w': 2, 'h': 5, 'i': '1' },
{'x': 6, 'y': 0, 'w': 4, 'h': 5, 'i': '2'}, { 'x': 6, 'y': 0, 'w': 4, 'h': 5, 'i': '2' },
{'x': 10, 'y': 0, 'w': 2, 'h': 10, 'i': '3'}, { 'x': 10, 'y': 0, 'w': 2, 'h': 10, 'i': '3' },
{'x': 4, 'y': 5, 'w': 4, 'h': 5, 'i': '4'}, { 'x': 4, 'y': 5, 'w': 4, 'h': 5, 'i': '4' },
{'x': 8, 'y': 5, 'w': 2, 'h': 5, 'i': '5'}, { 'x': 8, 'y': 5, 'w': 2, 'h': 5, 'i': '5' },
{'x': 0, 'y': 10, 'w': 8, 'h': 5, 'i': '6'}, { 'x': 0, 'y': 10, 'w': 8, 'h': 5, 'i': '6' },
{'x': 8, 'y': 10, 'w': 4, 'h': 5, 'i': '7'} { 'x': 8, 'y': 10, 'w': 4, 'h': 5, 'i': '7' }
], ],
colNum: 12, colNum: 12,
rowHeight: 30, rowHeight: 30,

View File

@@ -118,7 +118,7 @@ export default {
} }
}, },
methods: { methods: {
handleRowEdit ({index, row}, done) { handleRowEdit ({ index, row }, done) {
this.formOptions.saveLoading = true this.formOptions.saveLoading = true
setTimeout(() => { setTimeout(() => {
console.log(index) console.log(index)

View File

@@ -96,7 +96,7 @@ export default {
} }
}, },
methods: { methods: {
handleRowRemove ({index, row}, done) { handleRowRemove ({ index, row }, done) {
setTimeout(() => { setTimeout(() => {
console.log(index) console.log(index)
console.log(row) console.log(row)

View File

@@ -78,7 +78,7 @@ export default {
} }
}, },
methods: { methods: {
handleCustomEvent ({index, row}) { handleCustomEvent ({ index, row }) {
console.log(index) console.log(index)
console.log(row) console.log(row)
} }

View File

@@ -124,7 +124,7 @@ export default {
} }
}, },
methods: { methods: {
handleRowEdit ({index, row}, done) { handleRowEdit ({ index, row }, done) {
this.formOptions.saveLoading = true this.formOptions.saveLoading = true
setTimeout(() => { setTimeout(() => {
console.log(index) console.log(index)

View File

@@ -108,7 +108,7 @@ export default {
} }
}, },
methods: { methods: {
handleRowEdit ({index, row}, done) { handleRowEdit ({ index, row }, done) {
this.formOptions.saveLoading = true this.formOptions.saveLoading = true
setTimeout(() => { setTimeout(() => {
console.log(index) console.log(index)

View File

@@ -137,7 +137,7 @@ export default {
handleDataChange (data) { handleDataChange (data) {
console.log(data) console.log(data)
}, },
handleRowEdit ({index, row}, done) { handleRowEdit ({ index, row }, done) {
this.formOptions.saveLoading = true this.formOptions.saveLoading = true
setTimeout(() => { setTimeout(() => {
console.log(index) console.log(index)

View File

@@ -65,7 +65,7 @@ export default {
} }
], ],
options: { options: {
rowClassName ({row, rowIndex}) { rowClassName ({ row, rowIndex }) {
if (rowIndex === 1) { if (rowIndex === 1) {
return 'warning-row' return 'warning-row'
} else if (rowIndex === 3) { } else if (rowIndex === 3) {

View File

@@ -25,7 +25,7 @@ export default {
title: '带状态表格', title: '带状态表格',
index: 4, index: 4,
methods: { methods: {
tableRowClassName ({row, rowIndex}) { tableRowClassName ({ row, rowIndex }) {
if (rowIndex === 1) { if (rowIndex === 1) {
return 'warning-row' return 'warning-row'
} else if (rowIndex === 3) { } else if (rowIndex === 3) {

View File

@@ -42,7 +42,7 @@ export default {
methods: { methods: {
handleUpload (file) { handleUpload (file) {
this.$import.xlsx(file) this.$import.xlsx(file)
.then(({header, results}) => { .then(({ header, results }) => {
this.table.columns = header.map(e => { this.table.columns = header.map(e => {
return { return {
label: e, label: e,