Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
kuaifan committed Mar 5, 2024
1 parent 3c33f02 commit 52171b7
Show file tree
Hide file tree
Showing 121 changed files with 1,577 additions and 1,550 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

All notable changes to this project will be documented in this file.

## [0.35.20]

### Features

- 发起投票功能添加缓存记录选中效果
- 导出的签到数据和审批数据换成xlsx,因老版本的xls会出现兼容性问题

### Performance

- 默认映射443端口
- 优化子窗口
- 优化发布接口 删除目录的逻辑

## [0.35.10]

### Bug Fixes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);

use App\Models\User;
use App\Models\WebSocketDialog;
Expand Down
15 changes: 13 additions & 2 deletions electron/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,11 @@ function createWebTabWindow(args) {

webTabWindow.on('closed', () => {
webTabView.forEach(({view}) => {
view.webContents.close()
try {
view.webContents.close()
} catch (e) {
//
}
})
webTabView = []
webTabWindow = null
Expand Down Expand Up @@ -370,6 +374,9 @@ function createWebTabWindow(args) {
width: webTabWindow.getContentBounds().width || 1280,
height: (webTabWindow.getContentBounds().height || 800) - webTabHeight,
})
browserView.webContents.on('destroyed', () => {
closeWebTab(browserView.webContents.id)
})
browserView.webContents.setWindowOpenHandler(({url}) => {
if (allowedCalls.test(url)) {
return {action: 'allow'}
Expand Down Expand Up @@ -512,7 +519,11 @@ function closeWebTab(id) {
webTabWindow.hide()
}
webTabWindow.removeBrowserView(item.view)
item.view.webContents.close()
try {
item.view.webContents.close()
} catch (e) {
//
}

const index = webTabView.findIndex(({id}) => item.id == id)
if (index > -1) {
Expand Down
15 changes: 10 additions & 5 deletions electron/render/tabs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
data() {
return {
activeId: 0,
tabs: []
tabs: [],

stopTimer: null,
}
},
beforeCreate() {
Expand Down Expand Up @@ -83,15 +85,18 @@
case 'start-loading':
const startItem = this.tabs.find(item => item.id === id)
if (startItem) {
this.stopTimer && clearTimeout(this.stopTimer)
startItem.state = 'loading'
}
break

case 'stop-loading':
const stopItem = this.tabs.find(item => item.id === id)
if (stopItem) {
stopItem.state = 'loaded'
}
this.stopTimer = setTimeout(_ => {
const stopItem = this.tabs.find(item => item.id === id)
if (stopItem) {
stopItem.state = 'loaded'
}
}, 300)
break

case 'enter-full-screen':
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.35.10",
"version": "0.35.20",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",
Expand Down
1 change: 1 addition & 0 deletions public/js/build/404.ab7b0570.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/js/build/404.edf75765.js

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 52171b7

Please sign in to comment.