From 89f3c3a9b3f7c24e6096dbd1facd8f22c225e21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com> Date: Mon, 29 Jan 2018 08:07:20 +0800 Subject: [PATCH] no message Former-commit-id: 8a915014c5e632c23eaa60c2256f7e0f16824e27 Former-commit-id: 68184439f87afccc182f371b79cd679295e8f3bf Former-commit-id: 64591f063a6b0fe822b4d826846f9417b1d67b89 --- .../demo/plugins/mock/data/settingDTD.js | 16 +- src/router/menu/_plugin.js | 188 +++++++++--------- 2 files changed, 104 insertions(+), 100 deletions(-) diff --git a/src/pages/demo/plugins/mock/data/settingDTD.js b/src/pages/demo/plugins/mock/data/settingDTD.js index 9b89668f..9e1859c1 100644 --- a/src/pages/demo/plugins/mock/data/settingDTD.js +++ b/src/pages/demo/plugins/mock/data/settingDTD.js @@ -59,27 +59,31 @@ export default [ qq: '1711467488', tel: '123-4567-8910', city: 'beijing', - phone: 'Apple', mail: '1711467488liyang@gmail.com', github: 'https://github.com/FairyEver', - blog: 'http://www.fairyever.com/' + blog: 'http://www.fairyever.com/', + creatDate: '2018-1-1', + updateDate: '2018-1-2', + delFlag: 0 } } }, { - title: '随机选择3-6个属性', + title: '随机选择4-8个属性', json: { - "obj|3-6": { + "obj|4-8": { name: 'FairyEver', use: 'vue.js', sex: 1, qq: '1711467488', tel: '123-4567-8910', city: 'beijing', - phone: 'Apple', mail: '1711467488liyang@gmail.com', github: 'https://github.com/FairyEver', - blog: 'http://www.fairyever.com/' + blog: 'http://www.fairyever.com/', + creatDate: '2018-1-1', + updateDate: '2018-1-2', + delFlag: 0 } } }, diff --git a/src/router/menu/_plugin.js b/src/router/menu/_plugin.js index b2daef65..f51c2c24 100644 --- a/src/router/menu/_plugin.js +++ b/src/router/menu/_plugin.js @@ -11,47 +11,40 @@ export const menu = { // name: 'demo-plugins-marked-readme' // }, children: [ - // markdown 解析库 + // mock { - title: 'MD解析', - icon: 'font', + title: '模拟数据', + icon: 'globe', children: [ { - title: '基本示例', + title: '数据模板', icon: 'file-o', - path: 'marked/demo', - name: 'demo-plugins-marked-demo', + path: 'mock/demoDTD', + name: 'demo-plugins-mock-demoDTD', meta: { requiresAuth: true }, - component: resolve => { require(['@/pages/demo/plugins/marked/demo.vue'], resolve) } + component: resolve => { require(['@/pages/demo/plugins/mock/demoDTD.vue'], resolve) } }, { - title: '代码高亮', + title: '数据占位符', icon: 'file-o', - path: 'marked/demoHighlight', - name: 'demo-plugins-marked-demoHighlight', + path: 'mock/demoDPD', + name: 'demo-plugins-mock-demoDPD', meta: { requiresAuth: true }, - component: resolve => { require(['@/pages/demo/plugins/marked/demoHighlight.vue'], resolve) } - } - ] - }, - // MD编辑器 - { - title: 'MD编辑器', - icon: 'columns', - children: [ + component: resolve => { require(['@/pages/demo/plugins/mock/demoDPD.vue'], resolve) } + }, { - title: '基本示例', + title: '拦截Ajax请求', icon: 'file-o', - path: 'simpleMDE/demo', - name: 'demo-plugins-simpleMDE-demo', + path: 'mock/ajax', + name: 'demo-plugins-mock-ajax', meta: { requiresAuth: true }, - component: resolve => { require(['@/pages/demo/plugins/simpleMDE/demo.vue'], resolve) } + component: resolve => { require(['@/pages/demo/plugins/mock/ajax.vue'], resolve) } } ] }, @@ -72,6 +65,23 @@ export const menu = { } ] }, + // MD编辑器 + { + title: 'markdown编辑器', + icon: 'columns', + children: [ + { + title: '基本示例', + icon: 'file-o', + path: 'simpleMDE/demo', + name: 'demo-plugins-simpleMDE-demo', + meta: { + requiresAuth: true + }, + component: resolve => { require(['@/pages/demo/plugins/simpleMDE/demo.vue'], resolve) } + } + ] + }, // font-awesome { title: '图标库', @@ -116,40 +126,6 @@ export const menu = { } ] }, - // 时间计算 - { - title: '时间计算', - icon: 'clock-o', - children: [ - { - title: '基本示例', - icon: 'file-o', - path: 'timeago/demo', - name: 'demo-plugins-timeago-demo', - meta: { - requiresAuth: true - }, - component: resolve => { require(['@/pages/demo/plugins/timeago/demo.vue'], resolve) } - } - ] - }, - // papaParse - { - title: '表格解析', - icon: 'eye', - children: [ - { - title: '基本示例', - icon: 'file-o', - path: 'papaParse/demo', - name: 'demo-plugins-papaParse-demo', - meta: { - requiresAuth: true - }, - component: resolve => { require(['@/pages/demo/plugins/papaParse/demo.vue'], resolve) } - } - ] - }, // countup { title: '数字动画', @@ -218,43 +194,6 @@ export const menu = { } ] }, - // mock - { - title: '模拟数据', - icon: 'globe', - children: [ - { - title: '数据模板', - icon: 'file-o', - path: 'mock/demoDTD', - name: 'demo-plugins-mock-demoDTD', - meta: { - requiresAuth: true - }, - component: resolve => { require(['@/pages/demo/plugins/mock/demoDTD.vue'], resolve) } - }, - { - title: '数据占位符', - icon: 'file-o', - path: 'mock/demoDPD', - name: 'demo-plugins-mock-demoDPD', - meta: { - requiresAuth: true - }, - component: resolve => { require(['@/pages/demo/plugins/mock/demoDPD.vue'], resolve) } - }, - { - title: '拦截Ajax请求', - icon: 'file-o', - path: 'mock/ajax', - name: 'demo-plugins-mock-ajax', - meta: { - requiresAuth: true - }, - component: resolve => { require(['@/pages/demo/plugins/mock/ajax.vue'], resolve) } - } - ] - }, // 可调布局组件 { title: '可调布局', @@ -271,6 +210,67 @@ export const menu = { component: resolve => { require(['@/pages/demo/plugins/vue-splitpane/demo.vue'], resolve) } } ] + }, + // markdown 解析库 + { + title: 'MD解析', + icon: 'font', + children: [ + { + title: '基本示例', + icon: 'file-o', + path: 'marked/demo', + name: 'demo-plugins-marked-demo', + meta: { + requiresAuth: true + }, + component: resolve => { require(['@/pages/demo/plugins/marked/demo.vue'], resolve) } + }, + { + title: '代码高亮', + icon: 'file-o', + path: 'marked/demoHighlight', + name: 'demo-plugins-marked-demoHighlight', + meta: { + requiresAuth: true + }, + component: resolve => { require(['@/pages/demo/plugins/marked/demoHighlight.vue'], resolve) } + } + ] + }, + // 时间计算 + { + title: '时间计算', + icon: 'clock-o', + children: [ + { + title: '基本示例', + icon: 'file-o', + path: 'timeago/demo', + name: 'demo-plugins-timeago-demo', + meta: { + requiresAuth: true + }, + component: resolve => { require(['@/pages/demo/plugins/timeago/demo.vue'], resolve) } + } + ] + }, + // papaParse + { + title: '表格解析', + icon: 'eye', + children: [ + { + title: '基本示例', + icon: 'file-o', + path: 'papaParse/demo', + name: 'demo-plugins-papaParse-demo', + meta: { + requiresAuth: true + }, + component: resolve => { require(['@/pages/demo/plugins/papaParse/demo.vue'], resolve) } + } + ] } ] }