umbrella22

更新依赖版本

node_modules
dist
build
package-lock.json
.DS_Store
node_modules/
build/
/dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
package-lock.json
......
......@@ -54,11 +54,11 @@
},
"dependencies": {
"axios": "^0.18.0",
"element-ui": "^2.6.3",
"element-ui": "^2.8.0",
"nedb": "^1.8.0",
"vue": "^2.6.10",
"vue-electron": "^1.0.6",
"vue-router": "^3.0.2",
"vue-router": "^3.0.6",
"vuex": "^3.1.0",
"vuex-electron": "^1.0.3"
},
......@@ -82,7 +82,7 @@
"css-loader": "^0.28.11",
"del": "^3.0.0",
"devtron": "^1.4.0",
"electron": "^4.1.1",
"electron": "^4.1.5",
"electron-builder": "^20.39.0",
"electron-debug": "^2.1.0",
"electron-devtools-installer": "^2.2.4",
......@@ -91,7 +91,7 @@
"eslint-friendly-formatter": "^4.0.1",
"eslint-loader": "^2.0.0",
"eslint-plugin-html": "^4.0.3",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-standard": "^3.1.0",
......@@ -120,9 +120,9 @@
"vue-loader": "^15.2.4",
"vue-style-loader": "^4.1.0",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.15.1",
"webpack-cli": "^3.3.0",
"webpack-dev-server": "^3.1.4",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.1",
"webpack-dev-server": "^3.3.1",
"webpack-hot-middleware": "^2.22.2",
"webpack-merge": "^4.1.3"
}
......
......@@ -69,25 +69,25 @@ export default {
deledata(){
// dialog为electron实例,data则是显示需要的参数,fun是需要执行的函数,此选项不是为必选的
const dialog = this.$electron.remote.dialog
const data = {
title:'清除数据',
buttons:['OK', 'Cancel'],
message:'此操作会清空本地数据库中的所有数据,是否继续?'
}
const fun = this.$db.deleall({name:'yyy'})
api.MessageBox(dialog,data,fun).then(res=>{
this.getdata()
this.$message({
showClose: true,
message: '成功删除'+res+'条',
type: 'success'
});
})
// const data = {
// title:'发生致命错误',
// message:'?'
// title:'清除数据',
// buttons:['OK', 'Cancel'],
// message:'此操作会清空本地数据库中的所有数据,是否继续?'
// }
// api.ErrorMessageBox(dialog,data)
// const fun = this.$db.deleall({name:'yyy'})
// api.MessageBox(dialog,data,fun).then(res=>{
// this.getdata()
// this.$message({
// showClose: true,
// message: '成功删除'+res+'条',
// type: 'success'
// });
// })
const data = {
title:'发生致命错误',
message:'?'
}
api.ErrorMessageBox(dialog,data)
},
}
};
......
......@@ -8,9 +8,7 @@ export default new Router({
{
path: '/',
name: 'landing-page',
// component: require('@/components/LandingPage').default
// component: () => import('@/components/LandingPage')
component: resolve => require(['@/components/LandingPage'], resolve)
component: () => import('@/components/LandingPage')
},
{
path: '*',
......