提交 8452d20b authored 作者: caicai's avatar caicai

移除

上级 a4249537
...@@ -58,7 +58,7 @@ class cateWin { ...@@ -58,7 +58,7 @@ class cateWin {
// 将id挂载到主窗口 // 将id挂载到主窗口
return; return;
} }
console.log('item', item) // console.log('item', item)
len = item.softList && item.softList.length || 0; len = item.softList && item.softList.length || 0;
console.log(len) console.log(len)
currentWidth = item.softList && len ? (len * 50 + (len-1)*24 + 80) : 20; currentWidth = item.softList && len ? (len * 50 + (len-1)*24 + 80) : 20;
......
...@@ -96,7 +96,7 @@ class MainWindow { ...@@ -96,7 +96,7 @@ class MainWindow {
this.win.on('closed', () => { this.win.on('closed', () => {
this.win = null this.win = null
console.log('windows closed') // console.log('windows closed')
}) })
} }
...@@ -171,10 +171,10 @@ class MainWindow { ...@@ -171,10 +171,10 @@ class MainWindow {
} }
let opt = this.winOpts([args.width, args.height]) let opt = this.winOpts([args.width, args.height])
if(args.parentId) { if(args.parentId) {
console.log('parentId:' + args.parentId) // console.log('parentId:' + args.parentId)
opt.parent = this.getWindow(args.parentId) opt.parent = this.getWindow(args.parentId)
} else if(this.main) { } else if(this.main) {
console.log(666) // console.log(666)
} }
if(typeof args.modal === 'boolean') opt.modal = args.modal if(typeof args.modal === 'boolean') opt.modal = args.modal
...@@ -272,7 +272,7 @@ class MainWindow { ...@@ -272,7 +272,7 @@ class MainWindow {
if(win.webContents.webType) { if(win.webContents.webType) {
let focusWin = BrowserWindow.getFocusedWindow(); let focusWin = BrowserWindow.getFocusedWindow();
if(focusWin != null) return; if(focusWin != null) return;
console.log('需要隐藏') // 需要隐藏
event.sender.send('manageVisible',false); event.sender.send('manageVisible',false);
if(win.webContents.webType === 'appManage') win.hide(); if(win.webContents.webType === 'appManage') win.hide();
...@@ -280,12 +280,6 @@ class MainWindow { ...@@ -280,12 +280,6 @@ class MainWindow {
let manageWin = this.getWinOf('appManage'); let manageWin = this.getWinOf('appManage');
if(manageWin != null) manageWin.hide(); if(manageWin != null) manageWin.hide();
} }
// let winList = this.getAllWindows();
// console.log(winList[0].webContents.webType, winList[1].webContents.webType)
// if(winList[1].webContents.webType === 'mainWindow') {
// console.log('通知')
// winList[1].webContents.send('manageVisible',false);
// }
} }
}) })
...@@ -324,7 +318,6 @@ class MainWindow { ...@@ -324,7 +318,6 @@ class MainWindow {
if(this.getWindow(Number(i))) { if(this.getWindow(Number(i))) {
this.getWindow(Number(i)).close() this.getWindow(Number(i)).close()
} else { } else {
console.log('---------------------------')
app.quit() app.quit()
} }
} }
......
...@@ -201,16 +201,16 @@ export default { ...@@ -201,16 +201,16 @@ export default {
this.cateName = ""; this.cateName = "";
}, },
sureAdd() { sureAdd() {
console.log('sureAdd', this.cateName) // 确认添加
let name = this.cateName; let name = this.cateName;
if(name == '' || name.trim() == '') name = "未命名"; if(name == '' || name.trim() == '') name = "未命名";
console.log(name)
if(name.length<1 || name.length>6) { if(name.length<1 || name.length>6) {
this.$message.warning("分类名字1到6个字"); this.$message.warning("分类名字1到6个字");
this.cateName = ""; this.cateName = "";
return; return;
} }
console.log('addCategory',)
this.$emit("addCategory", name); this.$emit("addCategory", name);
this.cateName = ""; this.cateName = "";
}, },
......
...@@ -212,7 +212,6 @@ export default { ...@@ -212,7 +212,6 @@ export default {
// 管理页隐藏 // 管理页隐藏
this.ipcRenderer.on("manageVisible", (event,visible) => { this.ipcRenderer.on("manageVisible", (event,visible) => {
console.log('visible', visible)
this.showManage = false; this.showManage = false;
}) })
...@@ -227,11 +226,9 @@ export default { ...@@ -227,11 +226,9 @@ export default {
// console.log("获取到app列表", list); // console.log("获取到app列表", list);
this.appList = list; this.appList = list;
this.appList.forEach((item, index) => { this.appList.forEach((item, index) => {
// console.log(item.icon)
if (item.icon if (item.icon
&& (item.icon.indexOf('data:image/png') == -1 && item.icon.indexOf('data:image/svg') == -1) && (item.icon.indexOf('data:image/png') == -1 && item.icon.indexOf('data:image/svg') == -1)
&& item.searchIcon === true) { && item.searchIcon === true) {
// console.log('getBase64', index)
this.ipcRenderer.send("getBase64", { imagePath: item.icon, index }); this.ipcRenderer.send("getBase64", { imagePath: item.icon, index });
} }
}); });
...@@ -239,12 +236,12 @@ export default { ...@@ -239,12 +236,12 @@ export default {
}); });
this.ipcRenderer.on("category-list", (event, list) => { this.ipcRenderer.on("category-list", (event, list) => {
console.log("获取到分类列表 1", list); // console.log("获取到分类列表 1", list);
this.categoryList = list; this.categoryList = list;
}); });
this.ipcRenderer.on("appsList_update", (event, list) => { this.ipcRenderer.on("appsList_update", (event, list) => {
console.log("刷新app列表", list); // console.log("刷新app列表", list);
this.appList = list; this.appList = list;
// this.getPinyin(); // this.getPinyin();
}); });
...@@ -256,7 +253,7 @@ export default { ...@@ -256,7 +253,7 @@ export default {
// 右键菜单点击-切换模式 // 右键菜单点击-切换模式
this.ipcRenderer.on("context-menu-command", (event, mode) => { this.ipcRenderer.on("context-menu-command", (event, mode) => {
console.log("context-menu-command", mode); // console.log("context-menu-command", mode);
let modeObj = { let modeObj = {
modeJianYue: "modeJianYue", modeJianYue: "modeJianYue",
modeJiJian: "modeJiJian", modeJiJian: "modeJiJian",
...@@ -269,7 +266,7 @@ export default { ...@@ -269,7 +266,7 @@ export default {
// 通知主进程 // 通知主进程
const screen = this.$electron.remote.screen; const screen = this.$electron.remote.screen;
const { width, height } = screen.getPrimaryDisplay().workAreaSize; //获取到屏幕的宽度和高度 const { width, height } = screen.getPrimaryDisplay().workAreaSize; //获取到屏幕的宽度和高度
console.log("宽高", width, height); // console.log("宽高", width, height);
// 设置程序位置 // 设置程序位置
// this.ipcRenderer.send("setMainWindow0", { width, height }); // this.ipcRenderer.send("setMainWindow0", { width, height });
...@@ -282,7 +279,7 @@ export default { ...@@ -282,7 +279,7 @@ export default {
}, 1000); }, 1000);
}, },
tapApp(item) { tapApp(item) {
console.log(item); // console.log(item);
this.ipcRenderer.send("openApp", item); this.ipcRenderer.send("openApp", item);
}, },
getFrontApp() { getFrontApp() {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论