-
-
-
-
-
-
输入任意用户名和密码即可
@@ -16,30 +18,27 @@ From 7b2e8d8ab2cc846bd11e2f8f3e732c60b0f45431 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 15:02:04 +0800 Subject: [PATCH 016/164] =?UTF-8?q?git=E9=83=A8=E7=BD=B2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?BASE=5FURL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/vue.config.js b/vue.config.js index b3e1a73d5..f44a47d61 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,8 +1,8 @@ -const path = require('path') +const path = require("path"); -const resolve = dir => { - return path.join(__dirname, dir) -} +const resolve = (dir) => { + return path.join(__dirname, dir); +}; // 项目部署基础 // 默认情况下，我们假设你的应用将被部署在域的根目录下, @@ -11,9 +11,8 @@ const resolve = dir => { // 如果您的应用程序部署在子路径中，则需要在这指定子路径 // 例如：https://www.foobar.com/my-app/ // 需要将它改为'/my-app/' -const BASE_URL = process.env.NODE_ENV === 'production' - ? '/' - : '/' +const BASE_URL = + process.env.NODE_ENV === "production" ? "/iview-dynamicRouter" : "/"; module.exports = { // Project deployment base @@ -28,10 +27,10 @@ module.exports = { // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md // 如果你不需要使用eslint，把lintOnSave设为false即可 lintOnSave: false, - chainWebpack: config => { + chainWebpack: (config) => { config.resolve.alias - .set('@', resolve('src')) // key,value自行定义，比如.set('@@', resolve('src/components')) - .set('_c', resolve('src/components')) + .set("@", resolve("src")) // key,value自行定义，比如.set('@@', resolve('src/components')) + .set("_c", resolve("src/components")); }, // 打包时不生成.map文件 productionSourceMap: false @@ -39,4 +38,4 @@ module.exports = { // devServer: { // proxy: 'localhost:3000' // } -} +}; From a8156f0d952476b6e40d29e3ca86220c8e41656f Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 15:26:41 +0800 Subject: [PATCH 017/164] =?UTF-8?q?github=E9=83=A8=E7=BD=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9baseUrl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/index.js b/src/config/index.js index 9b5127044..74c9c3c2c 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -14,7 +14,7 @@ export default { */ baseUrl: { dev: "https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/", - pro: "https://produce.com" + pro: "https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/" }, /** * @description 默认打开的首页的路由name值，默认为home From 4040bc728a39bcda72b2014f5b1972d99c8f13a6 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 15:41:41 +0800 Subject: [PATCH 018/164] =?UTF-8?q?github=E9=83=A8=E7=BD=B2baseUrl?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/index.js b/src/config/index.js index 74c9c3c2c..e0e14205f 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -14,7 +14,7 @@ export default { */ baseUrl: { dev: "https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/", - pro: "https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/" + pro: "https://www.easy-mock.com/mock/5d5e559ed064102521b410b2" }, /** * @description 默认打开的首页的路由name值，默认为home From 1125ec4bf099fc84113562d6b7e4948f504442b4 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 15:50:53 +0800 Subject: [PATCH 019/164] =?UTF-8?q?github=E9=83=A8=E7=BD=B2=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9baseUrl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/index.js b/src/config/index.js index e0e14205f..74c9c3c2c 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -14,7 +14,7 @@ export default { */ baseUrl: { dev: "https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/", - pro: "https://www.easy-mock.com/mock/5d5e559ed064102521b410b2" + pro: "https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/" }, /** * @description 默认打开的首页的路由name值，默认为home From 79cab7ef188b4869985f3b08b255a4e8d9efe617 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 15:51:26 +0800 Subject: [PATCH 020/164] =?UTF-8?q?github=E9=83=A8=E7=BD=B2=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=90=8C=E6=A0=B7?= =?UTF-8?q?=E5=BC=95=E5=85=A5mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main.js b/src/main.js index 203ee8b4d..7c43aa872 100644 --- a/src/main.js +++ b/src/main.js @@ -1,20 +1,21 @@ // The Vue build version to load with the `import` command // (runtime-only or standalone) has been set in webpack.base.conf with an alias. -import Vue from 'vue' -import App from './App' -import router from './router' -import store from './store' -import iView from 'iview' -import i18n from '@/locale' -import config from '@/config' -import importDirective from '@/directive' -import installPlugin from '@/plugin' -import 'iview/dist/styles/iview.css' -import './index.less' -import '@/assets/icons/iconfont.css' +import Vue from "vue"; +import App from "./App"; +import router from "./router"; +import store from "./store"; +import iView from "iview"; +import i18n from "@/locale"; +import config from "@/config"; +import importDirective from "@/directive"; +import installPlugin from "@/plugin"; +import "iview/dist/styles/iview.css"; +import "./index.less"; +import "@/assets/icons/iconfont.css"; // 实际打包时应该不引入mock /* eslint-disable */ -if (process.env.NODE_ENV !== 'production') require('@/mock') +// if (process.env.NODE_ENV !== 'production') +require('@/mock') Vue.use(iView, { i18n: (key, value) => i18n.t(key, value) From bf9bcec610399c6cae3e707849b0d432457075c9 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 15:58:57 +0800 Subject: [PATCH 021/164] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E5=88=B0github=20gh-?= =?UTF-8?q?pages=20->=20=E5=8F=96=E6=B6=88=E8=B7=AF=E7=94=B1history?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 67 +++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 5dd6a78f1..338110af9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,60 +1,61 @@ -import Vue from 'vue' -import Router from 'vue-router' -import routes from './routers' -import store from '@/store' -import iView from 'iview' -import { setToken, getToken, canTurnTo } from '@/libs/util' -import config from '@/config' -const { homeName } = config +import Vue from "vue"; +import Router from "vue-router"; +import routes from "./routers"; +import store from "@/store"; +import iView from "iview"; +import { setToken, getToken, canTurnTo } from "@/libs/util"; +import config from "@/config"; +const { homeName } = config; -Vue.use(Router) +Vue.use(Router); const router = new Router({ - routes, - mode: 'history' -}) -const LOGIN_PAGE_NAME = 'login' + routes + // 部署到github gh-pages -> 取消history + // mode: "history" +}); +const LOGIN_PAGE_NAME = "login"; const turnTo = (to, access, next) => { - if (canTurnTo(to.name, access, routes)) next() // 有权限，可访问 - else next({ replace: true, name: 'error_401' }) // 无权限，重定向到401页面 -} + if (canTurnTo(to.name, access, routes)) next(); // 有权限，可访问 + else next({ replace: true, name: "error_401" }); // 无权限，重定向到401页面 +}; router.beforeEach((to, from, next) => { - iView.LoadingBar.start() - const token = getToken() + iView.LoadingBar.start(); + const token = getToken(); if (!token && to.name !== LOGIN_PAGE_NAME) { // 未登录且要跳转的页面不是登录页 next({ name: LOGIN_PAGE_NAME // 跳转到登录页 - }) + }); } else if (!token && to.name === LOGIN_PAGE_NAME) { // 未登陆且要跳转的页面是登录页 - next() // 跳转 + next(); // 跳转 } else if (token && to.name === LOGIN_PAGE_NAME) { // 已登录且要跳转的页面是登录页 next({ name: homeName // 跳转到homeName页 - }) + }); } else { if (store.state.user.hasGetInfo) { - turnTo(to, store.state.user.access, next) + turnTo(to, store.state.user.access, next); } else { - store.dispatch('getUserInfo').then(user => { + store.dispatch("getUserInfo").then(user => { // 拉取用户信息，通过用户权限和跳转的页面的name来判断是否有权限访问;access必须是一个数组，如：['super_admin'] ['super_admin', 'admin'] - turnTo(to, user.access, next) + turnTo(to, user.access, next); }).catch(() => { - setToken('') + setToken(""); next({ - name: 'login' - }) - }) + name: "login" + }); + }); } } -}) +}); router.afterEach(to => { - iView.LoadingBar.finish() - window.scrollTo(0, 0) -}) + iView.LoadingBar.finish(); + window.scrollTo(0, 0); +}); -export default router +export default router; From 95b53086818a9e36fcc1badba0258dedd9e7b3fd Mon Sep 17 00:00:00 2001 From: SimonShao <435776313@qq.com> Date: Mon, 27 Apr 2020 16:05:19 +0800 Subject: [PATCH 022/164] Update README.md --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6dace663c..23f0b443f 100755 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ # iview-dynamicRouter iview-admin，后端动态生成路由模板 -1.模拟数据改造： +1.axios加工改造，使其更符合后端的回文格式： +libs > axios.js +mock > login.js +store > user.js +view > login.vue + +2.模拟数据改造： mock - role.js，新建角色列表、菜单列表、菜单层级列表 -2.axios加工： +3.github部署： +router > index.js，取消history模式 +部署后的css文件 > static > fonts > 把外面的fonts放进去 From 3c8813f04a8f20ab6a8adc851760b72e4ad41a50 Mon Sep 17 00:00:00 2001 From: SimonShao <435776313@qq.com> Date: Mon, 27 Apr 2020 17:04:00 +0800 Subject: [PATCH 023/164] Update README.md --- README.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23f0b443f..0a26e05c7 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # iview-dynamicRouter iview-admin，后端动态生成路由模板 +userName：super_admin / visitor +password：any / any 1.axios加工改造，使其更符合后端的回文格式： libs > axios.js @@ -7,10 +9,22 @@ mock > login.js store > user.js view > login.vue -2.模拟数据改造： +2.mock数据改造： -mock - role.js，新建角色列表、菜单列表、菜单层级列表 +mock - role.js，新建用户列表、角色列表、菜单列表、菜单层级列表 +对应关系图 + +3.动态获取路由数据 + +store > app.js，动态获取路由事件，动态挂载菜单 +libs > +router > 3.github部署： router > index.js，取消history模式 部署后的css文件 > static > fonts > 把外面的fonts放进去 + +4.扩展： +项目需求万千，万变不离其宗。以下两种情况我已做好demo并集成到项目中 +追加顶部3级菜单： +动态角色“首页”： From ee076778c7fe4ef25a48c5b0f7b146abe1ee9bf7 Mon Sep 17 00:00:00 2001 From: SimonShao <435776313@qq.com> Date: Mon, 27 Apr 2020 17:39:34 +0800 Subject: [PATCH 024/164] Update README.md --- README.md | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0a26e05c7..4a6d1e6bc 100755 --- a/README.md +++ b/README.md @@ -1,30 +1,52 @@ # iview-dynamicRouter + iview-admin，后端动态生成路由模板 + userName：super_admin / visitor + password：any / any 1.axios加工改造，使其更符合后端的回文格式： + libs > axios.js + mock > login.js + store > user.js + view > login.vue 2.mock数据改造： -mock - role.js，新建用户列表、角色列表、菜单列表、菜单层级列表 +mock - role.js，新建角色列表、菜单列表、菜单层级列表，这里以我在实际项目中后端给到的数据结构为例 + +角色列表： + +菜单列表： + +菜单层级列表： + 对应关系图 -3.动态获取路由数据 +3.注册mock事件，动态获取路由数据 + store > app.js，动态获取路由事件，动态挂载菜单 + libs > + router > 3.github部署： + router > index.js，取消history模式 + 部署后的css文件 > static > fonts > 把外面的fonts放进去 4.扩展： + 项目需求万千，万变不离其宗。以下两种情况我已做好demo并集成到项目中 -追加顶部3级菜单： + +追加顶部3级菜单：https://github.com/simon9124/fengfeng + 动态角色“首页”： From 315c3f3a433d32b3c714a195639994f2fe9cd006 Mon Sep 17 00:00:00 2001 From: SimonShao <435776313@qq.com> Date: Mon, 27 Apr 2020 18:08:22 +0800 Subject: [PATCH 025/164] Update README.md --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4a6d1e6bc..b8fbadf34 100755 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ store > user.js view > login.vue -2.mock数据改造： +2.mock数据、mock接口： mock - role.js，新建角色列表、菜单列表、菜单层级列表，这里以我在实际项目中后端给到的数据结构为例 @@ -28,12 +28,18 @@ mock - role.js，新建角色列表、菜单列表、菜单层级列表，这里 对应关系图 -3.注册mock事件，动态获取路由数据 +注册mock事件不过多陈述： -store > app.js，动态获取路由事件，动态挂载菜单 +mock > data getAllMenus +mock > index getAllMenus +api > data getAllMenus -libs > +3.动态获取路由数据，并对数据进行处理： + +store > app.js + +libs > router-util.js router > From 5bdccf38440af2387a88f0ddb0ef3f9f7c20eb4e Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 18:17:44 +0800 Subject: [PATCH 026/164] =?UTF-8?q?=E6=B3=A8=E5=86=8Cmock=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=EF=BC=9AgetAllMenus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/data.js | 44 +++++++++++++++++++++++++---------------- src/mock/data.js | 50 ++++++++++++++++++++++++++++------------------- src/mock/index.js | 21 ++++++++++---------- 3 files changed, 68 insertions(+), 47 deletions(-) diff --git a/src/api/data.js b/src/api/data.js index 9ba95be54..753b831b5 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -1,30 +1,40 @@ -import axios from '@/libs/api.request' +import axios from "@/libs/api.request"; export const getTableData = () => { return axios.request({ - url: 'get_table_data', - method: 'get' - }) -} + url: "get_table_data", + method: "get" + }); +}; export const getDragList = () => { return axios.request({ - url: 'get_drag_list', - method: 'get' - }) -} + url: "get_drag_list", + method: "get" + }); +}; export const errorReq = () => { return axios.request({ - url: 'error_url', - method: 'post' - }) -} + url: "error_url", + method: "post" + }); +}; export const saveErrorLogger = info => { return axios.request({ - url: 'save_error_logger', + url: "save_error_logger", data: info, - method: 'post' - }) -} + method: "post" + }); +}; + +// 获取菜单数据 +export const getAllMenus = token => { + if (token !== undefined) { + return axios.request({ + url: "get_all_menus", + method: "get" + }); + } +}; diff --git a/src/mock/data.js b/src/mock/data.js index 517daa025..1e438e817 100644 --- a/src/mock/data.js +++ b/src/mock/data.js @@ -1,26 +1,36 @@ -import Mock from 'mockjs' -import { doCustomTimes } from '@/libs/util' -const Random = Mock.Random +import Mock from "mockjs"; +import { doCustomTimes } from "@/libs/util"; +import { menuList } from "./role"; // 菜单列表 +const Random = Mock.Random; export const getTableData = req => { - let tableData = [] + let tableData = []; doCustomTimes(5, () => { - tableData.push(Mock.mock({ - name: '@name', - email: '@email', - createTime: '@date' - })) - }) - return tableData -} + tableData.push( + Mock.mock({ + name: "@name", + email: "@email", + createTime: "@date" + }) + ); + }); + return tableData; +}; export const getDragList = req => { - let dragList = [] + let dragList = []; doCustomTimes(5, () => { - dragList.push(Mock.mock({ - name: Random.csentence(10, 13), - id: Random.increment(10) - })) - }) - return dragList -} + dragList.push( + Mock.mock({ + name: Random.csentence(10, 13), + id: Random.increment(10) + }) + ); + }); + return dragList; +}; + +// 获取菜单列表 +export const getAllMenus = req => { + return { status: 200, message: "成功！", data: menuList }; +}; diff --git a/src/mock/index.js b/src/mock/index.js index ac43573cf..e9cd03a6f 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -1,13 +1,14 @@ -import Mock from 'mockjs' -import { login, logout, getUserInfo } from './login' -import { getTableData, getDragList } from './data' +import Mock from "mockjs"; +import { login, logout, getUserInfo } from "./login"; +import { getTableData, getDragList, getAllMenus } from "./data"; // 登录相关和获取用户信息 -Mock.mock(/\/login/, login) -Mock.mock(/\/get_info/, getUserInfo) -Mock.mock(/\/logout/, logout) -Mock.mock(/\/get_table_data/, getTableData) -Mock.mock(/\/get_drag_list/, getDragList) -Mock.mock(/\/save_error_logger/, 'success') +Mock.mock(/\/login/, login); +Mock.mock(/\/get_info/, getUserInfo); +Mock.mock(/\/logout/, logout); +Mock.mock(/\/get_table_data/, getTableData); +Mock.mock(/\/get_drag_list/, getDragList); +Mock.mock(/\/get_all_menus/, getAllMenus); +Mock.mock(/\/save_error_logger/, "success"); -export default Mock +export default Mock; From aec7c1b16cf88e862d359a84c9fb313f7ee352cb Mon Sep 17 00:00:00 2001 From: SimonShao <435776313@qq.com> Date: Mon, 27 Apr 2020 18:22:36 +0800 Subject: [PATCH 027/164] Update README.md --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b8fbadf34..cc41fcf73 100755 --- a/README.md +++ b/README.md @@ -41,15 +41,21 @@ store > app.js libs > router-util.js -router > +libs > tools.js 函数: 引入组件 -3.github部署： +4.路由改造 + +router > index.js + +router > router.js + +5.github部署： router > index.js，取消history模式 部署后的css文件 > static > fonts > 把外面的fonts放进去 -4.扩展： +6.扩展： 项目需求万千，万变不离其宗。以下两种情况我已做好demo并集成到项目中 From 657ae08c606ccae424e135d745539bd7a714fb49 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 18:22:42 +0800 Subject: [PATCH 028/164] =?UTF-8?q?=E5=87=BD=E6=95=B0:=20=E5=BC=95?= =?UTF-8?q?=E5=85=A5=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/tools.js | 170 ++++++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 83 deletions(-) diff --git a/src/libs/tools.js b/src/libs/tools.js index 0ca81d61f..ed0509572 100644 --- a/src/libs/tools.js +++ b/src/libs/tools.js @@ -1,12 +1,12 @@ export const forEach = (arr, fn) => { - if (!arr.length || !fn) return - let i = -1 - let len = arr.length + if (!arr.length || !fn) return; + let i = -1; + let len = arr.length; while (++i < len) { - let item = arr[i] - fn(item, i, arr) + let item = arr[i]; + fn(item, i, arr); } -} +}; /** * @param {Array} arr1 @@ -14,15 +14,15 @@ export const forEach = (arr, fn) => { * @description 得到两个数组的交集, 两个数组的元素为数值或字符串 */ export const getIntersection = (arr1, arr2) => { - let len = Math.min(arr1.length, arr2.length) - let i = -1 - let res = [] + let len = Math.min(arr1.length, arr2.length); + let i = -1; + let res = []; while (++i < len) { - const item = arr2[i] - if (arr1.indexOf(item) > -1) res.push(item) + const item = arr2[i]; + if (arr1.indexOf(item) > -1) res.push(item); } - return res -} + return res; +}; /** * @param {Array} arr1 @@ -30,8 +30,8 @@ export const getIntersection = (arr1, arr2) => { * @description 得到两个数组的并集, 两个数组的元素为数值或字符串 */ export const getUnion = (arr1, arr2) => { - return Array.from(new Set([...arr1, ...arr2])) -} + return Array.from(new Set([...arr1, ...arr2])); +}; /** * @param {Array} target 目标数组 @@ -39,8 +39,8 @@ export const getUnion = (arr1, arr2) => { * @description 判断要查询的数组是否至少有一个元素包含在目标数组中 */ export const hasOneOf = (targetarr, arr) => { - return targetarr.some(_ => arr.indexOf(_) > -1) -} + return targetarr.some(_ => arr.indexOf(_) > -1); +}; /** * @param {String|Number} value 要验证的字符串或数值 @@ -49,10 +49,10 @@ export const hasOneOf = (targetarr, arr) => { export function oneOf (value, validList) { for (let i = 0; i < validList.length; i++) { if (value === validList[i]) { - return true + return true; } } - return false + return false; } /** @@ -60,9 +60,9 @@ export function oneOf (value, validList) { * @returns {Boolean} */ const isMillisecond = timeStamp => { - const timeStr = String(timeStamp) - return timeStr.length > 10 -} + const timeStr = String(timeStamp); + return timeStr.length > 10; +}; /** * @param {Number} timeStamp 传入的时间戳 @@ -70,8 +70,8 @@ const isMillisecond = timeStamp => { * @returns {Boolean} 传入的时间戳是否早于当前时间戳 */ const isEarly = (timeStamp, currentTime) => { - return timeStamp < currentTime -} + return timeStamp < currentTime; +}; /** * @param {Number} num 数值 @@ -79,26 +79,26 @@ const isEarly = (timeStamp, currentTime) => { * @description 如果传入的数值小于10，即位数只有1位，则在前面补充0 */ const getHandledValue = num => { - return num < 10 ? '0' + num : num -} + return num < 10 ? "0" + num : num; +}; /** * @param {Number} timeStamp 传入的时间戳 * @param {Number} startType 要返回的时间字符串的格式类型，传入'year'则返回年开头的完整时间 */ const getDate = (timeStamp, startType) => { - const d = new Date(timeStamp * 1000) - const year = d.getFullYear() - const month = getHandledValue(d.getMonth() + 1) - const date = getHandledValue(d.getDate()) - const hours = getHandledValue(d.getHours()) - const minutes = getHandledValue(d.getMinutes()) - const second = getHandledValue(d.getSeconds()) - let resStr = '' - if (startType === 'year') resStr = year + '-' + month + '-' + date + ' ' + hours + ':' + minutes + ':' + second - else resStr = month + '-' + date + ' ' + hours + ':' + minutes - return resStr -} + const d = new Date(timeStamp * 1000); + const year = d.getFullYear(); + const month = getHandledValue(d.getMonth() + 1); + const date = getHandledValue(d.getDate()); + const hours = getHandledValue(d.getHours()); + const minutes = getHandledValue(d.getMinutes()); + const second = getHandledValue(d.getSeconds()); + let resStr = ""; + if (startType === "year") resStr = year + "-" + month + "-" + date + " " + hours + ":" + minutes + ":" + second; + else resStr = month + "-" + date + " " + hours + ":" + minutes; + return resStr; +}; /** * @param {String|Number} timeStamp 时间戳 @@ -106,49 +106,49 @@ const getDate = (timeStamp, startType) => { */ export const getRelativeTime = timeStamp => { // 判断当前传入的时间戳是秒格式还是毫秒 - const IS_MILLISECOND = isMillisecond(timeStamp) + const IS_MILLISECOND = isMillisecond(timeStamp); // 如果是毫秒格式则转为秒格式 - if (IS_MILLISECOND) Math.floor(timeStamp /= 1000) + if (IS_MILLISECOND) Math.floor(timeStamp /= 1000); // 传入的时间戳可以是数值或字符串类型，这里统一转为数值类型 - timeStamp = Number(timeStamp) + timeStamp = Number(timeStamp); // 获取当前时间时间戳 - const currentTime = Math.floor(Date.parse(new Date()) / 1000) + const currentTime = Math.floor(Date.parse(new Date()) / 1000); // 判断传入时间戳是否早于当前时间戳 - const IS_EARLY = isEarly(timeStamp, currentTime) + const IS_EARLY = isEarly(timeStamp, currentTime); // 获取两个时间戳差值 - let diff = currentTime - timeStamp + let diff = currentTime - timeStamp; // 如果IS_EARLY为false则差值取反 - if (!IS_EARLY) diff = -diff - let resStr = '' - const dirStr = IS_EARLY ? '前' : '后' + if (!IS_EARLY) diff = -diff; + let resStr = ""; + const dirStr = IS_EARLY ? "前" : "后"; // 少于等于59秒 - if (diff <= 59) resStr = diff + '秒' + dirStr + if (diff <= 59) resStr = diff + "秒" + dirStr; // 多于59秒，少于等于59分钟59秒 - else if (diff > 59 && diff <= 3599) resStr = Math.floor(diff / 60) + '分钟' + dirStr + else if (diff > 59 && diff <= 3599) resStr = Math.floor(diff / 60) + "分钟" + dirStr; // 多于59分钟59秒，少于等于23小时59分钟59秒 - else if (diff > 3599 && diff <= 86399) resStr = Math.floor(diff / 3600) + '小时' + dirStr + else if (diff > 3599 && diff <= 86399) resStr = Math.floor(diff / 3600) + "小时" + dirStr; // 多于23小时59分钟59秒，少于等于29天59分钟59秒 - else if (diff > 86399 && diff <= 2623859) resStr = Math.floor(diff / 86400) + '天' + dirStr + else if (diff > 86399 && diff <= 2623859) resStr = Math.floor(diff / 86400) + "天" + dirStr; // 多于29天59分钟59秒，少于364天23小时59分钟59秒，且传入的时间戳早于当前 - else if (diff > 2623859 && diff <= 31567859 && IS_EARLY) resStr = getDate(timeStamp) - else resStr = getDate(timeStamp, 'year') - return resStr -} + else if (diff > 2623859 && diff <= 31567859 && IS_EARLY) resStr = getDate(timeStamp); + else resStr = getDate(timeStamp, "year"); + return resStr; +}; /** * @returns {String} 当前浏览器名称 */ export const getExplorer = () => { - const ua = window.navigator.userAgent + const ua = window.navigator.userAgent; const isExplorer = (exp) => { - return ua.indexOf(exp) > -1 - } - if (isExplorer('MSIE')) return 'IE' - else if (isExplorer('Firefox')) return 'Firefox' - else if (isExplorer('Chrome')) return 'Chrome' - else if (isExplorer('Opera')) return 'Opera' - else if (isExplorer('Safari')) return 'Safari' -} + return ua.indexOf(exp) > -1; + }; + if (isExplorer("MSIE")) return "IE"; + else if (isExplorer("Firefox")) return "Firefox"; + else if (isExplorer("Chrome")) return "Chrome"; + else if (isExplorer("Opera")) return "Opera"; + else if (isExplorer("Safari")) return "Safari"; +}; /** * @description 绑定事件 on(element, event, handler) @@ -157,17 +157,17 @@ export const on = (function () { if (document.addEventListener) { return function (element, event, handler) { if (element && event && handler) { - element.addEventListener(event, handler, false) + element.addEventListener(event, handler, false); } - } + }; } else { return function (element, event, handler) { if (element && event && handler) { - element.attachEvent('on' + event, handler) + element.attachEvent("on" + event, handler); } - } + }; } -})() +})(); /** * @description 解绑事件 off(element, event, handler) @@ -176,29 +176,29 @@ export const off = (function () { if (document.removeEventListener) { return function (element, event, handler) { if (element && event) { - element.removeEventListener(event, handler, false) + element.removeEventListener(event, handler, false); } - } + }; } else { return function (element, event, handler) { if (element && event) { - element.detachEvent('on' + event, handler) + element.detachEvent("on" + event, handler); } - } + }; } -})() +})(); /** * 判断一个对象是否存在key，如果传入第二个参数key，则是判断这个obj对象是否存在key这个属性 * 如果没有传入key这个参数，则判断obj对象是否有键值对 */ export const hasKey = (obj, key) => { - if (key) return key in obj + if (key) return key in obj; else { - let keysArr = Object.keys(obj) - return keysArr.length + let keysArr = Object.keys(obj); + return keysArr.length; } -} +}; /** * @param {*} obj1 对象 @@ -206,10 +206,14 @@ export const hasKey = (obj, key) => { * @description 判断两个对象是否相等，这两个对象的值只能是数字或字符串 */ export const objEqual = (obj1, obj2) => { - const keysArr1 = Object.keys(obj1) - const keysArr2 = Object.keys(obj2) - if (keysArr1.length !== keysArr2.length) return false - else if (keysArr1.length === 0 && keysArr2.length === 0) return true + const keysArr1 = Object.keys(obj1); + const keysArr2 = Object.keys(obj2); + if (keysArr1.length !== keysArr2.length) return false; + else if (keysArr1.length === 0 && keysArr2.length === 0) return true; /* eslint-disable-next-line */ else return !keysArr1.some(key => obj1[key] != obj2[key]) -} +}; + +// @函数: 引入组件 +export const lazyLoadingCop = file => + require("@/view/" + file + ".vue").default; From e24103a136d1b2e82162669a517d496899a3d41f Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 18:27:54 +0800 Subject: [PATCH 029/164] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mock/login.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mock/login.js b/src/mock/login.js index e5d0ee3f8..34f5a405f 100644 --- a/src/mock/login.js +++ b/src/mock/login.js @@ -4,15 +4,15 @@ const USER_MAP = { super_admin: { name: "super_admin", user_id: "1", - access: ["super_admin", "admin"], + access: ["super_admin"], token: "super_admin", avator: "https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png" }, - admin: { - name: "admin", + visitor: { + name: "visitor", user_id: "2", - access: ["admin"], - token: "admin", + access: ["visitor"], + token: "visitor", avator: "https://avatars0.githubusercontent.com/u/20942571?s=460&v=4" } }; From eaf472f314c1367a17b07db9260b65248ded45c0 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 18:29:10 +0800 Subject: [PATCH 030/164] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=9A=E7=94=A8function=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/router-util.js | 161 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 src/libs/router-util.js diff --git a/src/libs/router-util.js b/src/libs/router-util.js new file mode 100644 index 000000000..6948aacbc --- /dev/null +++ b/src/libs/router-util.js @@ -0,0 +1,161 @@ +import { localRead } from "@/libs/util"; +import { lazyLoadingCop } from "@/libs/tools"; +import Main from "@/components/main"; // Main 是架构组件，不在后台返回，在文件里单独引入 +import parentView from "@/components/parent-view"; // parentView 是二级架构组件，不在后台返回，在文件里单独引入 + +// 加载路由菜单,从localStorage拿到路由,在创建路由时使用 +export const dynamicRouterAdd = from => { + let data = localRead("dynamicRouter"); + let dynamicRouter = data !== "" ? filterAsyncRouter(JSON.parse(data)) : []; + console.log(`动态路由数据：${from}`, dynamicRouter); + return dynamicRouter; +}; + +// @函数：遍历后台传来的路由数据，转为路由基础数据 +export const routerDataHanding = apiRouterData => { + const asyncRouterMap = []; + + // 外层节点 + apiRouterData.forEach(route => { + if (route.parenetId === "root") { + // console.log(route); + if (route.path === "") { + // 有子节点的父级路由（模块，非页面） + asyncRouterMap.push({ + path: route.url === "/" ? route.url : "/" + route.url, + name: route.name, + component: "Main", + meta: { + icon: route.ico, + title: route.title, + hideInBread: true, + id: route.id // 根据id确定子组件 + }, + children: [] + }); + } else if (parseInt(route.showLevel) === 3) { + // 无子节点，菜单显示该页面选项，页面含菜单栏和面包屑 -> 根据url和name创建父子结构的路由 + asyncRouterMap.push({ + path: "/" + route.url.split("/")[0], + name: route.name.split("/")[0], + component: "Main", + meta: { + icon: route.ico, + title: route.title, + hideInBread: true + }, + children: [ + { + path: route.url + .split("/") + .filter((val, index) => { + return index !== 0; + }) + .join("/"), + name: route.name + .split("/") + .filter((val, index) => { + return index !== 0; + }) + .join("/"), + meta: { + icon: route.ico, + title: route.title + }, + component: route.path, + children: [] + } + ] + }); + } else if (parseInt(route.showLevel) === 1) { + // 无子节点，菜单显示该页面选项，页面不含菜单栏不含面包屑 -> 根节点路由，与main组件平级 + asyncRouterMap.push({ + path: "/" + route.url, + name: route.name, + component: route.path, + meta: { + icon: route.ico, + title: route.title, + hideInBread: true + }, + children: [] + }); + } else if (parseInt(route.showLevel) === 4) { + // 无子节点，菜单隐藏该页面选项，页面不含菜单栏不含面包屑 -> 根节点路由，与main组件平级 + asyncRouterMap.push({ + path: "/" + route.url, + name: route.name, + component: route.path, + meta: { + icon: route.ico, + title: route.title, + hideInBread: true, + hideInMenu: true + }, + children: [] + }); + } + } + }); + + // console.log(asyncRouterMap); + + // 内层子路由 - 递归 + const handleRecurrence = recurrenceData => { + recurrenceData.forEach(data => { + apiRouterData.forEach(route => { + if (data.meta.id === route.parenetId) { + data.children.push({ + path: route.url, + name: route.name, + meta: { + icon: data.meta.icon, + title: route.title + }, + component: route.path, + children: [] + }); + } + }); + // console.log(data); + handleRecurrence(data.children); + }); + }; + handleRecurrence(asyncRouterMap); + + // 首页重定向：处理name，追加 redirect 和 notCache + asyncRouterMap.forEach(route => { + if (route.path === "/") { + // home 页 -> 重定向为home + route.meta.notCache = true; + route.children[0].meta.notCache = true; + route.children[0].name = "_" + route.name; + route.redirect = route.path + route.children[0].path; + } else if (route.children.length !== 0) { + // 非 home 页且有子组件 -> 重定向为第一个子组件 + route.redirect = route.path + "/" + route.children[0].path; + } + }); + return asyncRouterMap; +}; + +// @函数: 遍历路由基础数据，转换为前端组件对象 +export const filterAsyncRouter = asyncRouterMap => { + const accessedRouters = asyncRouterMap.filter(route => { + if (route.component) { + if (route.component === "Main") { + route.component = Main; // Main组件特殊处理 + } else if (route.component === "parentView") { + route.component = parentView; // parentView组件特殊处理 + } else { + route.component = lazyLoadingCop(route.component); + } + } + if (route.children && route.children.length) { + route.children = filterAsyncRouter(route.children); // 子组件递归 + } + return true; + }); + // console.log(accessedRouters); + return accessedRouters; +}; From 2e0ceb42ca8195832d85b5904bf5697c7e994c39 Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Mon, 27 Apr 2020 18:29:32 +0800 Subject: [PATCH 031/164] =?UTF-8?q?=E4=B8=B4=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mock/role.js | 251 +++++++++++++++++++++++++++++++++++++++ src/store/module/app.js | 192 +++++++++++++++++++++--------- src/view/login/login.vue | 8 +- 3 files changed, 394 insertions(+), 57 deletions(-) create mode 100644 src/mock/role.js diff --git a/src/mock/role.js b/src/mock/role.js new file mode 100644 index 000000000..a750d8325 --- /dev/null +++ b/src/mock/role.js @@ -0,0 +1,251 @@ +// 角色列表 +const roleList = [ + { + name: "super_admin", + title: "超级管理员", + menus: [], + id: "1" + }, + { + name: "visitor", + title: "访客", + menus: [], + id: "2" + } +]; + +// 菜单列表 +const menuList = [ + { + id: "a4a49ff8874044dfbd90c06544be165b", + name: "home", + title: "首页概览", + url: "/home", + path: "single-page/home/home", + sort: 30, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "", + ico: "md-home", + isOutSide: false, + showLevel: 3 + }, + { + id: "3976b690e56b48639e108ac6d6ca622b", + name: "control-leader-shop", + title: "驾驶舱", + url: "control-leader-shop", + path: "6inspector/control", + sort: 25, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "驾驶舱-车间（管理员或车间主管）", + ico: "md-laptop", + isOutSide: false, + showLevel: 1 + }, + { + id: "ef93f8fe1b154de688bcbaab1a2a88ef", + name: "task", + title: "任务管理", + url: "task", + path: "", + sort: 15, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "", + ico: "md-shuffle", + isOutSide: false, + showLevel: 3 + }, + { + id: "8502de35df2c4d19ad337c5548f661b4", + name: "sopMessage/message", + title: "查看SOP", + url: "sopMessage/message", + path: "8taskManage/sopMessage", + sort: 13, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "", + ico: "md-document", + isOutSide: false, + showLevel: 3 + }, + { + id: "2", + name: "account", + title: "账号管理", + url: "account", + path: "3manage/account", + sort: 13, + parenetId: "d30bf0ff035c4e51875e7014ad46e1af", + parenetPath: "root.d30bf0ff035c4e51875e7014ad46e1af", + status: 1, + description: "系统账号管理", + ico: null, + isOutSide: false, + showLevel: 3 + }, + { + id: "3", + name: "role", + title: "角色管理", + url: "role", + path: "3manage/role", + sort: 12, + parenetId: "d30bf0ff035c4e51875e7014ad46e1af", + parenetPath: "root.d30bf0ff035c4e51875e7014ad46e1af", + status: 1, + description: "系统角色管理", + ico: null, + isOutSide: false, + showLevel: 3 + }, + { + id: "23001d1a12fe43ceac9769ee08f899f2", + name: "menu", + title: "菜单管理", + url: "menu", + path: "3manage/menu", + sort: 11, + parenetId: "d30bf0ff035c4e51875e7014ad46e1af", + parenetPath: "root.d30bf0ff035c4e51875e7014ad46e1af", + status: 1, + description: "", + ico: null, + isOutSide: false, + showLevel: 3 + }, + { + id: "c64f399d2c03445dbfa2b23c240e2dc6", + name: "number/print", + title: "条码打印", + url: "number/print", + path: "3manage/number", + sort: 11, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "", + ico: "md-print", + isOutSide: false, + showLevel: 3 + }, + { + id: "013ad32e79c44427a8cad340fb056821", + name: "report", + title: "报表中心", + url: "report", + path: "", + sort: 3, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "", + ico: "md-analytics", + isOutSide: false, + showLevel: 3 + }, + { + id: "6b2d3c49373946989262e586d655dccf", + name: "mould", + title: "模板配置", + url: "mould", + path: "3manage/mould/index", + sort: 3, + parenetId: "013ad32e79c44427a8cad340fb056821", + parenetPath: "root.013ad32e79c44427a8cad340fb056821", + status: 1, + description: "", + ico: "", + isOutSide: false, + showLevel: 3 + }, + { + id: "3db9fdd0ada749dab01149fa0248eb23", + name: "distribute", + title: "任务派发", + url: "distribute", + path: "8taskManage/taskDistribution", + sort: 2, + parenetId: "ef93f8fe1b154de688bcbaab1a2a88ef", + parenetPath: "root.ef93f8fe1b154de688bcbaab1a2a88ef", + status: 1, + description: "", + ico: "", + isOutSide: false, + showLevel: 3 + }, + { + id: "d30bf0ff035c4e51875e7014ad46e1af", + name: "manage", + title: "管理中心", + url: "manage", + path: "", + sort: 2, + parenetId: "root", + parenetPath: "root", + status: 1, + description: "系统基础配置", + ico: "md-settings", + isOutSide: false, + showLevel: 3 + }, + { + id: "82814bef61934f5aadb4e1e84608f414", + name: "view", + title: "异常产品报表", + url: "view/12", + path: "3manage/mould/reportView", + sort: 1, + parenetId: "013ad32e79c44427a8cad340fb056821", + parenetPath: "root.013ad32e79c44427a8cad340fb056821", + status: 1, + description: "", + ico: "", + isOutSide: false, + showLevel: 3 + }, + { + id: "e7dfaf2ec6aa482c93410d9b4e2323e5", + name: "history", + title: "历史任务", + url: "history", + path: "8taskManage/taskHistory", + sort: 1, + parenetId: "ef93f8fe1b154de688bcbaab1a2a88ef", + parenetPath: "root.ef93f8fe1b154de688bcbaab1a2a88ef", + status: 1, + description: "", + ico: "", + isOutSide: false, + showLevel: 3 + } +]; + +// 菜单层级 +const menuLevel = [ + { + label: "菜单显示该页面选项，页面不含菜单栏不含面包屑", + value: "1" + }, + { + label: "菜单显示该页面选项，页面含菜单栏但不含面包屑", + value: "2" + }, + { + label: "菜单显示该页面选项，页面含菜单栏和面包屑", + value: "3" + }, + { + label: "菜单隐藏该页面选项，页面不含菜单栏不含面包屑", + value: "4" + } +]; + +export { roleList, menuList, menuLevel }; diff --git a/src/store/module/app.js b/src/store/module/app.js index 003ad63a2..c9e6f3b69 100644 --- a/src/store/module/app.js +++ b/src/store/module/app.js @@ -10,103 +10,187 @@ import { getRouteTitleHandled, localSave, localRead -} from '@/libs/util' -import beforeClose from '@/router/before-close' -import { saveErrorLogger } from '@/api/data' -import router from '@/router' -import routers from '@/router/routers' -import config from '@/config' -const { homeName } = config +} from "@/libs/util"; +import beforeClose from "@/router/before-close"; +import { + saveErrorLogger, + getAllMenus // 获取当前用户的全部菜单 +} from "@/api/data"; +import router from "@/router"; +import routers from "@/router/routers"; +import config from "@/config"; +import { + dynamicRouterAdd, // 加载路由菜单，从localStorage拿到路由，在创建路由时使用 + routerDataHanding, // 遍历后台返回的路由数据，转为路由基础数据 + filterAsyncRouter // 遍历路由基础数据，转换为前端组件对象 +} from "@/libs/router-util"; +const { homeName } = config; const closePage = (state, route) => { - const nextRoute = getNextRoute(state.tagNavList, route) + const nextRoute = getNextRoute(state.tagNavList, route); state.tagNavList = state.tagNavList.filter(item => { - return !routeEqual(item, route) - }) - router.push(nextRoute) -} + return !routeEqual(item, route); + }); + router.push(nextRoute); +}; export default { state: { breadCrumbList: [], tagNavList: [], homeRoute: getHomeRoute(routers, homeName), - local: localRead('local'), + local: localRead("local"), errorList: [], hasReadErrorPage: false }, getters: { - menuList: (state, getters, rootState) => getMenuByRouter(routers, rootState.user.access), + menuList: (state, getters, rootState) => + getMenuByRouter(routers, rootState.user.access), errorCount: state => state.errorList.length }, mutations: { - setBreadCrumb (state, route) { - state.breadCrumbList = getBreadCrumbList(route, state.homeRoute) + setBreadCrumb(state, route) { + state.breadCrumbList = getBreadCrumbList(route, state.homeRoute); }, - setTagNavList (state, list) { - let tagList = [] + setTagNavList(state, list) { + let tagList = []; if (list) { - tagList = [...list] - } else tagList = getTagNavListFromLocalstorage() || [] - if (tagList[0] && tagList[0].name !== homeName) tagList.shift() - let homeTagIndex = tagList.findIndex(item => item.name === homeName) + tagList = [...list]; + } else tagList = getTagNavListFromLocalstorage() || []; + if (tagList[0] && tagList[0].name !== homeName) tagList.shift(); + let homeTagIndex = tagList.findIndex(item => item.name === homeName); if (homeTagIndex > 0) { - let homeTag = tagList.splice(homeTagIndex, 1)[0] - tagList.unshift(homeTag) + let homeTag = tagList.splice(homeTagIndex, 1)[0]; + tagList.unshift(homeTag); } - state.tagNavList = tagList - setTagNavListInLocalstorage([...tagList]) + state.tagNavList = tagList; + setTagNavListInLocalstorage([...tagList]); }, - closeTag (state, route) { - let tag = state.tagNavList.filter(item => routeEqual(item, route)) - route = tag[0] ? tag[0] : null - if (!route) return - if (route.meta && route.meta.beforeCloseName && route.meta.beforeCloseName in beforeClose) { + closeTag(state, route) { + let tag = state.tagNavList.filter(item => routeEqual(item, route)); + route = tag[0] ? tag[0] : null; + if (!route) return; + if ( + route.meta && + route.meta.beforeCloseName && + route.meta.beforeCloseName in beforeClose + ) { new Promise(beforeClose[route.meta.beforeCloseName]).then(close => { if (close) { - closePage(state, route) + closePage(state, route); } - }) + }); } else { - closePage(state, route) + closePage(state, route); } }, - addTag (state, { route, type = 'unshift' }) { - let router = getRouteTitleHandled(route) + addTag(state, { route, type = "unshift" }) { + let router = getRouteTitleHandled(route); if (!routeHasExist(state.tagNavList, router)) { - if (type === 'push') state.tagNavList.push(router) + if (type === "push") state.tagNavList.push(router); else { - if (router.name === homeName) state.tagNavList.unshift(router) - else state.tagNavList.splice(1, 0, router) + if (router.name === homeName) state.tagNavList.unshift(router); + else state.tagNavList.splice(1, 0, router); } - setTagNavListInLocalstorage([...state.tagNavList]) + setTagNavListInLocalstorage([...state.tagNavList]); } }, - setLocal (state, lang) { - localSave('local', lang) - state.local = lang + setLocal(state, lang) { + localSave("local", lang); + state.local = lang; }, - addError (state, error) { - state.errorList.push(error) + addError(state, error) { + state.errorList.push(error); }, - setHasReadErrorLoggerStatus (state, status = true) { - state.hasReadErrorPage = status + setHasReadErrorLoggerStatus(state, status = true) { + state.hasReadErrorPage = status; } }, actions: { - addErrorLog ({ commit, rootState }, info) { - if (!window.location.href.includes('error_logger_page')) commit('setHasReadErrorLoggerStatus', false) - const { user: { token, userId, userName } } = rootState + addErrorLog({ commit, rootState }, info) { + if (!window.location.href.includes("error_logger_page")) { + commit("setHasReadErrorLoggerStatus", false); + } + const { + user: { token, userId, userName } + } = rootState; let data = { ...info, time: Date.parse(new Date()), token, userId, userName - } + }; saveErrorLogger(info).then(() => { - commit('addError', data) - }) + commit("addError", data); + }); + }, + // 获取动态路由数据 + getRouters({ dispatch, commit, rootState }, routes) { + return new Promise((resolve, reject) => { + var gotRouter = []; // 设置动态路由 + if (localRead("dynamicRouter") === "") { + /* localStorage里dynamicRouter值为空 -> 没有路由数据 -> 获取路由数据 */ + console.log("获取路由：从api"); + // if (!isMock) { + // // 接口数据 + try { + getAllMenus(rootState.user.token) + .then(res => { + // console.log(res); + var routerData = routerDataHanding(res.data.data); // 拿到路由接口数据 + localSave("dynamicRouter", JSON.stringify(routerData)); // 存储routerData到localStorage + gotRouter = filterAsyncRouter(routerData); // 过滤路由,路由组件转换 + // dispatch("updateMenuList", gotRouter).then(res => { + resolve(routerData); + // }); + }) + .catch(err => { + reject(err); + }); + } catch (error) { + reject(error); + } + // } else { + // /* mock数据 */ + // // 1.根据用户角色，处理该角色的路由数据 + // var menus = []; + // rootState.user.access.forEach(_access => { + // // 把该用户所有的角色对应的菜单都加进来 + // menus = menus.concat( + // getValueByKey(roleList, "id", _access.id, "menus") + // ); + // }); + // menus = [...new Set(menus)]; // 然后去重 + // // console.log(menus); // 获取该用户所有角色的所有菜单数据 + // // 2.拿到路由模拟动态数据，与该角色处理后的数据做比对筛选 + // var routerData = menuList.filter(menu => { + // return menus.some( + // _menu => _menu.id === menu.id // 根据id全等筛选数据 + // ); + // }); + // routerData = routerDataHanding( + // JSON.parse(JSON.stringify(routerData)) + // ); + // // console.log(routerData); + // // 3.处理后路由数据生成路由和菜单等 + // localSave("dynamicRouter", JSON.stringify(routerData)); // 存储routerData到localStorage + // gotRouter = filterAsyncRouter(routerData); // 过滤路由,路由组件转换 + // dispatch("updateMenuList", gotRouter).then(res => { + // resolve(routerData); + // }); + // } + } else { + /* 有路由数据 -> 直接从localStorage里面获取 */ + console.log("获取路由：从localStorage"); + gotRouter = dynamicRouterAdd("router-util.js"); + commit("setMenuList", { + menuList: gotRouter, + access: rootState.user.access + }); + resolve(routerData); + } + }); } } -} +}; diff --git a/src/view/login/login.vue b/src/view/login/login.vue index da129284d..ce377acbd 100755 --- a/src/view/login/login.vue +++ b/src/view/login/login.vue @@ -25,13 +25,15 @@ export default { LoginForm }, methods: { - ...mapActions(["handleLogin", "getUserInfo"]), + ...mapActions(["handleLogin", "getUserInfo", "getRouters"]), handleSubmit({ userName, password }) { this.handleLogin({ userName, password }).then(res => { res.data.status === 200 && this.getUserInfo().then(res => { - this.$router.push({ - name: this.$config.homeName + this.getRouters().then(resRoutes => { + this.$router.push({ + name: this.$config.homeName + }); }); }); }); From 1889fc1c45e3be61fa87339b9d3859fd279e00ef Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Tue, 28 Apr 2020 16:13:31 +0800 Subject: [PATCH 032/164] =?UTF-8?q?vuex=EF=BC=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=80=80=E5=87=BA=E6=97=B6=EF=BC=8C=E6=B8=85=E7=A9=BA=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E5=92=8C=E6=A0=87=E7=AD=BE=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/module/user.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/store/module/user.js b/src/store/module/user.js index a4d88bd1b..149e569a1 100644 --- a/src/store/module/user.js +++ b/src/store/module/user.js @@ -3,7 +3,7 @@ import { // logout, getUserInfo } from "@/api/user"; -import { setToken, getToken, removeToken } from "@/libs/util"; +import { setToken, getToken, removeToken, localSave } from "@/libs/util"; export default { state: { @@ -70,6 +70,8 @@ export default { // commit('setToken', '') removeToken(); // 删除token commit("setAccess", []); + localSave("dynamicRouter", []); // 清空本地存储localStorage中的dynamicRouter + localSave("tagNaveList", []); // 清空localStorage中的tagNaveList记录 resolve(); }); }, From 9afa0794531267ff81ccccc75645db302a929b9b Mon Sep 17 00:00:00 2001 From: simon9124 <435776313@qq.com> Date: Tue, 28 Apr 2020 16:14:05 +0800 Subject: [PATCH 033/164] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/template.vue | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/view/template.vue diff --git a/src/view/template.vue b/src/view/template.vue new file mode 100644 index 000000000..a9dc1891f --- /dev/null +++ b/src/view/template.vue @@ -0,0 +1,27 @@ + +
-userName：super_admin / visitor
+基于iview-admin，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】。
-password：any / any
+## 在线预览
+Live Demo
-### axios加工改造
+- userName：super_admin / visitor
+- password：any / any
+
+在控制台可查看【当前路由】和【左侧菜单】
+
+
+# 开发文档（更新中）
+
+## axios加工改造
axios加工改造，使其更符合后端的回文格式：
@@ -20,7 +29,7 @@ store > user.js
view > login.vue
-### mock数据、mock接口：
+## mock数据、mock接口：
mock - role.js，新建菜单列表、菜单层级列表，这里以我在实际项目中后端给到的数据结构为例
@@ -36,18 +45,20 @@ mock > index getAllMenus
api > data getAllMenus
-### 动态获取路由数据，并对数据进行处理：
+## 动态获取路由数据，并对数据进行处理：
store > app.js
-libs > router-util.js 3个封装方法
+libs > router-util.js 4个封装方法
libs > tools.js 函数: 引入组件
+libs > dataHanding.js 追加通用方法
+
store > user.js 退出登录时清空路由和标签缓存
-### 路由改造
+## 路由改造
router > router.js
@@ -63,7 +74,7 @@ view > login.vue 登录后，调用app.js的方法，生成动态路由
每次刷新 -> 从localStorage获取路由，处理后生成左侧菜单
-### 前端控制权限
+## 前端控制权限
实际开发中，后台会提供“根据用户查询菜单（getAllMenus）”的接口，返回的数据已经是该用户的菜单，因此当前步骤仅针对前端控制权限。
@@ -76,14 +87,14 @@ mock - role.js，新建角色列表，这里仍以我在实际项目中后端给
store > app.js 对路由数据进行用户权限处理
-### github部署：
+## github部署：
router > index.js，取消history模式
部署后的css文件 > static > fonts > 把外面的fonts放进去
-### 扩展：
+## 扩展：
项目需求万千，万变不离其宗。以下两种情况我已做好demo并集成到项目中
From 8dcf3bc14e848b3359a4ff37c2469552c432efea Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Wed, 6 May 2020 16:37:10 +0800
Subject: [PATCH 049/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f0b765b88..3de97fe3c 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# iview-dynamicRouter
-
+
基于iview-admin，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】。
From fa2dbbb778d0fb26deb6788ebeb0cf1047dc0c4a Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Wed, 6 May 2020 16:43:50 +0800
Subject: [PATCH 050/164] Update README.md
---
README.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/README.md b/README.md
index 3de97fe3c..615f44b5b 100755
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+
+
+
+
+
From 58571b0de646ae4f76bdbbf97d5af6d62502d42a Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Wed, 6 May 2020 17:05:55 +0800
Subject: [PATCH 051/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 615f44b5b..e10092c39 100755
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
-基于iview-admin，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】。
+基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】。
## 在线预览
From b8c33d5393b6da7281fb720feb4df2afe5dfd1dd Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Wed, 6 May 2020 18:50:38 +0800
Subject: [PATCH 052/164] Update README.md
---
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index e10092c39..3deb3f72b 100755
--- a/README.md
+++ b/README.md
@@ -12,11 +12,12 @@
## 在线预览
-Live Demo
-
+- Live Demo
- userName：super_admin / visitor
- password：any / any
+
-基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】。
+基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
## 在线预览
From 19dc14ab78e603314cb84a2bf0ba365c1c7fef45 Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Wed, 6 May 2020 19:21:41 +0800
Subject: [PATCH 055/164] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 32f7112d0..83651f319 100755
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@
- 在控制台可查看【当前路由】和【左侧菜单】:
From 9d1b3c8a18f49803b59b314178db0152404473fd Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Thu, 7 May 2020 12:13:52 +0800
Subject: [PATCH 059/164] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 98f156073..d48096125 100755
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
# iView DynamicRouter
-
+基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
-基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
+
## 在线预览
From f32a7a8d629c8969ae963e4632c4009a9072ce2f Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Thu, 7 May 2020 12:15:27 +0800
Subject: [PATCH 060/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d48096125..e271133b1 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
# iView DynamicRouter
-基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
+#### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
From 8bc80907c0a04f9c7547df1d2d158eed1511ce8c Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Wed, 13 May 2020 14:57:53 +0800
Subject: [PATCH 061/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e271133b1..c3c94e56b 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
# iView DynamicRouter
-#### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
+#### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
From 51cfea7e1969108d352797164e71e93ea34f9fe9 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Thu, 14 May 2020 16:31:12 +0800
Subject: [PATCH 062/164] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=B0=81=E8=A3=85?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/libs/router-util.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/router-util.js b/src/libs/router-util.js
index bb888a4b8..1e4b7d0ad 100644
--- a/src/libs/router-util.js
+++ b/src/libs/router-util.js
@@ -34,7 +34,7 @@ export const routerDataHanding = apiRouterData => {
sort: route.sort, // 排序用
children: []
});
- } else if (route.path === "") {
+ } else if (route.path === "Main") {
// 非外链，有子节点的父级路由（模块，非页面）-> 创建父结构路由
asyncRouterMap.push({
path: route.url === "/" ? route.url : "/" + route.url,
From 0d1d81790c9e3976aefd75cc56a063b78417608c Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Thu, 14 May 2020 16:31:51 +0800
Subject: [PATCH 063/164] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A8=A1=E6=8B=9F?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mock/role.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mock/role.js b/src/mock/role.js
index bdd77596b..829eaf586 100644
--- a/src/mock/role.js
+++ b/src/mock/role.js
@@ -88,7 +88,7 @@ const menuList = [
name: "multilevel",
title: "多级菜单",
url: "multilevel",
- path: "",
+ path: "Main",
sort: 24,
parentId: "root",
ico: "md-menu",
From 715372ca5e9a14acb5f8479416cde46afd509076 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Thu, 14 May 2020 18:21:02 +0800
Subject: [PATCH 064/164] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mock/role.js | 20 +++++++++++++++++---
src/store/module/app.js | 8 ++++++--
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/mock/role.js b/src/mock/role.js
index 829eaf586..f6fa7e384 100644
--- a/src/mock/role.js
+++ b/src/mock/role.js
@@ -14,7 +14,8 @@ const roleList = [
"level_2_2_2",
"level_2_3",
"screen",
- "github"
+ "github",
+ "singleMenu"
],
id: "1"
},
@@ -29,7 +30,8 @@ const roleList = [
"level_2_2_1",
"level_2_2_2",
"level_2_3",
- "screen"
+ "screen",
+ "singleMenu"
],
id: "2"
}
@@ -63,7 +65,7 @@ const menuList = [
id: "doc",
name: "doc",
title: "文档",
- url: "https://lison16.github.io/iview-admin-doc/#/",
+ url: "https://simon9124.github.io/iview-dynamicRouter-doc/",
path: "",
sort: 28,
parentId: "root",
@@ -190,6 +192,18 @@ const menuList = [
ico: "md-log-in",
isOutSide: true,
showLevel: 1
+ },
+ {
+ id: "singleMenu",
+ name: "single/menu",
+ title: "单极菜单",
+ url: "single/menu",
+ path: "template",
+ sort: 22,
+ parentId: "root",
+ ico: "md-document",
+ isOutSide: false,
+ showLevel: 2
}
];
diff --git a/src/store/module/app.js b/src/store/module/app.js
index 9ede5b770..74757ff9a 100644
--- a/src/store/module/app.js
+++ b/src/store/module/app.js
@@ -168,7 +168,8 @@ export default {
.then(res => {
// console.log(res);
/* 1.拿到路由接口数据 */
- var routerData = routerDataHanding(res.data.data);
+ var routerData = res.data.data;
+ // console.log(routerData);
/* 2.根据用户角色，处理该角色的路由数据（后端生成数据时忽略此步骤） */
var menus = [];
rootState.user.access.forEach(_access => {
@@ -181,9 +182,12 @@ export default {
// console.log(menus); // 获取该用户所有角色的所有菜单
/* 3.将路由动态数据与该角色拥有的菜单做比对筛选（后端生成数据时忽略此步骤） */
routerData = routerData.filter(menu => {
- return menus.some(_menu => _menu === menu.name); // 根据id全等筛选数据
+ return menus.some(_menu => _menu === menu.id); // 根据id全等筛选数据
});
// console.log(routerData); // 筛选出该角色拥有的路由数据
+ routerData = routerDataHanding(
+ JSON.parse(JSON.stringify(routerData))
+ );
/* 4.处理后路由数据生成路由和菜单等 */
localSave("dynamicRouter", JSON.stringify(routerData)); // 存储routerData到localStorage
gotRouter = filterAsyncRouter(routerData); // 过滤路由,路由组件转换
From 067ba63069ba211029e04452ea65e564bdad1c62 Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Fri, 15 May 2020 11:26:23 +0800
Subject: [PATCH 065/164] Update README.md
---
README.md | 139 +++++++++++++++++-------------------------------------
1 file changed, 44 insertions(+), 95 deletions(-)
diff --git a/README.md b/README.md
index c3c94e56b..de1b8c681 100755
--- a/README.md
+++ b/README.md
@@ -4,107 +4,56 @@
-# iView DynamicRouter
-
-#### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
-
-## 在线预览
+## iView DynamicRouter
-- Live Demo
+- #### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
+- 在线预览
+- 使用文档（更新中）
- userName：super_admin / visitor
- password：any / any
-- 在控制台可查看【当前路由】和【左侧菜单】:
-
-
## iView DynamicRouter
+
+ 
+
+
+ 
+
+
+
+
+
- #### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
- 在线预览
- 使用文档（更新中）
From 641ae0d460b2f5fa7e47116f5edc4ed06dad4e60 Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Fri, 15 May 2020 11:40:53 +0800
Subject: [PATCH 067/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c09eca1af..9c3169cd2 100755
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
-## iView DynamicRouter
+# iView DynamicRouter
From 3931485ec5e0c41c364c489f9618f623a89cc810 Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Fri, 15 May 2020 11:48:29 +0800
Subject: [PATCH 068/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 9c3169cd2..65ba5883e 100755
--- a/README.md
+++ b/README.md
@@ -64,4 +64,4 @@ npm run dev
```
启动完成后，在控制台可监听【当前路由】和【左侧菜单】：
-
@@ -16,7 +18,6 @@
-- #### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
- 在线预览
- 使用文档（更新中）
- userName：super_admin / visitor
From ed895eb530ab687f2d97d0619ba8e47bf52097cf Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Mon, 18 May 2020 10:33:58 +0800
Subject: [PATCH 070/164] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d66225411..915081fea 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
# iView DynamicRouter
-#### 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
+基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
From 4ded2d0f11380c510aa07ea5f49708c708e571a8 Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Mon, 18 May 2020 10:35:20 +0800
Subject: [PATCH 071/164] Update README.md
---
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 915081fea..c338ebc40 100755
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@
# iView DynamicRouter
-基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
-
@@ -18,6 +16,7 @@
+- 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
- 在线预览
- 使用文档（更新中）
- userName：super_admin / visitor
From 03b58194f07f04fbd4d1c7fc348524a69a1d785f Mon Sep 17 00:00:00 2001
From: SimonShao <435776313@qq.com>
Date: Mon, 18 May 2020 10:36:18 +0800
Subject: [PATCH 072/164] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index c338ebc40..6a65e8b07 100755
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
+
- 基于iview-admin(branch:template)，动态获取路由数据，经数据处理后生成动态路由和菜单的【后端动态路由模板】
- 在线预览
From d52bc728880b4bf41729848e99021a607ce19d8e Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 14:47:11 +0800
Subject: [PATCH 073/164] =?UTF-8?q?node-sass=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 1107 ++++++++++++++++++++++++++++++++++++++++-----
package.json | 2 +
2 files changed, 1001 insertions(+), 108 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b7497a7c1..667975f68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1533,6 +1533,12 @@
"integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
"dev": true
},
+ "abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+ },
"accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -1628,6 +1634,12 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true
},
+ "amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "dev": true
+ },
"ansi-escapes": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
@@ -1974,6 +1986,16 @@
"integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
"dev": true
},
+ "are-we-there-yet": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+ "dev": true,
+ "requires": {
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
+ }
+ },
"area-data": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/area-data/-/area-data-1.0.0.tgz",
@@ -2163,6 +2185,12 @@
"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
"dev": true
},
+ "async-foreach": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+ "dev": true
+ },
"async-limiter": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@@ -2594,6 +2622,15 @@
"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
"dev": true
},
+ "block-stream": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+ "dev": true,
+ "requires": {
+ "inherits": "~2.0.0"
+ }
+ },
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -3404,6 +3441,25 @@
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
"dev": true
},
+ "clone-deep": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+ "dev": true,
+ "requires": {
+ "is-plain-object": "^2.0.4",
+ "kind-of": "^6.0.2",
+ "shallow-clone": "^3.0.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true
+ }
+ }
+ },
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -3608,6 +3664,12 @@
"date-now": "^0.1.4"
}
},
+ "console-control-strings": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+ "dev": true
+ },
"consolidate": {
"version": "0.15.1",
"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
@@ -4451,6 +4513,12 @@
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
+ "delegates": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+ "dev": true
+ },
"depd": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -4713,6 +4781,12 @@
"minimalistic-crypto-utils": "^1.0.0"
}
},
+ "emoji-regex": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "dev": true
+ },
"emojis-list": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -6165,8 +6239,8 @@
"dev": true,
"optional": true,
"requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.3.6"
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
}
},
"balanced-match": {
@@ -6183,7 +6257,7 @@
"dev": true,
"optional": true,
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -6260,7 +6334,7 @@
"dev": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "^2.2.1"
}
},
"fs.realpath": {
@@ -6277,14 +6351,14 @@
"dev": true,
"optional": true,
"requires": {
- "aproba": "1.2.0",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
}
},
"glob": {
@@ -6294,12 +6368,12 @@
"dev": true,
"optional": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"has-unicode": {
@@ -6316,7 +6390,7 @@
"dev": true,
"optional": true,
"requires": {
- "safer-buffer": "2.1.2"
+ "safer-buffer": "^2.1.0"
}
},
"ignore-walk": {
@@ -6326,7 +6400,7 @@
"dev": true,
"optional": true,
"requires": {
- "minimatch": "3.0.4"
+ "minimatch": "^3.0.4"
}
},
"inflight": {
@@ -6336,8 +6410,8 @@
"dev": true,
"optional": true,
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -6361,7 +6435,7 @@
"dev": true,
"optional": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"isarray": {
@@ -6378,7 +6452,7 @@
"dev": true,
"optional": true,
"requires": {
- "brace-expansion": "1.1.11"
+ "brace-expansion": "^1.1.7"
}
},
"minimist": {
@@ -6395,8 +6469,8 @@
"dev": true,
"optional": true,
"requires": {
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.0"
}
},
"minizlib": {
@@ -6406,7 +6480,7 @@
"dev": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "^2.2.1"
}
},
"mkdirp": {
@@ -6433,9 +6507,9 @@
"dev": true,
"optional": true,
"requires": {
- "debug": "2.6.9",
- "iconv-lite": "0.4.21",
- "sax": "1.2.4"
+ "debug": "^2.1.2",
+ "iconv-lite": "^0.4.4",
+ "sax": "^1.2.4"
}
},
"node-pre-gyp": {
@@ -6445,16 +6519,16 @@
"dev": true,
"optional": true,
"requires": {
- "detect-libc": "1.0.3",
- "mkdirp": "0.5.1",
- "needle": "2.2.0",
- "nopt": "4.0.1",
- "npm-packlist": "1.1.10",
- "npmlog": "4.1.2",
- "rc": "1.2.7",
- "rimraf": "2.6.2",
- "semver": "5.5.0",
- "tar": "4.4.1"
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.0",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.1.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4"
}
},
"nopt": {
@@ -6464,8 +6538,8 @@
"dev": true,
"optional": true,
"requires": {
- "abbrev": "1.1.1",
- "osenv": "0.1.5"
+ "abbrev": "1",
+ "osenv": "^0.1.4"
}
},
"npm-bundled": {
@@ -6482,8 +6556,8 @@
"dev": true,
"optional": true,
"requires": {
- "ignore-walk": "3.0.1",
- "npm-bundled": "1.0.3"
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1"
}
},
"npmlog": {
@@ -6493,10 +6567,10 @@
"dev": true,
"optional": true,
"requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
}
},
"number-is-nan": {
@@ -6520,7 +6594,7 @@
"dev": true,
"optional": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"os-homedir": {
@@ -6544,8 +6618,8 @@
"dev": true,
"optional": true,
"requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": {
@@ -6569,10 +6643,10 @@
"dev": true,
"optional": true,
"requires": {
- "deep-extend": "0.5.1",
- "ini": "1.3.5",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
+ "deep-extend": "^0.5.1",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -6591,13 +6665,13 @@
"dev": true,
"optional": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.1.1",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
}
},
"rimraf": {
@@ -6607,7 +6681,7 @@
"dev": true,
"optional": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"safe-buffer": {
@@ -6659,9 +6733,9 @@
"dev": true,
"optional": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"string_decoder": {
@@ -6671,7 +6745,7 @@
"dev": true,
"optional": true,
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "~5.1.0"
}
},
"strip-ansi": {
@@ -6681,7 +6755,7 @@
"dev": true,
"optional": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
@@ -6698,13 +6772,13 @@
"dev": true,
"optional": true,
"requires": {
- "chownr": "1.0.1",
- "fs-minipass": "1.2.5",
- "minipass": "2.2.4",
- "minizlib": "1.1.0",
- "mkdirp": "0.5.1",
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "chownr": "^1.0.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.2.4",
+ "minizlib": "^1.1.0",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.2"
}
},
"util-deprecate": {
@@ -6721,7 +6795,7 @@
"dev": true,
"optional": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "^1.0.2"
}
},
"wrappy": {
@@ -6740,6 +6814,18 @@
}
}
},
+ "fstream": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "inherits": "~2.0.0",
+ "mkdirp": ">=0.5 0",
+ "rimraf": "2"
+ }
+ },
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -6752,6 +6838,31 @@
"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
"dev": true
},
+ "gauge": {
+ "version": "2.7.4",
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+ "dev": true,
+ "requires": {
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
+ }
+ },
+ "gaze": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+ "dev": true,
+ "requires": {
+ "globule": "^1.0.0"
+ }
+ },
"get-caller-file": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -6872,6 +6983,25 @@
}
}
},
+ "globule": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
+ "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
+ "dev": true,
+ "requires": {
+ "glob": "~7.1.1",
+ "lodash": "~4.17.12",
+ "minimatch": "~3.0.2"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "dev": true
+ }
+ }
+ },
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
@@ -6956,6 +7086,12 @@
"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
"dev": true
},
+ "has-unicode": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+ "dev": true
+ },
"has-value": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -7718,6 +7854,12 @@
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
"dev": true
},
+ "in-publish": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+ "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
+ "dev": true
+ },
"indent-string": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
@@ -8359,6 +8501,12 @@
}
}
},
+ "js-base64": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
+ "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==",
+ "dev": true
+ },
"js-calendar": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/js-calendar/-/js-calendar-1.2.3.tgz",
@@ -9901,6 +10049,203 @@
"integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
"dev": true
},
+ "node-gyp": {
+ "version": "3.8.0",
+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+ "dev": true,
+ "requires": {
+ "fstream": "^1.0.0",
+ "glob": "^7.0.3",
+ "graceful-fs": "^4.1.2",
+ "mkdirp": "^0.5.0",
+ "nopt": "2 || 3",
+ "npmlog": "0 || 1 || 2 || 3 || 4",
+ "osenv": "0",
+ "request": "^2.87.0",
+ "rimraf": "2",
+ "semver": "~5.3.0",
+ "tar": "^2.0.0",
+ "which": "1"
+ },
+ "dependencies": {
+ "ajv": {
+ "version": "6.12.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+ "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "dev": true
+ },
+ "aws4": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+ "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+ "dev": true
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+ "dev": true
+ },
+ "fast-deep-equal": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+ "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "dev": true,
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "dev": true
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "dev": true,
+ "requires": {
+ "ajv": "^6.5.5",
+ "har-schema": "^2.0.0"
+ }
+ },
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ }
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
+ "mime-db": {
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+ "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+ "dev": true
+ },
+ "mime-types": {
+ "version": "2.1.27",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+ "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+ "dev": true,
+ "requires": {
+ "mime-db": "1.44.0"
+ }
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+ "dev": true
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "dev": true
+ },
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "dev": true
+ },
+ "qs": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "dev": true
+ },
+ "request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "dev": true,
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ }
+ },
+ "semver": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+ "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+ "dev": true
+ },
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "dev": true,
+ "requires": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+ "dev": true
+ }
+ }
+ },
"node-ipc": {
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz",
@@ -9952,40 +10297,292 @@
"semver": "^5.3.0"
}
},
- "nodent-runtime": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/nodent-runtime/-/nodent-runtime-3.2.1.tgz",
- "integrity": "sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==",
- "dev": true
- },
- "normalize-package-data": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
- "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
- "dev": true,
- "requires": {
- "hosted-git-info": "^2.1.4",
- "is-builtin-module": "^1.0.0",
- "semver": "2 || 3 || 4 || 5",
- "validate-npm-package-license": "^3.0.1"
- }
- },
- "normalize-path": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "node-sass": {
+ "version": "4.14.1",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+ "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
"dev": true,
"requires": {
- "remove-trailing-separator": "^1.0.1"
- }
- },
- "normalize-range": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
- "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
- "dev": true
- },
- "normalize-url": {
+ "async-foreach": "^0.1.3",
+ "chalk": "^1.1.1",
+ "cross-spawn": "^3.0.0",
+ "gaze": "^1.0.0",
+ "get-stdin": "^4.0.1",
+ "glob": "^7.0.3",
+ "in-publish": "^2.0.0",
+ "lodash": "^4.17.15",
+ "meow": "^3.7.0",
+ "mkdirp": "^0.5.1",
+ "nan": "^2.13.2",
+ "node-gyp": "^3.8.0",
+ "npmlog": "^4.0.0",
+ "request": "^2.88.0",
+ "sass-graph": "2.2.5",
+ "stdout-stream": "^1.4.0",
+ "true-case-path": "^1.0.2"
+ },
+ "dependencies": {
+ "ajv": {
+ "version": "6.12.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+ "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "ansi-styles": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "dev": true
+ },
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "dev": true
+ },
+ "aws4": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+ "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+ "dev": true
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+ }
+ },
+ "cross-spawn": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
+ }
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+ "dev": true
+ },
+ "fast-deep-equal": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+ "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "dev": true,
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "dev": true
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "dev": true,
+ "requires": {
+ "ajv": "^6.5.5",
+ "har-schema": "^2.0.0"
+ }
+ },
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ }
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "dev": true
+ },
+ "mime-db": {
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+ "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+ "dev": true
+ },
+ "mime-types": {
+ "version": "2.1.27",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+ "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+ "dev": true,
+ "requires": {
+ "mime-db": "1.44.0"
+ }
+ },
+ "nan": {
+ "version": "2.14.1",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+ "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+ "dev": true
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+ "dev": true
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "dev": true
+ },
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "dev": true
+ },
+ "qs": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "dev": true
+ },
+ "request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "dev": true,
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+ "dev": true
+ },
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "dev": true,
+ "requires": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+ "dev": true
+ }
+ }
+ },
+ "nodent-runtime": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/nodent-runtime/-/nodent-runtime-3.2.1.tgz",
+ "integrity": "sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==",
+ "dev": true
+ },
+ "nopt": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+ "dev": true,
+ "requires": {
+ "abbrev": "1"
+ }
+ },
+ "normalize-package-data": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "^2.1.4",
+ "is-builtin-module": "^1.0.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "dev": true,
+ "requires": {
+ "remove-trailing-separator": "^1.0.1"
+ }
+ },
+ "normalize-range": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+ "dev": true
+ },
+ "normalize-url": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.2.0.tgz",
"integrity": "sha512-WvF3Myk0NhXkG8S9bygFM4IC1KOvnVJGq0QoGeoqOYOBeinBZp5ybW3QuYbTc89lkWBMM9ZBO4QGRoc0353kKA==",
@@ -10020,6 +10617,18 @@
"which": "^1.2.10"
}
},
+ "npmlog": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+ "dev": true,
+ "requires": {
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
+ }
+ },
"nth-check": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
@@ -10291,6 +10900,12 @@
"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
"dev": true
},
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "dev": true
+ },
"os-locale": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -10325,6 +10940,16 @@
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
+ "osenv": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+ "dev": true,
+ "requires": {
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
+ }
+ },
"p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -12484,6 +13109,196 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true
},
+ "sass-graph": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
+ "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.0.0",
+ "lodash": "^4.0.0",
+ "scss-tokenizer": "^0.2.3",
+ "yargs": "^13.3.2"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true
+ },
+ "cliui": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "dev": true,
+ "requires": {
+ "string-width": "^3.1.0",
+ "strip-ansi": "^5.2.0",
+ "wrap-ansi": "^5.1.0"
+ }
+ },
+ "find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^3.0.0"
+ }
+ },
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.0.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "^7.0.1",
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^5.1.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^4.1.0"
+ }
+ },
+ "wrap-ansi": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.0",
+ "string-width": "^3.0.0",
+ "strip-ansi": "^5.0.0"
+ }
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+ "dev": true
+ },
+ "yargs": {
+ "version": "13.3.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+ "dev": true,
+ "requires": {
+ "cliui": "^5.0.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^2.0.1",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^3.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^13.1.2"
+ }
+ },
+ "yargs-parser": {
+ "version": "13.1.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+ "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
+ }
+ }
+ },
+ "sass-loader": {
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
+ "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
+ "dev": true,
+ "requires": {
+ "clone-deep": "^4.0.1",
+ "loader-utils": "^1.0.1",
+ "neo-async": "^2.5.0",
+ "pify": "^4.0.1",
+ "semver": "^6.3.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "dev": true
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ }
+ }
+ },
"sax": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -12532,6 +13347,27 @@
}
}
},
+ "scss-tokenizer": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+ "dev": true,
+ "requires": {
+ "js-base64": "^2.1.8",
+ "source-map": "^0.4.2"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "dev": true,
+ "requires": {
+ "amdefine": ">=0.0.4"
+ }
+ }
+ }
+ },
"select": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
@@ -12697,6 +13533,23 @@
"safe-buffer": "^5.0.1"
}
},
+ "shallow-clone": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+ "dev": true,
+ "requires": {
+ "kind-of": "^6.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true
+ }
+ }
+ },
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -13175,6 +14028,15 @@
"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
"dev": true
},
+ "stdout-stream": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "^2.0.1"
+ }
+ },
"stealthy-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -13497,6 +14359,17 @@
"integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
"dev": true
},
+ "tar": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+ "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+ "dev": true,
+ "requires": {
+ "block-stream": "*",
+ "fstream": "^1.0.12",
+ "inherits": "2"
+ }
+ },
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -13696,6 +14569,15 @@
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
"dev": true
},
+ "true-case-path": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.2"
+ }
+ },
"tryer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -14993,6 +15875,15 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
+ "wide-align": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+ "dev": true,
+ "requires": {
+ "string-width": "^1.0.2 || 2"
+ }
+ },
"wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
diff --git a/package.json b/package.json
index 71e05b5ce..148a68170 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,8 @@
"less-loader": "^4.0.5",
"lint-staged": "^6.0.0",
"mockjs": "^1.0.1-beta3",
+ "node-sass": "^4.14.1",
+ "sass-loader": "^7.3.1",
"vue-template-compiler": "^2.5.13"
},
"browserslist": [
From 100f3d97fd6d88ecac4a4d2418722c113c2ef863 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 14:47:34 +0800
Subject: [PATCH 074/164] =?UTF-8?q?validate=E6=96=B9=E6=B3=95=E5=B0=81?=
=?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/libs/validate.js | 213 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 213 insertions(+)
create mode 100644 src/libs/validate.js
diff --git a/src/libs/validate.js b/src/libs/validate.js
new file mode 100644
index 000000000..aaff10011
--- /dev/null
+++ b/src/libs/validate.js
@@ -0,0 +1,213 @@
+/* eslint-disable no-useless-escape */
+/**
+ * Created by jiachenpan on 16/11/18.
+ */
+
+export function isvalidUsername(str) {
+ const valid_map = ["admin", "editor"];
+ return valid_map.indexOf(str.trim()) >= 0;
+}
+
+/* 合法uri */
+export function validateURL(textval) {
+ const urlregex = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+ return urlregex.test(textval);
+}
+
+/* 小写字母 */
+export function validateLowerCase(str) {
+ const reg = /^[a-z]+$/;
+ return reg.test(str);
+}
+
+/* 大写字母 */
+export function validateUpperCase(str) {
+ const reg = /^[A-Z]+$/;
+ return reg.test(str);
+}
+
+/* 大小写字母 */
+export function validatAlphabets(str) {
+ const reg = /^[A-Za-z]+$/;
+ return reg.test(str);
+}
+
+/* 邮箱 */
+export function validateEmail(email) {
+ const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+ // /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/
+ return re.test(email);
+}
+
+/* ip地址 */
+export function validateIP(ip) {
+ const re = /^(?:(?:1[0-9][0-9]\.)|(?:2[0-4][0-9]\.)|(?:25[0-5]\.)|(?:[1-9][0-9]\.)|(?:[0-9]\.)){3}(?:(?:1[0-9][0-9])|(?:2[0-4][0-9])|(?:25[0-5])|(?:[1-9][0-9])|(?:[0-9]))$/;
+
+ return re.test(ip);
+}
+
+/* 域名 */
+export function validateDSN(dsn) {
+ const re = /(http:\/\/|https:\/\/|[A-Za-z0-9]+[\-]?[A-Za-z0-9]+\.|[A-Za-z0-9]+\.)((\w|=|\?|\.|\/|&|-)*)$/;
+ return re.test(dsn);
+}
+
+/* 电话号码 */
+export function validateTel(tel) {
+ const re = /^[1][3,4,5,7,8][0-9]{9}$/;
+ return re.test(tel);
+}
+
+/* 非负整数 */
+export function validateNumber(num) {
+ const re = /^[1-9]+\d*$/;
+ return re.test(num);
+}
+
+/* qq号 */
+export function validateQQ(qq) {
+ const re = /^[1-9][0-9]{4,10}$/gim;
+ return re.test(qq);
+}
+
+/* 密码 */
+export function validatePassword(pwd) {
+ const re = /^(?![a-zA-Z]+$)(?![a-z\d]+$)(?![a-z!@#\$%]+$)(?![A-Z\d]+$)(?![A-Z!@#\$%]+$)(?![\d!@#\$%]+$)[a-zA-Z\d!@#\$%]+$/;
+ return re.test(pwd);
+}
+
+// 密码不得包含和用户名完整字符串，大小写变位，形似变换的字符串
+export function levenshteinDistance(user, pwd) {
+ var LevenshteinDistance;
+ LevenshteinDistance = {
+ str1: null,
+ str3: null,
+ matrix: null,
+ isString(s) {
+ return Object.prototype.toString.call(s) === "[object String]";
+ },
+ isNumber(s) {
+ return Object.prototype.toString.call(s) === "[object Number]";
+ },
+ init(str1, str2) {
+ if (!this.isString(str1) || !this.isString(str2)) return;
+
+ this.str1 = str1;
+ this.str2 = str2;
+
+ str1.length &&
+ str2.length &&
+ this.createMatrix(str1.length + 1, str2.length + 1);
+ this.matrix && this.initMatrix();
+
+ return this;
+ },
+ get() {
+ return (
+ 1 - this.getDistance() / Math.max(this.str1.length, this.str2.length)
+ );
+ },
+ // 计算编辑距离
+ getDistance: function() {
+ var len1 = this.str1.length;
+ var len2 = this.str2.length;
+
+ if (!len1 || !len2) return Math.max(len1, len2);
+
+ var str1 = this.str1.split("");
+ var str2 = this.str2.split("");
+
+ var i = 0;
+ var j = 0;
+ var temp = 0;
+ while (i++ < len1) {
+ j = 0;
+ while (j++ < len2) {
+ temp = str1[i - 1] === str2[j - 1] ? 0 : 1;
+ this.matrix[i][j] = Math.min(
+ this.matrix[i - 1][j] + 1,
+ this.matrix[i][j - 1] + 1,
+ this.matrix[i - 1][j - 1] + temp
+ );
+ }
+ }
+ return this.matrix[i - 1][j - 1];
+ },
+ /*
+ * 初始化矩阵
+ * 为第一行、第一列赋值
+ */
+ initMatrix: function() {
+ var cols = this.matrix[0].length;
+ var rows = this.matrix.length;
+ var l = Math.max(cols, rows);
+ while (l--) {
+ cols - 1 >= l && (this.matrix[0][l] = l);
+ rows - 1 >= l && (this.matrix[l][0] = l);
+ }
+ },
+ /*
+ * 创建矩阵
+ * n:行
+ * m:列
+ */
+ createMatrix: function(n, m) {
+ if (!this.isNumber(n) || !this.isNumber(m) || n < 1 || m < 1) return;
+
+ this.matrix = new Array(n);
+ var i = 0;
+ while (i < n) this.matrix[i++] = new Array(m);
+ }
+ };
+ return LevenshteinDistance.init(pwd, user).get() > 0.5;
+}
+
+// 密码不得包含和用户名完整字符串，大小写变位，形似变换的字符串
+export function similarityString(user, pwd) {
+ // 不得包含和用户名完整字符串，大小写变位的字符串
+ if (
+ pwd.indexOf(user) !== -1 ||
+ pwd.toLocaleUpperCase().indexOf(user.toLocaleUpperCase()) !== -1
+ ) {
+ return true;
+ }
+ return false;
+}
+
+// 密码避免键盘排序
+export function keyboardSortPassword(pwd) {
+ pwd = pwd.toLocaleLowerCase();
+ var i = 0;
+ var arr = [
+ "1234567890",
+ "qwertyuiop[]",
+ "|asdfghjklzxcvbnm",
+ "~!@#$%^&*()_+"
+ ];
+ for (i = 0; i < arr.length; i++) {
+ if (arr[i].indexOf(pwd) !== -1) {
+ break;
+ }
+ }
+ if (i < arr.length) {
+ return true;
+ }
+ return false;
+}
+
+// 检测是否为外链
+export function isExternal(path) {
+ return /^(https?:|mailto:|tel:)/.test(path);
+}
+
+// 检测是否为演练展示
+export function isExhibit(path) {
+ return path.indexOf("/exhibit") > -1;
+}
+
+/* 检测是否为正整数及是否在规定范围内 */
+export function isPositiveInteger(number, superLimit = 9999, lowerLimit = 0) {
+ return (
+ number <= superLimit && number >= lowerLimit && number.indexOf(".") === -1
+ );
+}
From 753b82f24b595a55793bd8a618844de211b63de5 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 14:48:31 +0800
Subject: [PATCH 075/164] =?UTF-8?q?vuex=20-=20=E4=BF=AE=E6=94=B9user?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/module/user.js | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/store/module/user.js b/src/store/module/user.js
index 149e569a1..e41d27752 100644
--- a/src/store/module/user.js
+++ b/src/store/module/user.js
@@ -35,6 +35,11 @@ export default {
state.hasGetInfo = status;
}
},
+ getters: {
+ userAccess: state => state.access,
+ userName: state => state.userName,
+ token: state => state.token
+ },
actions: {
// 登录
handleLogin({ commit }, { userName, password }) {
@@ -46,7 +51,7 @@ export default {
})
.then(res => {
const data = res.data;
- commit("setToken", data.token);
+ commit("setToken", data.data);
resolve(res);
})
.catch(err => {
@@ -81,11 +86,11 @@ export default {
try {
getUserInfo(state.token)
.then(res => {
- const data = res.data.data;
- commit("setAvator", data.avator);
- commit("setUserName", data.name);
- commit("setUserId", data.user_id);
- commit("setAccess", data.access);
+ const data = res.data;
+ commit("setAvator", data.data.avator);
+ commit("setUserName", data.data.name);
+ commit("setUserId", data.data.user_id);
+ commit("setAccess", data.data.access);
commit("setHasGetInfo", true);
resolve(data);
})
From 5970693ddbda7bb9bc1af5cf71ae4ba01f0878aa Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 14:50:09 +0800
Subject: [PATCH 076/164] =?UTF-8?q?mock=E4=BA=8B=E4=BB=B6=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=EF=BC=9A=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=20&=20?=
=?UTF-8?q?=E6=8B=89=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mock/login.js | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/mock/login.js b/src/mock/login.js
index 4cc787387..39a6848a1 100644
--- a/src/mock/login.js
+++ b/src/mock/login.js
@@ -1,21 +1,11 @@
import store from "@/store";
+import { userList } from "./role"; // mockData - 用户列表
-const USER_MAP = {
- super_admin: {
- name: "super_admin",
- user_id: "1",
- access: ["super_admin", "visitor"],
- token: "super_admin",
- avator: "https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png"
- },
- visitor: {
- name: "visitor",
- user_id: "2",
- access: ["visitor"],
- token: "visitor",
- avator: "https://avatars0.githubusercontent.com/u/20942571?s=460&v=4"
- }
-};
+// 用户列表
+const USER_MAP = {};
+userList.forEach(user => {
+ USER_MAP[user.name] = user;
+});
// 用户登录
export const login = req => {
@@ -24,7 +14,7 @@ export const login = req => {
return {
status: 200,
message: "成功！",
- token: USER_MAP[req.userName].token
+ data: USER_MAP[req.userName].name
};
} else {
return { status: 500, message: "用户名或密码错误！", data: null };
From fb45691c6f3b7f6c7ce25b0edca23c50fd496927 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 14:51:52 +0800
Subject: [PATCH 077/164] =?UTF-8?q?mock=E6=95=B0=E6=8D=AE=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=EF=BC=9A=E8=BF=BD=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=97?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mock/role.js | 76 ++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 74 insertions(+), 2 deletions(-)
diff --git a/src/mock/role.js b/src/mock/role.js
index f6fa7e384..e84fa565b 100644
--- a/src/mock/role.js
+++ b/src/mock/role.js
@@ -1,3 +1,23 @@
+// 用户列表
+const userList = [
+ {
+ user_id: "1",
+ name: "super_admin",
+ displayName: "管理员",
+ phone: "13888888888",
+ access: ["super_admin", "visitor"],
+ avator: "https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png"
+ },
+ {
+ user_id: "2",
+ name: "visitor",
+ displayName: "访客",
+ phone: "13888888888",
+ access: ["visitor"],
+ avator: "https://avatars0.githubusercontent.com/u/20942571?s=460&v=4"
+ }
+];
+
// 角色列表
const roleList = [
{
@@ -15,7 +35,11 @@ const roleList = [
"level_2_3",
"screen",
"github",
- "singleMenu"
+ "singleMenu",
+ "authority",
+ "userManage",
+ "roleManage",
+ "menuManage"
],
id: "1"
},
@@ -204,7 +228,55 @@ const menuList = [
ico: "md-document",
isOutSide: false,
showLevel: 2
+ },
+ {
+ id: "authority",
+ name: "authority",
+ title: "权限管理",
+ url: "authority",
+ path: "Main",
+ sort: 20,
+ parentId: "root",
+ ico: "md-settings",
+ isOutSide: false,
+ showLevel: 2
+ },
+ {
+ id: "userManage",
+ name: "userManage",
+ title: "用户管理",
+ url: "userManage",
+ path: "authority/user",
+ sort: 10,
+ parentId: "authority",
+ ico: "",
+ isOutSide: false,
+ showLevel: 2
+ },
+ {
+ id: "roleManage",
+ name: "roleManage",
+ title: "角色管理",
+ url: "roleManage",
+ path: "authority/role",
+ sort: 8,
+ parentId: "authority",
+ ico: "",
+ isOutSide: false,
+ showLevel: 2
+ },
+ {
+ id: "menuManage",
+ name: "menuManage",
+ title: "菜单管理",
+ url: "menuManage",
+ path: "authority/menu",
+ sort: 6,
+ parentId: "authority",
+ ico: "",
+ isOutSide: false,
+ showLevel: 2
}
];
-export { roleList, menuList, menuLevel };
+export { userList, roleList, menuList, menuLevel };
From 51fede3bb99ee87abe080bd503cf15662ac1ff93 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 14:58:19 +0800
Subject: [PATCH 078/164] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/components/side-menu/side-menu.less | 36 +++++++++++++------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/components/main/components/side-menu/side-menu.less b/src/components/main/components/side-menu/side-menu.less
index 4716d8273..b34be7a7c 100644
--- a/src/components/main/components/side-menu/side-menu.less
+++ b/src/components/main/components/side-menu/side-menu.less
@@ -1,24 +1,30 @@
-.side-menu-wrapper{
+.side-menu-wrapper {
user-select: none;
- .menu-collapsed{
+
+ .menu-collapsed {
padding-top: 10px;
- .ivu-dropdown{
+ .ivu-dropdown {
width: 100%;
- .ivu-dropdown-rel a{
+
+ .ivu-dropdown-rel a {
width: 100%;
}
}
- .ivu-tooltip{
+
+ .ivu-tooltip {
width: 100%;
- .ivu-tooltip-rel{
+
+ .ivu-tooltip-rel {
width: 100%;
}
- .ivu-tooltip-popper .ivu-tooltip-content{
- .ivu-tooltip-arrow{
+
+ .ivu-tooltip-popper .ivu-tooltip-content {
+ .ivu-tooltip-arrow {
border-right-color: #fff;
}
- .ivu-tooltip-inner{
+
+ .ivu-tooltip-inner {
background: #fff;
color: #495060;
}
@@ -27,14 +33,22 @@
}
- a.drop-menu-a{
+
+ a.drop-menu-a {
display: inline-block;
padding: 6px 15px;
width: 100%;
text-align: center;
color: #495060;
}
+
+ // 处理父子菜单的标签位置
+ .ivu-menu-submenu-title>i,
+ .ivu-menu-submenu-title span>i {
+ margin-right: 12px;
+ }
}
-.menu-title{
+
+.menu-title {
padding-left: 6px;
}
From a901d46a3ede757dcaa528a19f0e0dd0c0e8ded1 Mon Sep 17 00:00:00 2001
From: simon9124 <435776313@qq.com>
Date: Mon, 18 May 2020 15:03:10 +0800
Subject: [PATCH 079/164] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/view/authority/menu.vue | 12 +
src/view/authority/role.vue | 12 +
src/view/authority/user.vue | 611 ++++++++++++++++++++++++++++++++++++
3 files changed, 635 insertions(+)
create mode 100644 src/view/authority/menu.vue
create mode 100644 src/view/authority/role.vue
create mode 100644 src/view/authority/user.vue
diff --git a/src/view/authority/menu.vue b/src/view/authority/menu.vue
new file mode 100644
index 000000000..2e020cfd1
--- /dev/null
+++ b/src/view/authority/menu.vue
@@ -0,0 +1,12 @@
+
+