github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-11 18:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '76570e2f1b72de50cb54c36229447eea69c59940' into pro

Browse Source
This commit is contained in:
kuaifan 2024-02-29 19:51:11 +08:00
commit 47832ececb
14 changed files with 112 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/publish-desktop.yml → .github/workflows/publish-desktop-mac.yml vendored
View File

@ -1,4 +1,4 @@
name: Publish Desktop
name: Publish Mac
on:
push:
@ -6,7 +6,7 @@ on:
- 'v*'
jobs:
build:
Build:
runs-on: macos-latest
environment: build
@ -29,5 +29,6 @@ jobs:
DP_KEY: ${{ secrets.DP_KEY }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_REPOSITORY: ${{ github.repository }}
run: ./cmd electron all
run: |
./cmd electron mac

30
.github/workflows/publish-desktop-win.yml vendored Normal file
View File

@ -0,0 +1,30 @@
name: Publish Win
on:
push:
tags:
- 'v*'
jobs:
Build:
runs-on: windows-latest
environment: build
if: startsWith(github.event.ref, 'refs/tags/v')
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 16.x
- name: Build
env:
DP_KEY: ${{ secrets.DP_KEY }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_REPOSITORY: ${{ github.repository }}
shell: bash
run: |
./cmd electron win

6
electron/build.js vendored
View File

@ -336,9 +336,11 @@ if (["dev"].includes(argv[2])) {
notarize: false,
}
}, false, false)
} else if (["all"].includes(argv[2])) {
} else if (["all", "win", "mac"].includes(argv[2])) {
// 自动编译
platforms.forEach(platform => {
platforms.filter(p => {
return argv[2] === "all" || p.indexOf(argv[2]) !== -1
}).forEach(platform => {
config.app.forEach(data => {
data.configure = {
platform,

10
electron/electron.js vendored
View File

@ -19,6 +19,7 @@ const spawn = require("child_process").spawn;
const isMac = process.platform === 'darwin'
const isWin = process.platform === 'win32'
const allowedUrls = /^(?:https?|mailto|tel|callto):/i;
const allowedCalls = /^(?:mailto|tel|callto):/i;
let enableStoreBkp = true;
let dialogOpen = false;
let enablePlugins = false;
@ -74,6 +75,9 @@ function createMainWindow() {
const originalUA = mainWindow.webContents.session.getUserAgent() || mainWindow.webContents.getUserAgent()
mainWindow.webContents.setUserAgent(originalUA + " MainTaskWindow/" + process.platform + "/" + os.arch() + "/1.0");
mainWindow.webContents.setWindowOpenHandler(({url}) => {
if (allowedCalls.test(url)) {
return {action: 'allow'}
}
utils.onBeforeOpenWindow(mainWindow.webContents, url).then(() => {
openExternal(url)
})
@ -184,6 +188,9 @@ function createSubWindow(args) {
const originalUA = browser.webContents.session.getUserAgent() || browser.webContents.getUserAgent()
browser.webContents.setUserAgent(originalUA + " SubTaskWindow/" + process.platform + "/" + os.arch() + "/1.0" + (args.userAgent ? (" " + args.userAgent) : ""));
browser.webContents.setWindowOpenHandler(({url}) => {
if (allowedCalls.test(url)) {
return {action: 'allow'}
}
utils.onBeforeOpenWindow(browser.webContents, url).then(() => {
openExternal(url)
})
@ -361,6 +368,9 @@ function createWebWindow(args) {
height: (webWindow.getContentBounds().height || 800) - webTabHeight,
})
browserView.webContents.setWindowOpenHandler(({url}) => {
if (allowedCalls.test(url)) {
return {action: 'allow'}
}
createWebWindow({url})
return {action: 'deny'}
})

4
electron/package.json
View File

@ -32,7 +32,7 @@
"@electron-forge/maker-squirrel": "^7.3.0",
"@electron-forge/maker-zip": "^7.3.0",
"dotenv": "^16.3.1",
"electron": "^29.0.1",
"electron": "^29.1.0",
"electron-builder": "^24.12.0",
"electron-notarize": "^1.2.2",
"form-data": "^4.0.0",
@ -45,7 +45,7 @@
"electron-log": "^5.1.1",
"electron-screenshots-tool": "^1.1.2",
"electron-squirrel-startup": "^1.0.0",
"electron-updater": "^6.1.7",
"electron-updater": "^6.1.8",
"fs-extra": "^11.2.0",
"pdf-lib": "^1.17.1",
"request": "^2.88.2"

4
package.json
View File

@ -26,7 +26,7 @@
"css-loader": "^6.7.2",
"dexie": "^3.2.3",
"echarts": "^5.2.2",
"element-sea": "^2.15.10-6",
"element-sea": "^2.15.10-7",
"file-loader": "^6.2.0",
"highlight.js": "^11.7.0",
"inquirer": "^8.2.0",
@ -49,7 +49,7 @@
"quill": "^1.3.7",
"quill-mention-hi": "^3.1.0-4",
"resolve-url-loader": "^4.0.0",
"sass": "~1.32.13",
"sass": "^1.71.1",
"sass-loader": "^12.6.0",
"stylus": "^0.59.0",
"stylus-loader": "^7.1.0",

8
public/site/css/download.css vendored
View File

@ -168,13 +168,15 @@
}
.download-other-btn{
padding: 10px 16px;
color: var(--txt-gray-color);
opacity: .7;
border-radius: 8px;
margin-top: 64px;
margin-bottom: 100px;
}
.download-other-btn:hover{
.download-other-btn span {
opacity: 0.7;
color: var(--txt-gray-color);
}
.download-other-btn:hover span {
color: var(--txt-theme-color);
opacity: 1;
}

5
public/site/css/log.css vendored
View File

@ -135,6 +135,11 @@
.logs-sticky{
position: sticky;
top: 80px;
height: calc(100vh - 136px);
}
#help-l-ul{
overflow-y: auto;
height: calc(100% - 36px);
}
.footer-layut{
border-top: var(--border-color) solid 1px;

2
public/site/en/download.html
View File

@ -145,7 +145,7 @@
</a>
</li>
</ul>
<a class="download-other-btn" href="https://www.dootask.com/desktop/publish/latest" target="_blank">Other Versions</a>
<a class="download-other-btn dow-animate-box" style="--delay: 0.5s;" href="https://www.dootask.com/desktop/publish/latest" target="_blank"><span>Other Versions</span></a>
</div>
</div>
</div>

12
public/site/en/help.html
View File

@ -2440,6 +2440,18 @@
"[data-id='" + `section-${i}` + "']"
);
elementsWithDataId[0]?.classList?.add("active");
//滚动设置
const liHight = elementsWithDataId[0]?.offsetTop;
const pHihtt = elementsWithDataId[0]?.parentNode.parentNode.offsetHeight;
const ulElement = document.getElementById('help-l-ul'); // 替换为你的 <div> 元素的 id
const scrollHeight = ulElement.scrollTop;
const ulHeight = ulElement.offsetHeight;
if (liHight > scrollHeight + ulHeight) {
ulElement.scrollTop += (pHihtt + 24);
}
if (liHight < scrollHeight) {
ulElement.scrollTop -= (pHihtt + 24);
}
return;
}
}

12
public/site/en/log.html
View File

@ -511,6 +511,18 @@ function scrollHandler(){
rm()
let elementsWithDataId = document.querySelectorAll("[data-id='" + `section-${i}` + "']");
elementsWithDataId[1]?.classList?.add("active");
//滚动设置
const liHight = elementsWithDataId[1]?.offsetTop;
const pHihtt = elementsWithDataId[1]?.offsetHeight;
const ulElement = document.getElementById('help-l-ul'); // 替换为你的 <div> 元素的 id
const scrollHeight = ulElement.scrollTop;
const ulHeight = ulElement.offsetHeight;
if (liHight > scrollHeight + ulHeight) {
ulElement.scrollTop += (pHihtt + pHihtt);
}
if (liHight < scrollHeight) {
ulElement.scrollTop -= (pHihtt + pHihtt);
}
return;
}
}

2
public/site/zh/download.html
View File

@ -145,7 +145,7 @@
</a>
</li>
</ul>
<a class="download-other-btn" href="https://www.dootask.com/desktop/publish/latest" target="_blank">其他版本</a>
<a class="download-other-btn dow-animate-box" style="--delay: 0.5s;" href="https://www.dootask.com/desktop/publish/latest" target="_blank"><span>其他版本</span></a>
</div>
</div>
</div>

12
public/site/zh/help.html
View File

@ -816,6 +816,18 @@ function scrollHandler(){
if (arrOffsetTop[i] > window.scrollY){
let elementsWithDataId = document.querySelectorAll("[data-id='" + `section-${i}` + "']");
elementsWithDataId[0]?.classList?.add("active");
//滚动设置
const liHight = elementsWithDataId[0]?.offsetTop;
const pHihtt = elementsWithDataId[0]?.parentNode.parentNode.offsetHeight;
const ulElement = document.getElementById('help-l-ul'); // 替换为你的 <div> 元素的 id
const scrollHeight = ulElement.scrollTop;
const ulHeight = ulElement.offsetHeight;
if (liHight > scrollHeight + ulHeight) {
ulElement.scrollTop += (pHihtt + 24);
}
if (liHight < scrollHeight) {
ulElement.scrollTop -= (pHihtt + 24);
}
return;
}
}

12
public/site/zh/log.html
View File

@ -509,6 +509,18 @@ function scrollHandler(){
rm()
let elementsWithDataId = document.querySelectorAll("[data-id='" + `section-${i}` + "']");
elementsWithDataId[1]?.classList?.add("active");
//滚动设置
const liHight = elementsWithDataId[1]?.offsetTop;
const pHihtt = elementsWithDataId[1]?.offsetHeight;
const ulElement = document.getElementById('help-l-ul'); // 替换为你的 <div> 元素的 id
const scrollHeight = ulElement.scrollTop;
const ulHeight = ulElement.offsetHeight;
if (liHight > scrollHeight + ulHeight) {
ulElement.scrollTop += (pHihtt + pHihtt);
}
if (liHight < scrollHeight) {
ulElement.scrollTop -= (pHihtt + pHihtt);
}
return;
}
}