From 3c45b7826bf7035012a5b0c05ea5eade13d54299 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 11 Sep 2018 16:19:03 +0800 Subject: [PATCH 1/2] lint 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 --- src/components/d2-markdown/index.vue | 2 +- src/components/d2-quill/index.vue | 2 +- src/mock/api/sys/login/index.js | 2 +- src/pages/demo/components/layout/grid.vue | 16 ++++++++-------- src/pages/demo/d2-crud/demo17/index.vue | 2 +- src/pages/demo/d2-crud/demo18/index.vue | 2 +- src/pages/demo/d2-crud/demo19/index.vue | 2 +- src/pages/demo/d2-crud/demo20/index.vue | 2 +- src/pages/demo/d2-crud/demo21/index.vue | 2 +- src/pages/demo/d2-crud/demo26/index.vue | 2 +- src/pages/demo/d2-crud/demo4/index.vue | 2 +- .../data-table/components/table4/index.vue | 2 +- src/pages/demo/plugins/import/xlsx.vue | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/d2-markdown/index.vue b/src/components/d2-markdown/index.vue index aaf60f50..2a0a33b2 100644 --- a/src/components/d2-markdown/index.vue +++ b/src/components/d2-markdown/index.vue @@ -74,7 +74,7 @@ export default { return (this.baidupan && bandupan(quote, this.$baseUrl)) || `
${quote}
` } return marked(data, { - ...this.highlight ? {highlight: (code) => highlight.highlightAuto(code).value} : {}, + ...this.highlight ? { highlight: (code) => highlight.highlightAuto(code).value } : {}, renderer }) } diff --git a/src/components/d2-quill/index.vue b/src/components/d2-quill/index.vue index bb371a01..6702a7c4 100644 --- a/src/components/d2-quill/index.vue +++ b/src/components/d2-quill/index.vue @@ -60,7 +60,7 @@ export default { const text = this.Quill.getText() const quill = this.Quill 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.$emit('text-change', delta, oldDelta, source) diff --git a/src/mock/api/sys/login/index.js b/src/mock/api/sys/login/index.js index f3b03b60..2b2becb4 100644 --- a/src/mock/api/sys/login/index.js +++ b/src/mock/api/sys/login/index.js @@ -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 user = userDB.find(e => e.username === bodyObj.username && e.password === bodyObj.password) if (user) { diff --git a/src/pages/demo/components/layout/grid.vue b/src/pages/demo/components/layout/grid.vue index 05467b86..a95e9600 100644 --- a/src/pages/demo/components/layout/grid.vue +++ b/src/pages/demo/components/layout/grid.vue @@ -30,14 +30,14 @@ export default { return { layout: { layout: [ - {'x': 0, 'y': 0, 'w': 4, 'h': 10, 'i': '0'}, - {'x': 4, 'y': 0, 'w': 2, 'h': 5, 'i': '1'}, - {'x': 6, 'y': 0, 'w': 4, 'h': 5, 'i': '2'}, - {'x': 10, 'y': 0, 'w': 2, 'h': 10, 'i': '3'}, - {'x': 4, 'y': 5, 'w': 4, 'h': 5, 'i': '4'}, - {'x': 8, 'y': 5, 'w': 2, 'h': 5, 'i': '5'}, - {'x': 0, 'y': 10, 'w': 8, 'h': 5, 'i': '6'}, - {'x': 8, 'y': 10, 'w': 4, 'h': 5, 'i': '7'} + { 'x': 0, 'y': 0, 'w': 4, 'h': 10, 'i': '0' }, + { 'x': 4, 'y': 0, 'w': 2, 'h': 5, 'i': '1' }, + { 'x': 6, 'y': 0, 'w': 4, 'h': 5, 'i': '2' }, + { 'x': 10, 'y': 0, 'w': 2, 'h': 10, 'i': '3' }, + { 'x': 4, 'y': 5, 'w': 4, 'h': 5, 'i': '4' }, + { 'x': 8, 'y': 5, 'w': 2, 'h': 5, 'i': '5' }, + { 'x': 0, 'y': 10, 'w': 8, 'h': 5, 'i': '6' }, + { 'x': 8, 'y': 10, 'w': 4, 'h': 5, 'i': '7' } ], colNum: 12, rowHeight: 30, diff --git a/src/pages/demo/d2-crud/demo17/index.vue b/src/pages/demo/d2-crud/demo17/index.vue index 6c2226d4..9b828546 100644 --- a/src/pages/demo/d2-crud/demo17/index.vue +++ b/src/pages/demo/d2-crud/demo17/index.vue @@ -118,7 +118,7 @@ export default { } }, methods: { - handleRowEdit ({index, row}, done) { + handleRowEdit ({ index, row }, done) { this.formOptions.saveLoading = true setTimeout(() => { console.log(index) diff --git a/src/pages/demo/d2-crud/demo18/index.vue b/src/pages/demo/d2-crud/demo18/index.vue index b6ebe804..27049354 100644 --- a/src/pages/demo/d2-crud/demo18/index.vue +++ b/src/pages/demo/d2-crud/demo18/index.vue @@ -96,7 +96,7 @@ export default { } }, methods: { - handleRowRemove ({index, row}, done) { + handleRowRemove ({ index, row }, done) { setTimeout(() => { console.log(index) console.log(row) diff --git a/src/pages/demo/d2-crud/demo19/index.vue b/src/pages/demo/d2-crud/demo19/index.vue index 73e437bd..3fb0b783 100644 --- a/src/pages/demo/d2-crud/demo19/index.vue +++ b/src/pages/demo/d2-crud/demo19/index.vue @@ -78,7 +78,7 @@ export default { } }, methods: { - handleCustomEvent ({index, row}) { + handleCustomEvent ({ index, row }) { console.log(index) console.log(row) } diff --git a/src/pages/demo/d2-crud/demo20/index.vue b/src/pages/demo/d2-crud/demo20/index.vue index 0451b8ee..fe04454f 100644 --- a/src/pages/demo/d2-crud/demo20/index.vue +++ b/src/pages/demo/d2-crud/demo20/index.vue @@ -124,7 +124,7 @@ export default { } }, methods: { - handleRowEdit ({index, row}, done) { + handleRowEdit ({ index, row }, done) { this.formOptions.saveLoading = true setTimeout(() => { console.log(index) diff --git a/src/pages/demo/d2-crud/demo21/index.vue b/src/pages/demo/d2-crud/demo21/index.vue index d32d5e4c..8605d14e 100644 --- a/src/pages/demo/d2-crud/demo21/index.vue +++ b/src/pages/demo/d2-crud/demo21/index.vue @@ -108,7 +108,7 @@ export default { } }, methods: { - handleRowEdit ({index, row}, done) { + handleRowEdit ({ index, row }, done) { this.formOptions.saveLoading = true setTimeout(() => { console.log(index) diff --git a/src/pages/demo/d2-crud/demo26/index.vue b/src/pages/demo/d2-crud/demo26/index.vue index b51f7362..66620693 100644 --- a/src/pages/demo/d2-crud/demo26/index.vue +++ b/src/pages/demo/d2-crud/demo26/index.vue @@ -137,7 +137,7 @@ export default { handleDataChange (data) { console.log(data) }, - handleRowEdit ({index, row}, done) { + handleRowEdit ({ index, row }, done) { this.formOptions.saveLoading = true setTimeout(() => { console.log(index) diff --git a/src/pages/demo/d2-crud/demo4/index.vue b/src/pages/demo/d2-crud/demo4/index.vue index 824f87a3..73379e91 100644 --- a/src/pages/demo/d2-crud/demo4/index.vue +++ b/src/pages/demo/d2-crud/demo4/index.vue @@ -65,7 +65,7 @@ export default { } ], options: { - rowClassName ({row, rowIndex}) { + rowClassName ({ row, rowIndex }) { if (rowIndex === 1) { return 'warning-row' } else if (rowIndex === 3) { diff --git a/src/pages/demo/element/data-table/components/table4/index.vue b/src/pages/demo/element/data-table/components/table4/index.vue index 32f04b01..bc1856fd 100644 --- a/src/pages/demo/element/data-table/components/table4/index.vue +++ b/src/pages/demo/element/data-table/components/table4/index.vue @@ -25,7 +25,7 @@ export default { title: '带状态表格', index: 4, methods: { - tableRowClassName ({row, rowIndex}) { + tableRowClassName ({ row, rowIndex }) { if (rowIndex === 1) { return 'warning-row' } else if (rowIndex === 3) { diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue index 4c8761a5..c6797ecc 100644 --- a/src/pages/demo/plugins/import/xlsx.vue +++ b/src/pages/demo/plugins/import/xlsx.vue @@ -42,7 +42,7 @@ export default { methods: { handleUpload (file) { this.$import.xlsx(file) - .then(({header, results}) => { + .then(({ header, results }) => { this.table.columns = header.map(e => { return { label: e, From 08789f2edb6ab9cde937790b52ef45b071e4edee Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 12 Sep 2018 08:10:16 +0800 Subject: [PATCH 2/2] symlinks Former-commit-id: 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly ed06554acf0d631543d588aee3168e755160254c [formerly dd6bb685a95e6af52b2e1f62e55da787c2dc9abf]]]]] Former-commit-id: 881a777ca3b34f27f2fe53b59629a116190756aa Former-commit-id: 5c090e456cab182c1ba08c0379ec9faa1f30819f Former-commit-id: 7145dd6a26091e158facd5a190045ea739cd69cc [formerly cc038b48c71da1ed8d992e105cf14aa094c17de3] Former-commit-id: 1f201c8e6badb3959bcaffe4691ef31e5d476d3c Former-commit-id: d8e9f886713011a532d9097739b5669fe9c54aef Former-commit-id: 70dcf760d460d297d879e77b23153bc32e7f68f4 Former-commit-id: 093877a858cfa8b88c9ddc852420ffd247a9782c Former-commit-id: 02dad2ef0e0e57906fccc4ccec19457a4c5969b4 --- vue.config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 8a006147..8a0c6608 100644 --- a/vue.config.js +++ b/vue.config.js @@ -14,9 +14,11 @@ module.exports = { devServer: { publicPath: baseUrl // 和 baseUrl 保持一致 }, - // webpack 设置 // 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js chainWebpack: config => { + // 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559 + config.resolve + .symlinks(true) // markdown config.module .rule('md')