From cf40b6802d5e32be04906f7dd110c67c3f37ad90 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 11 Sep 2018 16:45:54 +0800 Subject: [PATCH 1/4] no message Former-commit-id: d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly 8f5cfd3c33e32d2ff37d25e4e34ed61741eb1fa1 [formerly c686ceb0e645a0dd653c6fee403a798a5b91b034]]]]] Former-commit-id: 3305041bc85763ddbf1a87be400b4e2e7ccbb8b5 Former-commit-id: 1288647619abbdb6e58e664654e47fddb9a37009 Former-commit-id: 931dfdedcf3b5bf43ca69af5c74b08b4d53613e6 [formerly 9c8ecc0dcb6d3b5d81045304e70f2502a0b5e0b6] Former-commit-id: 18f5933d3c962f792f492f3d6f2997a8466f80ba Former-commit-id: f5efaad087762fc1603aa7e8f214236d7f4c67b5 Former-commit-id: d90125d91809d253419b09f6121651efec3212bc Former-commit-id: ca39a5ea51976cd81b5a015d842aa0d48d41ef82 Former-commit-id: d9d4039049ce37aaa121c2f47c6514786f47ecf3 --- package-lock.json.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 09d4bdd0..62bb89ab 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -0db501622270146313d905a0a5f39854fb2494ac \ No newline at end of file +12048ef98cbc909b11ea70298ee10637ece9fe87 \ No newline at end of file From 3786b7ae04852ce84f2c7633adff0a5542b3475c Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 11 Sep 2018 16:46:24 +0800 Subject: [PATCH 2/4] lint 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 --- 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 f0aa8a600ecd09be7e47be1762a88dada8744dd9 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 12 Sep 2018 09:44:13 +0800 Subject: [PATCH 3/4] remove sys page Former-commit-id: f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly 5d34221abf83c3a4075867e5250cceccc87ed5f2 [formerly 377c63c9ed64bd4d844fc847a4abd91cd85e0cc7]]]]] Former-commit-id: 509465d465f44ced64dbcb80739123c9601b8f2b Former-commit-id: 3e3ad33268a5d8f9b43f00ecce9f38ad2a1f85b6 Former-commit-id: 5e4267d4e01b1fbe1ac54e3b7b4e972b0cba3de9 [formerly aa4c6b47934baf0da1c4f0fd1e3eba706b1e393b] Former-commit-id: ebe7073116283b080c02b0779a1a201894a445ab Former-commit-id: 8af25c2d1cfeb6614a51eac3828bc49c74003701 Former-commit-id: 6daa09cbdce17045aea484e7f5fec6b3f388f5e4 Former-commit-id: 0532f9553a65e5ba81ee157b23f0f163fff6fa76 Former-commit-id: 58204a1ae07090e3356ef23f0d117a9e776354e3 --- src/menu/modules/demo-playground.js | 1 - src/pages/demo/playground/store/sys/index.vue | 172 ------------------ src/router/routes.js.REMOVED.git-id | 2 +- 3 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 src/pages/demo/playground/store/sys/index.vue diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js index 75037b95..571cee06 100644 --- a/src/menu/modules/demo-playground.js +++ b/src/menu/modules/demo-playground.js @@ -60,7 +60,6 @@ export default { title: '全局状态管理', icon: 'bolt', children: [ - { path: `${pre}store/sys`, title: '系统状态', icon: 'microchip' }, { path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' }, { path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' }, { path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' }, diff --git a/src/pages/demo/playground/store/sys/index.vue b/src/pages/demo/playground/store/sys/index.vue deleted file mode 100644 index a4846fbb..00000000 --- a/src/pages/demo/playground/store/sys/index.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 6a61f620..28d91126 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -58069f63d26f33421df3d333c4aa58af52c87aaa \ No newline at end of file +496110b25d96991d627a36afd39eefaab552561b \ No newline at end of file From f535d7163f74d6bea299b68ced4773e9b7703149 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 12 Sep 2018 10:31:16 +0800 Subject: [PATCH 4/4] no message Former-commit-id: 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 78de87c4262aff3a4c314eba6308e80bc4b94568 [formerly af05d745c14160b7c5d74645c04b52653af3d6a6]]]]] Former-commit-id: 8d552fccc75f9e545862d3a0de474c1460b2b35b Former-commit-id: 86c5771f8d752674e7a84468e0e0f79f8e311602 Former-commit-id: e876ce46ba02cb64874edd55fd4c2bbed529c30a [formerly b6f22036fb293f78cd12866d09d951f44bf0fae0] Former-commit-id: aa944f9181fa0bbfd45041c63d52ce4cee4b6fcc Former-commit-id: c9e2b70e8b207c6fce4764921ebea4922dec2988 Former-commit-id: a27f7a6b68419d2767d2c5bdcbdd82951831f87e Former-commit-id: 78af6b9ccd824244e328beaae291056c77af0cab Former-commit-id: 126348234a6e5fe0915a7c12be737e861b0ffbab --- src/menu/modules/demo-playground.js | 1 + .../demo/playground/store/size/index.vue | 39 +++++++++++++++++++ src/plugin/d2admin/index.js | 1 - src/router/routes.js.REMOVED.git-id | 2 +- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/playground/store/size/index.vue diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js index 571cee06..5023625d 100644 --- a/src/menu/modules/demo-playground.js +++ b/src/menu/modules/demo-playground.js @@ -61,6 +61,7 @@ export default { icon: 'bolt', children: [ { path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' }, + { path: `${pre}store/size`, title: '全局尺寸', icon: 'font' }, { path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' }, { path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' }, { path: `${pre}store/fullscreen`, title: '全屏', icon: 'arrows-alt' }, diff --git a/src/pages/demo/playground/store/size/index.vue b/src/pages/demo/playground/store/size/index.vue new file mode 100644 index 00000000..37524f72 --- /dev/null +++ b/src/pages/demo/playground/store/size/index.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/plugin/d2admin/index.js b/src/plugin/d2admin/index.js index 6af7047b..e906ce4c 100644 --- a/src/plugin/d2admin/index.js +++ b/src/plugin/d2admin/index.js @@ -25,7 +25,6 @@ export default { defaultValue: '', user: true }) - console.log('size: ', size) // Element Vue.use(ElementUI, { size diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 28d91126..3d2a77b8 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -496110b25d96991d627a36afd39eefaab552561b \ No newline at end of file +c62802e4146a602e5c498cdb99205b56768d4047 \ No newline at end of file