Skip to content
GitLab
"admin-console/vscode:/vscode.git/clone" did not exist on "98ca1176c43e851da9d429d70d2412cac6869087"
Commit e028dea9 authored by Junling Bu's avatar Junling Bu
Browse files

feat[litemall-admin]: 更新vue-element-admin框架版本4.2.1

parent 639f841d
Hide whitespace changes
Inline Side-by-side
litemall-admin/config/dev.env.js deleted 100644 → 0
View file @ 639f841d
module.exports = {
NODE_ENV: '"development"',
ENV_CONFIG: '"dev"',
BASE_API: '"http://localhost:8080/admin"'
}
litemall-admin/config/index.js deleted 100644 → 0
View file @ 639f841d
'use strict'
// Template version: 1.2.6
// see http://vuejs-templates.github.io/webpack for documentation.
const path = require('path')
module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
// Various Dev Server settings
// can be overwritten by process.env.HOST
// if you want dev by ip, please set host: '0.0.0.0'
host: 'localhost',
port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: false,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
useEslint: true,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
/**
* Source Maps
*/
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-source-map',
// CSS Sourcemaps off by default because relative paths are "buggy"
// with this option, according to the CSS-Loader README
// (https://github.com/webpack/css-loader#sourcemaps)
// In our experience, they generally work as expected,
// just be aware of this issue when enabling this option.
cssSourceMap: false
},
build: {
// Template for index.html
index: path.resolve(__dirname, '../dist/index.html'),
// Paths
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
/**
* You can set by youself according to actual condition
* You will need to set this if you plan to deploy your site under a sub path,
* for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
assetsPublicPath: './',
/**
* Source Maps
*/
productionSourceMap: false,
// https://webpack.js.org/configuration/devtool/#production
devtool: 'source-map',
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin
productionGzip: false,
productionGzipExtensions: ['js', 'css'],
// Run the build command with an extra argument to
// View the bundle analyzer report after build finishes:
// `npm run build:prod --report`
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report || false,
// `npm run build:prod --generate_report`
generateAnalyzerReport: process.env.npm_config_generate_report || false
}
}
litemall-admin/config/prod.env.js deleted 100644 → 0
View file @ 639f841d
module.exports = {
NODE_ENV: '"production"',
ENV_CONFIG: '"prod"',
BASE_API: '"https://www.example.com/admin"'
}
litemall-admin/jest.config.js 0 → 100644
View file @ e028dea9
module.exports = {
moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
transform: {
'^.+\\.vue$': 'vue-jest',
'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
'jest-transform-stub',
'^.+\\.jsx?$': 'babel-jest'
},
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1'
},
snapshotSerializers: ['jest-serializer-vue'],
testMatch: [
'**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
],
collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
coverageDirectory: '<rootDir>/tests/unit/coverage',
// 'collectCoverage': true,
'coverageReporters': [
'lcov',
'text-summary'
],
testURL: 'http://localhost/'
}
litemall-admin/jsconfig.json 0 → 100644
View file @ e028dea9
{
"compilerOptions": {
"baseUrl": "./",
"paths": {
"@/*": ["src/*"]
}
},
"exclude": ["node_modules", "dist"]
}
\ No newline at end of file
litemall-admin/package.json
View file @ e028dea9
{ {
"name": "litemall-admin", "name": "litemall-admin",
"version": "0.1.0", "version": "1.0.0",
"description": "litemall-admin basing on vue-element-admin 3.9.3", "description": "litemall-admin basing on vue-element-admin 4.2.1",
"author": "linlinjava <linlinjava@163.com>", "author": "linlinjava <linlinjava@163.com>",
"license": "MIT", "license": "MIT",
"private": true,
"scripts": { "scripts": {
"dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "vue-cli-service serve",
"build:dep": "cross-env NODE_ENV=production env_config=dep node build/build.js", "build": "vue-cli-service build --mode production",
"build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js", "build:prod": "vue-cli-service build --mode production",
"build:dep": "vue-cli-service build --mode deployment",
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"test": "npm run lint", "test:unit": "jest --clearCache && vue-cli-service test:unit",
"precommit": "lint-staged", "test:ci": "npm run lint && npm run test:unit",
"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
"new": "plop"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
}, },
"lint-staged": { "lint-staged": {
"src/**/*.{js,vue}": [ "src/**/*.{js,vue}": [
...@@ -20,90 +27,80 @@ ...@@ -20,90 +27,80 @@
"git add" "git add"
] ]
}, },
"keywords": [
"vue",
"admin",
"dashboard",
"element-ui",
"boilerplate",
"admin-template",
"management-system"
],
"repository": {
"type": "git",
"url": "git+https://github.com/linlinjava/litemall.git"
},
"bugs": {
"url": "https://github.com/linlinjava/litemall/issues"
},
"dependencies": { "dependencies": {
"@tinymce/tinymce-vue": "1.1.0", "@tinymce/tinymce-vue": "1.1.0",
"@riophae/vue-treeselect": "0.0.37",
"v-charts": "1.19.0", "v-charts": "1.19.0",
"axios": ">=0.18.1", "axios": "0.18.1",
"clipboard": "1.7.1", "clipboard": "2.0.4",
"connect": "3.6.6", "connect": "3.6.6",
"echarts": "4.1.0", "echarts": "4.2.1",
"element-ui": "2.12.0", "element-ui": "2.12.0",
"file-saver": "1.3.8", "file-saver": "1.3.8",
"font-awesome": "4.7.0",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"jszip": "3.1.5", "jszip": "3.2.1",
"normalize.css": "7.0.0", "normalize.css": "7.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"screenfull": "3.3.3", "screenfull": "4.2.0",
"vue": "2.5.17", "vue": "2.6.10",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-router": "3.0.1", "vue-router": "3.0.2",
"vuex": "3.0.1", "vuex": "3.1.0",
"xlsx": "^0.11.16" "xlsx": "0.14.1"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "8.5.0", "@babel/core": "7.0.0",
"babel-core": "6.26.3", "@babel/register": "7.0.0",
"babel-eslint": "8.2.6", "@vue/cli-plugin-babel": "3.5.3",
"babel-helper-vue-jsx-merge-props": "2.0.3", "@vue/cli-plugin-eslint": "^3.9.1",
"babel-loader": "7.1.5", "@vue/cli-plugin-unit-jest": "3.5.3",
"babel-plugin-dynamic-import-node": "2.0.0", "@vue/cli-service": "3.5.3",
"babel-plugin-syntax-jsx": "6.18.0", "@vue/test-utils": "1.0.0-beta.29",
"babel-plugin-transform-runtime": "6.23.0", "autoprefixer": "^9.5.1",
"babel-plugin-transform-vue-jsx": "3.7.0", "babel-core": "7.0.0-bridge.0",
"babel-preset-env": "1.7.0", "babel-eslint": "10.0.1",
"babel-preset-stage-2": "6.24.1", "babel-jest": "23.6.0",
"chalk": "2.4.1", "chalk": "2.4.2",
"copy-webpack-plugin": "4.5.2", "chokidar": "2.1.5",
"cross-env": "5.2.0", "connect": "3.6.6",
"css-loader": "1.0.0", "eslint": "5.15.3",
"eslint": "4.19.1", "eslint-plugin-vue": "5.2.2",
"eslint-friendly-formatter": "4.0.1", "html-webpack-plugin": "3.2.0",
"eslint-loader": "2.0.0", "husky": "1.3.1",
"eslint-plugin-vue": "4.7.1", "lint-staged": "8.1.5",
"file-loader": "1.1.11", "mockjs": "1.0.1-beta3",
"friendly-errors-webpack-plugin": "1.7.0", "node-sass": "^4.9.0",
"hash-sum": "1.0.2", "plop": "2.3.0",
"html-webpack-plugin": "4.0.0-alpha", "runjs": "^4.3.2",
"husky": "0.14.3", "sass-loader": "^7.1.0",
"lint-staged": "7.2.2", "script-ext-html-webpack-plugin": "2.1.3",
"mini-css-extract-plugin": "0.4.1",
"node-notifier": "5.2.1",
"node-sass": "^4.7.2",
"optimize-css-assets-webpack-plugin": "5.0.0",
"ora": "3.0.0",
"path-to-regexp": "2.4.0",
"portfinder": "1.0.13",
"postcss-import": "11.1.0",
"postcss-loader": "2.1.6",
"postcss-url": "7.3.2",
"rimraf": "2.6.2",
"sass-loader": "7.0.3",
"script-ext-html-webpack-plugin": "2.0.1",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"semver": "5.5.0", "serve-static": "^1.13.2",
"serve-static": "1.13.2", "svg-sprite-loader": "4.1.3",
"shelljs": "0.8.2", "svgo": "1.2.0",
"svg-sprite-loader": "3.8.0", "vue-template-compiler": "2.6.10"
"svgo": "1.0.5",
"uglifyjs-webpack-plugin": "1.2.7",
"url-loader": "1.0.1",
"vue-loader": "15.3.0",
"vue-style-loader": "4.1.2",
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-cli": "3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
}, },
"engines": { "engines": {
"node": ">= 6.0.0", "node": ">=8.9",
"npm": ">= 3.0.0" "npm": ">= 3.0.0"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",
"last 2 versions", "last 2 versions"
"not ie <= 8"
] ]
} }
litemall-admin/postcss.config.js 0 → 100644
View file @ e028dea9
module.exports = {
plugins: {
autoprefixer: {}
}
}
litemall-admin/index.html → litemall-admin/public/index.html
View file @ e028dea9
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>litemall-admin</title> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
litemall-admin/src/assets/custom-theme/index.css deleted 100644 → 0
View file @ 639f841d
This source diff could not be displayed because it is too large. You can view the blob instead.
litemall-admin/src/filters/index.js
View file @ e028dea9
// set function parseTime,formatTime to filter // import parseTime, formatTime and set to filter
export { parseTime, formatTime } from '@/utils' export { parseTime, formatTime } from '@/utils'
/**
* Show plural label if time is plural number
* @param {number} time
* @param {string} label
* @return {string}
*/
function pluralize(time, label) { function pluralize(time, label) {
if (time === 1) { if (time === 1) {
return time + label return time + label
...@@ -8,6 +14,9 @@ function pluralize(time, label) { ...@@ -8,6 +14,9 @@ function pluralize(time, label) {
return time + label + 's' return time + label + 's'
} }
/**
* @param {number} time
*/
export function timeAgo(time) { export function timeAgo(time) {
const between = Date.now() / 1000 - Number(time) const between = Date.now() / 1000 - Number(time)
if (between < 3600) { if (between < 3600) {
...@@ -19,7 +28,12 @@ export function timeAgo(time) { ...@@ -19,7 +28,12 @@ export function timeAgo(time) {
} }
} }
/* 数字 格式化*/ /**
* Number formatting
* like 10000 => 10k
* @param {number} num
* @param {number} digits
*/
export function numberFormatter(num, digits) { export function numberFormatter(num, digits) {
const si = [ const si = [
{ value: 1E18, symbol: 'E' }, { value: 1E18, symbol: 'E' },
...@@ -31,12 +45,24 @@ export function numberFormatter(num, digits) { ...@@ -31,12 +45,24 @@ export function numberFormatter(num, digits) {
] ]
for (let i = 0; i < si.length; i++) { for (let i = 0; i < si.length; i++) {
if (num >= si[i].value) { if (num >= si[i].value) {
return (num / si[i].value + 0.1).toFixed(digits).replace(/\.0+$|(\.[0-9]*[1-9])0+$/, '$1') + si[i].symbol return (num / si[i].value).toFixed(digits).replace(/\.0+$|(\.[0-9]*[1-9])0+$/, '$1') + si[i].symbol
} }
} }
return num.toString() return num.toString()
} }
/**
* 10000 => "10,000"
* @param {number} num
*/
export function toThousandFilter(num) { export function toThousandFilter(num) {
return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ',')) return (+num || 0).toString().replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','))
} }
/**
* Upper case first char
* @param {String} string
*/
export function uppercaseFirst(string) {
return string.charAt(0).toUpperCase() + string.slice(1)
}
litemall-admin/src/main.js
View file @ e028dea9
...@@ -5,13 +5,13 @@ import Cookies from 'js-cookie' ...@@ -5,13 +5,13 @@ import Cookies from 'js-cookie'
import 'normalize.css/normalize.css' // A modern alternative to CSS resets import 'normalize.css/normalize.css' // A modern alternative to CSS resets
import Element from 'element-ui' import Element from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' import './styles/element-variables.scss'
import '@/styles/index.scss' // global css import '@/styles/index.scss' // global css
import App from './App' import App from './App'
import router from './router'
import store from './store' import store from './store'
import router from './router'
import './icons' // icon import './icons' // icon
import './permission' // permission control import './permission' // permission control
......
litemall-admin/src/styles/element-variables.scss 0 → 100644
View file @ e028dea9
/**
* I think element-ui's default theme color is too light for long-term use.
* So I modified the default color and you can modify it to your liking.
**/
/* theme color */
$--color-primary: #1890ff;
$--color-success: #13ce66;
$--color-warning: #FFBA00;
$--color-danger: #ff4949;
// $--color-info: #1E1E1E;
$--button-font-weight: 400;
// $--color-text-regular: #1f2d3d;
$--border-color-light: #dfe4ed;
$--border-color-lighter: #e6ebf5;
$--table-border:1px solid#dfe6ec;
/* icon font path, required */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
@import "~element-ui/packages/theme-chalk/src/index";
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
:export {
theme: $--color-primary;
}
litemall-admin/src/utils/request.js
View file @ e028dea9
...@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth' ...@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
// create an axios instance // create an axios instance
const service = axios.create({ const service = axios.create({
baseURL: process.env.BASE_API, // api 的 base_url baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url
timeout: 5000 // request timeout timeout: 5000 // request timeout
}) })
......
litemall-admin/src/views/errorPage/401.vue
View file @ e028dea9
<template> <template>
<div class="errPage-container"> <div class="errPage-container">
<el-button icon="arrow-left" class="pan-back-btn" @click="back">返回</el-button> <el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">返回</el-button>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<h1 class="text-jumbo text-ginormous">Oops!</h1> <h1 class="text-jumbo text-ginormous">Oops!</h1>
......
litemall-admin/vue.config.js 0 → 100644
View file @ e028dea9
'use strict'
const path = require('path')
function resolve(dir) {
return path.join(__dirname, dir)
}
const name = 'litemall' // page title
// If your port is set to 80,
// use administrator privileges to execute the command line.
// For example, Mac: sudo npm run
// You can change the port by the following method:
// port = 9527 npm run dev OR npm run dev --port = 9527
const port = process.env.port || process.env.npm_config_port || 9527 // dev port
// All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = {
/**
* You will need to set publicPath if you plan to deploy your site under a sub path,
* for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
* then publicPath should be set to "/bar/".
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: './',
outputDir: 'dist',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,
devServer: {
port: port
},
configureWebpack: {
// provide the app's title in webpack's name field, so that
// it can be accessed in index.html to inject the correct title.
name: name,
resolve: {
alias: {
'@': resolve('src')
}
}
},
chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test
config.plugins.delete('prefetch') // TODO: need test
// set svg-sprite-loader
config.module
.rule('svg')
.exclude.add(resolve('src/icons'))
.end()
config.module
.rule('icons')
.test(/\.svg$/)
.include.add(resolve('src/icons'))
.end()
.use('svg-sprite-loader')
.loader('svg-sprite-loader')
.options({
symbolId: 'icon-[name]'
})
.end()
// set preserveWhitespace
config.module
.rule('vue')
.use('vue-loader')
.loader('vue-loader')
.tap(options => {
options.compilerOptions.preserveWhitespace = true
return options
})
.end()
config
// https://webpack.js.org/configuration/devtool/#development
.when(process.env.NODE_ENV === 'development',
config => config.devtool('cheap-source-map')
)
config
.when(process.env.NODE_ENV !== 'development',
config => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}])
.end()
config
.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
})
config.optimization.runtimeChunk('single')
}
)
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment