From 67b588d4aa255e5a6949bac9603a2c22c508adbb Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 15:09:37 +0800 Subject: [PATCH 01/46] Update meta.js --- meta.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta.js b/meta.js index a521f9bdd0..a7d44f2182 100644 --- a/meta.js +++ b/meta.js @@ -74,6 +74,11 @@ module.exports = { type: 'confirm', message: 'Install vue-router?', }, + filter: { + when: 'isNotTest', + type: 'confirm', + message: 'Install filters 全局的filter?', + }, lint: { when: 'isNotTest', type: 'confirm', @@ -170,6 +175,7 @@ module.exports = { 'test/unit/setup.js': "unit && runner === 'jest'", 'test/e2e/**/*': 'e2e', 'src/router/**/*': 'router', + 'src/filter/**/*': 'filter', }, complete: function(data, { chalk }) { const green = chalk.green From d89e191d15464f7d1a1dc96dacde8416f2fdad8c Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 15:09:41 +0800 Subject: [PATCH 02/46] Update main.js --- template/src/main.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/template/src/main.js b/template/src/main.js index 48833b5ab7..723f695258 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -8,8 +8,15 @@ import App from './App' import router from './router' {{/router}} +{{#filter}} +import filters from './filter/filter' +{{/filter}} Vue.config.productionTip = false - +{{#filter}} +Object.keys(filters).forEach(key => { + Vue.filter(key, filters[key]) +}) +{{/filter}} /* eslint-disable no-new */ new Vue({ el: '#app', From 77094c1f24c391de723001f28b8de1fb08e25c63 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 15:19:01 +0800 Subject: [PATCH 03/46] Create filter.js --- template/src/filter/filter.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 template/src/filter/filter.js diff --git a/template/src/filter/filter.js b/template/src/filter/filter.js new file mode 100644 index 0000000000..fccb3bd365 --- /dev/null +++ b/template/src/filter/filter.js @@ -0,0 +1,19 @@ +/** + * Created by Administrator on 2019/4/2. + */ +import { format } from 'date-fns'; +export default { + //一般的过滤器 + formatTime(time){ + "use strict"; + if(time){ + return format(time, 'YYYY-MM-DD HH:mm:ss'); + } + }, + multiParam(first,second){ + return first+'-'+second + }, + multiParam2([first,second]){ + return first+'-'+second + } +} From 9db4e29b1b36c299cb860c54fc00c8a31b6b479b Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 15:24:02 +0800 Subject: [PATCH 04/46] Update meta.js --- meta.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.js b/meta.js index a7d44f2182..bf887c081c 100644 --- a/meta.js +++ b/meta.js @@ -72,7 +72,7 @@ module.exports = { router: { when: 'isNotTest', type: 'confirm', - message: 'Install vue-router?', + message: 'Install 路由?', }, filter: { when: 'isNotTest', From c7b608d1484456b00304ce3b62956eb990ac57b8 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 15:54:02 +0800 Subject: [PATCH 05/46] Update meta.js --- meta.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta.js b/meta.js index bf887c081c..a9e7314a92 100644 --- a/meta.js +++ b/meta.js @@ -37,19 +37,19 @@ module.exports = { when: 'isNotTest', type: 'string', required: true, - message: 'Project name', + message: '滴答滴答滴答的 name', }, description: { when: 'isNotTest', type: 'string', required: false, - message: 'Project description', + message: '滴答滴答滴答的description', default: 'A Vue.js project', }, author: { when: 'isNotTest', type: 'string', - message: 'Author', + message: '滴答滴答滴答的Author', }, build: { when: 'isNotTest', @@ -82,7 +82,7 @@ module.exports = { lint: { when: 'isNotTest', type: 'confirm', - message: 'Use ESLint to lint your code?', + message: 'Use ESLint规范代码?', }, lintConfig: { when: 'isNotTest && lint', From 16ba10bf09cb6839fe29858ce4cd8ebe662a7457 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 16:27:08 +0800 Subject: [PATCH 06/46] Update meta.js --- meta.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta.js b/meta.js index a9e7314a92..a7d44f2182 100644 --- a/meta.js +++ b/meta.js @@ -37,19 +37,19 @@ module.exports = { when: 'isNotTest', type: 'string', required: true, - message: '滴答滴答滴答的 name', + message: 'Project name', }, description: { when: 'isNotTest', type: 'string', required: false, - message: '滴答滴答滴答的description', + message: 'Project description', default: 'A Vue.js project', }, author: { when: 'isNotTest', type: 'string', - message: '滴答滴答滴答的Author', + message: 'Author', }, build: { when: 'isNotTest', @@ -72,7 +72,7 @@ module.exports = { router: { when: 'isNotTest', type: 'confirm', - message: 'Install 路由?', + message: 'Install vue-router?', }, filter: { when: 'isNotTest', @@ -82,7 +82,7 @@ module.exports = { lint: { when: 'isNotTest', type: 'confirm', - message: 'Use ESLint规范代码?', + message: 'Use ESLint to lint your code?', }, lintConfig: { when: 'isNotTest && lint', From 5d4286c1f1b1877bc81ea2c0701d9e5b7b6c16c8 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 16:39:57 +0800 Subject: [PATCH 07/46] Update package.json router --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index db88d649df..1dc1a46dda 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,8 @@ "docs:deploy": "bash ./deploy-docs.sh" }, "devDependencies": { - "vue-cli": "^2.8.1" + "vue-cli": "^2.8.1", + "vue-router": "^3.0.1", + "date-fns": "^1.30.1" } } From d4e6dd2af3d61f4e1bf3d574cc6dd29e52747683 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 16:40:04 +0800 Subject: [PATCH 08/46] Update main.js router --- template/src/main.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/template/src/main.js b/template/src/main.js index 723f695258..2701912324 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -5,7 +5,13 @@ import Vue from 'vue' import App from './App' {{#router}} -import router from './router' +import routes from './router.js' +import VueRouter from 'vue-router'; +Vue.use(VueRouter); +const router = new VueRouter({ + mode: 'hash', + routes: routes, +}); {{/router}} {{#filter}} From 4d7ae173bd1cde0f7a80588d87b27b5f0755eee8 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 16:40:10 +0800 Subject: [PATCH 09/46] Update index.js router --- template/src/router/index.js | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/template/src/router/index.js b/template/src/router/index.js index 5fa7f9d319..d9200b7f9b 100644 --- a/template/src/router/index.js +++ b/template/src/router/index.js @@ -1,15 +1,7 @@ -import Vue from 'vue' -import Router from 'vue-router' -import HelloWorld from '@/components/HelloWorld' - -Vue.use(Router) - -export default new Router({ - routes: [ - { - path: '/', - name: 'HelloWorld', - component: HelloWorld - } +export default [ + { + path: '/', + name: 'index', + component: resolve => require(['../components/HelloWorld.vue'], resolve),//懒加载 + } ] -}) From bc40b0883a3f7998353f50d58d809aa55e91ef5a Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 16:52:31 +0800 Subject: [PATCH 10/46] Update main.js --- template/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/src/main.js b/template/src/main.js index 2701912324..2a37493c5d 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -5,7 +5,7 @@ import Vue from 'vue' import App from './App' {{#router}} -import routes from './router.js' +import routes from './router' import VueRouter from 'vue-router'; Vue.use(VueRouter); const router = new VueRouter({ From a60cd46a2ff2686f5678874bcd0fb94cd345ac05 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 16:52:34 +0800 Subject: [PATCH 11/46] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1dc1a46dda..0998b44a64 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "vue-cli": "^2.8.1", - "vue-router": "^3.0.1", - "date-fns": "^1.30.1" + "date-fns": "^1.30.1", + "vue-router": "^3.0.1" } } From d77555f28b5dce8d3317fa4f93048c26da59faf5 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 19:12:56 +0800 Subject: [PATCH 12/46] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0998b44a64..aee16b6d19 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "devDependencies": { "vue-cli": "^2.8.1", + "vue": "^2.5.2", "date-fns": "^1.30.1", "vue-router": "^3.0.1" } From a02f3ce29c56dd02176c73ebe89a3440a505cb99 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 19:23:51 +0800 Subject: [PATCH 13/46] Update package.json --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index aee16b6d19..b0380e81fe 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,6 @@ }, "devDependencies": { "vue-cli": "^2.8.1", - "vue": "^2.5.2", - "date-fns": "^1.30.1", "vue-router": "^3.0.1" } } From 6f5807f4893dd15accceb6da9f97ba21104da942 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 19:23:56 +0800 Subject: [PATCH 14/46] Update package.json --- template/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index 207322b98c..40cb8bf45f 100644 --- a/template/package.json +++ b/template/package.json @@ -26,7 +26,9 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}} + "vue-router": "^3.0.1"{{/router}}, + {{#filter}}"date-fns": "^1.30.1"{{/filter}}, + }, "devDependencies": { {{#lint}} From 21c316ee597851644bf70efa081aae2cd19a3b3c Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 19:28:15 +0800 Subject: [PATCH 15/46] Update package.json --- template/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/package.json b/template/package.json index 40cb8bf45f..cf492d5a0b 100644 --- a/template/package.json +++ b/template/package.json @@ -27,8 +27,7 @@ "dependencies": { "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, - {{#filter}}"date-fns": "^1.30.1"{{/filter}}, - + {{#filter}}"date-fns": "^1.30.1"{{/filter}} }, "devDependencies": { {{#lint}} From 210d4ec1fc90f9a87618a39d3be992fe1c81a274 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 19:42:37 +0800 Subject: [PATCH 16/46] Update package.json --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index cf492d5a0b..d31c7f52ad 100644 --- a/template/package.json +++ b/template/package.json @@ -27,7 +27,7 @@ "dependencies": { "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, - {{#filter}}"date-fns": "^1.30.1"{{/filter}} + {{#filter}}"date-fns": "^1.30.1" }, "devDependencies": { {{#lint}} From 306efe85c7ce9e7711de422543c46dbfd33461e3 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Tue, 23 Apr 2019 19:45:22 +0800 Subject: [PATCH 17/46] Update package.json --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index d31c7f52ad..041613dd98 100644 --- a/template/package.json +++ b/template/package.json @@ -27,7 +27,7 @@ "dependencies": { "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, - {{#filter}}"date-fns": "^1.30.1" + }, "devDependencies": { {{#lint}} From f6e1072d093d3dae8eaae78f63e8002e13dbf923 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:26:02 +0800 Subject: [PATCH 18/46] Revert "Update meta.js" This reverts commit 67b588d4aa255e5a6949bac9603a2c22c508adbb. --- meta.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta.js b/meta.js index a7d44f2182..a521f9bdd0 100644 --- a/meta.js +++ b/meta.js @@ -74,11 +74,6 @@ module.exports = { type: 'confirm', message: 'Install vue-router?', }, - filter: { - when: 'isNotTest', - type: 'confirm', - message: 'Install filters 全局的filter?', - }, lint: { when: 'isNotTest', type: 'confirm', @@ -175,7 +170,6 @@ module.exports = { 'test/unit/setup.js': "unit && runner === 'jest'", 'test/e2e/**/*': 'e2e', 'src/router/**/*': 'router', - 'src/filter/**/*': 'filter', }, complete: function(data, { chalk }) { const green = chalk.green From 6e67014ea2f75e8c096e4c3957aec485880a10c2 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:27:03 +0800 Subject: [PATCH 19/46] Revert "Revert "Update meta.js"" This reverts commit f6e1072d093d3dae8eaae78f63e8002e13dbf923. --- meta.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta.js b/meta.js index a521f9bdd0..a7d44f2182 100644 --- a/meta.js +++ b/meta.js @@ -74,6 +74,11 @@ module.exports = { type: 'confirm', message: 'Install vue-router?', }, + filter: { + when: 'isNotTest', + type: 'confirm', + message: 'Install filters 全局的filter?', + }, lint: { when: 'isNotTest', type: 'confirm', @@ -170,6 +175,7 @@ module.exports = { 'test/unit/setup.js': "unit && runner === 'jest'", 'test/e2e/**/*': 'e2e', 'src/router/**/*': 'router', + 'src/filter/**/*': 'filter', }, complete: function(data, { chalk }) { const green = chalk.green From 4b757300441a5219f4df7cac33cd481be18b31a0 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:34:52 +0800 Subject: [PATCH 20/46] Update package.json --- template/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/package.json b/template/package.json index 041613dd98..207322b98c 100644 --- a/template/package.json +++ b/template/package.json @@ -26,8 +26,7 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}}, - + "vue-router": "^3.0.1"{{/router}} }, "devDependencies": { {{#lint}} From 95654037ac56bac315d56de5eeabfb169ef92fbd Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:40:16 +0800 Subject: [PATCH 21/46] Update package.json --- template/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index 207322b98c..d31c7f52ad 100644 --- a/template/package.json +++ b/template/package.json @@ -26,7 +26,8 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}} + "vue-router": "^3.0.1"{{/router}}, + {{#filter}}"date-fns": "^1.30.1" }, "devDependencies": { {{#lint}} From 0d519a95ef49c0a9487bef271a1c8e09d61180d8 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:41:45 +0800 Subject: [PATCH 22/46] Update package.json --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index d31c7f52ad..b64d1b8b7f 100644 --- a/template/package.json +++ b/template/package.json @@ -27,7 +27,7 @@ "dependencies": { "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, - {{#filter}}"date-fns": "^1.30.1" + "date-fns": "^1.30.1"{{/filter}} }, "devDependencies": { {{#lint}} From 7878d29d206966eaa663db1a4be20b9098dabeb5 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:44:21 +0800 Subject: [PATCH 23/46] Update package.json --- template/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index b64d1b8b7f..5ce9c8eb2b 100644 --- a/template/package.json +++ b/template/package.json @@ -27,9 +27,10 @@ "dependencies": { "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, - "date-fns": "^1.30.1"{{/filter}} }, "devDependencies": { + {{#filter}} + "date-fns": "^1.30.1" {{#lint}} "babel-eslint": "^7.2.3", "eslint": "^4.15.0", From 63a2d1045c53708f89cfb40dc23a2fdf418e2929 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:46:50 +0800 Subject: [PATCH 24/46] Update package.json --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index 5ce9c8eb2b..f31b1bec9a 100644 --- a/template/package.json +++ b/template/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}}, + "vue-router": "^3.0.1"{{/router}} }, "devDependencies": { {{#filter}} From 668e6c290c5e186bd71e9be6adfdd844f6af660d Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:48:09 +0800 Subject: [PATCH 25/46] Update package.json --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index f31b1bec9a..f8278176a4 100644 --- a/template/package.json +++ b/template/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { {{#filter}} - "date-fns": "^1.30.1" + "date-fns": "^1.30.1", {{#lint}} "babel-eslint": "^7.2.3", "eslint": "^4.15.0", From 2a011876d21116e44eeafb5a6581369ad288c9b6 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:51:56 +0800 Subject: [PATCH 26/46] Update package.json --- template/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/template/package.json b/template/package.json index f8278176a4..041613dd98 100644 --- a/template/package.json +++ b/template/package.json @@ -26,11 +26,10 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}} + "vue-router": "^3.0.1"{{/router}}, + }, "devDependencies": { - {{#filter}} - "date-fns": "^1.30.1", {{#lint}} "babel-eslint": "^7.2.3", "eslint": "^4.15.0", From cacad4d668f2f9270b60516f68e6e7d1eb20c14e Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:53:27 +0800 Subject: [PATCH 27/46] Update package.json --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index 041613dd98..56aedde163 100644 --- a/template/package.json +++ b/template/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}}, + "vue-router": "^3.0.1"{{/router}} }, "devDependencies": { From 36576e5acc1e08ebc8763ff66854580f634b2acd Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:55:02 +0800 Subject: [PATCH 28/46] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b0380e81fe..1dc1a46dda 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "devDependencies": { "vue-cli": "^2.8.1", - "vue-router": "^3.0.1" + "vue-router": "^3.0.1", + "date-fns": "^1.30.1" } } From 47d0cc07559c72acdc4eca7b9b6e30b0c37c3e36 Mon Sep 17 00:00:00 2001 From: yang <1592587981@qq.com> Date: Tue, 23 Apr 2019 23:55:08 +0800 Subject: [PATCH 29/46] Update package.json --- template/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/package.json b/template/package.json index 56aedde163..cf492d5a0b 100644 --- a/template/package.json +++ b/template/package.json @@ -26,8 +26,8 @@ }, "dependencies": { "vue": "^2.5.2"{{#router}}, - "vue-router": "^3.0.1"{{/router}} - + "vue-router": "^3.0.1"{{/router}}, + {{#filter}}"date-fns": "^1.30.1"{{/filter}} }, "devDependencies": { {{#lint}} From 534e872a661e5752d8a42cb5f64dd7e6e4597181 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 11:43:13 +0800 Subject: [PATCH 30/46] Update meta.js --- meta.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.js b/meta.js index a7d44f2182..7b28ab54d2 100644 --- a/meta.js +++ b/meta.js @@ -174,7 +174,7 @@ module.exports = { 'test/unit/specs/index.js': "unit && runner === 'karma'", 'test/unit/setup.js': "unit && runner === 'jest'", 'test/e2e/**/*': 'e2e', - 'src/router/**/*': 'router', + 'router.js': 'router', 'src/filter/**/*': 'filter', }, complete: function(data, { chalk }) { From f0a3c088844d7c1f792baee7e6e5d8b019f973db Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 11:43:17 +0800 Subject: [PATCH 31/46] Create router.js --- template/router.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 template/router.js diff --git a/template/router.js b/template/router.js new file mode 100644 index 0000000000..01326950b5 --- /dev/null +++ b/template/router.js @@ -0,0 +1,7 @@ +export default [ + { + path: '/', + name: 'index', + component: resolve => require(['./src/components/HelloWorld.vue'], resolve),//懒加载 + } + ] From 9856df2e0736fc05a6b95f376f079c6b25781122 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 11:43:21 +0800 Subject: [PATCH 32/46] Update main.js --- template/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/src/main.js b/template/src/main.js index 2a37493c5d..2701912324 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -5,7 +5,7 @@ import Vue from 'vue' import App from './App' {{#router}} -import routes from './router' +import routes from './router.js' import VueRouter from 'vue-router'; Vue.use(VueRouter); const router = new VueRouter({ From 62bbefb0aa43310e6badb249ba765ef5b60fe59e Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 11:43:23 +0800 Subject: [PATCH 33/46] Delete index.js --- template/src/router/index.js | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 template/src/router/index.js diff --git a/template/src/router/index.js b/template/src/router/index.js deleted file mode 100644 index d9200b7f9b..0000000000 --- a/template/src/router/index.js +++ /dev/null @@ -1,7 +0,0 @@ -export default [ - { - path: '/', - name: 'index', - component: resolve => require(['../components/HelloWorld.vue'], resolve),//懒加载 - } - ] From ba03ad5401e0670d288e38724518a6cbe7564357 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 11:54:30 +0800 Subject: [PATCH 34/46] Update router.js --- template/router.js | 7 ------- template/src/router.js | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 template/router.js create mode 100644 template/src/router.js diff --git a/template/router.js b/template/router.js deleted file mode 100644 index 01326950b5..0000000000 --- a/template/router.js +++ /dev/null @@ -1,7 +0,0 @@ -export default [ - { - path: '/', - name: 'index', - component: resolve => require(['./src/components/HelloWorld.vue'], resolve),//懒加载 - } - ] diff --git a/template/src/router.js b/template/src/router.js new file mode 100644 index 0000000000..18d155dd43 --- /dev/null +++ b/template/src/router.js @@ -0,0 +1,7 @@ +export default [ + { + path: '/', + name: 'index', + component: resolve => require(['./components/HelloWorld.vue'], resolve),//懒加载 + } + ] From 8a41365b4fb726765e7cdc185a6f12650831f772 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:00:23 +0800 Subject: [PATCH 35/46] Update meta.js --- meta.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta.js b/meta.js index 7b28ab54d2..d60fada6db 100644 --- a/meta.js +++ b/meta.js @@ -79,6 +79,11 @@ module.exports = { type: 'confirm', message: 'Install filters 全局的filter?', }, + elementUi: { + when: 'isNotTest', + type: 'confirm', + message: 'Use elementUi?', + }, lint: { when: 'isNotTest', type: 'confirm', From a88da238514734932c2e4323ee9368a10395f8f4 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:00:27 +0800 Subject: [PATCH 36/46] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1dc1a46dda..1138f7cc9b 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "devDependencies": { "vue-cli": "^2.8.1", "vue-router": "^3.0.1", - "date-fns": "^1.30.1" + "date-fns": "^1.30.1", + "element-ui": "^2.6.3" } } From b4e8b645a1045fb4c42fc81d759030854b1f84d5 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:00:32 +0800 Subject: [PATCH 37/46] Update package.json --- template/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index cf492d5a0b..aec3577cc4 100644 --- a/template/package.json +++ b/template/package.json @@ -27,7 +27,8 @@ "dependencies": { "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, - {{#filter}}"date-fns": "^1.30.1"{{/filter}} + {{#filter}}"date-fns": "^1.30.1"{{/filter}}, + {{#elementUi}}"element-ui": "^2.6.3"{{/elementUi}} }, "devDependencies": { {{#lint}} From 437642ec2fc0f89ddd9a9a6db6abc3716f978412 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:00:35 +0800 Subject: [PATCH 38/46] Update main.js --- template/src/main.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/template/src/main.js b/template/src/main.js index 2701912324..e2bebe6a0b 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -14,6 +14,11 @@ const router = new VueRouter({ }); {{/router}} +{{#elementUi}} +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +Vue.use(ElementUI); +{{/elementUi}} {{#filter}} import filters from './filter/filter' {{/filter}} From 58151726f3c2188e0eb9420aa25e2e05c50876a6 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:42:50 +0800 Subject: [PATCH 39/46] Update meta.js vuex --- meta.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta.js b/meta.js index d60fada6db..6d9b26037a 100644 --- a/meta.js +++ b/meta.js @@ -84,6 +84,11 @@ module.exports = { type: 'confirm', message: 'Use elementUi?', }, + vuex: { + when: 'isNotTest', + type: 'confirm', + message: 'Use 模块化管理 vuex?', + }, lint: { when: 'isNotTest', type: 'confirm', @@ -181,6 +186,7 @@ module.exports = { 'test/e2e/**/*': 'e2e', 'router.js': 'router', 'src/filter/**/*': 'filter', + 'src/store/**/*': 'vuex' }, complete: function(data, { chalk }) { const green = chalk.green From ac62af302473aeef4478bc24b0eb046210935f44 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:42:59 +0800 Subject: [PATCH 40/46] Update main.js vuex --- template/src/main.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/template/src/main.js b/template/src/main.js index e2bebe6a0b..d858ef47a6 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -4,6 +4,9 @@ {{/if_eq}} import Vue from 'vue' import App from './App' +{{#vuex}} +import store from './store/modules' +{{/vuex}} {{#router}} import routes from './router.js' import VueRouter from 'vue-router'; @@ -34,6 +37,9 @@ new Vue({ {{#router}} router, {{/router}} + {{#vuex}} + store, + {{/vuex}} {{#if_eq build "runtime"}} render: h => h(App) {{/if_eq}} From 67507ecf0e22cb800c0767fa81d3c2d00fa66e1e Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:43:07 +0800 Subject: [PATCH 41/46] Create common.js vuex --- template/src/store/common.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 template/src/store/common.js diff --git a/template/src/store/common.js b/template/src/store/common.js new file mode 100644 index 0000000000..964e1c5a5a --- /dev/null +++ b/template/src/store/common.js @@ -0,0 +1,16 @@ +export default { + //开启命名控件的方式 + // namespaced: true, + state:{ + commonCount:0 + }, + mutations: { + commonIncrement (state) {//在大多数情况下,payload载荷应该是一个对象,这样可以包含多个字段并且记录的 mutation 会更易读 + state.commonCount +=1 + } + }, + actions:{ + commonIncrement ({ commit },increment) { + commit('commonIncrement',increment)} + }, +} From c074c6a76dc4db48224e79f8b06f5be38570f447 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 14:43:10 +0800 Subject: [PATCH 42/46] Create modules.js --- template/src/store/modules.js | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 template/src/store/modules.js diff --git a/template/src/store/modules.js b/template/src/store/modules.js new file mode 100644 index 0000000000..1dfd641320 --- /dev/null +++ b/template/src/store/modules.js @@ -0,0 +1,48 @@ +import common from './common'; +import Vue from 'vue'; +import Vuex from 'vuex'; +import createLogger from 'vuex/dist/logger' + +Vue.use(Vuex) +//采用的是 多个分类的形式 +const myPlugin = store => {//此方式可以监控到提交的状态 + // 当 store 初始化后调用 + let prevState = _.cloneDeep(store.state) + store.subscribe((mutation, state) => { + let nextState = _.cloneDeep(state) + // 每次 mutation 之后调用 + // mutation 的格式为 { type, payload } + console.dir(prevState) + console.dir(nextState) + prevState = nextState + + }) +} +const logger = createLogger({ + collapsed: false, // 自动展开记录的 mutation + filter (mutation, stateBefore, stateAfter) { + // 若 mutation 需要被记录,就让它返回 true 即可 + // 顺便,`mutation` 是个 { type, payload } 对象 + return mutation.type !== "aBlacklistedMutation" + }, + transformer (state) { + // 在开始记录之前转换状态 + // 例如,只返回指定的子树 + return state + }, + mutationTransformer (mutation) { + // mutation 按照 { type, payload } 格式记录 + // 我们可以按任意方式格式化 + return mutation.type + }, + logger: console, // 自定义 console 实现,默认为 `console` +}) +export default new Vuex.Store({ + modules: { + common: common, + }, + // plugins: [myPlugin] + plugins: process.env.NODE_ENV !== 'production' + ? [logger] + : [] +}) From cd6a5805035855e9fac95cce9ee0132d07a0120f Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 15:16:09 +0800 Subject: [PATCH 43/46] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1138f7cc9b..bc41e9c9b8 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "vue-cli": "^2.8.1", "vue-router": "^3.0.1", "date-fns": "^1.30.1", - "element-ui": "^2.6.3" + "element-ui": "^2.6.3", + "vuex": "^3.1.0" } } From 6859eea9d1e1b6ca809dcf1c89ccf8b1f82e5e9c Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 15:16:13 +0800 Subject: [PATCH 44/46] Update package.json --- template/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index aec3577cc4..5782e86920 100644 --- a/template/package.json +++ b/template/package.json @@ -28,7 +28,8 @@ "vue": "^2.5.2"{{#router}}, "vue-router": "^3.0.1"{{/router}}, {{#filter}}"date-fns": "^1.30.1"{{/filter}}, - {{#elementUi}}"element-ui": "^2.6.3"{{/elementUi}} + {{#elementUi}}"element-ui": "^2.6.3"{{/elementUi}}, + {{#vuex}}"vuex": "^3.1.0"{{/vuex}} }, "devDependencies": { {{#lint}} From 0f1600ef777b5a34f97aae0118362c3cdaff58d0 Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 15:16:16 +0800 Subject: [PATCH 45/46] Update main.js --- template/src/main.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/template/src/main.js b/template/src/main.js index d858ef47a6..d9c61490b0 100644 --- a/template/src/main.js +++ b/template/src/main.js @@ -10,21 +10,22 @@ import store from './store/modules' {{#router}} import routes from './router.js' import VueRouter from 'vue-router'; +{{#elementUi}} +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +{{/elementUi}} +{{#filter}} +import filters from './filter/filter' +{{/filter}} Vue.use(VueRouter); const router = new VueRouter({ mode: 'hash', routes: routes, }); {{/router}} - {{#elementUi}} -import ElementUI from 'element-ui'; -import 'element-ui/lib/theme-chalk/index.css'; Vue.use(ElementUI); {{/elementUi}} -{{#filter}} -import filters from './filter/filter' -{{/filter}} Vue.config.productionTip = false {{#filter}} Object.keys(filters).forEach(key => { @@ -38,7 +39,7 @@ new Vue({ router, {{/router}} {{#vuex}} - store, + store, {{/vuex}} {{#if_eq build "runtime"}} render: h => h(App) From 0bfa3578dba1699badf01c134ee4c69c71021f3c Mon Sep 17 00:00:00 2001 From: ZhengDavid5 <1592587981@qq.com> Date: Wed, 24 Apr 2019 15:33:24 +0800 Subject: [PATCH 46/46] Update meta.js --- meta.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta.js b/meta.js index 6d9b26037a..4da4a4c895 100644 --- a/meta.js +++ b/meta.js @@ -33,6 +33,11 @@ module.exports = { }, prompts: { + special: { + when: 'isNotTest', + type: 'confirm', + message: '教学专属装逼脚手架', + }, name: { when: 'isNotTest', type: 'string',