From 40a5977d1fab286ebea8245f5bef8bf871e74228 Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 26 Jun 2017 18:03:05 +0800 Subject: [PATCH] :tangerine: --- build/webpack.prod.conf.js | 5 + favicon.ico | Bin 0 -> 67646 bytes src/components/Hamburger/index.vue | 2 +- src/components/Icon-svg/index.js | 11 - .../Icon-svg/{wscn-icon-svg.vue => index.vue} | 8 +- src/components/Icon-svg/wscn-icon-stack.vue | 52 ---- src/main.js | 31 +-- src/store/getters.js | 4 - src/styles/btn.scss | 103 -------- src/styles/element-ui.scss | 56 +---- src/styles/index.scss | 231 ++---------------- src/styles/mixin.scss | 33 --- src/utils/createUniqueString.js | 8 - src/utils/index.js | 144 ----------- src/utils/openWindow.js | 27 -- src/utils/validate.js | 6 - src/views/layout/AppMain.vue | 2 +- src/views/layout/Layout.vue | 6 +- src/views/layout/Navbar.vue | 5 - src/views/layout/SidebarItem.vue | 6 +- src/views/layout/TabsView.vue | 45 ---- src/views/login/index.vue | 45 +--- 22 files changed, 57 insertions(+), 773 deletions(-) create mode 100644 favicon.ico delete mode 100644 src/components/Icon-svg/index.js rename src/components/Icon-svg/{wscn-icon-svg.vue => index.vue} (72%) delete mode 100644 src/components/Icon-svg/wscn-icon-stack.vue delete mode 100644 src/styles/btn.scss delete mode 100644 src/utils/createUniqueString.js delete mode 100644 src/utils/openWindow.js delete mode 100644 src/views/layout/TabsView.vue diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index da44b65..7b01b9f 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -11,6 +11,10 @@ var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') var env = config.build.env +function resolveApp(relativePath) { + return path.resolve(relativePath); +} + var webpackConfig = merge(baseWebpackConfig, { module: { rules: utils.styleLoaders({ @@ -53,6 +57,7 @@ var webpackConfig = merge(baseWebpackConfig, { filename: config.build.index, template: 'index.html', inject: true, + favicon: resolveApp('favicon.ico'), minify: { removeComments: true, collapseWhitespace: true, diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..7cd39d7fc1b9c5df62f01f25614cc1062f5685a1 GIT binary patch literal 67646 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
- +
diff --git a/src/components/Icon-svg/index.js b/src/components/Icon-svg/index.js deleted file mode 100644 index 55d342a..0000000 --- a/src/components/Icon-svg/index.js +++ /dev/null @@ -1,11 +0,0 @@ -import Vue from 'vue' - -function registerAllComponents(requireContext) { - return requireContext.keys().forEach(comp => { - const vueComp = requireContext(comp) - const compName = vueComp.name ? vueComp.name.toLowerCase() : /\/([\w-]+)\.vue$/.exec(comp)[1] - Vue.component(compName, vueComp) - }) -} - -registerAllComponents(require.context('./', false, /\.vue$/)) diff --git a/src/components/Icon-svg/wscn-icon-svg.vue b/src/components/Icon-svg/index.vue similarity index 72% rename from src/components/Icon-svg/wscn-icon-svg.vue rename to src/components/Icon-svg/index.vue index 04b01f4..44881b1 100644 --- a/src/components/Icon-svg/wscn-icon-svg.vue +++ b/src/components/Icon-svg/index.vue @@ -1,12 +1,12 @@ - - diff --git a/src/components/Icon-svg/wscn-icon-stack.vue b/src/components/Icon-svg/wscn-icon-stack.vue deleted file mode 100644 index bf7b07e..0000000 --- a/src/components/Icon-svg/wscn-icon-stack.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/src/main.js b/src/main.js index 14ed8a6..721e4a8 100644 --- a/src/main.js +++ b/src/main.js @@ -4,31 +4,32 @@ import Vue from 'vue' import App from './App' import router from './router' import store from './store' -import ElementUI from 'element-ui'; +import ElementUI from 'element-ui' import 'element-ui/lib/theme-default/index.css' import NProgress from 'nprogress' -import 'normalize.css/normalize.css';// normalize.css 样式格式化 -import '@/styles/index.scss'; // 全局自定义的css样式 -import '@/components/Icon-svg/index'; // 封装的svg组件 +import 'normalize.css/normalize.css' +import '@/styles/index.scss' // 全局自定义的css样式 +import '@/assets/iconfont/iconfont' +import IconSvg from '@/components/Icon-svg/index.vue' Vue.config.productionTip = false Vue.use(ElementUI); +Vue.component('icon-svg', IconSvg) - -const whiteList = ['/login'];// 不重定向白名单 +const whiteList = ['/login']; router.beforeEach((to, from, next) => { - NProgress.start(); // 开启Progress - if (store.getters.token) { // 判断是否有token + NProgress.start(); + if (store.getters.token) { if (to.path === '/login') { next({ path: '/' }); } else { - if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(res => { // 拉取user_info + if (store.getters.roles.length === 0) { + store.dispatch('GetInfo').then(res => { const roles = res.data.role; - store.dispatch('GenerateRoutes', { roles }).then(() => { // 生成可访问的路由表 - router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 - next(to.path); // hack方法 确保addRoutes已完成 + store.dispatch('GenerateRoutes', { roles }).then(() => { + router.addRoutes(store.getters.addRouters) + next(to.path); }) }).catch(err => { console.log(err); @@ -38,10 +39,10 @@ router.beforeEach((to, from, next) => { } } } else { - if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入 + if (whiteList.indexOf(to.path) !== -1) { next() } else { - next('/login'); // 否则全部重定向到登录页 + next('/login'); NProgress.done(); } } diff --git a/src/store/getters.js b/src/store/getters.js index 71c9e6b..8553cd8 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,12 +1,8 @@ const getters = { sidebar: state => state.app.sidebar, - visitedViews: state => state.app.visitedViews, token: state => state.user.token, avatar: state => state.user.avatar, name: state => state.user.name, - uid: state => state.user.uid, - email: state => state.user.email, - introduction: state => state.user.introduction, roles: state => state.user.roles, permission_routers: state => state.permission.routers, addRouters: state => state.permission.addRouters diff --git a/src/styles/btn.scss b/src/styles/btn.scss deleted file mode 100644 index edd2f31..0000000 --- a/src/styles/btn.scss +++ /dev/null @@ -1,103 +0,0 @@ -$blue:#324157; -$light-blue:#3A71A8; -$red:#C03639; -$pink: #E65D6E; -$green: #30B08F; -$tiffany: #4AB7BD; -$yellow:#FEC171; - -$panGreen: #30B08F; - -@mixin colorBtn($color) { - background: $color; - &:hover { - color: $color; - &:before, &:after { - background: $color; - } - } -} - - -.blue-btn { - @include colorBtn($blue) -} - -.light-blue-btn{ - @include colorBtn($light-blue) -} - - -.red-btn { - @include colorBtn($red) -} - -.pink-btn { - @include colorBtn($pink) -} - -.green-btn { - @include colorBtn($green) -} - - -.tiffany-btn { - @include colorBtn($tiffany) -} - - -.yellow-btn { - @include colorBtn($yellow) -} - -.pan-btn { - font-size: 14px; - color: #fff; - padding: 14px 36px; - border-radius: 8px; - border: none; - outline: none; - margin-right: 25px; - transition: 600ms ease all; - position: relative; - display: inline-block; - &:hover { - background: #fff; - &:before, &:after { - width: 100%; - transition: 600ms ease all; - } - } - &:before, &:after { - content: ''; - position: absolute; - top: 0; - right: 0; - height: 2px; - width: 0; - transition: 400ms ease all; - } - &::after { - right: inherit; - top: inherit; - left: 0; - bottom: 0; - } -} - -.custom-button{ - display: inline-block; - line-height: 1; - white-space: nowrap; - cursor: pointer; - background: #fff; - color: #fff; - -webkit-appearance: none; - text-align: center; - box-sizing: border-box; - outline: 0; - margin: 0; - padding: 10px 15px; - font-size: 14px; - border-radius: 4px; -} diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 382aff1..c618f7d 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -1,23 +1,4 @@ - //覆盖一些element-ui样式 -.block-checkbox { - display: block; -} - -.operation-container { - .cell { - padding: 10px !important; - } - .el-button { - &:nth-child(3) { - margin-top: 10px; - margin-left: 0px; - } - &:nth-child(4) { - margin-top: 10px; - } - } -} - + //覆盖一些element-ui样式 覆盖css样式可在这里添加 .el-upload { input[type="file"] { display: none !important; @@ -28,29 +9,6 @@ display: none; } -.cell { - .el-tag { - margin-right: 8px; - } -} - -.small-padding { - .cell { - padding-left: 8px; - padding-right: 8px; - } -} - -.status-col { - .cell { - padding: 0 10px; - text-align: center; - .el-tag { - margin-right: 0px; - } - } -} - //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 .el-dialog { transform: none; @@ -59,18 +17,6 @@ margin: 0 auto; } - -//文章页textarea修改样式 -.article-textarea { - textarea { - padding-right: 40px; - resize: none; - border: none; - border-radius: 0px; - border-bottom: 1px solid #bfcbd9; - } -} - //element ui upload .upload-container { .el-upload { diff --git a/src/styles/index.scss b/src/styles/index.scss index e566c38..6dad036 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,4 +1,3 @@ -@import './btn.scss'; @import './element-ui.scss'; @import "./mixin.scss"; body { @@ -8,10 +7,6 @@ body { font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; } -label { - font-weight: 700; -} - html { box-sizing: border-box; } @@ -22,14 +17,6 @@ html { box-sizing: inherit; } -.no-padding { - padding: 0px !important; -} - -.padding-content { - padding: 4px 0; -} - a:focus, a:active { outline: none; @@ -43,145 +30,6 @@ a:hover { text-decoration: none; } -.fr { - float: right; -} - -.fl { - float: left; -} - -.pr-5 { - padding-right: 5px; -} - -.pl-5 { - padding-left: 5px; -} - -.block { - display: block; -} - -.pointer { - cursor: pointer; -} - -.inlineBlock { - display: block; -} - -code { - background: #eef1f6; - padding: 15px 10px; - margin-bottom: 20px; - display: block; - line-height: 36px; - a { - color: #337ab7; - cursor: pointer; - &:hover { - color: rgb(32, 160, 255); - } - } -} - -.fade-enter-active, -.fade-leave-active { - transition: all .2s ease -} - -.fade-enter, -.fade-leave-active { - opacity: 0; -} - -//main-container全局样式 -.app-container { - padding: 20px; -} -.components-container { - margin: 30px 50px; - position: relative; -} -.pagination-container { - margin-top: 30px; -} - - -.editor-container .CodeMirror { - height: 100%!important; -} - -.wscn-icon { - width: 1em; - height: 1em; - vertical-align: -0.15em; - fill: currentColor; - overflow: hidden; -} - -.sub-navbar { - height: 50px; - line-height: 50px; - position: relative; - width: 100%; - text-align: right; - padding-right: 20px; - transition: 600ms ease position; - background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); - .subtitle { - font-size: 20px; - color: #fff; - } - &.draft { - background: #d0d0d0; - } - &.deleted { - background: #d0d0d0; - } -} - -.link-type, -.link-type:focus { - color: #337ab7; - cursor: pointer; - &:hover { - color: rgb(32, 160, 255); - } -} - -.publishedTag, -.draftTag, -.deletedTag { - color: #fff; - background-color: $panGreen; - line-height: 1; - text-align: center; - margin: 0; - padding: 8px 12px; - font-size: 14px; - border-radius: 4px; - position: absolute; - left: 20px; - top: 10px; -} - -.draftTag { - background-color: $yellow; -} - -.deletedTag { - background-color: $red; -} - -.input-label { - font-size: 14px; - color: #48576a; - line-height: 1; - padding: 11px 5px 11px 0; -} - .clearfix { &:after { visibility: hidden; @@ -193,74 +41,31 @@ code { } } -.no-marginLeft { - .el-checkbox { - margin: 0 20px 15px 0; - } - .el-checkbox+.el-checkbox { - margin-left: 0px; - } +//vue router transition css +.fade-enter-active, +.fade-leave-active { + transition: all .2s ease } -.filter-container { - padding-bottom: 10px; - .filter-item { - display: inline-block; - vertical-align: middle; - margin-bottom: 10px; - } +.fade-enter, +.fade-leave-active { + opacity: 0; } - -//refine vue-multiselect plugin -.multiselect { - line-height: 16px; +//main-container全局样式 +.app-main{ + min-height: 100% } -.multiselect--active { - z-index: 1000 !important; +.app-container { + padding: 20px; } -//refine simplemde -.simplemde-container{ - .editor-toolbar.fullscreen,.CodeMirror-fullscreen{ - z-index: 1003; - } +.svg-icon { + width: 1em; + height: 1em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; } -//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; -} - -//github-corner -.github-corner:hover .octo-arm { - animation: octocat-wave 560ms ease-in-out -} - -@keyframes octocat-wave { - 0%, - 100% { - transform: rotate(0) - } - 20%, - 60% { - transform: rotate(-25deg) - } - 40%, - 80% { - transform: rotate(10deg) - } -} - -@media (max-width:500px) { - .github-corner:hover .octo-arm { - animation: none - } - .github-corner .octo-arm { - animation: octocat-wave 560ms ease-in-out - } -} diff --git a/src/styles/mixin.scss b/src/styles/mixin.scss index 822ab92..601d7a0 100644 --- a/src/styles/mixin.scss +++ b/src/styles/mixin.scss @@ -25,36 +25,3 @@ height: 100%; } -@mixin pct($pct) { - width: #{$pct}; - position: relative; - margin: 0 auto; -} - -@mixin triangle($width, $height, $color, $direction) { - $width: $width/2; - $color-border-style: $height solid $color; - $transparent-border-style: $width solid transparent; - height: 0; - width: 0; - @if $direction==up { - border-bottom: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - @else if $direction==right { - border-left: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } - @else if $direction==down { - border-top: $color-border-style; - border-left: $transparent-border-style; - border-right: $transparent-border-style; - } - @else if $direction==left { - border-right: $color-border-style; - border-top: $transparent-border-style; - border-bottom: $transparent-border-style; - } -} diff --git a/src/utils/createUniqueString.js b/src/utils/createUniqueString.js deleted file mode 100644 index 2e6e357..0000000 --- a/src/utils/createUniqueString.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Created by jiachenpan on 17/3/8. - */ -export default function createUniqueString() { - const timestamp = +new Date() + ''; - const randomNum = parseInt((1 + Math.random()) * 65536) + ''; - return (+(randomNum + timestamp)).toString(32); -} diff --git a/src/utils/index.js b/src/utils/index.js index a011f17..3f6b15f 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -57,92 +57,6 @@ } } -// 格式化时间 - export function getQueryObject(url) { - url = url == null ? window.location.href : url; - const search = url.substring(url.lastIndexOf('?') + 1); - const obj = {}; - const reg = /([^?&=]+)=([^?&=]*)/g; - search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1); - let val = decodeURIComponent($2); - val = String(val); - obj[name] = val; - return rs; - }); - return obj; - } - - -/** - *get getByteLen - * @param {Sting} val input value - * @returns {number} output value - */ - export function getByteLen(val) { - let len = 0; - for (let i = 0; i < val.length; i++) { - if (val[i].match(/[^\x00-\xff]/ig) != null) { - len += 1; - } else { len += 0.5; } - } - return Math.floor(len); - } - - export function cleanArray(actual) { - const newArray = []; - for (let i = 0; i < actual.length; i++) { - if (actual[i]) { - newArray.push(actual[i]); - } - } - return newArray; - } - - export function param(json) { - if (!json) return ''; - return cleanArray(Object.keys(json).map(key => { - if (json[key] === undefined) return ''; - return encodeURIComponent(key) + '=' + - encodeURIComponent(json[key]); - })).join('&'); - } - - export function param2Obj(url) { - const search = url.split('?')[1]; - return JSON.parse('{"' + decodeURIComponent(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g, '":"') + '"}') - } - - export function html2Text(val) { - const div = document.createElement('div'); - div.innerHTML = val; - return div.textContent || div.innerText; - } - - export function objectMerge(target, source) { - /* Merges two objects, - giving the last one precedence */ - - if (typeof target !== 'object') { - target = {}; - } - if (Array.isArray(source)) { - return source.slice(); - } - for (const property in source) { - if (source.hasOwnProperty(property)) { - const sourceProperty = source[property]; - if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty); - continue; - } - target[property] = sourceProperty; - } - } - return target; - } - - export function scrollTo(element, to, duration) { if (duration <= 0) return; const difference = to - element.scrollTop; @@ -154,61 +68,3 @@ scrollTo(element, to, duration - 10); }, 10); } - - export function toggleClass(element, className) { - if (!element || !className) { - return; - } - let classString = element.className; - const nameIndex = classString.indexOf(className); - if (nameIndex === -1) { - classString += '' + className; - } else { - classString = classString.substr(0, nameIndex) + classString.substr(nameIndex + className.length); - } - element.className = classString; - } - - export const pickerOptions = [ - { - text: '今天', - onClick(picker) { - const end = new Date(); - const start = new Date(new Date().toDateString()); - end.setTime(start.getTime()); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近一周', - onClick(picker) { - const end = new Date(new Date().toDateString()); - const start = new Date(); - start.setTime(end.getTime() - 3600 * 1000 * 24 * 7); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近一个月', - onClick(picker) { - const end = new Date(new Date().toDateString()); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近三个月', - onClick(picker) { - const end = new Date(new Date().toDateString()); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); - picker.$emit('pick', [start, end]); - } - }] - - export function getTime(type) { - if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 - } else { - return new Date(new Date().toDateString()) - } - } - diff --git a/src/utils/openWindow.js b/src/utils/openWindow.js deleted file mode 100644 index a7e2b91..0000000 --- a/src/utils/openWindow.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - *Created by jiachenpan on 16/11/29. - * @param {Sting} url - * @param {Sting} title - * @param {Number} w - * @param {Number} h - */ - -export default function openWindow(url, title, w, h) { - // Fixes dual-screen position Most browsers Firefox - const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left; - const dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top; - - const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width; - const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height; - - const left = ((width / 2) - (w / 2)) + dualScreenLeft; - const top = ((height / 2) - (h / 2)) + dualScreenTop; - const newWindow = window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left); - - // Puts focus on the newWindow - if (window.focus) { - newWindow.focus(); - } -} - - diff --git a/src/utils/validate.js b/src/utils/validate.js index 3dbc5fe..6051c04 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -20,12 +20,6 @@ export function validateLowerCase(str) { return reg.test(str); } -/* 验证key*/ -// export function validateKey(str) { -// var reg = /^[a-z_\-:]+$/; -// return reg.test(str); -// } - /* 大写字母*/ export function validateUpperCase(str) { const reg = /^[A-Z]+$/; diff --git a/src/views/layout/AppMain.vue b/src/views/layout/AppMain.vue index d296a33..2dce938 100644 --- a/src/views/layout/AppMain.vue +++ b/src/views/layout/AppMain.vue @@ -1,5 +1,5 @@