From 51c2260e8fad52b724a7f24676e306e3a872b0b0 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 6 Jun 2018 22:42:53 +0800 Subject: [PATCH] no message Former-commit-id: f3c11b2f64cc627044be20129050e193a8eec631 Former-commit-id: 49657d956a264020cda5ee3230870cf736197400 Former-commit-id: c3796afffe32e911c917133f2dc804cfe664acd7 --- .../plugins/build/{page.vue => index.vue} | 0 .../{page.vue => index.vue} | 0 .../export/{page/table/page.vue => table.vue} | 0 .../export/{page/txt/page.vue => txt.vue} | 0 .../plugins/import/{csv/page.vue => csv.vue} | 0 .../import/{xlsx/page.vue => xlsx.vue} | 0 .../plugins/index/{page.vue => index.vue} | 0 .../plugins/js-cookie/{page.vue => index.vue} | 0 .../layout/{grid/page.vue => grid.vue} | 0 .../{splitpane/page.vue => splitpane.vue} | 0 .../mock/{page/ajax/page.vue => ajax.vue} | 0 .../mock/{page/dpd/page.vue => dpd.vue} | 0 .../mock/{page/dtd/page.vue => dtd.vue} | 0 .../plugins/timeago/{page.vue => index.vue} | 0 .../{page/demo-1/page.vue => demo1.vue} | 0 .../{page/demo-2/page.vue => demo2.vue} | 0 .../vue-i18n/{page/doc/page.vue => doc.vue} | 0 src/router/index.js | 40 ++----------------- 18 files changed, 4 insertions(+), 36 deletions(-) rename src/pages/demo/plugins/build/{page.vue => index.vue} (100%) rename src/pages/demo/plugins/clipboard-polyfill/{page.vue => index.vue} (100%) rename src/pages/demo/plugins/export/{page/table/page.vue => table.vue} (100%) rename src/pages/demo/plugins/export/{page/txt/page.vue => txt.vue} (100%) rename src/pages/demo/plugins/import/{csv/page.vue => csv.vue} (100%) rename src/pages/demo/plugins/import/{xlsx/page.vue => xlsx.vue} (100%) rename src/pages/demo/plugins/index/{page.vue => index.vue} (100%) rename src/pages/demo/plugins/js-cookie/{page.vue => index.vue} (100%) rename src/pages/demo/plugins/layout/{grid/page.vue => grid.vue} (100%) rename src/pages/demo/plugins/layout/{splitpane/page.vue => splitpane.vue} (100%) rename src/pages/demo/plugins/mock/{page/ajax/page.vue => ajax.vue} (100%) rename src/pages/demo/plugins/mock/{page/dpd/page.vue => dpd.vue} (100%) rename src/pages/demo/plugins/mock/{page/dtd/page.vue => dtd.vue} (100%) rename src/pages/demo/plugins/timeago/{page.vue => index.vue} (100%) rename src/pages/demo/plugins/vue-i18n/{page/demo-1/page.vue => demo1.vue} (100%) rename src/pages/demo/plugins/vue-i18n/{page/demo-2/page.vue => demo2.vue} (100%) rename src/pages/demo/plugins/vue-i18n/{page/doc/page.vue => doc.vue} (100%) diff --git a/src/pages/demo/plugins/build/page.vue b/src/pages/demo/plugins/build/index.vue similarity index 100% rename from src/pages/demo/plugins/build/page.vue rename to src/pages/demo/plugins/build/index.vue diff --git a/src/pages/demo/plugins/clipboard-polyfill/page.vue b/src/pages/demo/plugins/clipboard-polyfill/index.vue similarity index 100% rename from src/pages/demo/plugins/clipboard-polyfill/page.vue rename to src/pages/demo/plugins/clipboard-polyfill/index.vue diff --git a/src/pages/demo/plugins/export/page/table/page.vue b/src/pages/demo/plugins/export/table.vue similarity index 100% rename from src/pages/demo/plugins/export/page/table/page.vue rename to src/pages/demo/plugins/export/table.vue diff --git a/src/pages/demo/plugins/export/page/txt/page.vue b/src/pages/demo/plugins/export/txt.vue similarity index 100% rename from src/pages/demo/plugins/export/page/txt/page.vue rename to src/pages/demo/plugins/export/txt.vue diff --git a/src/pages/demo/plugins/import/csv/page.vue b/src/pages/demo/plugins/import/csv.vue similarity index 100% rename from src/pages/demo/plugins/import/csv/page.vue rename to src/pages/demo/plugins/import/csv.vue diff --git a/src/pages/demo/plugins/import/xlsx/page.vue b/src/pages/demo/plugins/import/xlsx.vue similarity index 100% rename from src/pages/demo/plugins/import/xlsx/page.vue rename to src/pages/demo/plugins/import/xlsx.vue diff --git a/src/pages/demo/plugins/index/page.vue b/src/pages/demo/plugins/index/index.vue similarity index 100% rename from src/pages/demo/plugins/index/page.vue rename to src/pages/demo/plugins/index/index.vue diff --git a/src/pages/demo/plugins/js-cookie/page.vue b/src/pages/demo/plugins/js-cookie/index.vue similarity index 100% rename from src/pages/demo/plugins/js-cookie/page.vue rename to src/pages/demo/plugins/js-cookie/index.vue diff --git a/src/pages/demo/plugins/layout/grid/page.vue b/src/pages/demo/plugins/layout/grid.vue similarity index 100% rename from src/pages/demo/plugins/layout/grid/page.vue rename to src/pages/demo/plugins/layout/grid.vue diff --git a/src/pages/demo/plugins/layout/splitpane/page.vue b/src/pages/demo/plugins/layout/splitpane.vue similarity index 100% rename from src/pages/demo/plugins/layout/splitpane/page.vue rename to src/pages/demo/plugins/layout/splitpane.vue diff --git a/src/pages/demo/plugins/mock/page/ajax/page.vue b/src/pages/demo/plugins/mock/ajax.vue similarity index 100% rename from src/pages/demo/plugins/mock/page/ajax/page.vue rename to src/pages/demo/plugins/mock/ajax.vue diff --git a/src/pages/demo/plugins/mock/page/dpd/page.vue b/src/pages/demo/plugins/mock/dpd.vue similarity index 100% rename from src/pages/demo/plugins/mock/page/dpd/page.vue rename to src/pages/demo/plugins/mock/dpd.vue diff --git a/src/pages/demo/plugins/mock/page/dtd/page.vue b/src/pages/demo/plugins/mock/dtd.vue similarity index 100% rename from src/pages/demo/plugins/mock/page/dtd/page.vue rename to src/pages/demo/plugins/mock/dtd.vue diff --git a/src/pages/demo/plugins/timeago/page.vue b/src/pages/demo/plugins/timeago/index.vue similarity index 100% rename from src/pages/demo/plugins/timeago/page.vue rename to src/pages/demo/plugins/timeago/index.vue diff --git a/src/pages/demo/plugins/vue-i18n/page/demo-1/page.vue b/src/pages/demo/plugins/vue-i18n/demo1.vue similarity index 100% rename from src/pages/demo/plugins/vue-i18n/page/demo-1/page.vue rename to src/pages/demo/plugins/vue-i18n/demo1.vue diff --git a/src/pages/demo/plugins/vue-i18n/page/demo-2/page.vue b/src/pages/demo/plugins/vue-i18n/demo2.vue similarity index 100% rename from src/pages/demo/plugins/vue-i18n/page/demo-2/page.vue rename to src/pages/demo/plugins/vue-i18n/demo2.vue diff --git a/src/pages/demo/plugins/vue-i18n/page/doc/page.vue b/src/pages/demo/plugins/vue-i18n/doc.vue similarity index 100% rename from src/pages/demo/plugins/vue-i18n/page/doc/page.vue rename to src/pages/demo/plugins/vue-i18n/doc.vue diff --git a/src/router/index.js b/src/router/index.js index 4a4a8844..e0807f7f 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,36 +2,8 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Cookies from 'js-cookie' -import pathPosix from 'path-posix' -import _get from 'lodash.get' - Vue.use(VueRouter) -const routesMaker = ({publicPath, namePrefix, req}) => { - const win2posix = pathString => pathString.split('\\').join('/') - return req.keys().map(req).map(page => { - // 每个文件的路径 已经转换为 posix - const pagePath = pathPosix.dirname(win2posix(page.default.__file)) - // 路由中使用的路径 - const path = pagePath - .replace(win2posix(publicPath), '') - .replace(new RegExp('/page/', 'g'), '/') - const name = `${namePrefix}${path.split('/').join('-')}` - const route = { - path: `${path}${_get(page, 'router.pathSuffix', '')}`, - name, - ...page.router, - meta: { requiresAuth: true }, - component: page.default - } - console.log(JSON.stringify({ - path: route.path, - name: route.name - })) - return route - }) -} - const routes = [ // 首页 { @@ -53,11 +25,9 @@ const routes = [ meta: { requiresAuth: true }, redirect: { name: 'demo-plugins-index' }, component: resolve => { require(['@/components/core/MainLayout/index.vue'], resolve) }, - children: routesMaker({ - publicPath: 'src/pages/demo/plugins/', - namePrefix: 'demo-plugins-', - req: require.context('@/pages/demo/plugins', true, /page\.vue$/) - }) + children: [ + + ] }, // 登陆 { @@ -69,9 +39,7 @@ const routes = [ console.log(routes) -let router = new VueRouter({ - routes -}) +let router = new VueRouter({ routes }) router.beforeEach((to, from, next) => { // 需要身份校验