Sky
提交者 GitHub

合并伞22/dev#19拉取请求

合并修改
......@@ -9,7 +9,7 @@ module.exports = {
chineseLog: false,
port: 9080
},
UseStartupChart: true,
UseStartupChart: false,
IsUseSysTitle: true,
DllFolder: '',
BuiltInServerPort: 25565
......
此文件的差异太大,无法显示。
......@@ -78,37 +78,34 @@
"express": "^4.17.1",
"fs-extra": "^9.0.1",
"js-cookie": "^2.2.1",
"nedb": "^1.8.0",
"nprogress": "^0.2.0",
"vue": "^2.6.11",
"vue-electron": "^1.0.6",
"vue-router": "^3.3.2",
"vuex": "^3.4.0",
"vuex-electron": "^1.0.3"
"vuex": "^3.4.0"
},
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/core": "^7.10.3",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-decorators": "^7.10.1",
"@babel/plugin-proposal-decorators": "^7.10.3",
"@babel/plugin-proposal-do-expressions": "^7.10.1",
"@babel/plugin-proposal-export-default-from": "^7.10.1",
"@babel/plugin-proposal-export-namespace-from": "^7.10.1",
"@babel/plugin-proposal-function-bind": "^7.10.1",
"@babel/plugin-proposal-function-sent": "^7.10.1",
"@babel/plugin-proposal-json-strings": "^7.10.1",
"@babel/plugin-proposal-logical-assignment-operators": "^7.10.1",
"@babel/plugin-proposal-logical-assignment-operators": "^7.10.3",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
"@babel/plugin-proposal-numeric-separator": "^7.10.1",
"@babel/plugin-proposal-optional-chaining": "^7.10.1",
"@babel/plugin-proposal-optional-chaining": "^7.10.3",
"@babel/plugin-proposal-pipeline-operator": "^7.10.1",
"@babel/plugin-proposal-throw-expressions": "^7.10.1",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.1",
"@babel/plugin-transform-runtime": "^7.10.1",
"@babel/plugin-transform-runtime": "^7.10.3",
"@babel/polyfill": "^7.10.1",
"@babel/preset-env": "^7.10.2",
"@babel/register": "^7.10.1",
"@babel/runtime": "^7.10.2",
"@babel/preset-env": "^7.10.3",
"@babel/register": "^7.10.3",
"@babel/runtime": "^7.10.3",
"ajv": "^6.12.2",
"babel-eslint": "^9.0.0",
"babel-loader": "^8.1.0",
......@@ -120,7 +117,7 @@
"cross-env": "^7.0.2",
"css-loader": "^3.5.3",
"del": "^5.1.0",
"electron": "^8.3.0",
"electron": "^8.3.3",
"electron-builder": "^22.6.1",
"electron-devtools-installer": "^3.0.0",
"eslint": "^6.8.0",
......@@ -138,13 +135,13 @@
"mini-css-extract-plugin": "0.9.0",
"multispinner": "^0.2.1",
"node-loader": "^0.6.0",
"node-sass": "^4.14.1",
"portfinder": "^1.0.26",
"sass": "^1.26.8",
"sass-loader": "^8.0.2",
"split2": "^3.1.1",
"style-loader": "^1.2.1",
"svg-sprite-loader": "^4.3.0",
"terser-webpack-plugin": "^3.0.3",
"terser-webpack-plugin": "^3.0.6",
"through2-filter": "^3.0.0",
"url-loader": "^4.1.0",
"vue-html-loader": "^1.2.4",
......@@ -152,7 +149,7 @@
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^4.2.2"
......
......@@ -54,13 +54,13 @@ export default {
Message(mainWindow, 4)
})
// 执行自动更新检查
ipcMain.on('check-update', () => {
ipcMain.handle('check-update', () => {
autoUpdater.checkForUpdates().catch(err => {
console.log('网络连接问题', err)
})
})
// 渲染进程执行更新操作
ipcMain.on('confirm-update', () => {
ipcMain.handle('confirm-update', () => {
autoUpdater.quitAndInstall()
})
}
......
......@@ -21,9 +21,8 @@ if (os.platform().includes('win32')) {
}
export default {
download (mainWindow) {
ipcMain.on('start-download', (event, msg) => {
ipcMain.handle('start-download', (event, msg) => {
mainWindow.webContents.downloadURL(msg.downloadUrL || defaultDownloadUrL)
event.reply('confirm-download', true)
mainWindow.webContents.session.on('will-download', (event, item, webContents) => {
// 将文件保存在系统的下载目录
const filePath = path.join(app.getPath('downloads'), item.getFilename())
......
......@@ -4,63 +4,64 @@ import { winURL } from '../config/StaticPath'
export default {
Mainfunc (mainWindow, IsUseSysTitle) {
ipcMain.on('IsUseSysTitle', (event) => {
const data = IsUseSysTitle
event.reply('CisUseSysTitle', data)
ipcMain.handle('IsUseSysTitle', async () => {
return IsUseSysTitle
})
ipcMain.on('windows-mini', () => {
ipcMain.handle('windows-mini', () => {
mainWindow.minimize()
})
ipcMain.on('window-max', (event) => {
ipcMain.handle('window-max', async () => {
if (mainWindow.isMaximized()) {
event.reply('window-confirm', false)
mainWindow.restore()
return { status: false }
} else {
event.reply('window-confirm', true)
mainWindow.maximize()
return { status: true }
}
})
ipcMain.on('window-close', () => {
ipcMain.handle('window-close', () => {
mainWindow.close()
})
ipcMain.on('open-messagebox', (event, arg) => {
dialog.showMessageBox(mainWindow, {
ipcMain.handle('open-messagebox', async (event, arg) => {
const res = await dialog.showMessageBox(mainWindow, {
type: arg.type || 'info',
title: arg.title || '',
buttons: arg.buttons || [],
message: arg.message || '',
noLink: arg.noLink || true
}).then(res => {
event.reply('confirm-message', res)
})
return res
})
ipcMain.on('open-errorbox', (event, arg) => {
ipcMain.handle('open-errorbox', (event, arg) => {
dialog.showErrorBox(
arg.title,
arg.message
)
})
ipcMain.on('statr-server', (event, arg) => {
Server.StatrServer().then(res => {
event.reply('confirm-start', res)
}).catch(err => {
ipcMain.handle('statr-server', async () => {
try {
const serveStatus = await Server.StatrServer()
console.log(serveStatus)
return serveStatus
} catch (error) {
dialog.showErrorBox(
'错误',
err
error
)
}
})
})
ipcMain.on('stop-server', (event, arg) => {
Server.StopServer().then(res => {
event.reply('confirm-stop', res)
}).catch(err => {
ipcMain.handle('stop-server', async (event, arg) => {
try {
const serveStatus = await Server.StopServer()
return serveStatus
} catch (error) {
dialog.showErrorBox(
'错误',
err
error
)
}
})
})
ipcMain.on('open-win', (event, arg) => {
ipcMain.handle('open-win', (event, arg) => {
const ChildWin = new BrowserWindow({
height: 595,
useContentSize: true,
......
......@@ -58,14 +58,14 @@ function createMainWindow () {
electronDevtoolsInstaller(VUEJS_DEVTOOLS)
.then((name) => console.log(`installed: ${name}`))
.catch(err => console.log('Unable to install `vue-devtools`: \n', err))
loadWindow.destroy()
})
if (config.UseStartupChart) loadWindow.destroy()
mainWindow.webContents.openDevTools(true)
} else {
mainWindow.webContents.once('dom-ready', () => {
mainWindow.show()
loadWindow.destroy()
// mainWindow.webContents.openDevTools(true)
if (config.UseStartupChart) loadWindow.destroy()
})
}
......
import request from '@/utils/request'
// 仅示例
// import request from '@/utils/request'
export function login (data) {
return request({
url: '/user/login',
method: 'post',
data
})
}
// export function login (data) {
// return request({
// url: '/user/login',
// method: 'post',
// data
// })
// }
export function getInfo (token) {
return request({
url: '/user/info',
method: 'get',
params: { token }
})
}
export function logout () {
return request({
url: '/user/logout',
method: 'post'
})
}
export function message () {
return request({
url: '/message',
method: 'get'
})
}
// export function getInfo (token) {
// return request({
// url: '/user/info',
// method: 'get',
// params: { token }
// })
// }
......
import db from '@/utils/db'
export default {
adddata (data) {
return new Promise((resolve, reject) => {
db.insert(data, (err, newdoc) => {
if (err) {
reject(err)
return false
}
resolve(newdoc)
})
})
},
finddata (query) {
return new Promise((resolve, reject) => {
db.find(query, (err, res) => {
if (err) {
reject(err)
return false
}
resolve(res)
})
})
},
findone (query) {
return new Promise((resolve, reject) => {
db.findOne(query, (err, res) => {
if (err) {
reject(err)
return false
}
resolve(res)
})
})
},
deleone (query) {
return new Promise((resolve, reject) => {
db.remove(query, (err, number) => {
if (err) {
reject(err)
return false
}
resolve(number)
})
})
},
deleall (query) {
return new Promise((resolve, reject) => {
db.remove(query, {
multi: true
}, (err, number) => {
if (err) {
reject(err)
return false
}
resolve(number)
})
})
}
}
......@@ -19,9 +19,6 @@
<div class="doc">
<div class="title alt">您可以点击的按钮测试功能</div>
<el-button type="primary" round @click="open()">控制台打印</el-button>
<el-button type="primary" round @click="setdata">写入数据</el-button>
<el-button type="primary" round @click="getdata">读取数据</el-button>
<el-button type="primary" round @click="deledata">清除所有数据</el-button>
<el-button type="primary" round @click="CheckUpdate('one')">检查更新</el-button>
</div>
<div class="doc">
......@@ -99,8 +96,7 @@ export default {
});
},
StopServer() {
this.$ipcApi.send("stop-server");
this.$ipcApi.on("confirm-stop", (event, arg) => {
this.$ipcApi.send("stop-server").then(res => {
this.$message({
type: "success",
message: "已关闭"
......@@ -108,83 +104,28 @@ export default {
});
},
StartServer() {
this.$ipcApi.send("statr-server");
this.$ipcApi.on("confirm-start", (event, arg) => {
console.log(arg);
this.$ipcApi.send("statr-server").then(res => {
if (res) {
this.$message({
type: "success",
message: arg
});
});
},
// 获取electron方法
open() {
console.log(this.$electron);
},
// 设置数据库的数据
setdata() {
this.$db
.adddata(this.newdata)
.then(res => this.getdata())
.catch(err => console.log(err));
},
// 获取数据库的数据
getdata() {
this.$db
.finddata()
.then(res => {
console.log(res);
this.textarray = res;
console.log(this.textarray);
})
.catch(err => console.log(err));
},
// 清空数据库的数据
deledata() {
// data则是显示需要的参数
const data = {
title: "清除数据",
buttons: ["确定了!", "才不要,我手滑了"],
noLink: true,
message: "此操作会清空本地数据库中的所有数据,是否继续?"
};
this.$ipcApi.send("open-messagebox", data);
this.$ipcApi.on("confirm-message", (event, arg) => {
console.log(arg);
if (arg.response === 0) {
this.$db.deleall({ name: "yyy" }).then(res => {
console.log(res);
if (res !== 0) {
this.getdata();
this.$message({
message: "成功删除" + res + "条",
type: "success"
});
} else {
let errormsg = {
title: "错误",
message: "已经没有数据可以被删除!"
};
this.$ipcApi.send("open-errorbox", errormsg);
}
message: res
});
}
});
},
// 获取electron方法
open() {},
CheckUpdate(data) {
switch (data) {
case "one":
const dialog = this.$electron.remote.dialog;
this.$ipcApi.send("check-update");
console.log("启动检查");
this.$ipcApi.on("UpdateMsg", (event, data) => {
console.log(data);
switch (data.state) {
this.$ipcApi.send("check-update").then(res => {
switch (res.state) {
case -1:
const msgdata = {
title: data.msg
title: "发生错误",
message: res.msg
};
api.MessageBox(dialog, msgdata);
this.$ipcApi.send("open-errorbox");
break;
case 0:
this.$message("正在检查更新");
......@@ -200,7 +141,7 @@ export default {
this.$message({ type: "success", message: "无新版本" });
break;
case 3:
this.percentage = data.msg.percent.toFixed(1);
this.percentage = res.msg.percent.toFixed(1);
break;
case 4:
this.progressStaus = "success";
......@@ -216,14 +157,13 @@ export default {
break;
}
});
console.log("启动检查");
console.log(data);
break;
case "two":
console.log(111);
this.$ipcApi.send("start-download");
this.$ipcApi.on("confirm-download", (event, arg) => {
if (arg) {
this.$ipcApi.send("start-download").then(() => {
this.dialogVisible = true;
}
});
this.$ipcApi.on("download-progress", (event, arg) => {
this.percentage = Number(arg);
......@@ -252,7 +192,7 @@ export default {
this.$alert("更新下载完成!", "提示", {
confirmButtonText: "确定",
callback: action => {
this.$electron.shell.openItem(this.filePath);
this.$electron.shell.openPath(this.filePath);
}
});
});
......@@ -267,7 +207,7 @@ export default {
}
},
destroyed() {
console.log("销毁了哦")
console.log("销毁了哦");
this.$ipcApi.remove("confirm-message");
this.$ipcApi.remove("download-done");
this.$ipcApi.remove("download-paused");
......
......@@ -102,7 +102,7 @@ export default {
<style lang="scss" scoped>
.editor-slide-upload {
margin-bottom: 20px;
/deep/ .el-upload--picture-card {
::v-deep .el-upload--picture-card {
width: 100%;
}
}
......
......@@ -35,11 +35,9 @@ export default {
components: {},
created() {
this.$ipcApi.send("IsUseSysTitle");
this.$ipcApi.on(
"CisUseSysTitle",
(event, arg) => (this.IsUseSysTitle = arg)
);
this.$ipcApi.send("IsUseSysTitle").then(res => {
this.IsUseSysTitle = res;
});
},
mounted() {},
......@@ -49,8 +47,9 @@ export default {
this.$ipcApi.send("windows-mini");
},
MixOrReduction() {
this.$ipcApi.send("window-max");
this.$ipcApi.on("window-confirm", (event, arg) => (this.mix = arg));
this.$ipcApi.send("window-max").then(res=>{
this.mix = res.status
})
},
Close() {
this.$ipcApi.send("window-close");
......
......@@ -128,7 +128,7 @@ export default {
width: 30px;
height: 30px;
margin-right: 10px;
/deep/ img {
::v-deep img {
width: 100%;
height: 100%;
border-radius: 50%;
......@@ -144,7 +144,7 @@ export default {
padding-right: 20px;
border-right: 1px solid #cccccc;
}
.select-right /deep/ .el-dropdown > span {
.select-right ::v-deep .el-dropdown > span {
font-size: 6px;
}
.select-right {
......@@ -152,7 +152,7 @@ export default {
color: #333333;
font-weight: 400;
}
/deep/ .el-dropdown-selfdefine {
::v-deep .el-dropdown-selfdefine {
display: flex;
align-items: center;
}
......
......@@ -129,12 +129,12 @@ export default {
</script>
<style lang="scss" scoped>
.menu-wrapper {
/deep/ .el-menu-item,
::v-deep .el-menu-item,
.el-submenu__title {
height: 46px;
line-height: 46px;
}
/deep/ .el-menu-item {
::v-deep .el-menu-item {
padding: 0 20px 0 12px;
}
}
......
......@@ -13,12 +13,10 @@ import './icons'
import '@/styles/index.scss'
if (!process.env.IS_WEB) {
Vue.use(require('vue-electron'))
if (!require('../../config').IsUseSysTitle) {
require('@/styles/custom-title.scss')
}
// 当处于electron状态下才引用db
Vue.prototype.$db = require('./api/operationalData').default
Vue.prototype.$ipcApi = require('./utils/ipcRenderer').default
}
......
import DataStore from 'nedb'
import path from 'path'
import { remote } from 'electron'
export default new DataStore({
autoload: true,
filename: path.join(remote.app.getPath('userData'), '/data.db')
})
import $electron from 'electron'
import { ipcRenderer } from 'electron'
export default {
send (data, arg, cb) {
$electron.ipcRenderer.send(data, arg, (event, arg) => cb(event, arg))
send (name, data = {}) {
return new Promise((resolve, reject) => {
ipcRenderer.invoke(name, data).then(res => {
resolve(res)
})
})
},
on (data, arg, cb) {
$electron.ipcRenderer.on(data, arg, (event, arg) => cb(event, arg))
},
remove (data) {
$electron.ipcRenderer.removeAllListeners(data)
on (name) {
return new Promise((resolve, reject) => {
ipcRenderer.on(name, (event, args) => {
resolve(args)
})
})
}
}
......
......@@ -133,7 +133,7 @@ $light_gray: #eee;
left: 0;
background-image: url("https://i.loli.net/2019/10/18/buDT4YS6zUMfHst.jpg");
background-position: center;
/deep/ .el-input {
::v-deep .el-input {
display: inline-block;
height: 47px;
width: 85%;
......@@ -151,7 +151,7 @@ $light_gray: #eee;
}
}
}
/deep/ .el-form-item {
::v-deep .el-form-item {
border: 1px solid rgba(255, 255, 255, 0.1);
background: rgba(0, 0, 0, 0.1);
border-radius: 5px;
......
此文件的差异太大,无法显示。