From 7fd8bcdcc695262cc81a49d7f258e4bb2add3b5e Mon Sep 17 00:00:00 2001 From: zuiidea Date: Wed, 14 Dec 2016 00:19:41 +0800 Subject: [PATCH] mockStorge --- mock/app.js | 38 ++++++++-------------- mock/users.js | 70 +++++++++++++++++++---------------------- src/routes/dashboard.js | 6 +--- src/utils/index.js | 1 - src/utils/mockStorge.js | 7 +++-- 5 files changed, 51 insertions(+), 71 deletions(-) diff --git a/mock/app.js b/mock/app.js index 236890e..7eba2a4 100644 --- a/mock/app.js +++ b/mock/app.js @@ -2,33 +2,21 @@ const qs = require('qs') const Mock = require('mockjs') const Watch = require("watchjs") const Cookie = require("js-cookie") +import mockStorge from '../src/utils/mockStorge' -let adminUsersData = {} -if (!global.adminUsersData) { - const data = !!localStorage.getItem("antdAdminUsersData") - ? JSON.parse(localStorage.getItem("antdAdminUsersData")) - : [ - { - username: 'guest', - password: 'guest' - }, - { - username: '吴彦祖', - password: '123456' - } - ] - adminUsersData = data - global.adminUsersData = adminUsersData - if (!localStorage.getItem("antdAdminUsersData")) { - localStorage.setItem("antdAdminUsersData", JSON.stringify(adminUsersData)) + +let dataKey = mockStorge('AdminUsers',[ + { + username: 'guest', + password: 'guest' + }, + { + username: '吴彦祖', + password: '123456' } -} else { - adminUsersData = global.adminUsersData -} +]) -Watch.watch(adminUsersData, function () { - localStorage.setItem("antdAdminUsersData", JSON.stringify(adminUsersData)) -}) +console.log(global[dataKey]); module.exports = { 'POST /api/login' (req, res) { @@ -37,7 +25,7 @@ module.exports = { success: false, message: "" } - const d = adminUsersData.filter(function (item) { + const d = global[dataKey].filter(function (item) { return item.username == userItem.username }) if (!!d.length) { diff --git a/mock/users.js b/mock/users.js index 80b1fd0..8b51347 100644 --- a/mock/users.js +++ b/mock/users.js @@ -1,45 +1,34 @@ const qs = require('qs') const Mock = require('mockjs') const Watch = require("watchjs") +import mockStorge from '../src/utils/mockStorge' -let usersListData = {} -if (!global.usersListData) { - const data = !!localStorage.getItem("antdUsersListData") - ? JSON.parse(localStorage.getItem("antdUsersListData")) - : Mock.mock({ - 'data|100': [ - { - 'id|+1': 1, - name: '@cname', - nickName: '@last', - phone: /^1[34578]\d{9}$/, - 'age|11-99': 1, - address: '@county(true)', - isMale: '@boolean', - email: '@email', - createTime: '@datetime', - avatar: function(){ - return Mock.Random.image('100x100', Mock.Random.color(),"#757575",'png',this.nickName.substr(0,1)) - } - } - ], - page: { - total: 100, - current: 1 +let dataKey = mockStorge('UsersList',Mock.mock({ + 'data|100': [ + { + 'id|+1': 1, + name: '@cname', + nickName: '@last', + phone: /^1[34578]\d{9}$/, + 'age|11-99': 1, + address: '@county(true)', + isMale: '@boolean', + email: '@email', + createTime: '@datetime', + avatar: function(){ + return Mock.Random.image('100x100', Mock.Random.color(),"#757575",'png',this.nickName.substr(0,1)) } - }) - usersListData = data - global.usersListData = usersListData - if (!localStorage.getItem("antdUsersListData")) { - localStorage.setItem("antdUsersListData", JSON.stringify(usersListData)) + } + ], + page: { + total: 100, + current: 1 } -} else { - usersListData = global.usersListData -} +})) -Watch.watch(usersListData, function () { - localStorage.setItem("antdUsersListData", JSON.stringify(usersListData)) -}) +let usersListData = global[dataKey] + +console.log(global[dataKey]); module.exports = { @@ -86,7 +75,9 @@ module.exports = { usersListData.page.total = usersListData.data.length usersListData.page.current = 1 - global.usersListData = usersListData + // global.usersListData = usersListData + global[dataKey] = usersListData + res.json({success: true, data: usersListData.data, page: usersListData.page}) }, @@ -102,7 +93,9 @@ module.exports = { usersListData.page.total = usersListData.data.length - global.usersListData = usersListData + // global.usersListData = usersListData + global[dataKey] = usersListData + res.json({success: true, data: usersListData.data, page: usersListData.page}) }, @@ -119,7 +112,8 @@ module.exports = { return item }) - global.usersListData = usersListData + // global.usersListData = usersListData + global[dataKey] = usersListData res.json({success: true, data: usersListData.data, page: usersListData.page}) } diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js index 6756dc4..c080606 100644 --- a/src/routes/dashboard.js +++ b/src/routes/dashboard.js @@ -7,11 +7,7 @@ import Quote from '../components/dashboard/quote' import Sales from '../components/dashboard/sales' import Weather from '../components/dashboard/weather' import styles from './dashboard.less' -import {color,mockStorge} from '../utils' - -mockStorge('Dashboard',{ - a:6 -}) +import {color} from '../utils' const numberCardData = [ { diff --git a/src/utils/index.js b/src/utils/index.js index a3ef0ae..d797b36 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -24,5 +24,4 @@ module.exports = { request, color, classnames, - mockStorge, } diff --git a/src/utils/mockStorge.js b/src/utils/mockStorge.js index 4a7f8f3..edd7d5a 100644 --- a/src/utils/mockStorge.js +++ b/src/utils/mockStorge.js @@ -7,6 +7,9 @@ export default function mockStorge(name, defaultValue) { global[key] = localStorage.getItem(key) ? JSON.parse(localStorage.getItem(key)) : defaultValue - !localStorage.getItem(key)&&localStorage.setItem(key, JSON.stringify(global[key])) - + !localStorage.getItem(key) && localStorage.setItem(key, JSON.stringify(global[key])) + Watch.watch(global[key], function () { + localStorage.setItem(key, JSON.stringify(global[key])) + }) + return key }