Compare commits

...

5 Commits

Author SHA1 Message Date
花裤衩 6ab5763591 bump 2019-10-09 21:41:07 +08:00
花裤衩 81a44a0284 perf: fix eslint warning 2019-10-09 21:12:03 +08:00
花裤衩 c1ce24081e Merge branch 'master' into chore/update 2019-10-09 20:54:51 +08:00
花裤衩 459bef2d2f refacor[screenfull]: 4.2.0=>5.0.0 2019-10-09 20:44:17 +08:00
花裤衩 8504f692df bump 2019-09-30 16:35:50 +08:00
6 changed files with 43 additions and 40 deletions

View File

@ -1,4 +1,4 @@
const { run } = require('runjs') const { sh } = require('tasksfile')
const chalk = require('chalk') const chalk = require('chalk')
const config = require('../vue.config.js') const config = require('../vue.config.js')
const rawArgv = process.argv.slice(2) const rawArgv = process.argv.slice(2)
@ -7,7 +7,7 @@ const args = rawArgv.join(' ')
if (process.env.npm_config_preview || rawArgv.includes('--preview')) { if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
const report = rawArgv.includes('--report') const report = rawArgv.includes('--report')
run(`vue-cli-service build ${args}`) sh(`vue-cli-service build ${args}`)
const port = 9526 const port = 9526
const publicPath = config.publicPath const publicPath = config.publicPath
@ -31,5 +31,5 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
}) })
} else { } else {
run(`vue-cli-service build ${args}`) sh(`vue-cli-service build ${args}`)
} }

View File

@ -45,61 +45,61 @@
"dependencies": { "dependencies": {
"axios": "0.18.1", "axios": "0.18.1",
"clipboard": "2.0.4", "clipboard": "2.0.4",
"codemirror": "5.45.0", "codemirror": "5.49.0",
"driver.js": "0.9.5", "driver.js": "0.9.7",
"dropzone": "5.5.1", "dropzone": "5.5.1",
"echarts": "4.2.1", "echarts": "4.3.0",
"element-ui": "2.7.0", "element-ui": "2.12.0",
"file-saver": "2.0.1", "file-saver": "2.0.2",
"fuse.js": "3.4.4", "fuse.js": "3.4.5",
"js-cookie": "2.2.0", "js-cookie": "2.2.1",
"jsonlint": "1.6.3", "jsonlint": "1.6.3",
"jszip": "3.2.1", "jszip": "3.2.2",
"normalize.css": "7.0.0", "normalize.css": "7.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"path-to-regexp": "2.4.0", "path-to-regexp": "2.4.0",
"screenfull": "4.2.0", "screenfull": "5.0.0",
"showdown": "1.9.0", "showdown": "1.9.0",
"sortablejs": "1.8.4", "sortablejs": "1.10.1",
"tui-editor": "1.3.3", "tui-editor": "1.4.7",
"vue": "2.6.10", "vue": "2.6.10",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-router": "3.0.2", "vue-router": "3.1.3",
"vue-splitpane": "1.0.4", "vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0", "vuedraggable": "2.23.2",
"vuex": "3.1.0", "vuex": "3.1.1",
"xlsx": "0.14.1" "xlsx": "0.15.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.0.0", "@babel/core": "7.0.0",
"@babel/register": "7.0.0", "@babel/register": "7.0.0",
"@vue/cli-plugin-babel": "3.5.3", "@vue/cli-plugin-babel": "3.11.0",
"@vue/cli-plugin-eslint": "^3.9.1", "@vue/cli-plugin-eslint": "3.11.0",
"@vue/cli-plugin-unit-jest": "3.5.3", "@vue/cli-plugin-unit-jest": "3.11.0",
"@vue/cli-service": "3.5.3", "@vue/cli-service": "3.11.0",
"@vue/test-utils": "1.0.0-beta.29", "@vue/test-utils": "1.0.0-beta.29",
"autoprefixer": "^9.5.1", "autoprefixer": "^9.5.1",
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.0.1", "babel-eslint": "10.0.3",
"babel-jest": "23.6.0", "babel-jest": "24.9.0",
"chalk": "2.4.2", "chalk": "2.4.2",
"chokidar": "2.1.5", "chokidar": "3.1.1",
"connect": "3.6.6", "connect": "3.7.0",
"eslint": "5.15.3", "eslint": "6.5.1",
"eslint-plugin-vue": "5.2.2", "eslint-plugin-vue": "5.2.3",
"html-webpack-plugin": "3.2.0", "html-webpack-plugin": "3.2.0",
"husky": "1.3.1", "husky": "3.0.8",
"lint-staged": "8.1.5", "lint-staged": "9.4.2",
"mockjs": "1.0.1-beta3", "mockjs": "1.0.1-beta3",
"node-sass": "^4.9.0", "node-sass": "^4.9.0",
"plop": "2.3.0", "plop": "2.4.0",
"runjs": "^4.3.2", "tasksfile": "5.1.0",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3", "script-ext-html-webpack-plugin": "2.1.4",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"serve-static": "^1.13.2", "serve-static": "^1.13.2",
"svg-sprite-loader": "4.1.3", "svg-sprite-loader": "4.1.6",
"svgo": "1.2.0", "svgo": "1.3.0",
"vue-template-compiler": "2.6.10" "vue-template-compiler": "2.6.10"
}, },
"engines": { "engines": {

View File

@ -248,7 +248,8 @@ export default {
// //
isSupported, isSupported,
// //
isSupportTouch: document.hasOwnProperty('ontouchstart'),
isSupportTouch: Object.prototype.hasOwnProperty.call(document, 'ontouchstart'),
// //
step: 1, // 1 2 3 step: 1, // 1 2 3
// //

View File

@ -22,7 +22,7 @@ export default {
}, },
methods: { methods: {
click() { click() {
if (!screenfull.enabled) { if (!screenfull.isEnabled) {
this.$message({ this.$message({
message: 'you browser can not work', message: 'you browser can not work',
type: 'warning' type: 'warning'
@ -35,12 +35,12 @@ export default {
this.isFullscreen = screenfull.isFullscreen this.isFullscreen = screenfull.isFullscreen
}, },
init() { init() {
if (screenfull.enabled) { if (screenfull.isEnabled) {
screenfull.on('change', this.change) screenfull.on('change', this.change)
} }
}, },
destroy() { destroy() {
if (screenfull.enabled) { if (screenfull.isEnabled) {
screenfull.off('change', this.change) screenfull.off('change', this.change)
} }
} }

View File

@ -13,7 +13,8 @@ const state = {
const mutations = { const mutations = {
CHANGE_SETTING: (state, { key, value }) => { CHANGE_SETTING: (state, { key, value }) => {
if (state.hasOwnProperty(key)) { // https://eslint.org/docs/rules/no-prototype-builtins
if (Object.prototype.hasOwnProperty.call(state, key)) {
state[key] = value state[key] = value
} }
} }

View File

@ -104,6 +104,7 @@ const actions = {
// dynamically modify permissions // dynamically modify permissions
changeRoles({ commit, dispatch }, role) { changeRoles({ commit, dispatch }, role) {
// eslint-disable-next-line
return new Promise(async resolve => { return new Promise(async resolve => {
const token = role + '-token' const token = role + '-token'