Former-commit-id: ecdadbbb5239575790787988dff81e89028e4b21 [formerly ecdadbbb5239575790787988dff81e89028e4b21 [formerly ecdadbbb5239575790787988dff81e89028e4b21 [formerly ecdadbbb5239575790787988dff81e89028e4b21 [formerly faa40145c1044f7d814aca7335e2958ee2af488f [formerly e7a26ae4b2b89f1095af40fabc80b6d7c28a88d7]]]]]
Former-commit-id: cdb18109e6f6405a153c0c77085cb26bfa2866f9
Former-commit-id: 9cd8dafaede8e06c29b9c1b28fbdc2a1ba3789e6
Former-commit-id: 8ee55ec8b9fa61ddc5c04797706db62c07e66fa9 [formerly cf46566d4316a4ac126dba8a16c9155133d6d6a1]
Former-commit-id: 7978ef3eb50dc580a497919fb7360ae382ebe71e
Former-commit-id: e0ae6ead53a9ea798a0746e72181f19c69786d2d
Former-commit-id: 784f3641d01fe1f6705725411e2abe95d0a3fd35
Former-commit-id: 13f3be9e685bd44b2c04b7821f1e737e4eefc7d9
Former-commit-id: 13aaa78b3f2f9808641261666f3c71aeb097dd9e
This commit is contained in:
liyang
2018-09-11 16:46:24 +08:00
parent cf40b6802d
commit 3786b7ae04
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,