9 Commits

Author SHA1 Message Date
272227e4e3 Merge pull request #20 from landaiqing/dev
Added code block export image extension
2025-12-23 20:53:43 +08:00
00bdafc621 Merge pull request #19 from landaiqing/issue-template
Update issue templates
2025-12-22 19:05:14 +08:00
78422899e4 Update issue templates 2025-12-22 19:02:07 +08:00
37aae9e03c Merge pull request #18 from landaiqing/dev
♻️ Refactor keybinding service
2025-12-20 17:21:13 +08:00
c50bf452ca Merge pull request #16 from landaiqing/snyk-upgrade-84db4245b76a139f9893542518e26f7c
[Snyk] Upgrade @toml-tools/lexer from 1.0.0 to 1.0.1
2025-12-20 16:46:48 +08:00
dace5ce2b0 Merge branch 'master' into snyk-upgrade-84db4245b76a139f9893542518e26f7c 2025-12-20 16:46:29 +08:00
ef145169aa Merge pull request #17 from landaiqing/snyk-upgrade-d49a610d736beff91ab0d19edbc6eead
[Snyk] Upgrade @toml-tools/parser from 1.0.0 to 1.0.1
2025-12-20 16:44:52 +08:00
snyk-bot
b289f4054d fix: upgrade @toml-tools/parser from 1.0.0 to 1.0.1
Snyk has created this PR to upgrade @toml-tools/parser from 1.0.0 to 1.0.1.

See this package in npm:
@toml-tools/parser

See this project in Snyk:
https://app.snyk.io/org/landaiqing/project/27ce8f71-d823-4dce-84c2-bf6a1cf5aa6a?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-12-19 11:27:17 +00:00
snyk-bot
bdee1fdf84 fix: upgrade @toml-tools/lexer from 1.0.0 to 1.0.1
Snyk has created this PR to upgrade @toml-tools/lexer from 1.0.0 to 1.0.1.

See this package in npm:
@toml-tools/lexer

See this project in Snyk:
https://app.snyk.io/org/landaiqing/project/27ce8f71-d823-4dce-84c2-bf6a1cf5aa6a?utm_source=github&utm_medium=referral&page=upgrade-pr
2025-12-19 11:27:13 +00:00
70 changed files with 2564 additions and 3074 deletions

38
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.

View File

@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@@ -461,11 +461,6 @@ export class GeneralConfig {
*/
"enableTabs": boolean;
/**
* 是否启用内存监视器
*/
"enableMemoryMonitor": boolean;
/** Creates a new GeneralConfig instance. */
constructor($$source: Partial<GeneralConfig> = {}) {
if (!("alwaysOnTop" in $$source)) {
@@ -495,9 +490,6 @@ export class GeneralConfig {
if (!("enableTabs" in $$source)) {
this["enableTabs"] = false;
}
if (!("enableMemoryMonitor" in $$source)) {
this["enableMemoryMonitor"] = false;
}
Object.assign(this, $$source);
}

View File

@@ -89,21 +89,13 @@ export function UpdateKeyBindingEnabled(id: number, enabled: boolean): Promise<v
}
/**
* UpdateKeyBindingKeys 更新快捷键绑定
* UpdateKeyBindingKeys 更新快捷键绑定(根据操作系统自动判断更新哪个字段)
*/
export function UpdateKeyBindingKeys(id: number, key: string): Promise<void> & { cancel(): void } {
let $resultPromise = $Call.ByID(3432755175, id, key) as any;
return $resultPromise;
}
/**
* UpdateKeyBindingPreventDefault 更新快捷键 PreventDefault 状态
*/
export function UpdateKeyBindingPreventDefault(id: number, preventDefault: boolean): Promise<void> & { cancel(): void } {
let $resultPromise = $Call.ByID(202386744, id, preventDefault) as any;
return $resultPromise;
}
// Private type creation functions
const $$createType0 = models$0.KeyBinding.createFrom;
const $$createType1 = $Create.Array($$createType0);

View File

@@ -11,8 +11,6 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
AccordionContainer: typeof import('./src/components/accordion/AccordionContainer.vue')['default']
AccordionItem: typeof import('./src/components/accordion/AccordionItem.vue')['default']
BlockLanguageSelector: typeof import('./src/components/toolbar/BlockLanguageSelector.vue')['default']
DocumentSelector: typeof import('./src/components/toolbar/DocumentSelector.vue')['default']
LinuxTitleBar: typeof import('./src/components/titlebar/LinuxTitleBar.vue')['default']
@@ -24,8 +22,6 @@ declare module 'vue' {
TabContainer: typeof import('./src/components/tabs/TabContainer.vue')['default']
TabContextMenu: typeof import('./src/components/tabs/TabContextMenu.vue')['default']
TabItem: typeof import('./src/components/tabs/TabItem.vue')['default']
Toast: typeof import('./src/components/toast/Toast.vue')['default']
ToastContainer: typeof import('./src/components/toast/ToastContainer.vue')['default']
Toolbar: typeof import('./src/components/toolbar/Toolbar.vue')['default']
WindowsTitleBar: typeof import('./src/components/titlebar/WindowsTitleBar.vue')['default']
WindowTitleBar: typeof import('./src/components/titlebar/WindowTitleBar.vue')['default']

View File

@@ -36,7 +36,7 @@
"@codemirror/lint": "^6.9.2",
"@codemirror/search": "^6.5.11",
"@codemirror/state": "^6.5.3",
"@codemirror/view": "^6.39.8",
"@codemirror/view": "^6.39.6",
"@cospaia/prettier-plugin-clojure": "^0.0.2",
"@lezer/highlight": "^1.2.3",
"@lezer/lr": "^1.4.5",
@@ -63,7 +63,7 @@
"prettier": "^3.7.4",
"sass": "^1.97.1",
"vue": "^3.5.26",
"vue-i18n": "^11.2.8",
"vue-i18n": "^11.2.7",
"vue-pick-colors": "^1.8.0",
"vue-router": "^4.6.4"
},
@@ -77,8 +77,9 @@
"eslint": "^9.39.2",
"eslint-plugin-vue": "^10.6.2",
"globals": "^16.5.0",
"happy-dom": "^20.0.11",
"typescript": "^5.9.3",
"typescript-eslint": "^8.51.0",
"typescript-eslint": "^8.50.1",
"unplugin-vue-components": "^30.0.0",
"vite": "npm:rolldown-vite@latest",
"vite-plugin-node-polyfills": "^0.24.0",
@@ -609,9 +610,9 @@
}
},
"node_modules/@codemirror/view": {
"version": "6.39.8",
"resolved": "https://registry.npmmirror.com/@codemirror/view/-/view-6.39.8.tgz",
"integrity": "sha512-1rASYd9Z/mE3tkbC9wInRlCNyCkSn+nLsiQKZhEDUUJiUfs/5FHDpCUDaQpoTIaNGeDc6/bhaEAyLmeEucEFPw==",
"version": "6.39.6",
"resolved": "https://registry.npmmirror.com/@codemirror/view/-/view-6.39.6.tgz",
"integrity": "sha512-/N+SoP5NndJjkGInp3BwlUa3KQKD6bDo0TV6ep37ueAdQ7BVu/PqlZNywmgjCq0MQoZadZd8T+MZucSr7fktyQ==",
"license": "MIT",
"dependencies": {
"@codemirror/state": "^6.5.0",
@@ -1340,13 +1341,13 @@
}
},
"node_modules/@intlify/core-base": {
"version": "11.2.8",
"resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-11.2.8.tgz",
"integrity": "sha512-nBq6Y1tVkjIUsLsdOjDSJj4AsjvD0UG3zsg9Fyc+OivwlA/oMHSKooUy9tpKj0HqZ+NWFifweHavdljlBLTwdA==",
"version": "11.2.7",
"resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-11.2.7.tgz",
"integrity": "sha512-+Ra9I/LAzXDnmv/IrTO03WMCiLya7pHRmGJvNl9fKwx/W4REJ0xaMk2PxCRqnxcBsX443amEMdebQ3R1geiuIw==",
"license": "MIT",
"dependencies": {
"@intlify/message-compiler": "11.2.8",
"@intlify/shared": "11.2.8"
"@intlify/message-compiler": "11.2.7",
"@intlify/shared": "11.2.7"
},
"engines": {
"node": ">= 16"
@@ -1356,12 +1357,12 @@
}
},
"node_modules/@intlify/message-compiler": {
"version": "11.2.8",
"resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-11.2.8.tgz",
"integrity": "sha512-A5n33doOjmHsBtCN421386cG1tWp5rpOjOYPNsnpjIJbQ4POF0QY2ezhZR9kr0boKwaHjbOifvyQvHj2UTrDFQ==",
"version": "11.2.7",
"resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-11.2.7.tgz",
"integrity": "sha512-TFamC+GzJAotAFwUNvbtRVBgvuSn2nCwKNresmPUHv3IIVMmXJt7QQJj/DORI1h8hs46ZF6L0Fs2xBohSOE4iQ==",
"license": "MIT",
"dependencies": {
"@intlify/shared": "11.2.8",
"@intlify/shared": "11.2.7",
"source-map-js": "^1.0.2"
},
"engines": {
@@ -1372,9 +1373,9 @@
}
},
"node_modules/@intlify/shared": {
"version": "11.2.8",
"resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-11.2.8.tgz",
"integrity": "sha512-l6e4NZyUgv8VyXXH4DbuucFOBmxLF56C/mqh2tvApbzl2Hrhi1aTDcuv5TKdxzfHYmpO3UB0Cz04fgDT9vszfw==",
"version": "11.2.7",
"resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-11.2.7.tgz",
"integrity": "sha512-uvlkvc/0uQ4FDlHQZccpUnmcOwNcaI3i+69ck2YJ+GqM35AoVbuS63b+YfirV4G0SZh64Ij2UMcFRMmB4nr95w==",
"license": "MIT",
"engines": {
"node": ">= 16"
@@ -2864,25 +2865,23 @@
"resolved": "https://registry.npmmirror.com/@types/whatwg-mimetype/-/whatwg-mimetype-3.0.2.tgz",
"integrity": "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true
"license": "MIT"
},
"node_modules/@typescript-eslint/eslint-plugin": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.51.0.tgz",
"integrity": "sha512-XtssGWJvypyM2ytBnSnKtHYOGT+4ZwTnBVl36TA4nRO2f4PRNGz5/1OszHzcZCvcBMh+qb7I06uoCmLTRdR9og==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.50.1.tgz",
"integrity": "sha512-PKhLGDq3JAg0Jk/aK890knnqduuI/Qj+udH7wCf0217IGi4gt+acgCyPVe79qoT+qKUvHMDQkwJeKW9fwl8Cyw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
"@typescript-eslint/scope-manager": "8.51.0",
"@typescript-eslint/type-utils": "8.51.0",
"@typescript-eslint/utils": "8.51.0",
"@typescript-eslint/visitor-keys": "8.51.0",
"@typescript-eslint/scope-manager": "8.50.1",
"@typescript-eslint/type-utils": "8.50.1",
"@typescript-eslint/utils": "8.50.1",
"@typescript-eslint/visitor-keys": "8.50.1",
"ignore": "^7.0.0",
"natural-compare": "^1.4.0",
"ts-api-utils": "^2.2.0"
"ts-api-utils": "^2.1.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2892,7 +2891,7 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"@typescript-eslint/parser": "^8.51.0",
"@typescript-eslint/parser": "^8.50.1",
"eslint": "^8.57.0 || ^9.0.0",
"typescript": ">=4.8.4 <6.0.0"
}
@@ -2908,16 +2907,16 @@
}
},
"node_modules/@typescript-eslint/parser": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-8.51.0.tgz",
"integrity": "sha512-3xP4XzzDNQOIqBMWogftkwxhg5oMKApqY0BAflmLZiFYHqyhSOxv/cd/zPQLTcCXr4AkaKb25joocY0BD1WC6A==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-8.50.1.tgz",
"integrity": "sha512-hM5faZwg7aVNa819m/5r7D0h0c9yC4DUlWAOvHAtISdFTc8xB86VmX5Xqabrama3wIPJ/q9RbGS1worb6JfnMg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/scope-manager": "8.51.0",
"@typescript-eslint/types": "8.51.0",
"@typescript-eslint/typescript-estree": "8.51.0",
"@typescript-eslint/visitor-keys": "8.51.0",
"@typescript-eslint/scope-manager": "8.50.1",
"@typescript-eslint/types": "8.50.1",
"@typescript-eslint/typescript-estree": "8.50.1",
"@typescript-eslint/visitor-keys": "8.50.1",
"debug": "^4.3.4"
},
"engines": {
@@ -2933,14 +2932,14 @@
}
},
"node_modules/@typescript-eslint/project-service": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/project-service/-/project-service-8.51.0.tgz",
"integrity": "sha512-Luv/GafO07Z7HpiI7qeEW5NW8HUtZI/fo/kE0YbtQEFpJRUuR0ajcWfCE5bnMvL7QQFrmT/odMe8QZww8X2nfQ==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/project-service/-/project-service-8.50.1.tgz",
"integrity": "sha512-E1ur1MCVf+YiP89+o4Les/oBAVzmSbeRB0MQLfSlYtbWU17HPxZ6Bhs5iYmKZRALvEuBoXIZMOIRRc/P++Ortg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/tsconfig-utils": "^8.51.0",
"@typescript-eslint/types": "^8.51.0",
"@typescript-eslint/tsconfig-utils": "^8.50.1",
"@typescript-eslint/types": "^8.50.1",
"debug": "^4.3.4"
},
"engines": {
@@ -2955,14 +2954,14 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-8.51.0.tgz",
"integrity": "sha512-JhhJDVwsSx4hiOEQPeajGhCWgBMBwVkxC/Pet53EpBVs7zHHtayKefw1jtPaNRXpI9RA2uocdmpdfE7T+NrizA==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-8.50.1.tgz",
"integrity": "sha512-mfRx06Myt3T4vuoHaKi8ZWNTPdzKPNBhiblze5N50//TSHOAQQevl/aolqA/BcqqbJ88GUnLqjjcBc8EWdBcVw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/types": "8.51.0",
"@typescript-eslint/visitor-keys": "8.51.0"
"@typescript-eslint/types": "8.50.1",
"@typescript-eslint/visitor-keys": "8.50.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2973,9 +2972,9 @@
}
},
"node_modules/@typescript-eslint/tsconfig-utils": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.51.0.tgz",
"integrity": "sha512-Qi5bSy/vuHeWyir2C8u/uqGMIlIDu8fuiYWv48ZGlZ/k+PRPHtaAu7erpc7p5bzw2WNNSniuxoMSO4Ar6V9OXw==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.50.1.tgz",
"integrity": "sha512-ooHmotT/lCWLXi55G4mvaUF60aJa012QzvLK0Y+Mp4WdSt17QhMhWOaBWeGTFVkb2gDgBe19Cxy1elPXylslDw==",
"dev": true,
"license": "MIT",
"engines": {
@@ -2990,17 +2989,17 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-8.51.0.tgz",
"integrity": "sha512-0XVtYzxnobc9K0VU7wRWg1yiUrw4oQzexCG2V2IDxxCxhqBMSMbjB+6o91A+Uc0GWtgjCa3Y8bi7hwI0Tu4n5Q==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-8.50.1.tgz",
"integrity": "sha512-7J3bf022QZE42tYMO6SL+6lTPKFk/WphhRPe9Tw/el+cEwzLz1Jjz2PX3GtGQVxooLDKeMVmMt7fWpYRdG5Etg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/types": "8.51.0",
"@typescript-eslint/typescript-estree": "8.51.0",
"@typescript-eslint/utils": "8.51.0",
"@typescript-eslint/types": "8.50.1",
"@typescript-eslint/typescript-estree": "8.50.1",
"@typescript-eslint/utils": "8.50.1",
"debug": "^4.3.4",
"ts-api-utils": "^2.2.0"
"ts-api-utils": "^2.1.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3015,9 +3014,9 @@
}
},
"node_modules/@typescript-eslint/types": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-8.51.0.tgz",
"integrity": "sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-8.50.1.tgz",
"integrity": "sha512-v5lFIS2feTkNyMhd7AucE/9j/4V9v5iIbpVRncjk/K0sQ6Sb+Np9fgYS/63n6nwqahHQvbmujeBL7mp07Q9mlA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -3029,21 +3028,21 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.51.0.tgz",
"integrity": "sha512-1qNjGqFRmlq0VW5iVlcyHBbCjPB7y6SxpBkrbhNWMy/65ZoncXCEPJxkRZL8McrseNH6lFhaxCIaX+vBuFnRng==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.50.1.tgz",
"integrity": "sha512-woHPdW+0gj53aM+cxchymJCrh0cyS7BTIdcDxWUNsclr9VDkOSbqC13juHzxOmQ22dDkMZEpZB+3X1WpUvzgVQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/project-service": "8.51.0",
"@typescript-eslint/tsconfig-utils": "8.51.0",
"@typescript-eslint/types": "8.51.0",
"@typescript-eslint/visitor-keys": "8.51.0",
"@typescript-eslint/project-service": "8.50.1",
"@typescript-eslint/tsconfig-utils": "8.50.1",
"@typescript-eslint/types": "8.50.1",
"@typescript-eslint/visitor-keys": "8.50.1",
"debug": "^4.3.4",
"minimatch": "^9.0.4",
"semver": "^7.6.0",
"tinyglobby": "^0.2.15",
"ts-api-utils": "^2.2.0"
"ts-api-utils": "^2.1.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3083,16 +3082,16 @@
}
},
"node_modules/@typescript-eslint/utils": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-8.51.0.tgz",
"integrity": "sha512-11rZYxSe0zabiKaCP2QAwRf/dnmgFgvTmeDTtZvUvXG3UuAdg/GU02NExmmIXzz3vLGgMdtrIosI84jITQOxUA==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-8.50.1.tgz",
"integrity": "sha512-lCLp8H1T9T7gPbEuJSnHwnSuO9mDf8mfK/Nion5mZmiEaQD9sWf9W4dfeFqRyqRjF06/kBuTmAqcs9sewM2NbQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.7.0",
"@typescript-eslint/scope-manager": "8.51.0",
"@typescript-eslint/types": "8.51.0",
"@typescript-eslint/typescript-estree": "8.51.0"
"@typescript-eslint/scope-manager": "8.50.1",
"@typescript-eslint/types": "8.50.1",
"@typescript-eslint/typescript-estree": "8.50.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3107,13 +3106,13 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.51.0.tgz",
"integrity": "sha512-mM/JRQOzhVN1ykejrvwnBRV3+7yTKK8tVANVN3o1O0t0v7o+jqdVu9crPy5Y9dov15TJk/FTIgoUGHrTOVL3Zg==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.50.1.tgz",
"integrity": "sha512-IrDKrw7pCRUR94zeuCSUWQ+w8JEf5ZX5jl/e6AHGSLi1/zIr0lgutfn/7JpfCey+urpgQEdrZVYzCaVVKiTwhQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/types": "8.51.0",
"@typescript-eslint/types": "8.50.1",
"eslint-visitor-keys": "^4.2.1"
},
"engines": {
@@ -5734,8 +5733,6 @@
"integrity": "sha512-QsCdAUHAmiDeKeaNojb1OHOPF7NjcWPBR7obdu3NwH2a/oyQaLg5d0aaCy/9My6CdPChYF07dvz5chaXBGaD4g==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"@types/node": "^20.0.0",
"@types/whatwg-mimetype": "^3.0.2",
@@ -5751,8 +5748,6 @@
"integrity": "sha512-ZsJzA5thDQMSQO788d7IocwwQbI8B5OPzmqNvpf3NY/+MHDAS759Wo0gd2WQeXYt5AAAQjzcrTVC6SKCuYgoCQ==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"undici-types": "~6.21.0"
}
@@ -5762,9 +5757,7 @@
"resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-6.21.0.tgz",
"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true
"license": "MIT"
},
"node_modules/has-flag": {
"version": "4.0.0",
@@ -8167,9 +8160,9 @@
}
},
"node_modules/ts-api-utils": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-2.3.0.tgz",
"integrity": "sha512-6eg3Y9SF7SsAvGzRHQvvc1skDAhwI4YQ32ui1scxD1Ccr0G5qIIbUBT3pFTKX8kmWIQClHobtUdNuaBgwdfdWg==",
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -8238,16 +8231,16 @@
}
},
"node_modules/typescript-eslint": {
"version": "8.51.0",
"resolved": "https://registry.npmmirror.com/typescript-eslint/-/typescript-eslint-8.51.0.tgz",
"integrity": "sha512-jh8ZuM5oEh2PSdyQG9YAEM1TCGuWenLSuSUhf/irbVUNW9O5FhbFVONviN2TgMTBnUmyHv7E56rYnfLZK6TkiA==",
"version": "8.50.1",
"resolved": "https://registry.npmmirror.com/typescript-eslint/-/typescript-eslint-8.50.1.tgz",
"integrity": "sha512-ytTHO+SoYSbhAH9CrYnMhiLx8To6PSSvqnvXyPUgPETCvB6eBKmTI9w6XMPS3HsBRGkwTVBX+urA8dYQx6bHfQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "8.51.0",
"@typescript-eslint/parser": "8.51.0",
"@typescript-eslint/typescript-estree": "8.51.0",
"@typescript-eslint/utils": "8.51.0"
"@typescript-eslint/eslint-plugin": "8.50.1",
"@typescript-eslint/parser": "8.50.1",
"@typescript-eslint/typescript-estree": "8.50.1",
"@typescript-eslint/utils": "8.50.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8953,13 +8946,13 @@
}
},
"node_modules/vue-i18n": {
"version": "11.2.8",
"resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-11.2.8.tgz",
"integrity": "sha512-vJ123v/PXCZntd6Qj5Jumy7UBmIuE92VrtdX+AXr+1WzdBHojiBxnAxdfctUFL+/JIN+VQH4BhsfTtiGsvVObg==",
"version": "11.2.7",
"resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-11.2.7.tgz",
"integrity": "sha512-LPv8bAY5OA0UvFEXl4vBQOBqJzRrlExy92tWgRuwW7tbykHf7CH71G2Y4TM2OwGcIS4+hyqKHS2EVBqaYwPY9Q==",
"license": "MIT",
"dependencies": {
"@intlify/core-base": "11.2.8",
"@intlify/shared": "11.2.8",
"@intlify/core-base": "11.2.7",
"@intlify/shared": "11.2.7",
"@vue/devtools-api": "^6.5.0"
},
"engines": {
@@ -9048,8 +9041,6 @@
"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"engines": {
"node": ">=12"
}

View File

@@ -50,14 +50,14 @@
"@codemirror/lint": "^6.9.2",
"@codemirror/search": "^6.5.11",
"@codemirror/state": "^6.5.3",
"@codemirror/view": "^6.39.8",
"@codemirror/view": "^6.39.6",
"@cospaia/prettier-plugin-clojure": "^0.0.2",
"@lezer/highlight": "^1.2.3",
"@lezer/lr": "^1.4.5",
"@prettier/plugin-xml": "^3.4.2",
"@replit/codemirror-lang-svelte": "^6.0.0",
"@toml-tools/lexer": "^1.0.0",
"@toml-tools/parser": "^1.0.0",
"@toml-tools/lexer": "^1.0.1",
"@toml-tools/parser": "^1.0.1",
"@types/katex": "^0.16.7",
"@zumer/snapdom": "^2.0.1",
"codemirror": "^6.0.2",
@@ -77,7 +77,7 @@
"prettier": "^3.7.4",
"sass": "^1.97.1",
"vue": "^3.5.26",
"vue-i18n": "^11.2.8",
"vue-i18n": "^11.2.7",
"vue-pick-colors": "^1.8.0",
"vue-router": "^4.6.4"
},
@@ -91,8 +91,9 @@
"eslint": "^9.39.2",
"eslint-plugin-vue": "^10.6.2",
"globals": "^16.5.0",
"happy-dom": "^20.0.11",
"typescript": "^5.9.3",
"typescript-eslint": "^8.51.0",
"typescript-eslint": "^8.50.1",
"unplugin-vue-components": "^30.0.0",
"vite": "npm:rolldown-vite@latest",
"vite-plugin-node-polyfills": "^0.24.0",

View File

@@ -1 +0,0 @@
<svg t="1767366893329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="106998" width="200" height="200"><path d="M344.064 36.571429v95.085714H155.428571a23.771429 23.771429 0 0 0-23.259428 19.017143l-0.512 4.754285-0.073143 509.952L306.176 505.417143a95.085714 95.085714 0 0 1 121.270857-5.997714l4.827429 3.876571 152.137143 130.413714 102.546285-102.4a95.085714 95.085714 0 0 1 119.003429-12.507428l5.266286 3.657143 81.042285 60.781714 0.073143-118.784 0.512-7.021714a47.542857 47.542857 0 0 1 94.061714 0l0.512 7.021714v404.114286c0 62.171429-47.762286 113.225143-108.617142 118.418285l-10.24 0.438857h-713.142858l-10.24-0.438857a118.857143 118.857143 0 0 1-108.105142-107.52L36.571429 868.498286v-713.142857l0.438857-10.24A118.857143 118.857143 0 0 1 155.428571 36.571429h188.708572z m26.331429 538.916571L131.657143 794.404571l0.073143 74.166858c0 11.483429 8.118857 21.065143 19.017143 23.259428l4.754285 0.512h713.142857a23.771429 23.771429 0 0 0 23.259429-19.017143l0.512-4.754285-0.073143-166.473143-138.093714-103.570286-97.353143 97.28 76.288 65.316571a47.542857 47.542857 0 0 1-58.002286 75.190858l-3.876571-2.925715-300.836572-257.901714zM649.069714 60.269714a47.542857 47.542857 0 0 1 3.291429 63.634286l-3.291429 3.657143-61.44 61.44 61.44 61.44a47.542857 47.542857 0 0 1 3.291429 63.634286l-3.291429 3.657142a47.542857 47.542857 0 0 1-63.634285 3.218286l-3.584-3.291428-95.085715-95.085715a47.542857 47.542857 0 0 1-3.291428-63.634285l3.291428-3.584 95.085715-95.085715a47.542857 47.542857 0 0 1 67.291428 0zM855.259429 57.051429l3.584 3.218285 95.085714 95.085715a47.542857 47.542857 0 0 1 3.291428 63.634285l-3.291428 3.657143-95.085714 95.085714a47.542857 47.542857 0 0 1-70.509715-63.634285l3.291429-3.657143 61.44-61.44-61.44-61.44a47.542857 47.542857 0 0 1-3.291429-63.634286l3.291429-3.657143a47.542857 47.542857 0 0 1 63.634286-3.218285zM344.210286 36.571429a47.542857 47.542857 0 0 1 7.021714 94.573714l-7.021714 0.512V36.571429z" p-id="106999" fill="#e0620d"></path></svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1 +0,0 @@
<svg t="1767367606621" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15611" width="200" height="200"><path d="M511.966509 0.066982c96.036384 0 185.886507 26.451603 262.724147 72.443261L767.949763 68.670494l-127.948963 221.638835A254.788666 254.788666 0 0 0 511.966509 256.050237V0.066982z" fill="#E70212" p-id="15612"></path><path d="M767.949763 68.670494a509.577332 509.577332 0 0 1 191.304819 194.120635L955.329506 256.050237l-221.638835 127.991627a257.263171 257.263171 0 0 0-93.689871-93.689871L767.949763 68.670494z" fill="#EA6101" p-id="15613"></path><path d="M955.329506 256.050237A509.577332 509.577332 0 0 1 1023.933018 519.798317V512.033491h-255.983255a254.788666 254.788666 0 0 0-34.259092-127.991627l221.638835-127.991627z" fill="#F39801" p-id="15614"></path><path d="M1023.933018 512.033491c0 90.020778-23.251812 174.665907-64.038478 248.175765l-4.565034 7.80749-221.638835-127.948964c21.758577-37.672202 34.259092-81.402675 34.259092-128.034291v-0.042664L1023.933018 512.033491z" fill="#FCC902" p-id="15615"></path><path d="M733.690671 640.025118l221.638835 127.991628a509.66266 509.66266 0 0 1-179.52959 182.900035l-7.850153 4.479707-127.991627-221.638835A257.263171 257.263171 0 0 0 733.690671 640.025118z" fill="#FEF200" p-id="15616"></path><path d="M640.0008 733.757653L767.949763 955.396488A509.66266 509.66266 0 0 1 521.011251 1024H511.966509v-255.983254a254.788666 254.788666 0 0 0 128.034291-34.259093z" fill="#90C320" p-id="15617"></path><path d="M511.966509 768.016746v255.983254c-90.020778 0-174.665907-23.251812-248.175765-64.038477L255.983254 955.396488l127.991628-221.638835c37.672202 21.758577 81.402675 34.259092 128.034291 34.259093z" fill="#019A44" p-id="15618"></path><path d="M383.974882 733.757653l-127.991628 221.638835a509.66266 509.66266 0 0 1-182.900035-179.529589L68.603512 768.016746l221.638835-127.991628A257.263171 257.263171 0 0 0 383.974882 733.757653z" fill="#019E97" p-id="15619"></path><path d="M255.983254 512.033491c0 46.631616 12.457852 90.362089 34.259093 128.034291L68.603512 768.016746A509.66266 509.66266 0 0 1 0 521.078233V512.033491h255.983254z" fill="#0169B8" p-id="15620"></path><path d="M68.603512 256.050237l221.638835 127.991627A254.788666 254.788666 0 0 0 255.983254 512.033491H0c0-90.020778 23.251812-174.665907 64.038477-248.175765L68.603512 256.050237z" fill="#1C2089" p-id="15621"></path><path d="M262.681483 64.745418L255.983254 68.670494l127.991628 221.638835A257.263171 257.263171 0 0 0 290.242347 384.041864L68.603512 256.050237a509.577332 509.577332 0 0 1 194.120635-191.304819z" fill="#621988" p-id="15622"></path><path d="M519.731334 0.066982H511.966509v255.983255a254.788666 254.788666 0 0 0-128.034291 34.259092L255.983254 68.670494A509.577332 509.577332 0 0 1 519.731334 0.066982z" fill="#910783" p-id="15623"></path></svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -1 +0,0 @@
<svg t="1767366808037" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="103196" width="200" height="200"><path d="M878.921143 96c27.099429 0 49.078857 21.942857 49.078857 49.078857v349.842286c0 27.099429-21.942857 49.078857-49.078857 49.078857h-221.842286c-27.099429 0-49.078857-21.942857-49.078857-49.078857V145.078857c0-27.099429 21.942857-49.078857 49.078857-49.078857z m-14.921143 320h-192v64h192v-64z m0-128h-192v64h192v-64z m0-128h-192v64h192v-64zM384 309.321143A202.678857 202.678857 0 0 1 586.678857 512v213.321143a202.678857 202.678857 0 0 1-202.678857 202.678857H298.678857a202.678857 202.678857 0 0 1-202.678857-202.678857V512a202.678857 202.678857 0 0 1 202.678857-202.678857z m138.642286 298.642286H160v117.394285a138.678857 138.678857 0 0 0 131.547429 138.459429l7.131428 0.182857H384a138.678857 138.678857 0 0 0 138.678857-138.678857l-0.036571-117.357714z m-213.321143-234.642286h-10.642286A138.678857 138.678857 0 0 0 160 512v31.963429h149.321143v-170.642286z" p-id="103197" fill="#8992c8"></path></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -1 +0,0 @@
<svg t="1767366707029" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="100833" width="200" height="200"><path d="M533.333 54c16.138 0 29.75 12.016 31.753 28.03l17.828 142.569L896 224.6c17.496 0 31.713 14.042 31.996 31.47l0.004 0.53V939c0 17.673-14.327 32-32 32H469.735a31.94 31.94 0 0 1-3.051-0.102l-0.09-0.009c-10.834-0.868-19.434-6.86-24.45-14.999a31.766 31.766 0 0 1-3.374-7.39 32.348 32.348 0 0 1-1.405-7.246L419.752 800.4H128c-17.496 0-31.713-14.042-31.996-31.47L96 768.4V86c0-17.673 14.327-32 32-32zM864 288.599H590.917l13.33 106.6L704 395.2c17.673 0 32 14.327 32 32 0 17.496-14.042 31.713-31.47 31.996l-0.53 0.004-91.75-0.001 13.331 106.6L704 565.8c17.673 0 32 14.327 32 32 0 17.496-14.042 31.713-31.47 31.996l-0.53 0.004-70.416-0.001 16.548 132.332 0.287 2.298c0.024 0.188 0.046 0.376 0.066 0.565 0.986 9.171-2.002 17.793-7.523 24.232l-0.217 0.25L539.872 907H864v-618.4zM548.127 800.4H484.25l7.985 63.851 55.892-63.851zM505.085 118H160v618.4h287.598c0.302-0.004 0.603-0.004 0.904 0h133.913l-0.001-0.004L569.01 629.21l-3.386-27.076c-0.03-0.225-0.058-0.45-0.084-0.676l-21.256-169.977c-0.03-0.219-0.056-0.438-0.081-0.659L505.085 118zM448 565.8c17.673 0 32 14.327 32 32 0 17.496-14.042 31.713-31.47 31.996l-0.53 0.004H256c-17.673 0-32-14.327-32-32 0-17.496 14.042-31.713 31.47-31.996l0.53-0.004h192z m-21.333-170.6c17.673 0 32 14.327 32 32 0 17.496-14.042 31.713-31.471 31.996l-0.53 0.004H256c-17.673 0-32-14.327-32-32 0-17.496 14.042-31.713 31.47-31.996l0.53-0.004h170.667z m-21.334-170.6c17.673 0 32 14.327 32 32 0 17.496-14.041 31.713-31.47 31.996l-0.53 0.004H256c-17.673 0-32-14.327-32-32 0-17.496 14.042-31.713 31.47-31.996l0.53-0.004h149.333z" p-id="100834" fill="#1aaba8"></path></svg>

Before

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -1 +0,0 @@
<svg t="1767367226608" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5585" width="200" height="200"><path d="M416 64H768v64h-64v704h64v64H448v-64h64V512H416a224 224 0 1 1 0-448zM576 832h64V128H576v704zM416 128H512v320H416a160 160 0 0 1 0-320z" fill="#a4579d" p-id="5586"></path></svg>

Before

Width:  |  Height:  |  Size: 330 B

View File

@@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1767366207284" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="95138" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M753.5 130.4v763.3h70.1v66.4H477v-66.4h70.1V547.1H443.9c-44.2 0-84.8-11.1-121.7-33.2-36.9-22.1-66.4-51.6-88.5-88.5s-33.2-76.8-33.2-119.8 11.1-83.6 33.2-121.7c22.1-38.1 51.6-67.6 88.5-88.5s77.4-31.3 121.7-31.3h379.8v66.4h-70.1z m-206.5 0H443.8c-49.2 0-90.3 17.2-123.5 51.6-33.2 34.4-49.8 75.6-49.8 123.5s16.6 88.5 49.8 121.7c33.2 33.2 74.4 49.8 123.5 49.8H547V130.4z m140.1 0H617v763.3h70.1V130.4z" p-id="95139"></path></svg>

Before

Width:  |  Height:  |  Size: 758 B

View File

@@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1767365935803" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="81379" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 64a64 64 0 0 1 64 64v613.952l-121.28-95.68a83.2 83.2 0 0 0-110.848 7.04l-6.016 6.784-5.312 7.616a83.2 83.2 0 0 0-12.032 34.56l-0.064 1.728H595.2A83.2 83.2 0 0 0 512 787.2v44.8H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h768z" fill="#B5E3CC" p-id="81380"></path><path d="M640 256a32 32 0 1 1 0 64h-32v224a32 32 0 0 1-64 0V320h-64v224a32 32 0 0 1-64 0V320H384a32 32 0 0 1 0-64h256z m160 0a96 96 0 0 1 0 192H768v96a32 32 0 0 1-26.24 31.488L736 576a32 32 0 0 1-32-32v-256a32 32 0 0 1 32-32h64zM768 384h32a32 32 0 1 0 0-64H768v64zM288 256a32 32 0 0 1 32 32v256a32 32 0 0 1-64 0V448H192v96a32 32 0 0 1-64 0v-256a32 32 0 0 1 64 0V384h64V288a32 32 0 0 1 32-32zM772.096 699.712a19.2 19.2 0 0 0-4.096 11.904v56.32L595.2 768a19.2 19.2 0 0 0-19.2 19.2v89.6a19.2 19.2 0 0 0 19.2 19.2H768v56.384a19.2 19.2 0 0 0 31.104 15.104l152.576-120.384a19.2 19.2 0 0 0 0-30.208l-152.576-120.32a19.2 19.2 0 0 0-27.008 3.136z" fill="#129250" p-id="81381"></path></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1767365120766" class="icon" viewBox="0 0 1160 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12589" xmlns:xlink="http://www.w3.org/1999/xlink" width="226.5625" height="200"><path d="M398.5408 736.142222l435.768889-384.568889a44.009244 44.009244 0 0 0 0-67.675022 59.483022 59.483022 0 0 0-76.731733 0l-435.768889 384.568889a43.872711 43.872711 0 0 0 0 67.675022 59.164444 59.164444 0 0 0 76.731733 0z m143.7696-66.582755a39.867733 39.867733 0 0 1 9.102222 25.031111 38.866489 38.866489 0 0 1-13.653333 30.128355L308.929422 926.151111a52.8384 52.8384 0 0 1-68.266666 0L111.047111 811.781689a39.139556 39.139556 0 0 1 0-60.302222l228.192711-201.9328a50.335289 50.335289 0 0 1 34.178845-11.969423 53.748622 53.748622 0 0 1 22.755555 4.551112l69.632-60.848356c-57.617067-41.824711-141.7216-38.365867-194.696533 7.964444L42.052267 690.631111c-56.069689 50.3808-56.069689 131.117511 0 181.4528l130.207289 114.323911a158.651733 158.651733 0 0 0 204.8 0L605.297778 785.066667c54.613333-48.196267 57.025422-125.474133 5.779911-176.355556zM1117.980444 151.916089L988.410311 37.546667c-56.797867-50.062222-148.821333-50.062222-205.664711 0L554.552889 238.933333c-52.519822 46.739911-56.388267 120.968533-9.102222 171.804445L614.4 349.889422a41.688178 41.688178 0 0 1-5.142756-20.48 38.866489 38.866489 0 0 1 13.653334-30.128355l228.875378-201.386667a50.335289 50.335289 0 0 1 34.178844-12.515556 52.383289 52.383289 0 0 1 34.178844 12.515556l129.570134 114.323911a39.139556 39.139556 0 0 1 0 60.302222l-228.192711 201.9328a50.335289 50.335289 0 0 1-34.178845 11.969423 57.7536 57.7536 0 0 1-28.353422-7.418312l-68.266667 60.302223c57.389511 45.101511 144.543289 43.099022 199.202134-4.551111l228.192711-201.9328a117.418667 117.418667 0 0 0 0-180.906667z" fill="#1A97F0" p-id="12590"></path></svg>

Before

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -1 +0,0 @@
<svg t="1767366749042" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="102155" width="200" height="200"><path d="M426.7008 256c0-23.552 19.0976-42.6496 42.6496-42.6496h384a42.6496 42.6496 0 1 1 0 85.2992h-384A42.6496 42.6496 0 0 1 426.7008 256zM426.7008 512c0-23.552 19.0976-42.6496 42.6496-42.6496h384a42.6496 42.6496 0 1 1 0 85.2992h-384A42.6496 42.6496 0 0 1 426.7008 512zM469.2992 768c0-23.552 19.1488-42.6496 42.7008-42.6496h341.2992a42.6496 42.6496 0 0 1 0 85.2992H512A42.6496 42.6496 0 0 1 469.2992 768zM256 640a42.6496 42.6496 0 0 0-42.6496 42.6496 42.6496 42.6496 0 0 1-85.3504 0 128 128 0 1 1 256 0c0 25.856-11.264 45.6192-22.4256 59.8528-8.0384 10.1888-18.5856 20.48-26.8288 28.5184l-5.888 5.8368a42.4448 42.4448 0 0 1-2.8672 2.56l-37.4784 31.232h52.8384a42.6496 42.6496 0 1 1 0 85.3504H170.6496a42.6496 42.6496 0 0 1-27.2896-75.4688l126.5152-105.472 6.5024-6.3488 0.4096-0.4096 7.2704-7.168c4.608-4.608 7.936-8.192 10.3936-11.3664a28.672 28.672 0 0 0 3.9424-6.0928c0.3072-0.7168 0.256-0.9728 0.256-1.024A42.6496 42.6496 0 0 0 256 640zM272.3328 131.2256a42.6496 42.6496 0 0 1 26.3168 39.424v256a42.6496 42.6496 0 0 1-85.2992 0V273.664l-12.4928 12.4928a42.6496 42.6496 0 1 1-60.3648-60.3136l85.3504-85.3504a42.6496 42.6496 0 0 1 46.4896-9.216z" p-id="102156" fill="#87c38f"></path></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1767365625477" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="51837" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M98.649225 16.619164h734.636904v990.162784h-734.636904z" fill="#FF8A90" p-id="51838"></path><path d="M881.197231 128.411736h-31.940735V32.589531c0-17.642265-14.29847-31.940735-31.940735-31.940735H114.619592c-17.642265 0-31.940735 14.29847-31.940735 31.940735v958.222049c0 17.642265 14.29847 31.940735 31.940735 31.940735h702.696169c17.642265 0 31.940735-14.29847 31.940735-31.940735V415.878351h31.940735c17.642265 0 31.940735-14.29847 31.940735-31.940735V160.352471c0-17.642265-14.29847-31.940735-31.940735-31.940735z m-63.88147 0h-383.288819c-17.642265 0-31.940735 14.29847-31.940735 31.940735V383.937616c0 17.642265 14.29847 31.940735 31.940735 31.940735h383.288819v574.933229H114.619592v-958.222049h702.696169v95.822205z" fill="#2B3139" p-id="51839"></path><path d="M434.026942 160.352471h447.170289V383.937616h-447.170289z" fill="#FFFFFF" p-id="51840"></path><path d="M544.808889 215.175748h49.969783l16.294765 67.025636h0.311922l16.294765-67.025636h49.957306v113.963544h-33.18842v-73.101861h-0.336875l-19.80076 73.101861h-26.176431l-19.788283-73.101861h-0.336875v73.101861h-33.200897zM698.947889 215.175748h57.618092c37.992007 0 51.392143 28.097865 51.392143 56.819573 0 34.947656-18.490691 57.143971-58.241934 57.143971h-50.768301v-113.963544z" fill="#2B3139" p-id="51841"></path><path d="M726.584111 299.918511h13.712058c21.85944 0 25.065991-17.717126 25.065991-28.409787 0-7.174189-2.233356-27.112194-27.611269-27.112194h-11.154303v55.521981z" fill="#FFFFFF" p-id="51842"></path><path d="M630.512369 785.841895l-94.998733-129.709328h57.318647V544.888976h76.445658v111.243591h57.30617L630.487415 785.841895z" fill="#1EB9B0" p-id="51843"></path><path d="M508.139428 785.754557l-76.445657 0.087338v-120.439029l-57.331124 77.194268-57.343601-77.194268v120.439029H240.573389V544.976313h76.445657l57.343601 80.288528 57.331124-80.288528 76.445657-0.087337z" fill="#1EB9B0" p-id="51844"></path></svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -1 +0,0 @@
<svg t="1767367796950" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18541" width="200" height="200"><path d="M880.489336 512H993.882278v455.107765A56.786824 56.786824 0 0 1 937.185807 1024h-56.681412V512z" fill="#4AC3BB" fill-opacity=".603" p-id="18542"></path><path d="M143.510513 1024a113.182118 113.182118 0 0 1-80.188235-33.325176A113.980235 113.980235 0 0 1 30.117572 910.215529V113.784471C30.117572 83.606588 42.059219 54.663529 63.322278 33.325176A113.182118 113.182118 0 0 1 143.510513 0h510.238118C778.977807 0 880.489336 101.872941 880.489336 227.553882v739.553883A56.786824 56.786824 0 0 0 937.185807 1024H143.510513z" fill="#4AC3BB" p-id="18543"></path><path d="M575.653572 335.329882c64.331294 65.024 66.529882 169.758118 4.954353 237.477647l-4.954353 5.240471-98.063059 122.473412a28.175059 28.175059 0 0 1-21.985882 10.586353 28.175059 28.175059 0 0 1-21.985883-10.586353l-98.078117-122.473412-4.412236-4.638118c-63.503059-68.487529-60.777412-175.841882 6.098824-240.941176a168.478118 168.478118 0 0 1 238.426353 2.861176z m-120.048941 64.150589a56.470588 56.470588 0 0 0-49.016471 28.611764 57.735529 57.735529 0 0 0 0 57.193412 56.470588 56.470588 0 0 0 49.016471 28.611765c31.247059-0.015059 56.576-25.630118 56.576-57.22353 0-31.578353-25.328941-57.193412-56.576-57.193411z" fill="#FFFFFF" fill-opacity=".95" p-id="18544"></path></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1767364585914" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8006" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M960 128c0-35.36-28.704-64.224-63.936-61.728A896.48 896.48 0 0 0 326.4 326.4a896.48 896.48 0 0 0-260.128 569.664C63.776 931.296 92.64 960 128 960c0 0 19.52 0.576 32 0 64-272 84.48-383.68 234.24-533.76C544.32 276.16 752 192 960 160V128z" fill="#F8312F" p-id="8007"></path><path d="M960 256V160a800 800 0 0 0-565.76 234.24A801.344 801.344 0 0 0 160 960h96c32-128 106.24-333.76 238.08-465.92C625.92 362.24 752 304 960 256z" fill="#FFB02E" p-id="8008"></path><path d="M960 256v96c-160 16-284.16 96-398.08 209.92C448 676.16 384 800 352 960H256c0-186.56 74.24-365.76 206.08-497.92A704.32 704.32 0 0 1 960 256z" fill="#FFF478" p-id="8009"></path><path d="M630.08 630.08C534.08 726.08 480 832 448 960h-96c0-161.28 64-315.84 177.92-430.08C643.84 416 798.72 352 960 352v96c-144 32-233.92 86.08-329.92 182.08z" fill="#00D26A" p-id="8010"></path><path d="M960 544v-96c-135.68 0-265.92 54.08-361.92 150.08-96 96-150.08 226.24-150.08 361.92h96c0-110.4 43.84-216.32 121.92-294.08C744 587.84 849.92 544 960 544z" fill="#3F5FFF" p-id="8011"></path><path d="M960 576c0 35.36-28.928 63.36-63.584 70.336a320.384 320.384 0 0 0-250.112 250.08C639.36 931.04 611.392 960 576 960h-32c0-110.4 43.84-216.32 121.92-294.08C744 587.84 849.92 544 960 544v32z" fill="#8D65C5" p-id="8012"></path></svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -1 +0,0 @@
<svg t="1767366992790" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="111373" width="200" height="200"><path d="M581.973333 846.933333a380.8 380.8 0 1 1 380.8-380.8A381.226667 381.226667 0 0 1 581.973333 846.933333z m0-688a307.2 307.2 0 1 0 307.2 307.2 307.413333 307.413333 0 0 0-307.2-307.2z" fill="#FA6302" p-id="111374"></path><path d="M146.56 938.666667a36.906667 36.906667 0 0 1-26.026667-64l192-190.933334a36.906667 36.906667 0 0 1 52.053334 52.266667l-192 192a37.333333 37.333333 0 0 1-26.026667 10.666667z" fill="#43D7B4" p-id="111375"></path><path d="M470.826667 274.773333m-49.066667 0a49.066667 49.066667 0 1 0 98.133333 0 49.066667 49.066667 0 1 0-98.133333 0Z" fill="#43D7B4" p-id="111376"></path><path d="M312.106667 684.8l-23.68 23.466667A388.693333 388.693333 0 0 0 341.333333 760.32l23.466667-23.253333a36.906667 36.906667 0 0 0-52.053333-52.266667z" fill="#425300" p-id="111377"></path></svg>

Before

Width:  |  Height:  |  Size: 956 B

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 8.3 KiB

View File

@@ -6,10 +6,7 @@ import {useKeybindingStore} from '@/stores/keybindingStore';
import {useThemeStore} from '@/stores/themeStore';
import {useUpdateStore} from '@/stores/updateStore';
import WindowTitleBar from '@/components/titlebar/WindowTitleBar.vue';
import ToastContainer from '@/components/toast/ToastContainer.vue';
import {useTranslationStore} from "@/stores/translationStore";
import {useI18n} from "vue-i18n";
import {LanguageType} from "../bindings/voidraft/internal/models";
const configStore = useConfigStore();
const systemStore = useSystemStore();
@@ -17,7 +14,6 @@ const keybindingStore = useKeybindingStore();
const themeStore = useThemeStore();
const updateStore = useUpdateStore();
const translationStore = useTranslationStore();
const {locale} = useI18n();
onBeforeMount(async () => {
// 并行初始化配置、系统信息和快捷键配置
@@ -26,8 +22,9 @@ onBeforeMount(async () => {
systemStore.initSystemInfo(),
keybindingStore.loadKeyBindings(),
]);
locale.value = configStore.config.appearance.language || LanguageType.LangEnUS;
// 初始化语言和主题
await configStore.initLanguage();
await themeStore.initTheme();
await translationStore.loadTranslators();
@@ -42,7 +39,6 @@ onBeforeMount(async () => {
<div class="app-content">
<router-view/>
</div>
<ToastContainer/>
</div>
</template>

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 8.5 KiB

View File

@@ -24,7 +24,6 @@ export const CONFIG_KEY_MAP = {
enableWindowSnap: 'general.enableWindowSnap',
enableLoadingAnimation: 'general.enableLoadingAnimation',
enableTabs: 'general.enableTabs',
enableMemoryMonitor: 'general.enableMemoryMonitor',
// editing
fontSize: 'editing.fontSize',
fontFamily: 'editing.fontFamily',
@@ -89,7 +88,6 @@ export const DEFAULT_CONFIG: AppConfig = {
enableWindowSnap: true,
enableLoadingAnimation: true,
enableTabs: false,
enableMemoryMonitor: true,
},
editing: {
fontSize: CONFIG_LIMITS.fontSize.default,

View File

@@ -5,7 +5,7 @@
// 编辑器实例管理
export const EDITOR_CONFIG = {
/** 最多缓存的编辑器实例数量 */
MAX_INSTANCES: 10,
MAX_INSTANCES: 5,
/** 语法树缓存过期时间(毫秒) */
SYNTAX_TREE_CACHE_TIMEOUT: 30000,
/** 加载状态延迟时间(毫秒) */

View File

@@ -0,0 +1,265 @@
/**
* 操作信息接口
*/
interface OperationInfo {
controller: AbortController;
createdAt: number;
timeout?: number;
timeoutId?: NodeJS.Timeout;
}
/**
* 异步操作管理器
* 用于管理异步操作的竞态条件,确保只有最新的操作有效
* 支持操作超时和自动清理机制
*
* @template T 操作上下文的类型
*/
export class AsyncManager<T = any> {
private operationSequence = 0;
private pendingOperations = new Map<number, OperationInfo>();
private currentContext: T | null = null;
private defaultTimeout: number;
/**
* 创建异步操作管理器
*
* @param defaultTimeout 默认超时时间毫秒0表示不设置超时
*/
constructor(defaultTimeout: number = 0) {
this.defaultTimeout = defaultTimeout;
}
/**
* 生成新的操作ID
*
* @returns 新的操作ID
*/
getNextOperationId(): number {
return ++this.operationSequence;
}
/**
* 开始新的操作
*
* @param context 操作上下文
* @param options 操作选项
* @returns 操作ID和AbortController
*/
startOperation(
context: T,
options?: {
excludeId?: number;
timeout?: number;
}
): { operationId: number; abortController: AbortController } {
const operationId = this.getNextOperationId();
const abortController = new AbortController();
const timeout = options?.timeout ?? this.defaultTimeout;
// 取消之前的操作
this.cancelPreviousOperations(options?.excludeId);
// 创建操作信息
const operationInfo: OperationInfo = {
controller: abortController,
createdAt: Date.now(),
timeout: timeout > 0 ? timeout : undefined
};
// 设置超时处理
if (timeout > 0) {
operationInfo.timeoutId = setTimeout(() => {
this.cancelOperation(operationId, 'timeout');
}, timeout);
}
// 设置当前上下文和操作
this.currentContext = context;
this.pendingOperations.set(operationId, operationInfo);
return { operationId, abortController };
}
/**
* 检查操作是否仍然有效
*
* @param operationId 操作ID
* @param context 操作上下文
* @returns 操作是否有效
*/
isOperationValid(operationId: number, context?: T): boolean {
const operationInfo = this.pendingOperations.get(operationId);
const contextValid = context === undefined || this.currentContext === context;
return (
operationInfo !== undefined &&
!operationInfo.controller.signal.aborted &&
contextValid
);
}
/**
* 完成操作
*
* @param operationId 操作ID
*/
completeOperation(operationId: number): void {
const operationInfo = this.pendingOperations.get(operationId);
if (operationInfo) {
// 清理超时定时器
if (operationInfo.timeoutId) {
clearTimeout(operationInfo.timeoutId);
}
this.pendingOperations.delete(operationId);
}
}
/**
* 取消指定操作
*
* @param operationId 操作ID
* @param reason 取消原因
*/
cancelOperation(operationId: number, reason?: string): void {
const operationInfo = this.pendingOperations.get(operationId);
if (operationInfo) {
// 清理超时定时器
if (operationInfo.timeoutId) {
clearTimeout(operationInfo.timeoutId);
}
// 取消操作
operationInfo.controller.abort(reason);
this.pendingOperations.delete(operationId);
}
}
/**
* 取消之前的操作修复并发bug
*
* @param excludeId 要排除的操作ID不取消该操作
*/
cancelPreviousOperations(excludeId?: number): void {
// 创建要取消的操作ID数组避免在遍历时修改Map
const operationIdsToCancel: number[] = [];
for (const [operationId] of this.pendingOperations) {
if (excludeId === undefined || operationId !== excludeId) {
operationIdsToCancel.push(operationId);
}
}
// 批量取消操作
for (const operationId of operationIdsToCancel) {
this.cancelOperation(operationId, 'superseded');
}
}
/**
* 取消所有操作
*/
cancelAllOperations(): void {
// 创建要取消的操作ID数组避免在遍历时修改Map
const operationIdsToCancel = Array.from(this.pendingOperations.keys());
// 批量取消操作
for (const operationId of operationIdsToCancel) {
this.cancelOperation(operationId, 'cancelled');
}
this.currentContext = null;
}
/**
* 清理过期操作(手动清理超时操作)
*
* @param maxAge 最大存活时间(毫秒)
* @returns 清理的操作数量
*/
cleanupExpiredOperations(maxAge: number): number {
const now = Date.now();
const expiredOperationIds: number[] = [];
for (const [operationId, operationInfo] of this.pendingOperations) {
if (now - operationInfo.createdAt > maxAge) {
expiredOperationIds.push(operationId);
}
}
// 批量取消过期操作
for (const operationId of expiredOperationIds) {
this.cancelOperation(operationId, 'expired');
}
return expiredOperationIds.length;
}
/**
* 获取操作统计信息
*
* @returns 操作统计信息
*/
getOperationStats(): {
total: number;
withTimeout: number;
averageAge: number;
oldestAge: number;
} {
const now = Date.now();
let withTimeout = 0;
let totalAge = 0;
let oldestAge = 0;
for (const operationInfo of this.pendingOperations.values()) {
const age = now - operationInfo.createdAt;
totalAge += age;
oldestAge = Math.max(oldestAge, age);
if (operationInfo.timeout) {
withTimeout++;
}
}
return {
total: this.pendingOperations.size,
withTimeout,
averageAge: this.pendingOperations.size > 0 ? totalAge / this.pendingOperations.size : 0,
oldestAge
};
}
/**
* 获取当前上下文
*
* @returns 当前上下文
*/
getCurrentContext(): T | null {
return this.currentContext;
}
/**
* 设置当前上下文
*
* @param context 新的上下文
*/
setCurrentContext(context: T | null): void {
this.currentContext = context;
}
/**
* 获取待处理操作数量
*
* @returns 待处理操作数量
*/
get pendingCount(): number {
return this.pendingOperations.size;
}
/**
* 检查是否有待处理的操作
*
* @returns 是否有待处理的操作
*/
hasPendingOperations(): boolean {
return this.pendingOperations.size > 0;
}
}

View File

@@ -1,13 +1,42 @@
import { LanguageType } from '@/../bindings/voidraft/internal/models/models';
import type { SupportedLocaleType } from '@/common/constant/locales';
/**
* 配置工具类
*/
export class ConfigUtils {
/**
* 将后端语言类型转换为前端语言代码
*/
static backendLanguageToFrontend(language: LanguageType): SupportedLocaleType {
return language === LanguageType.LangZhCN ? 'zh-CN' : 'en-US';
}
/**
* 验证数值是否在指定范围内
*/
static clamp(value: number, min: number, max: number): number {
return Math.max(min, Math.min(max, value));
}
/**
* 将前端语言代码转换为后端语言类型
*/
static frontendLanguageToBackend(locale: SupportedLocaleType): LanguageType {
return locale === 'zh-CN' ? LanguageType.LangZhCN : LanguageType.LangEnUS;
}
/**
* 验证数值是否在指定范围内
*/
static clamp(value: number, min: number, max: number): number {
return Math.max(min, Math.min(max, value));
}
/**
* 验证配置值是否有效
*/
static isValidConfigValue<T>(value: T, validValues: readonly T[]): boolean {
return validValues.includes(value);
}
/**
* 获取配置的默认值
*/
static getDefaultValue<T>(key: string, defaults: Record<string, { default: T }>): T {
return defaults[key]?.default;
}
}

View File

@@ -0,0 +1,329 @@
/**
* DOM Diff 算法单元测试
*/
import { describe, test, expect, beforeEach, afterEach } from 'vitest';
import { morphNode, morphHTML, morphWithKeys } from './domDiff';
describe('DOM Diff Algorithm', () => {
let container: HTMLElement;
beforeEach(() => {
container = document.createElement('div');
document.body.appendChild(container);
});
afterEach(() => {
document.body.removeChild(container);
});
describe('morphNode - 基础功能', () => {
test('应该更新文本节点内容', () => {
const fromNode = document.createTextNode('Hello');
const toNode = document.createTextNode('World');
container.appendChild(fromNode);
morphNode(fromNode, toNode);
expect(fromNode.nodeValue).toBe('World');
});
test('应该保持相同的文本节点不变', () => {
const fromNode = document.createTextNode('Hello');
const toNode = document.createTextNode('Hello');
container.appendChild(fromNode);
const originalNode = fromNode;
morphNode(fromNode, toNode);
expect(fromNode).toBe(originalNode);
expect(fromNode.nodeValue).toBe('Hello');
});
test('应该替换不同类型的节点', () => {
const fromNode = document.createElement('span');
fromNode.textContent = 'Hello';
const toNode = document.createElement('div');
toNode.textContent = 'World';
container.appendChild(fromNode);
morphNode(fromNode, toNode);
expect(container.firstChild?.nodeName).toBe('DIV');
expect(container.firstChild?.textContent).toBe('World');
});
});
describe('morphNode - 属性更新', () => {
test('应该添加新属性', () => {
const fromEl = document.createElement('div');
const toEl = document.createElement('div');
toEl.setAttribute('class', 'test');
toEl.setAttribute('id', 'myid');
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.getAttribute('class')).toBe('test');
expect(fromEl.getAttribute('id')).toBe('myid');
});
test('应该更新已存在的属性', () => {
const fromEl = document.createElement('div');
fromEl.setAttribute('class', 'old');
const toEl = document.createElement('div');
toEl.setAttribute('class', 'new');
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.getAttribute('class')).toBe('new');
});
test('应该删除不存在的属性', () => {
const fromEl = document.createElement('div');
fromEl.setAttribute('class', 'test');
fromEl.setAttribute('id', 'myid');
const toEl = document.createElement('div');
toEl.setAttribute('class', 'test');
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.getAttribute('class')).toBe('test');
expect(fromEl.hasAttribute('id')).toBe(false);
});
});
describe('morphNode - 子节点更新', () => {
test('应该添加新子节点', () => {
const fromEl = document.createElement('ul');
fromEl.innerHTML = '<li>1</li><li>2</li>';
const toEl = document.createElement('ul');
toEl.innerHTML = '<li>1</li><li>2</li><li>3</li>';
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.children.length).toBe(3);
expect(fromEl.children[2].textContent).toBe('3');
});
test('应该删除多余的子节点', () => {
const fromEl = document.createElement('ul');
fromEl.innerHTML = '<li>1</li><li>2</li><li>3</li>';
const toEl = document.createElement('ul');
toEl.innerHTML = '<li>1</li><li>2</li>';
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.children.length).toBe(2);
expect(fromEl.textContent).toBe('12');
});
test('应该更新子节点内容', () => {
const fromEl = document.createElement('div');
fromEl.innerHTML = '<p>Old</p>';
const toEl = document.createElement('div');
toEl.innerHTML = '<p>New</p>';
container.appendChild(fromEl);
const originalP = fromEl.querySelector('p');
morphNode(fromEl, toEl);
// 应该保持同一个 p 元素,只更新内容
expect(fromEl.querySelector('p')).toBe(originalP);
expect(fromEl.querySelector('p')?.textContent).toBe('New');
});
});
describe('morphHTML - HTML 字符串更新', () => {
test('应该从 HTML 字符串更新元素', () => {
const element = document.createElement('div');
element.innerHTML = '<p>Old</p>';
container.appendChild(element);
morphHTML(element, '<p>New</p>');
expect(element.innerHTML).toBe('<p>New</p>');
});
test('应该处理复杂的 HTML 结构', () => {
const element = document.createElement('div');
element.innerHTML = '<h1>Title</h1><p>Paragraph</p>';
container.appendChild(element);
morphHTML(element, '<h1>New Title</h1><p>New Paragraph</p><span>Extra</span>');
expect(element.children.length).toBe(3);
expect(element.querySelector('h1')?.textContent).toBe('New Title');
expect(element.querySelector('p')?.textContent).toBe('New Paragraph');
expect(element.querySelector('span')?.textContent).toBe('Extra');
});
});
describe('morphWithKeys - 基于 key 的智能 diff', () => {
test('应该保持相同 key 的节点', () => {
const fromEl = document.createElement('ul');
fromEl.innerHTML = `
<li data-key="a">A</li>
<li data-key="b">B</li>
<li data-key="c">C</li>
`;
const toEl = document.createElement('ul');
toEl.innerHTML = `
<li data-key="a">A Updated</li>
<li data-key="b">B</li>
<li data-key="c">C</li>
`;
container.appendChild(fromEl);
const originalA = fromEl.querySelector('[data-key="a"]');
morphWithKeys(fromEl, toEl);
expect(fromEl.querySelector('[data-key="a"]')).toBe(originalA);
expect(originalA?.textContent).toBe('A Updated');
});
test('应该重新排序节点', () => {
const fromEl = document.createElement('ul');
fromEl.innerHTML = `
<li data-key="a">A</li>
<li data-key="b">B</li>
<li data-key="c">C</li>
`;
const toEl = document.createElement('ul');
toEl.innerHTML = `
<li data-key="c">C</li>
<li data-key="a">A</li>
<li data-key="b">B</li>
`;
container.appendChild(fromEl);
morphWithKeys(fromEl, toEl);
const keys = Array.from(fromEl.children).map(child => child.getAttribute('data-key'));
expect(keys).toEqual(['c', 'a', 'b']);
});
test('应该添加新的 key 节点', () => {
const fromEl = document.createElement('ul');
fromEl.innerHTML = `
<li data-key="a">A</li>
<li data-key="b">B</li>
`;
const toEl = document.createElement('ul');
toEl.innerHTML = `
<li data-key="a">A</li>
<li data-key="b">B</li>
<li data-key="c">C</li>
`;
container.appendChild(fromEl);
morphWithKeys(fromEl, toEl);
expect(fromEl.children.length).toBe(3);
expect(fromEl.querySelector('[data-key="c"]')?.textContent).toBe('C');
});
test('应该删除不存在的 key 节点', () => {
const fromEl = document.createElement('ul');
fromEl.innerHTML = `
<li data-key="a">A</li>
<li data-key="b">B</li>
<li data-key="c">C</li>
`;
const toEl = document.createElement('ul');
toEl.innerHTML = `
<li data-key="a">A</li>
<li data-key="c">C</li>
`;
container.appendChild(fromEl);
morphWithKeys(fromEl, toEl);
expect(fromEl.children.length).toBe(2);
expect(fromEl.querySelector('[data-key="b"]')).toBeNull();
});
});
describe('性能测试', () => {
test('应该高效处理大量节点', () => {
const fromEl = document.createElement('ul');
for (let i = 0; i < 1000; i++) {
const li = document.createElement('li');
li.textContent = `Item ${i}`;
fromEl.appendChild(li);
}
const toEl = document.createElement('ul');
for (let i = 0; i < 1000; i++) {
const li = document.createElement('li');
li.textContent = `Updated Item ${i}`;
toEl.appendChild(li);
}
container.appendChild(fromEl);
const startTime = performance.now();
morphNode(fromEl, toEl);
const endTime = performance.now();
expect(endTime - startTime).toBeLessThan(100); // 应该在 100ms 内完成
expect(fromEl.children.length).toBe(1000);
expect(fromEl.children[0].textContent).toBe('Updated Item 0');
});
});
describe('边界情况', () => {
test('应该处理空节点', () => {
const fromEl = document.createElement('div');
const toEl = document.createElement('div');
container.appendChild(fromEl);
expect(() => morphNode(fromEl, toEl)).not.toThrow();
});
test('应该处理只有文本的节点', () => {
const fromEl = document.createElement('div');
fromEl.textContent = 'Hello';
const toEl = document.createElement('div');
toEl.textContent = 'World';
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.textContent).toBe('World');
});
test('应该处理嵌套的复杂结构', () => {
const fromEl = document.createElement('div');
fromEl.innerHTML = `
<div class="outer">
<div class="inner">
<span>Text</span>
</div>
</div>
`;
const toEl = document.createElement('div');
toEl.innerHTML = `
<div class="outer modified">
<div class="inner">
<span>Updated Text</span>
<strong>New</strong>
</div>
</div>
`;
container.appendChild(fromEl);
morphNode(fromEl, toEl);
expect(fromEl.querySelector('.outer')?.classList.contains('modified')).toBe(true);
expect(fromEl.querySelector('span')?.textContent).toBe('Updated Text');
expect(fromEl.querySelector('strong')?.textContent).toBe('New');
});
});
});

View File

@@ -0,0 +1,180 @@
/**
* 轻量级 DOM Diff 算法实现
* 基于 morphdom 思路,只更新变化的节点,保持未变化的节点不动
*/
/**
* 比较并更新两个 DOM 节点
* @param fromNode 原节点
* @param toNode 目标节点
*/
export function morphNode(fromNode: Node, toNode: Node): void {
// 节点类型不同,直接替换
if (fromNode.nodeType !== toNode.nodeType || fromNode.nodeName !== toNode.nodeName) {
fromNode.parentNode?.replaceChild(toNode.cloneNode(true), fromNode);
return;
}
// 文本节点:比较内容
if (fromNode.nodeType === Node.TEXT_NODE) {
if (fromNode.nodeValue !== toNode.nodeValue) {
fromNode.nodeValue = toNode.nodeValue;
}
return;
}
// 元素节点:更新属性和子节点
if (fromNode.nodeType === Node.ELEMENT_NODE) {
const fromEl = fromNode as Element;
const toEl = toNode as Element;
// 更新属性
morphAttributes(fromEl, toEl);
// 更新子节点
morphChildren(fromEl, toEl);
}
}
/**
* 更新元素属性
*/
function morphAttributes(fromEl: Element, toEl: Element): void {
// 移除旧属性
const fromAttrs = fromEl.attributes;
for (let i = fromAttrs.length - 1; i >= 0; i--) {
const attr = fromAttrs[i];
if (!toEl.hasAttribute(attr.name)) {
fromEl.removeAttribute(attr.name);
}
}
// 添加/更新新属性
const toAttrs = toEl.attributes;
for (let i = 0; i < toAttrs.length; i++) {
const attr = toAttrs[i];
const fromValue = fromEl.getAttribute(attr.name);
if (fromValue !== attr.value) {
fromEl.setAttribute(attr.name, attr.value);
}
}
}
/**
* 更新子节点(核心 diff 算法)
*/
function morphChildren(fromEl: Element, toEl: Element): void {
const fromChildren = Array.from(fromEl.childNodes);
const toChildren = Array.from(toEl.childNodes);
const fromLen = fromChildren.length;
const toLen = toChildren.length;
const minLen = Math.min(fromLen, toLen);
// 1. 更新公共部分
for (let i = 0; i < minLen; i++) {
morphNode(fromChildren[i], toChildren[i]);
}
// 2. 移除多余的旧节点
if (fromLen > toLen) {
for (let i = fromLen - 1; i >= toLen; i--) {
fromEl.removeChild(fromChildren[i]);
}
}
// 3. 添加新节点
if (toLen > fromLen) {
for (let i = fromLen; i < toLen; i++) {
fromEl.appendChild(toChildren[i].cloneNode(true));
}
}
}
/**
* 优化版:使用 key 进行更智能的 diff可选
* 适用于有 data-key 属性的元素
*/
export function morphWithKeys(fromEl: Element, toEl: Element): void {
const toChildren = Array.from(toEl.children) as Element[];
// 构建 from 的 key 映射
const fromKeyMap = new Map<string, Element>();
Array.from(fromEl.children).forEach((child) => {
const key = child.getAttribute('data-key');
if (key) {
fromKeyMap.set(key, child);
}
});
const processedKeys = new Set<string>();
// 按照 toChildren 的顺序处理
toChildren.forEach((toChild, toIndex) => {
const key = toChild.getAttribute('data-key');
if (!key) return;
processedKeys.add(key);
const fromChild = fromKeyMap.get(key);
if (fromChild) {
// 找到对应节点,更新内容
morphNode(fromChild, toChild);
// 确保节点在正确的位置
const currentNode = fromEl.children[toIndex];
if (currentNode !== fromChild) {
// 将 fromChild 移动到正确位置
fromEl.insertBefore(fromChild, currentNode);
}
} else {
// 新节点,插入到正确位置
const currentNode = fromEl.children[toIndex];
fromEl.insertBefore(toChild.cloneNode(true), currentNode || null);
}
});
// 删除不再存在的节点(从后往前删除,避免索引问题)
const childrenToRemove: Element[] = [];
fromKeyMap.forEach((child, key) => {
if (!processedKeys.has(key)) {
childrenToRemove.push(child);
}
});
childrenToRemove.forEach(child => {
fromEl.removeChild(child);
});
}
/**
* 高级 API直接从 HTML 字符串更新元素
*/
export function morphHTML(element: Element, htmlString: string): void {
const tempContainer = document.createElement('div');
tempContainer.innerHTML = htmlString;
// 更新元素的子节点列表
morphChildren(element, tempContainer);
}
/**
* 批量更新(使用 DocumentFragment
*/
export function batchMorph(element: Element, htmlString: string): void {
const tempContainer = document.createElement('div');
tempContainer.innerHTML = htmlString;
const fragment = document.createDocumentFragment();
Array.from(tempContainer.childNodes).forEach(node => {
fragment.appendChild(node);
});
// 清空原内容
while (element.firstChild) {
element.removeChild(element.firstChild);
}
// 批量插入
element.appendChild(fragment);
}

View File

@@ -1,105 +0,0 @@
<script setup lang="ts">
import { provide, ref } from 'vue';
interface Props {
/**
* 是否允许多个面板同时展开
* @default false - 单选模式(手风琴效果)
*/
multiple?: boolean;
}
const props = withDefaults(defineProps<Props>(), {
multiple: false,
});
// 当前展开的项(单选模式)或展开项列表(多选模式)
const expandedItems = ref<Set<string | number>>(new Set());
/**
* 切换展开状态
*/
const toggleItem = (id: string | number) => {
if (props.multiple) {
// 多选模式:切换单个项
if (expandedItems.value.has(id)) {
expandedItems.value.delete(id);
} else {
expandedItems.value.add(id);
}
} else {
// 单选模式:只能展开一个
if (expandedItems.value.has(id)) {
expandedItems.value.clear();
} else {
expandedItems.value.clear();
expandedItems.value.add(id);
}
}
// 触发响应式更新
expandedItems.value = new Set(expandedItems.value);
};
/**
* 检查项是否展开
*/
const isExpanded = (id: string | number): boolean => {
return expandedItems.value.has(id);
};
/**
* 展开指定项
*/
const expand = (id: string | number) => {
if (!props.multiple) {
expandedItems.value.clear();
}
expandedItems.value.add(id);
expandedItems.value = new Set(expandedItems.value);
};
/**
* 收起指定项
*/
const collapse = (id: string | number) => {
expandedItems.value.delete(id);
expandedItems.value = new Set(expandedItems.value);
};
/**
* 收起所有项
*/
const collapseAll = () => {
expandedItems.value.clear();
expandedItems.value = new Set(expandedItems.value);
};
// 通过 provide 向子组件提供状态和方法
provide('accordion', {
toggleItem,
isExpanded,
expand,
collapse,
});
// 暴露方法供父组件使用
defineExpose({
expand,
collapse,
collapseAll,
});
</script>
<template>
<div class="accordion-container">
<slot></slot>
</div>
</template>
<style scoped lang="scss">
.accordion-container {
display: flex;
flex-direction: column;
}
</style>

View File

@@ -1,187 +0,0 @@
<script setup lang="ts">
import { inject, computed, ref } from 'vue';
interface Props {
/**
* 唯一标识符
*/
id: string | number;
/**
* 标题
*/
title?: string;
/**
* 是否禁用
*/
disabled?: boolean;
}
const props = defineProps<Props>();
const accordion = inject<{
toggleItem: (id: string | number) => void;
isExpanded: (id: string | number) => boolean;
}>('accordion');
if (!accordion) {
throw new Error('AccordionItem must be used within AccordionContainer');
}
const isExpanded = computed(() => accordion.isExpanded(props.id));
const toggle = () => {
if (!props.disabled) {
accordion.toggleItem(props.id);
}
};
// 内容容器的引用,用于计算高度
const contentRef = ref<HTMLElement>();
const contentHeight = computed(() => {
if (!contentRef.value) return '0px';
return isExpanded.value ? `${contentRef.value.scrollHeight}px` : '0px';
});
</script>
<template>
<div
class="accordion-item"
:class="{
'is-expanded': isExpanded,
'is-disabled': disabled
}"
>
<!-- 标题栏 -->
<div
class="accordion-header"
@click="toggle"
:aria-expanded="isExpanded"
:aria-disabled="disabled"
role="button"
tabindex="0"
@keydown.enter="toggle"
@keydown.space.prevent="toggle"
>
<div class="accordion-title">
<slot name="title">
{{ title }}
</slot>
</div>
<div class="accordion-icon">
<svg
width="12"
height="12"
viewBox="0 0 12 12"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M3 4.5L6 7.5L9 4.5"
stroke="currentColor"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</div>
</div>
<!-- 内容区域 -->
<div
class="accordion-content-wrapper"
:style="{ height: contentHeight }"
>
<div
ref="contentRef"
class="accordion-content"
>
<div class="accordion-content-inner">
<slot></slot>
</div>
</div>
</div>
</div>
</template>
<style scoped lang="scss">
.accordion-item {
border-bottom: 1px solid var(--settings-border);
transition: background-color 0.2s ease;
&:last-child {
border-bottom: none;
}
&.is-expanded {
background-color: var(--settings-hover);
}
&.is-disabled {
opacity: 0.5;
cursor: not-allowed;
.accordion-header {
cursor: not-allowed;
}
}
}
.accordion-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 12px 16px;
cursor: pointer;
user-select: none;
transition: background-color 0.2s ease;
&:hover:not([aria-disabled="true"]) {
background-color: var(--settings-hover);
}
&:focus-visible {
outline: 2px solid #4a9eff;
outline-offset: -2px;
}
}
.accordion-title {
flex: 1;
font-size: 13px;
font-weight: 500;
color: var(--settings-text);
display: flex;
align-items: center;
gap: 8px;
}
.accordion-icon {
display: flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
color: var(--text-muted);
transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
.is-expanded & {
transform: rotate(180deg);
}
}
.accordion-content-wrapper {
overflow: hidden;
transition: height 0.3s cubic-bezier(0.4, 0, 0.2, 1);
}
.accordion-content {
// 用于测量实际内容高度
}
.accordion-content-inner {
padding: 0 16px 12px 16px;
color: var(--settings-text);
font-size: 13px;
}
</style>

View File

@@ -1,3 +0,0 @@
export { default as AccordionContainer } from './AccordionContainer.vue';
export { default as AccordionItem } from './AccordionItem.vue';

View File

@@ -7,7 +7,7 @@
v-for="tab in tabStore.tabs"
:key="tab.documentId"
:tab="tab"
:isActive="tab.documentId === documentStore.currentDocumentId"
:isActive="tab.documentId === tabStore.currentDocumentId"
:canClose="tabStore.canCloseTab"
@click="switchToTab"
@close="closeTab"
@@ -35,14 +35,8 @@ import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
import TabItem from './TabItem.vue';
import TabContextMenu from './TabContextMenu.vue';
import { useTabStore } from '@/stores/tabStore';
import { useDocumentStore } from '@/stores/documentStore';
import { useEditorStore } from '@/stores/editorStore';
import { useEditorStateStore } from '@/stores/editorStateStore';
const tabStore = useTabStore();
const documentStore = useDocumentStore();
const editorStore = useEditorStore();
const editorStateStore = useEditorStateStore();
// DOM 引用
const tabBarRef = ref<HTMLElement>();
@@ -56,36 +50,8 @@ const contextMenuTargetId = ref<number | null>(null);
// 标签页操作
const switchToTab = async (documentId: number) => {
// 保存旧文档的光标位置
const oldDocId = documentStore.currentDocumentId;
if (oldDocId) {
const cursorPos = editorStore.getCurrentCursorPosition();
editorStateStore.saveCursorPosition(oldDocId, cursorPos);
}
// 如果旧文档有未保存修改,保存它
if (oldDocId && editorStore.hasUnsavedChanges(oldDocId)) {
try {
const content = editorStore.getCurrentContent();
await documentStore.saveDocument(oldDocId, content);
editorStore.syncAfterSave(oldDocId);
} catch (error) {
console.error('save document error:', error);
}
}
// 切换文档
await tabStore.switchToTabAndDocument(documentId);
// 切换到新编辑器
await editorStore.switchToEditor(documentId);
// 更新标签页
if (documentStore.currentDocument && tabStore.isTabsEnabled) {
tabStore.addOrActivateTab(documentStore.currentDocument);
}
const switchToTab = (documentId: number) => {
tabStore.switchToTabAndDocument(documentId);
};
const closeTab = (documentId: number) => {
@@ -184,7 +150,7 @@ onUnmounted(() => {
});
// 监听当前活跃标签页的变化
watch(() => documentStore.currentDocumentId, () => {
watch(() => tabStore.currentDocumentId, () => {
scrollToActiveTab();
});

View File

@@ -1,292 +0,0 @@
<template>
<div
:class="['toast-item', `toast-${type}`]"
@mouseenter="pauseTimer"
@mouseleave="resumeTimer"
>
<!-- 图标 -->
<div class="toast-icon">
<svg v-if="type === 'success'" width="20" height="20" viewBox="0 0 20 20" fill="none">
<path d="M10 0C4.48 0 0 4.48 0 10s4.48 10 10 10 10-4.48 10-10S15.52 0 10 0zm-2 15l-5-5 1.41-1.41L8 12.17l7.59-7.59L17 6l-9 9z" fill="currentColor"/>
</svg>
<svg v-else-if="type === 'error'" width="20" height="20" viewBox="0 0 20 20" fill="none">
<path d="M10 0C4.48 0 0 4.48 0 10s4.48 10 10 10 10-4.48 10-10S15.52 0 10 0zm1 15H9v-2h2v2zm0-4H9V5h2v6z" fill="currentColor"/>
</svg>
<svg v-else-if="type === 'warning'" width="20" height="20" viewBox="0 0 20 20" fill="none">
<path d="M1 19h18L10 1 1 19zm10-3H9v-2h2v2zm0-4H9v-4h2v4z" fill="currentColor"/>
</svg>
<svg v-else-if="type === 'info'" width="20" height="20" viewBox="0 0 20 20" fill="none">
<path d="M10 0C4.48 0 0 4.48 0 10s4.48 10 10 10 10-4.48 10-10S15.52 0 10 0zm1 15H9V9h2v6zm0-8H9V5h2v2z" fill="currentColor"/>
</svg>
</div>
<!-- 内容 -->
<div class="toast-content">
<div v-if="title" class="toast-title">{{ title }}</div>
<div class="toast-message">{{ message }}</div>
</div>
<!-- 关闭按钮 -->
<button
v-if="closable"
class="toast-close"
@click="close"
aria-label="Close"
>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none">
<path d="M12 4L4 12M4 4L12 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
</svg>
</button>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, onUnmounted } from 'vue';
import type { Toast } from './types';
const props = withDefaults(
defineProps<{
toast: Toast;
}>(),
{}
);
const emit = defineEmits<{
close: [id: string];
}>();
const timer = ref<number | null>(null);
const remainingTime = ref(props.toast.duration);
const pausedAt = ref<number | null>(null);
const { id, message, title, type, duration, closable } = props.toast;
const close = () => {
emit('close', id);
};
const startTimer = () => {
if (duration > 0) {
timer.value = window.setTimeout(() => {
close();
}, remainingTime.value);
}
};
const clearTimer = () => {
if (timer.value) {
clearTimeout(timer.value);
timer.value = null;
}
};
const pauseTimer = () => {
if (timer.value && duration > 0) {
clearTimer();
pausedAt.value = Date.now();
}
};
const resumeTimer = () => {
if (pausedAt.value && duration > 0) {
const elapsed = Date.now() - pausedAt.value;
remainingTime.value = Math.max(0, remainingTime.value - elapsed);
pausedAt.value = null;
startTimer();
}
};
onMounted(() => {
startTimer();
});
onUnmounted(() => {
clearTimer();
});
</script>
<style scoped lang="scss">
.toast-item {
display: flex;
align-items: flex-start;
gap: 12px;
min-width: 300px;
max-width: 420px;
padding: 16px 18px;
margin-bottom: 12px;
transform-origin: center center;
// 毛玻璃效果
// 亮色主题
background: rgba(255, 255, 255, 0.85);
backdrop-filter: blur(20px) saturate(180%);
-webkit-backdrop-filter: blur(20px) saturate(180%);
border-radius: 12px;
border: 1px solid rgba(255, 255, 255, 0.5);
box-shadow:
0 4px 12px rgba(0, 0, 0, 0.08),
0 1px 3px rgba(0, 0, 0, 0.06),
inset 0 1px 0 rgba(255, 255, 255, 0.8);
cursor: default;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
&:hover {
transform: translateY(-2px);
box-shadow:
0 6px 16px rgba(0, 0, 0, 0.1),
0 2px 6px rgba(0, 0, 0, 0.08),
inset 0 1px 0 rgba(255, 255, 255, 0.8);
}
}
// 深色主题适配 - 使用应用的 data-theme 属性
:root[data-theme="dark"] .toast-item,
:root[data-theme="auto"] .toast-item {
background: rgba(45, 45, 45, 0.9);
border: 1px solid rgba(255, 255, 255, 0.1);
box-shadow:
0 4px 12px rgba(0, 0, 0, 0.3),
0 1px 3px rgba(0, 0, 0, 0.2),
inset 0 1px 0 rgba(255, 255, 255, 0.05);
&:hover {
box-shadow:
0 6px 16px rgba(0, 0, 0, 0.4),
0 2px 6px rgba(0, 0, 0, 0.3),
inset 0 1px 0 rgba(255, 255, 255, 0.05);
}
}
// 跟随系统主题时的浅色偏好
@media (prefers-color-scheme: light) {
:root[data-theme="auto"] .toast-item {
background: rgba(255, 255, 255, 0.85);
border: 1px solid rgba(255, 255, 255, 0.5);
box-shadow:
0 4px 12px rgba(0, 0, 0, 0.08),
0 1px 3px rgba(0, 0, 0, 0.06),
inset 0 1px 0 rgba(255, 255, 255, 0.8);
&:hover {
box-shadow:
0 6px 16px rgba(0, 0, 0, 0.1),
0 2px 6px rgba(0, 0, 0, 0.08),
inset 0 1px 0 rgba(255, 255, 255, 0.8);
}
}
}
.toast-icon {
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
margin-top: 2px;
svg {
width: 20px;
height: 20px;
filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.1));
}
}
// 有标题时,图标与标题对齐(不需要 margin-top
.toast-item:has(.toast-title) .toast-icon {
margin-top: 0;
}
.toast-success .toast-icon {
color: #16a34a;
}
.toast-error .toast-icon {
color: #dc2626;
}
.toast-warning .toast-icon {
color: #f59e0b;
}
.toast-info .toast-icon {
color: #3b82f6;
}
.toast-content {
flex: 1;
min-width: 0;
}
.toast-title {
font-size: 13px;
font-weight: 600;
color: var(--settings-text);
margin-bottom: 4px;
line-height: 1.4;
}
.toast-message {
font-size: 12px;
color: var(--settings-text-secondary);
line-height: 1.5;
word-wrap: break-word;
}
.toast-close {
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
padding: 0;
margin: 0;
margin-top: 0px;
background: rgba(0, 0, 0, 0.05);
border: none;
border-radius: 6px;
color: var(--settings-text-secondary);
cursor: pointer;
transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
svg {
width: 16px;
height: 16px;
}
&:hover {
background: rgba(0, 0, 0, 0.1);
color: var(--settings-text);
transform: rotate(90deg);
}
&:active {
transform: rotate(90deg) scale(0.9);
}
}
:root[data-theme="dark"] .toast-close,
:root[data-theme="auto"] .toast-close {
background: rgba(255, 255, 255, 0.08);
&:hover {
background: rgba(255, 255, 255, 0.15);
}
}
@media (prefers-color-scheme: light) {
:root[data-theme="auto"] .toast-close {
background: rgba(0, 0, 0, 0.05);
&:hover {
background: rgba(0, 0, 0, 0.1);
}
}
}
</style>

View File

@@ -1,168 +0,0 @@
<template>
<Teleport to="body">
<TransitionGroup
v-for="position in positions"
:key="position"
:class="['toast-container', `toast-container-${position}`]"
name="toast-list"
tag="div"
>
<ToastItem
v-for="toast in getToastsByPosition(position)"
:key="toast.id"
:toast="toast"
@close="removeToast"
/>
</TransitionGroup>
</Teleport>
</template>
<script setup lang="ts">
import ToastItem from './Toast.vue';
import { useToastStore } from './toastStore';
import type { ToastPosition } from './types';
const toastStore = useToastStore();
const positions: ToastPosition[] = [
'top-left',
'top-center',
'top-right',
'bottom-left',
'bottom-center',
'bottom-right',
];
const getToastsByPosition = (position: ToastPosition) => {
return toastStore.toasts.filter(toast => toast.position === position);
};
const removeToast = (id: string) => {
toastStore.remove(id);
};
</script>
<style scoped lang="scss">
.toast-container {
position: fixed;
z-index: 9999;
pointer-events: none;
display: flex;
flex-direction: column;
> * {
pointer-events: auto;
}
}
// 顶部位置 - 增加间距避免覆盖标题栏
.toast-container-top-left {
top: 35px;
left: 20px;
align-items: flex-start;
}
.toast-container-top-center {
top: 35px;
left: 50%;
transform: translateX(-50%);
align-items: center;
}
.toast-container-top-right {
top: 35px;
right: 20px;
align-items: flex-end;
}
// 底部位置
.toast-container-bottom-left {
bottom: 20px;
left: 20px;
align-items: flex-start;
flex-direction: column-reverse;
}
.toast-container-bottom-center {
bottom: 20px;
left: 50%;
transform: translateX(-50%);
align-items: center;
flex-direction: column-reverse;
}
.toast-container-bottom-right {
bottom: 20px;
right: 20px;
align-items: flex-end;
flex-direction: column-reverse;
}
// TransitionGroup 列表动画 - 从哪来回哪去,收缩滑出
.toast-list-move {
transition: transform 0.5s cubic-bezier(0.4, 0, 0.2, 1);
}
.toast-list-enter-active {
transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
}
.toast-list-leave-active {
transition: all 0.3s cubic-bezier(0.6, 0, 0.8, 0.4);
position: absolute !important;
}
// 右侧位置:从右滑入,收缩向右滑出
.toast-container-top-right,
.toast-container-bottom-right {
.toast-list-enter-from {
opacity: 0;
transform: translateX(100%) scale(0.8);
}
.toast-list-leave-to {
opacity: 0;
transform: translateX(100%) scale(0.8);
}
}
// 左侧位置:从左滑入,收缩向左滑出
.toast-container-top-left,
.toast-container-bottom-left {
.toast-list-enter-from {
opacity: 0;
transform: translateX(-100%) scale(0.8);
}
.toast-list-leave-to {
opacity: 0;
transform: translateX(-100%) scale(0.8);
}
}
// 居中位置:从上/下滑入,收缩向上/下滑出
.toast-container-top-center {
.toast-list-enter-from {
opacity: 0;
transform: translateY(-100%) scale(0.8);
}
.toast-list-leave-to {
opacity: 0;
transform: translateY(-100%) scale(0.8);
}
}
.toast-container-bottom-center {
.toast-list-enter-from {
opacity: 0;
transform: translateY(100%) scale(0.8);
}
.toast-list-leave-to {
opacity: 0;
transform: translateY(100%) scale(0.8);
}
}
</style>

View File

@@ -1,80 +0,0 @@
import { useToastStore } from './toastStore';
import type { ToastOptions } from './types';
class ToastService {
private getStore() {
return useToastStore();
}
/**
* 显示一个通知
*/
show(options: ToastOptions): string {
return this.getStore().add(options);
}
/**
* 显示成功通知
*/
success(message: string, title?: string, options?: Partial<ToastOptions>): string {
return this.show({
message,
title,
type: 'success',
...options,
});
}
/**
* 显示错误通知
*/
error(message: string, title?: string, options?: Partial<ToastOptions>): string {
return this.show({
message,
title,
type: 'error',
...options,
});
}
/**
* 显示警告通知
*/
warning(message: string, title?: string, options?: Partial<ToastOptions>): string {
return this.show({
message,
title,
type: 'warning',
...options,
});
}
/**
* 显示信息通知
*/
info(message: string, title?: string, options?: Partial<ToastOptions>): string {
return this.show({
message,
title,
type: 'info',
...options,
});
}
/**
* 关闭指定的通知
*/
close(id: string): void {
this.getStore().remove(id);
}
/**
* 清空所有通知
*/
clear(): void {
this.getStore().clear();
}
}
export const toast = new ToastService();
export default toast;

View File

@@ -1,55 +0,0 @@
import { defineStore } from 'pinia';
import { ref } from 'vue';
import type { Toast, ToastOptions } from './types';
export const useToastStore = defineStore('toast', () => {
const toasts = ref<Toast[]>([]);
let idCounter = 0;
/**
* 添加一个 Toast
*/
const add = (options: ToastOptions): string => {
const id = `toast-${Date.now()}-${idCounter++}`;
const toast: Toast = {
id,
message: options.message,
type: options.type || 'info',
title: options.title,
duration: options.duration ?? 4000,
position: options.position || 'top-right',
closable: options.closable ?? true,
createdAt: Date.now(),
};
toasts.value.push(toast);
return id;
};
/**
* 移除指定 Toast
*/
const remove = (id: string) => {
const index = toasts.value.findIndex(t => t.id === id);
if (index > -1) {
toasts.value.splice(index, 1);
}
};
/**
* 清空所有 Toast
*/
const clear = () => {
toasts.value = [];
};
return {
toasts,
add,
remove,
clear,
};
});

View File

@@ -1,52 +0,0 @@
/**
* Toast 通知类型定义
*/
export type ToastType = 'success' | 'error' | 'warning' | 'info';
export type ToastPosition =
| 'top-right'
| 'top-left'
| 'bottom-right'
| 'bottom-left'
| 'top-center'
| 'bottom-center';
export interface ToastOptions {
/**
* Toast 消息内容
*/
message: string;
/**
* Toast 类型
*/
type?: ToastType;
/**
* 标题(可选)
*/
title?: string;
/**
* 持续时间毫秒0 表示不自动关闭
*/
duration?: number;
/**
* 显示位置
*/
position?: ToastPosition;
/**
* 是否可关闭
*/
closable?: boolean;
}
export interface Toast extends Required<Omit<ToastOptions, 'title'>> {
id: string;
title?: string;
createdAt: number;
}

View File

@@ -51,13 +51,13 @@ let editorScope: ReturnType<typeof effectScope> | null = null;
// 更新当前块语言信息
const updateCurrentBlockLanguage = () => {
if (!editorStore.currentEditor) {
if (!editorStore.editorView) {
currentBlockLanguage.value = { name: 'text', auto: false };
return;
}
try {
const state = editorStore.currentEditor.state;
const state = editorStore.editorView.state;
const activeBlock = getActiveNoteBlock(state as any);
if (activeBlock) {
const newLanguage = {
@@ -128,7 +128,7 @@ const setupEventListeners = (view: any) => {
// 监听编辑器状态变化
watch(
() => editorStore.currentEditor,
() => editorStore.editorView,
(newView) => {
if (newView) {
setupEventListeners(newView);
@@ -175,13 +175,13 @@ const closeLanguageMenu = () => {
// 选择语言 - 优化性能
const selectLanguage = (languageId: SupportedLanguage) => {
if (!editorStore.currentEditor) {
if (!editorStore.editorView) {
closeLanguageMenu();
return;
}
try {
const view = editorStore.currentEditor;
const view = editorStore.editorView;
const state = view.state;
const dispatch = view.dispatch;
@@ -294,11 +294,9 @@ const scrollToCurrentLanguage = () => {
<span class="arrow" :class="{ 'open': showLanguageMenu }"></span>
</button>
<!-- 菜单 -->
<Transition name="slide-up">
<div class="language-menu" v-if="showLanguageMenu">
<!-- 搜索框 -->
<div class="search-container">
<div class="language-menu" v-if="showLanguageMenu">
<!-- 搜索框 -->
<div class="search-container">
<input
ref="searchInputRef"
v-model="searchQuery"
@@ -332,23 +330,11 @@ const scrollToCurrentLanguage = () => {
{{ t('toolbar.noLanguageFound') }}
</div>
</div>
</div>
</Transition>
</div>
</div>
</template>
<style scoped lang="scss">
.slide-up-enter-active,
.slide-up-leave-active {
transition: opacity 0.15s ease, transform 0.15s ease;
}
.slide-up-enter-from,
.slide-up-leave-to {
opacity: 0;
transform: translateY(8px);
}
.block-language-selector {
position: relative;
@@ -400,17 +386,15 @@ const scrollToCurrentLanguage = () => {
border: 1px solid var(--border-color);
border-radius: 3px;
margin-bottom: 4px;
width: 280px;
max-height: 400px;
width: 220px;
max-height: 280px;
z-index: 1000;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
overflow: hidden;
display: flex;
flex-direction: column;
.search-container {
position: relative;
padding: 10px;
padding: 8px;
border-bottom: 1px solid var(--border-color);
.search-input {
@@ -419,11 +403,11 @@ const scrollToCurrentLanguage = () => {
background-color: var(--bg-primary);
border: 1px solid var(--border-color);
border-radius: 2px;
padding: 6px 10px 6px 30px;
font-size: 12px;
padding: 5px 8px 5px 26px;
font-size: 11px;
color: var(--text-primary);
outline: none;
line-height: 1.4;
line-height: 1.2;
&:focus {
border-color: var(--text-muted);
@@ -436,7 +420,7 @@ const scrollToCurrentLanguage = () => {
.search-icon {
position: absolute;
left: 16px;
left: 14px;
top: 50%;
transform: translateY(-50%);
color: var(--text-muted);
@@ -445,21 +429,20 @@ const scrollToCurrentLanguage = () => {
}
.language-list {
max-height: 320px;
max-height: 200px;
overflow-y: auto;
flex: 1;
.language-option {
display: flex;
align-items: center;
justify-content: space-between;
padding: 8px 10px;
padding: 6px 8px;
cursor: pointer;
font-size: 12px;
border-bottom: 1px solid var(--border-color);
font-size: 11px;
&:hover {
background-color: var(--bg-hover);
background-color: var(--border-color);
opacity: 0.8;
}
&.active {
@@ -477,17 +460,17 @@ const scrollToCurrentLanguage = () => {
}
.language-alias {
font-size: 11px;
font-size: 10px;
color: var(--text-muted);
opacity: 0.6;
}
}
.no-results {
padding: 14px 10px;
padding: 12px 8px;
text-align: center;
color: var(--text-muted);
font-size: 12px;
font-size: 11px;
}
}
}
@@ -495,7 +478,7 @@ const scrollToCurrentLanguage = () => {
/* 自定义滚动条 */
.language-list::-webkit-scrollbar {
width: 6px;
width: 4px;
}
.language-list::-webkit-scrollbar-track {
@@ -504,7 +487,7 @@ const scrollToCurrentLanguage = () => {
.language-list::-webkit-scrollbar-thumb {
background-color: var(--border-color);
border-radius: 3px;
border-radius: 2px;
&:hover {
background-color: var(--text-muted);

View File

@@ -2,15 +2,12 @@
import {computed, nextTick, reactive, ref, watch} from 'vue';
import {useDocumentStore} from '@/stores/documentStore';
import {useTabStore} from '@/stores/tabStore';
import {useEditorStore} from '@/stores/editorStore';
import {useEditorStateStore} from '@/stores/editorStateStore';
import {useWindowStore} from '@/stores/windowStore';
import {useI18n} from 'vue-i18n';
import {useConfirm} from '@/composables';
import {validateDocumentTitle} from '@/common/utils/validation';
import {formatDateTime, truncateString} from '@/common/utils/formatter';
import {Document} from '@/../bindings/voidraft/internal/models/ent/models';
import toast from '@/components/toast';
import type {Document} from '@/../bindings/voidraft/internal/models/ent/models';
// 类型定义
interface DocumentItem extends Document {
@@ -19,8 +16,6 @@ interface DocumentItem extends Document {
const documentStore = useDocumentStore();
const tabStore = useTabStore();
const editorStore = useEditorStore();
const editorStateStore = useEditorStateStore();
const windowStore = useWindowStore();
const {t} = useI18n();
@@ -32,7 +27,6 @@ const editInputRef = ref<HTMLInputElement>();
const state = reactive({
isLoaded: false,
searchQuery: '',
documentList: [] as Document[], // 缓存文档列表
editing: {
id: null as number | null,
title: ''
@@ -50,7 +44,7 @@ const currentDocName = computed(() => {
});
const filteredItems = computed<DocumentItem[]>(() => {
const docs = state.documentList;
const docs = documentStore.documentList;
const query = state.searchQuery.trim();
if (!query) return docs;
@@ -73,7 +67,7 @@ const filteredItems = computed<DocumentItem[]>(() => {
// 核心操作
const openMenu = async () => {
state.documentList = await documentStore.getDocumentList();
await documentStore.getDocumentMetaList();
documentStore.openDocumentSelector();
state.isLoaded = true;
await nextTick();
@@ -94,10 +88,10 @@ const closeMenu = () => {
resetDeleteConfirm();
};
const selectDoc = async (doc: DocumentItem) => {
const selectDoc = async (doc: Document) => {
if (doc.id === undefined) return;
// 如果选择的就是当前文档,直接关闭菜单
// 如果选择的就是当前文档直接关闭菜单
if (documentStore.currentDocument?.id === doc.id) {
closeMenu();
return;
@@ -105,40 +99,17 @@ const selectDoc = async (doc: DocumentItem) => {
const hasOpen = await windowStore.isDocumentWindowOpen(doc.id);
if (hasOpen) {
toast.warning(t('toolbar.alreadyOpenInNewWindow'));
documentStore.setError(doc.id, t('toolbar.alreadyOpenInNewWindow'));
return;
}
// 保存旧文档的光标位置
const oldDocId = documentStore.currentDocumentId;
if (oldDocId) {
const cursorPos = editorStore.getCurrentCursorPosition();
editorStateStore.saveCursorPosition(oldDocId, cursorPos);
}
// 如果旧文档有未保存修改,保存它
if (oldDocId && editorStore.hasUnsavedChanges(oldDocId)) {
const content = editorStore.getCurrentContent();
await documentStore.saveDocument(oldDocId, content);
editorStore.syncAfterSave(oldDocId);
}
// 打开新文档
const success = await documentStore.openDocument(doc.id);
if (!success) return;
// 切换到新编辑器
await editorStore.switchToEditor(doc.id);
// 更新标签页
if (documentStore.currentDocument && tabStore.isTabsEnabled) {
tabStore.addOrActivateTab(documentStore.currentDocument);
if (success) {
if (tabStore.isTabsEnabled) {
tabStore.addOrActivateTab(doc);
}
closeMenu();
}
closeMenu();
};
const createDoc = async (title: string) => {
@@ -148,9 +119,7 @@ const createDoc = async (title: string) => {
try {
const newDoc = await documentStore.createNewDocument(trimmedTitle);
if (newDoc && newDoc.id) {
await selectDoc(newDoc);
}
if (newDoc) await selectDoc(newDoc);
} catch (error) {
console.error('Failed to create document:', error);
}
@@ -173,7 +142,7 @@ const handleSearchEnter = () => {
};
// 编辑操作
const renameDoc = (doc: DocumentItem, event: Event) => {
const renameDoc = (doc: Document, event: Event) => {
event.stopPropagation();
state.editing.id = doc.id ?? null;
state.editing.title = doc.title || '';
@@ -196,8 +165,8 @@ const saveEdit = async () => {
if (error) return;
try {
await documentStore.updateDocumentTitle(state.editing.id, trimmedTitle);
state.documentList = await documentStore.getDocumentList();
await documentStore.updateDocumentMetadata(state.editing.id, trimmedTitle);
await documentStore.getDocumentMetaList();
// 如果tabs功能开启且该文档有标签页更新标签页标题
if (tabStore.isTabsEnabled && tabStore.hasTab(state.editing.id)) {
@@ -217,21 +186,17 @@ const cancelEdit = () => {
};
// 其他操作
const openInNewWindow = async (doc: DocumentItem, event: Event) => {
const openInNewWindow = async (doc: Document, event: Event) => {
event.stopPropagation();
if (doc.id === undefined) return;
try {
// 在打开新窗口前,如果启用了标签且该文档有标签,先关闭标签
if (tabStore.isTabsEnabled && tabStore.hasTab(doc.id)) {
await tabStore.closeTab(doc.id);
}
await documentStore.openDocumentInNewWindow(doc.id);
} catch (error) {
console.error('Failed to open document in new window:', error);
}
};
const handleDelete = async (doc: DocumentItem, event: Event) => {
const handleDelete = async (doc: Document, event: Event) => {
event.stopPropagation();
if (doc.id === undefined) return;
@@ -239,17 +204,17 @@ const handleDelete = async (doc: DocumentItem, event: Event) => {
// 确认删除前检查文档是否在其他窗口打开
const hasOpen = await windowStore.isDocumentWindowOpen(doc.id);
if (hasOpen) {
toast.warning(t('toolbar.alreadyOpenInNewWindow'));
documentStore.setError(doc.id, t('toolbar.alreadyOpenInNewWindow'));
resetDeleteConfirm();
return;
}
const deleteSuccess = await documentStore.deleteDocument(doc.id);
if (deleteSuccess) {
state.documentList = await documentStore.getDocumentList();
// 如果删除的是当前文档,切换到第一个文档
if (documentStore.currentDocument?.id === doc.id && state.documentList.length > 0) {
const firstDoc = state.documentList[0];
await documentStore.getDocumentMetaList();
// 如果删除的是当前文档切换到第一个文档
if (documentStore.currentDocument?.id === doc.id && documentStore.documentList.length > 0) {
const firstDoc = documentStore.documentList[0];
if (firstDoc) await selectDoc(firstDoc);
}
}
@@ -342,7 +307,11 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
<!-- 普通显示 -->
<div v-if="state.editing.id !== item.id" class="doc-info">
<div class="doc-title">{{ item.title }}</div>
<div class="doc-date">{{ formatDateTime(item.updated_at) }}</div>
<!-- 根据状态显示错误信息或时间 -->
<div v-if="documentStore.selectorError?.docId === item.id" class="doc-error">
{{ documentStore.selectorError?.message }}
</div>
<div v-else class="doc-date">{{ formatDateTime(item.updated_at) }}</div>
</div>
<!-- 编辑状态 -->
@@ -384,7 +353,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
</svg>
</button>
<button
v-if="state.documentList.length > 1"
v-if="documentStore.documentList.length > 1 && item.id !== 1"
class="action-btn delete-btn"
:class="{ 'delete-confirm': isDeleting(item.id!) }"
@click="handleDelete(item, $event)"
@@ -475,7 +444,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
border: 1px solid var(--border-color);
border-radius: 3px;
margin-bottom: 4px;
width: 340px;
width: 300px;
max-height: calc(100vh - 40px);
z-index: 1000;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
@@ -485,7 +454,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
.input-box {
position: relative;
padding: 10px;
padding: 8px;
border-bottom: 1px solid var(--border-color);
.main-input {
@@ -494,8 +463,8 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
background-color: var(--bg-primary);
border: 1px solid var(--border-color);
border-radius: 2px;
padding: 6px 10px 6px 30px;
font-size: 12px;
padding: 5px 8px 5px 26px;
font-size: 11px;
color: var(--text-primary);
outline: none;
@@ -510,7 +479,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
.input-icon {
position: absolute;
left: 16px;
left: 14px;
top: 50%;
transform: translateY(-50%);
color: var(--text-muted);
@@ -531,7 +500,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
background-color: var(--bg-hover);
}
&.active {
&.active {
background-color: var(--selection-bg);
.doc-item-content .doc-info {
@@ -539,7 +508,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
color: var(--selection-text);
}
.doc-date {
.doc-date, .doc-error {
color: var(--selection-text);
opacity: 0.7;
}
@@ -551,8 +520,8 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
display: flex;
align-items: center;
gap: 8px;
padding: 10px 10px;
font-size: 12px;
padding: 8px 8px;
font-size: 11px;
font-weight: normal;
svg {
@@ -566,15 +535,15 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
display: flex;
align-items: center;
justify-content: space-between;
padding: 10px 10px;
padding: 8px 8px;
.doc-info {
flex: 1;
min-width: 0;
.doc-title {
font-size: 13px;
margin-bottom: 3px;
font-size: 12px;
margin-bottom: 2px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -582,10 +551,17 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
}
.doc-date {
font-size: 11px;
font-size: 10px;
color: var(--text-muted);
opacity: 0.6;
}
.doc-error {
font-size: 10px;
color: var(--text-danger);
font-weight: 500;
animation: fadeInOut 3s forwards;
}
}
.doc-edit {
@@ -597,8 +573,8 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
background-color: var(--bg-primary);
border: 1px solid var(--border-color);
border-radius: 2px;
padding: 5px 8px;
font-size: 12px;
padding: 4px 6px;
font-size: 11px;
color: var(--text-primary);
outline: none;
@@ -610,7 +586,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
.doc-actions {
display: flex;
gap: 8px;
gap: 6px;
opacity: 0;
transition: opacity 0.2s ease;
@@ -619,7 +595,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
border: none;
color: var(--text-muted);
cursor: pointer;
padding: 5px;
padding: 4px;
border-radius: 2px;
display: flex;
align-items: center;
@@ -640,7 +616,7 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
color: white;
.confirm-text {
font-size: 10px;
font-size: 9px;
font-weight: 500;
}
}
@@ -655,12 +631,27 @@ watch(() => documentStore.showDocumentSelector, (isOpen) => {
}
.empty {
padding: 18px 10px;
padding: 16px 8px;
text-align: center;
font-size: 12px;
font-size: 11px;
color: var(--text-muted);
}
}
}
}
@keyframes fadeInOut {
0% {
opacity: 0;
}
10% {
opacity: 1;
}
90% {
opacity: 1;
}
100% {
opacity: 0;
}
}
</style>

View File

@@ -3,7 +3,6 @@ import {useI18n} from 'vue-i18n';
import {computed, onMounted, onUnmounted, ref, watch, shallowRef, readonly, toRefs, effectScope, onScopeDispose} from 'vue';
import {useConfigStore} from '@/stores/configStore';
import {useEditorStore} from '@/stores/editorStore';
import {useEditorStateStore} from '@/stores/editorStateStore';
import {useUpdateStore} from '@/stores/updateStore';
import {useWindowStore} from '@/stores/windowStore';
import {useSystemStore} from '@/stores/systemStore';
@@ -16,7 +15,6 @@ import {formatBlockContent} from '@/views/editor/extensions/codeblock/formatCode
import {createDebounce} from '@/common/utils/debounce';
const editorStore = useEditorStore();
const editorStateStore = useEditorStateStore();
const configStore = useConfigStore();
const updateStore = useUpdateStore();
const windowStore = useWindowStore();
@@ -27,6 +25,7 @@ const router = useRouter();
const canFormatCurrentBlock = ref(false);
const isLoaded = shallowRef(false);
const { documentStats } = toRefs(editorStore);
const { config } = toRefs(configStore);
// 窗口置顶状态
@@ -58,14 +57,14 @@ const goToSettings = () => {
// 执行格式化
const formatCurrentBlock = () => {
if (!canFormatCurrentBlock.value || !editorStore.currentEditor) return;
formatBlockContent(editorStore.currentEditor);
if (!canFormatCurrentBlock.value || !editorStore.editorView) return;
formatBlockContent(editorStore.editorView);
};
// 统一更新按钮状态
const updateButtonStates = () => {
const view: any = editorStore.currentEditor;
const view: any = editorStore.editorView;
if (!view) {
canFormatCurrentBlock.value = false;
return;
@@ -126,7 +125,7 @@ const setupEditorListeners = (view: any) => {
// 监听编辑器视图变化
watch(
() => editorStore.currentEditor,
() => editorStore.editorView,
(newView) => {
// 在 scope 中管理副作用
editorScope.run(() => {
@@ -192,13 +191,11 @@ const updateButtonTitle = computed(() => {
});
// 统计数据的计算属性
const statsData = computed(() => {
const docId = editorStore.currentEditorId;
if (!docId) {
return { lines: 0, characters: 0, selectedCharacters: 0 };
}
return editorStateStore.getDocumentStats(docId);
});
const statsData = computed(() => ({
lines: documentStats.value.lines,
characters: documentStats.value.characters,
selectedCharacters: documentStats.value.selectedCharacters
}));
</script>
<template>

View File

@@ -1,14 +1,5 @@
export default {
locale: 'en-US',
common: {
ok: 'OK',
cancel: 'Cancel',
edit: 'Edit',
delete: 'Delete',
confirm: 'Confirm',
save: 'Save',
reset: 'Reset'
},
titlebar: {
minimize: 'Minimize',
maximize: 'Maximize',
@@ -65,19 +56,6 @@ export default {
},
resetToDefault: 'Reset to Default',
confirmReset: 'Confirm Reset?',
noKeybinding: 'Not Set',
waitingForKey: 'Waiting...',
clickToSet: 'Click to set keybinding',
editKeybinding: 'Edit keybinding',
config: {
enabled: 'Enabled',
preventDefault: 'Prevent Default',
keybinding: 'Keybinding'
},
keyPlaceholder: 'Enter key, press Enter to add',
invalidFormat: 'Invalid format',
conflict: 'Conflict: {command}',
maxKeysReached: 'Maximum 4 keys allowed',
commands: {
showSearch: 'Show search panel',
hideSearch: 'Hide search panel',
@@ -200,7 +178,6 @@ export default {
enableWindowSnap: 'Enable Window Snapping',
enableLoadingAnimation: 'Enable Loading Animation',
enableTabs: 'Enable Tabs',
enableMemoryMonitor: 'Enable Memory Monitor',
startup: 'Startup Settings',
startAtLogin: 'Start at Login',
dataStorage: 'Data Storage',
@@ -246,7 +223,6 @@ export default {
categoryEditing: 'Editing Enhancement',
categoryUI: 'UI Enhancement',
categoryTools: 'Tools',
enabled: 'Enabled',
configuration: 'Configuration',
resetToDefault: 'Reset to Default Configuration',
},

View File

@@ -1,14 +1,5 @@
export default {
locale: 'zh-CN',
common: {
ok: '确定',
cancel: '取消',
edit: '编辑',
delete: '删除',
confirm: '确认',
save: '保存',
reset: '重置'
},
titlebar: {
minimize: '最小化',
maximize: '最大化',
@@ -65,19 +56,6 @@ export default {
},
resetToDefault: '重置为默认',
confirmReset: '确认重置?',
noKeybinding: '未设置',
waitingForKey: '等待输入...',
clickToSet: '点击设置快捷键',
editKeybinding: '编辑快捷键',
config: {
enabled: '启用',
preventDefault: '阻止默认',
keybinding: '快捷键'
},
keyPlaceholder: '输入键名, 回车添加',
invalidFormat: '格式错误',
conflict: '冲突: {command}',
maxKeysReached: '最多只能添加4个键',
commands: {
showSearch: '显示搜索面板',
hideSearch: '隐藏搜索面板',
@@ -201,7 +179,6 @@ export default {
enableWindowSnap: '启用窗口吸附',
enableLoadingAnimation: '启用加载动画',
enableTabs: '启用标签页',
enableMemoryMonitor: '启用内存监视器',
startup: '启动设置',
startAtLogin: '开机自启动',
dataStorage: '数据存储',
@@ -249,7 +226,6 @@ export default {
categoryEditing: '编辑增强',
categoryUI: '界面增强',
categoryTools: '工具扩展',
enabled: '启用',
configuration: '配置',
resetToDefault: '重置为默认配置',
},

View File

@@ -4,6 +4,7 @@ import { BackupService } from '@/../bindings/voidraft/internal/services';
export const useBackupStore = defineStore('backup', () => {
const isSyncing = ref(false);
const error = ref<string | null>(null);
const sync = async (): Promise<void> => {
if (isSyncing.value) {
@@ -11,11 +12,12 @@ export const useBackupStore = defineStore('backup', () => {
}
isSyncing.value = true;
error.value = null;
try {
await BackupService.Sync();
} catch (e) {
throw e;
error.value = e instanceof Error ? e.message : String(e);
} finally {
isSyncing.value = false;
}
@@ -23,6 +25,7 @@ export const useBackupStore = defineStore('backup', () => {
return {
isSyncing,
error,
sync
};
});

View File

@@ -1,10 +1,18 @@
import {defineStore} from 'pinia';
import {computed, reactive} from 'vue';
import {ConfigService, StartupService} from '@/../bindings/voidraft/internal/services';
import {AppConfig, AuthMethod, LanguageType, SystemThemeType, TabType} from '@/../bindings/voidraft/internal/models/models';
import {
AppConfig,
AuthMethod,
EditingConfig,
LanguageType,
SystemThemeType,
TabType
} from '@/../bindings/voidraft/internal/models/models';
import {useI18n} from 'vue-i18n';
import {ConfigUtils} from '@/common/utils/configUtils';
import {FONT_OPTIONS} from '@/common/constant/fonts';
import {SUPPORTED_LOCALES} from '@/common/constant/locales';
import {
CONFIG_KEY_MAP,
CONFIG_LIMITS,
@@ -28,6 +36,12 @@ export const useConfigStore = defineStore('config', () => {
// Font options (no longer localized)
const fontOptions = computed(() => FONT_OPTIONS);
// 计算属性
const createLimitComputed = (key: NumberConfigKey) => computed(() => CONFIG_LIMITS[key]);
const limits = Object.fromEntries(
(['fontSize', 'tabSize', 'lineHeight'] as const).map(key => [key, createLimitComputed(key)])
) as Record<NumberConfigKey, ReturnType<typeof createLimitComputed>>;
// 统一配置更新方法
const updateConfig = async <K extends ConfigKey>(key: K, value: any): Promise<void> => {
if (!state.configLoaded && !state.isLoading) {
@@ -85,12 +99,39 @@ export const useConfigStore = defineStore('config', () => {
}
};
// 通用数值调整器工厂
const createAdjuster = <T extends NumberConfigKey>(key: T) => {
const limit = CONFIG_LIMITS[key];
const clamp = (value: number) => ConfigUtils.clamp(value, limit.min, limit.max);
return {
increase: async () => await updateConfig(key, clamp(state.config.editing[key] + 1)),
decrease: async () => await updateConfig(key, clamp(state.config.editing[key] - 1)),
set: async (value: number) => await updateConfig(key, clamp(value)),
reset: async () => await updateConfig(key, limit.default),
increaseLocal: () => updateConfigLocal(key, clamp(state.config.editing[key] + 1)),
decreaseLocal: () => updateConfigLocal(key, clamp(state.config.editing[key] - 1))
};
};
const createEditingToggler = <T extends keyof EditingConfig>(key: T) =>
async () => await updateConfig(key as ConfigKey, !state.config.editing[key] as EditingConfig[T]);
// 枚举值切换器
const createEnumToggler = <T extends TabType>(key: 'tabType', values: readonly T[]) =>
async () => {
const currentIndex = values.indexOf(state.config.editing[key] as T);
const nextIndex = (currentIndex + 1) % values.length;
return await updateConfig(key, values[nextIndex]);
};
// 重置配置
const resetConfig = async (): Promise<void> => {
if (state.isLoading) return;
state.isLoading = true;
try {
await ConfigService.ResetConfig();
const appConfig = await ConfigService.GetConfig();
if (appConfig) {
@@ -101,25 +142,57 @@ export const useConfigStore = defineStore('config', () => {
}
};
// 辅助函数:限制数值范围
const clampValue = (value: number, key: NumberConfigKey): number => {
const limit = CONFIG_LIMITS[key];
return ConfigUtils.clamp(value, limit.min, limit.max);
// 语言设置方法
const setLanguage = async (language: LanguageType): Promise<void> => {
await updateConfig('language', language);
const frontendLocale = ConfigUtils.backendLanguageToFrontend(language);
locale.value = frontendLocale as any;
};
// 计算属性
const fontConfig = computed(() => ({
fontSize: state.config.editing.fontSize,
fontFamily: state.config.editing.fontFamily,
lineHeight: state.config.editing.lineHeight,
fontWeight: state.config.editing.fontWeight
}));
// 系统主题设置方法
const setSystemTheme = async (systemTheme: SystemThemeType): Promise<void> => {
await updateConfig('systemTheme', systemTheme);
};
const tabConfig = computed(() => ({
tabSize: state.config.editing.tabSize,
enableTabIndent: state.config.editing.enableTabIndent,
tabType: state.config.editing.tabType
}));
// 当前主题设置方法
const setCurrentTheme = async (themeName: string): Promise<void> => {
await updateConfig('currentTheme', themeName);
};
// 初始化语言设置
const initLanguage = async (): Promise<void> => {
try {
// 如果配置未加载,先加载配置
if (!state.configLoaded) {
await initConfig();
}
// 同步前端语言设置
const frontendLocale = ConfigUtils.backendLanguageToFrontend(state.config.appearance.language);
locale.value = frontendLocale as any;
} catch (_error) {
const browserLang = SUPPORTED_LOCALES[0].code;
locale.value = browserLang as any;
}
};
// 创建数值调整器实例
const adjusters = {
fontSize: createAdjuster('fontSize'),
tabSize: createAdjuster('tabSize'),
lineHeight: createAdjuster('lineHeight')
};
// 创建切换器实例
const togglers = {
tabIndent: createEditingToggler('enableTabIndent'),
alwaysOnTop: async () => {
await updateConfig('alwaysOnTop', !state.config.general.alwaysOnTop);
await runtime.Window.SetAlwaysOnTop(state.config.general.alwaysOnTop);
},
tabType: createEnumToggler('tabType', CONFIG_LIMITS.tabType.values)
};
return {
// 状态
@@ -127,84 +200,53 @@ export const useConfigStore = defineStore('config', () => {
configLoaded: computed(() => state.configLoaded),
isLoading: computed(() => state.isLoading),
fontOptions,
fontConfig,
tabConfig,
// 限制常量
...limits,
// 核心方法
initConfig,
resetConfig,
// 语言相关方法
setLanguage: (value: LanguageType) => {
updateConfig('language', value);
locale.value = value as any;
},
setLanguage,
initLanguage,
// 主题相关方法
setSystemTheme: (value: SystemThemeType) => updateConfig('systemTheme', value),
setCurrentTheme: (value: string) => updateConfig('currentTheme', value),
setSystemTheme,
setCurrentTheme,
// 字体大小操作
setFontSize: async (value: number) => {
await updateConfig('fontSize', clampValue(value, 'fontSize'));
},
increaseFontSize: async () => {
const newValue = state.config.editing.fontSize + 1;
await updateConfig('fontSize', clampValue(newValue, 'fontSize'));
},
decreaseFontSize: async () => {
const newValue = state.config.editing.fontSize - 1;
await updateConfig('fontSize', clampValue(newValue, 'fontSize'));
},
resetFontSize: async () => {
await updateConfig('fontSize', CONFIG_LIMITS.fontSize.default);
},
increaseFontSizeLocal: () => {
updateConfigLocal('fontSize', clampValue(state.config.editing.fontSize + 1, 'fontSize'));
},
decreaseFontSizeLocal: () => {
updateConfigLocal('fontSize', clampValue(state.config.editing.fontSize - 1, 'fontSize'));
},
saveFontSize: async () => {
await saveConfig('fontSize');
},
...adjusters.fontSize,
increaseFontSize: adjusters.fontSize.increase,
decreaseFontSize: adjusters.fontSize.decrease,
resetFontSize: adjusters.fontSize.reset,
setFontSize: adjusters.fontSize.set,
// 字体大小操作
increaseFontSizeLocal: adjusters.fontSize.increaseLocal,
decreaseFontSizeLocal: adjusters.fontSize.decreaseLocal,
saveFontSize: () => saveConfig('fontSize'),
// Tab操作
toggleTabIndent: togglers.tabIndent,
setEnableTabIndent: (value: boolean) => updateConfig('enableTabIndent', value),
...adjusters.tabSize,
increaseTabSize: adjusters.tabSize.increase,
decreaseTabSize: adjusters.tabSize.decrease,
setTabSize: adjusters.tabSize.set,
toggleTabType: togglers.tabType,
// 行高操作
setLineHeight: adjusters.lineHeight.set,
// 窗口操作
toggleAlwaysOnTop: togglers.alwaysOnTop,
setAlwaysOnTop: (value: boolean) => updateConfig('alwaysOnTop', value),
// 字体操作
setFontFamily: (value: string) => updateConfig('fontFamily', value),
setFontWeight: (value: string) => updateConfig('fontWeight', value),
// 行高操作
setLineHeight: async (value: number) => {
await updateConfig('lineHeight', clampValue(value, 'lineHeight'));
},
// Tab操作
setEnableTabIndent: (value: boolean) => updateConfig('enableTabIndent', value),
setTabSize: async (value: number) => {
await updateConfig('tabSize', clampValue(value, 'tabSize'));
},
increaseTabSize: async () => {
const newValue = state.config.editing.tabSize + 1;
await updateConfig('tabSize', clampValue(newValue, 'tabSize'));
},
decreaseTabSize: async () => {
const newValue = state.config.editing.tabSize - 1;
await updateConfig('tabSize', clampValue(newValue, 'tabSize'));
},
toggleTabType: async () => {
const values = CONFIG_LIMITS.tabType.values;
const currentIndex = values.indexOf(state.config.editing.tabType as typeof values[number]);
const nextIndex = (currentIndex + 1) % values.length;
await updateConfig('tabType', values[nextIndex]);
},
// 窗口操作
toggleAlwaysOnTop: async () => {
await updateConfig('alwaysOnTop', !state.config.general.alwaysOnTop);
await runtime.Window.SetAlwaysOnTop(state.config.general.alwaysOnTop);
},
setAlwaysOnTop: (value: boolean) => updateConfig('alwaysOnTop', value),
// 路径操作
setDataPath: (value: string) => updateConfigLocal('dataPath', value),
@@ -233,9 +275,6 @@ export const useConfigStore = defineStore('config', () => {
// 标签页配置相关方法
setEnableTabs: (value: boolean) => updateConfig('enableTabs', value),
// 内存监视器配置相关方法
setEnableMemoryMonitor: (value: boolean) => updateConfig('enableMemoryMonitor', value),
// 快捷键模式配置相关方法
setKeymapMode: (value: any) => updateConfig('keymapMode', value),

View File

@@ -1,70 +1,79 @@
import {defineStore} from 'pinia';
import {ref} from 'vue';
import {computed, ref} from 'vue';
import {DocumentService} from '@/../bindings/voidraft/internal/services';
import {OpenDocumentWindow} from '@/../bindings/voidraft/internal/services/windowservice';
import {Document} from '@/../bindings/voidraft/internal/models/ent/models';
import type {TimerManager} from '@/common/utils/timerUtils';
import {createTimerManager} from '@/common/utils/timerUtils';
import {useTabStore} from "@/stores/tabStore";
import type {EditorViewState} from '@/stores/editorStore';
export const useDocumentStore = defineStore('document', () => {
// === 核心状态 ===
const documents = ref<Record<number, Document>>({});
const currentDocumentId = ref<number | null>(null);
const currentDocument = ref<Document | null>(null);
// 自动保存定时器
const autoSaveTimers = ref<Map<number, TimerManager>>(new Map());
// === 编辑器状态持久化 ===
const documentStates = ref<Record<number, EditorViewState>>({});
// === UI状态 ===
const showDocumentSelector = ref(false);
const selectorError = ref<{ docId: number; message: string } | null>(null);
const isLoading = ref(false);
// === 计算属性 ===
const documentList = computed(() =>
Object.values(documents.value).sort((a, b) => {
const timeA = a.updated_at ? new Date(a.updated_at).getTime() : 0;
const timeB = b.updated_at ? new Date(b.updated_at).getTime() : 0;
return timeB - timeA;
})
);
const setDocuments = (docs: Document[]) => {
documents.value = {};
docs.forEach(doc => {
if (doc.id !== undefined) {
documents.value[doc.id] = doc;
}
});
};
// === 错误处理 ===
const setError = (docId: number, message: string) => {
selectorError.value = {docId, message};
// 3秒后自动清除错误状态
setTimeout(() => {
if (selectorError.value?.docId === docId) {
selectorError.value = null;
}
}, 3000);
};
const clearError = () => {
selectorError.value = null;
};
// === UI控制方法 ===
const openDocumentSelector = () => {
showDocumentSelector.value = true;
clearError();
};
const closeDocumentSelector = () => {
showDocumentSelector.value = false;
clearError();
};
// 获取文档列表
const getDocumentList = async (): Promise<Document[]> => {
try {
isLoading.value = true;
const docs = await DocumentService.ListAllDocumentsMeta();
return docs?.filter((doc): doc is Document => doc !== null) || [];
} catch (_error) {
return [];
} finally {
isLoading.value = false;
}
};
// 获取单个文档
const getDocument = async (docId: number): Promise<Document | null> => {
try {
return await DocumentService.GetDocumentByID(docId);
} catch (error) {
console.error('Failed to get document:', error);
return null;
}
};
// 保存文档内容
const saveDocument = async (docId: number, content: string): Promise<Document | null> => {
try {
await DocumentService.UpdateDocumentContent(docId, content);
return await DocumentService.GetDocumentByID(docId);
} catch (error) {
console.error('Failed to save document:', error);
throw error;
}
};
// 在新窗口中打开文档
const openDocumentInNewWindow = async (docId: number): Promise<boolean> => {
try {
const tabStore = useTabStore();
if (tabStore.isTabsEnabled && tabStore.hasTab(docId)) {
tabStore.closeTab(docId);
}
await OpenDocumentWindow(docId);
return true;
} catch (error) {
@@ -77,16 +86,36 @@ export const useDocumentStore = defineStore('document', () => {
const createNewDocument = async (title: string): Promise<Document | null> => {
try {
const doc = await DocumentService.CreateDocument(title);
return doc || null;
if (doc && doc.id !== undefined) {
documents.value[doc.id] = doc;
return doc;
}
return null;
} catch (error) {
console.error('Failed to create document:', error);
return null;
}
};
// 获取文档列表
const getDocumentMetaList = async () => {
try {
isLoading.value = true;
const docs = await DocumentService.ListAllDocumentsMeta();
if (docs) {
setDocuments(docs.filter((doc): doc is Document => doc !== null));
}
} catch (error) {
console.error('Failed to update documents:', error);
} finally {
isLoading.value = false;
}
};
// 打开文档
const openDocument = async (docId: number): Promise<boolean> => {
try {
// 获取完整文档数据
const doc = await DocumentService.GetDocumentByID(docId);
if (!doc) {
throw new Error(`Document ${docId} not found`);
@@ -94,6 +123,7 @@ export const useDocumentStore = defineStore('document', () => {
currentDocumentId.value = docId;
currentDocument.value = doc;
return true;
} catch (error) {
console.error('Failed to open document:', error);
@@ -101,20 +131,30 @@ export const useDocumentStore = defineStore('document', () => {
}
};
// 更新文档标题
const updateDocumentTitle = async (docId: number, title: string): Promise<boolean> => {
// 更新文档元数据
const updateDocumentMetadata = async (docId: number, title: string): Promise<boolean> => {
try {
await DocumentService.UpdateDocumentTitle(docId, title);
// 更新当前文档状态
// 更新本地状态
const doc = documents.value[docId];
if (doc) {
doc.title = title;
doc.updated_at = new Date().toISOString();
}
if (currentDocument.value?.id === docId) {
currentDocument.value.title = title;
currentDocument.value.updated_at = new Date().toISOString();
}
// 同步更新标签页标题
const tabStore = useTabStore();
tabStore.updateTabTitle(docId, title);
return true;
} catch (error) {
console.error('Failed to update document title:', error);
console.error('Failed to update document metadata:', error);
return false;
}
};
@@ -124,18 +164,20 @@ export const useDocumentStore = defineStore('document', () => {
try {
await DocumentService.DeleteDocument(docId);
// 清理定时器
const timer = autoSaveTimers.value.get(docId);
if (timer) {
timer.clear();
autoSaveTimers.value.delete(docId);
// 更新本地状态
delete documents.value[docId];
// 同步清理标签页
const tabStore = useTabStore();
if (tabStore.hasTab(docId)) {
tabStore.closeTab(docId);
}
// 如果删除的是当前文档,切换到第一个可用文档
if (currentDocumentId.value === docId) {
const docs = await getDocumentList();
if (docs.length > 0 && docs[0].id !== undefined) {
await openDocument(docs[0].id);
const availableDocs = Object.values(documents.value);
if (availableDocs.length > 0 && availableDocs[0].id !== undefined) {
await openDocument(availableDocs[0].id);
} else {
currentDocumentId.value = null;
currentDocument.value = null;
@@ -148,46 +190,23 @@ export const useDocumentStore = defineStore('document', () => {
return false;
}
};
// 调度自动保存
const scheduleAutoSave = (docId: number, saveCallback: () => Promise<void>, delay: number = 2000) => {
let timer = autoSaveTimers.value.get(docId);
if (!timer) {
timer = createTimerManager();
autoSaveTimers.value.set(docId, timer);
}
timer.set(async () => {
try {
await saveCallback();
} catch (error) {
console.error(`auto save for document ${docId} failed:`, error);
}
}, delay);
};
// 取消自动保存
const cancelAutoSave = (docId: number) => {
const timer = autoSaveTimers.value.get(docId);
if (timer) {
timer.clear();
}
};
// 初始化文档
const initDocument = async (urlDocumentId?: number): Promise<void> => {
// === 初始化 ===
const initialize = async (urlDocumentId?: number): Promise<void> => {
try {
const docs = await getDocumentList();
await getDocumentMetaList();
// 优先使用URL参数中的文档ID
if (urlDocumentId) {
if (urlDocumentId && documents.value[urlDocumentId]) {
await openDocument(urlDocumentId);
} else if (currentDocumentId.value) {
// 使用持久化的文档ID
} else if (currentDocumentId.value && documents.value[currentDocumentId.value]) {
// 如果URL中没有指定文档ID使用持久化的文档ID
await openDocument(currentDocumentId.value);
} else if (docs.length > 0 && docs[0].id !== undefined) {
// 打开第一个文档
await openDocument(docs[0].id);
} else {
// 否则打开第一个文档
if (documentList.value[0].id) {
await openDocument(documentList.value[0].id);
}
}
} catch (error) {
console.error('Failed to initialize document store:', error);
@@ -196,35 +215,32 @@ export const useDocumentStore = defineStore('document', () => {
return {
// 状态
documents,
documentList,
currentDocumentId,
currentDocument,
documentStates,
showDocumentSelector,
selectorError,
isLoading,
getDocumentList,
getDocument,
saveDocument,
createNewDocument,
updateDocumentTitle,
deleteDocument,
// 方法
getDocumentMetaList,
openDocument,
openDocumentInNewWindow,
// 自动保存
scheduleAutoSave,
cancelAutoSave,
// UI 控制
createNewDocument,
updateDocumentMetadata,
deleteDocument,
openDocumentSelector,
closeDocumentSelector,
// 初始化
initDocument,
setError,
clearError,
initialize,
};
}, {
persist: {
key: 'voidraft-document',
storage: localStorage,
pick: ['currentDocumentId']
pick: ['currentDocumentId', 'documents', 'documentStates']
}
});

View File

@@ -1,70 +0,0 @@
import {defineStore} from 'pinia';
import {ref} from 'vue';
export interface DocumentStats {
lines: number;
characters: number;
selectedCharacters: number;
}
export const useEditorStateStore = defineStore('editorState', () => {
// 光标位置存储 Record<docId, cursorPosition>
const cursorPositions = ref<Record<number, number>>({});
// 文档统计数据存储 Record<docId, DocumentStats>
const documentStats = ref<Record<number, DocumentStats>>({});
// 保存光标位置
const saveCursorPosition = (docId: number, position: number) => {
cursorPositions.value[docId] = position;
};
// 获取光标位置
const getCursorPosition = (docId: number): number | undefined => {
return cursorPositions.value[docId];
};
// 保存文档统计数据
const saveDocumentStats = (docId: number, stats: DocumentStats) => {
documentStats.value[docId] = stats;
};
// 获取文档统计数据
const getDocumentStats = (docId: number): DocumentStats => {
return documentStats.value[docId] || {
lines: 0,
characters: 0,
selectedCharacters: 0
};
};
// 清除文档状态
const clearDocumentState = (docId: number) => {
delete cursorPositions.value[docId];
delete documentStats.value[docId];
};
// 清除所有状态
const clearAllStates = () => {
cursorPositions.value = {};
documentStats.value = {};
};
return {
cursorPositions,
documentStats,
saveCursorPosition,
getCursorPosition,
saveDocumentStats,
getDocumentStats,
clearDocumentState,
clearAllStates
};
}, {
persist: {
key: 'voidraft-editor-state',
storage: localStorage,
pick: ['cursorPositions']
}
});

View File

@@ -1,10 +1,11 @@
import {defineStore} from 'pinia';
import {computed, readonly, ref} from 'vue';
import {computed, nextTick, ref, watch} from 'vue';
import {EditorView} from '@codemirror/view';
import {EditorState, Extension} from '@codemirror/state';
import {Document} from '@/../bindings/voidraft/internal/models/ent/models';
import {useConfigStore} from './configStore';
import {useDocumentStore} from './documentStore';
import {DocumentService, ExtensionService} from '@/../bindings/voidraft/internal/services';
import {ensureSyntaxTree} from "@codemirror/language";
import {createBasicSetup} from '@/views/editor/basic/basicSetup';
import {createThemeExtension, updateEditorTheme} from '@/views/editor/basic/themeExtension';
import {getTabExtensions, updateTabConfig} from '@/views/editor/basic/tabExtension';
@@ -16,65 +17,138 @@ import {createCursorPositionExtension, scrollToCursor} from '@/views/editor/basi
import {createDynamicKeymapExtension, updateKeymapExtension} from '@/views/editor/keymap';
import {
createDynamicExtensions,
getExtensionManager,
removeExtensionManagerView,
setExtensionManagerView
} from '@/views/editor/manager';
import {useExtensionStore} from './extensionStore';
import createCodeBlockExtension from "@/views/editor/extensions/codeblock";
import {LruCache} from '@/common/utils/lruCache';
import {AsyncManager} from '@/common/utils/asyncManager';
import {generateContentHash} from "@/common/utils/hashUtils";
import {createTimerManager, type TimerManager} from '@/common/utils/timerUtils';
import {EDITOR_CONFIG} from '@/common/constant/editor';
import {useEditorStateStore, type DocumentStats} from './editorStateStore';
import {createDebounce} from '@/common/utils/debounce';
import {useKeybindingStore} from "@/stores/keybindingStore";
export interface DocumentStats {
lines: number;
characters: number;
selectedCharacters: number;
}
// 修复:只保存光标位置,恢复时自动滚动到光标处
export interface EditorViewState {
cursorPos: number;
}
// 编辑器实例
interface EditorInstance {
view: EditorView;
documentId: number;
contentTimestamp: string; // 文档时间戳
contentLength: number; // 内容长度
content: string;
isDirty: boolean;
lastModified: number;
lastModified: Date;
autoSaveTimer: TimerManager;
syntaxTreeCache: {
lastDocLength: number;
lastContentHash: string;
lastParsed: Date;
} | null;
// 修复:使用统一的类型,可选但不是 undefined | {...}
editorState?: EditorViewState;
}
export const useEditorStore = defineStore('editor', () => {
// === 依赖store ===
const configStore = useConfigStore();
const documentStore = useDocumentStore();
const editorStateStore = useEditorStateStore();
const extensionStore = useExtensionStore();
// === 核心状态 ===
const editorCache = new LruCache<number, EditorInstance>(EDITOR_CONFIG.MAX_INSTANCES);
const containerElement = ref<HTMLElement | null>(null);
const currentEditorId = ref<number | null>(null);
const currentEditor = ref<EditorView | null>(null);
const documentStats = ref<DocumentStats>({
lines: 0,
characters: 0,
selectedCharacters: 0
});
// 编辑器加载状态
const isLoading = ref(false);
// 修复:使用操作计数器精确管理加载状态
const loadingOperations = ref(0);
// 异步操作管理器
const operationManager = new AsyncManager<number>();
// 自动保存设置 - 从配置动态获取
const getAutoSaveDelay = () => configStore.config.editing.autoSaveDelay;
// 创建防抖的语法树缓存清理函数
const debouncedClearSyntaxCache = createDebounce((instance) => {
if (instance) {
instance.syntaxTreeCache = null;
}
}, { delay: 500 }); // 500ms 内的多次输入只清理一次
// 验证缓存是否有效
const isCacheValid = (cached: EditorInstance, doc: Document): boolean => {
return cached.contentTimestamp === doc.updated_at
&& cached.contentLength === (doc.content || '').length;
};
// 缓存化的语法树确保方法
const ensureSyntaxTreeCached = (view: EditorView, documentId: number): void => {
const instance = editorCache.get(documentId);
if (!instance) return;
// 检查内容是否真的不同
const hasContentChanged = (cached: EditorInstance, doc: Document): boolean => {
const currentContent = cached.view.state.doc.toString();
return currentContent !== (doc.content || '');
const docLength = view.state.doc.length;
const content = view.state.doc.toString();
const contentHash = generateContentHash(content);
const now = new Date();
// 检查是否需要重新构建语法树
const cache = instance.syntaxTreeCache;
const shouldRebuild = !cache ||
cache.lastDocLength !== docLength ||
cache.lastContentHash !== contentHash ||
(now.getTime() - cache.lastParsed.getTime()) > EDITOR_CONFIG.SYNTAX_TREE_CACHE_TIMEOUT;
if (shouldRebuild) {
try {
ensureSyntaxTree(view.state, docLength, 5000);
// 更新缓存
instance.syntaxTreeCache = {
lastDocLength: docLength,
lastContentHash: contentHash,
lastParsed: now
};
} catch (error) {
console.warn('Failed to ensure syntax tree:', error);
}
}
};
// 创建编辑器实例
const createEditorInstance = async (
docId: number,
doc: Document
): Promise<EditorInstance> => {
content: string,
operationId: number,
documentId: number
): Promise<EditorView> => {
if (!containerElement.value) {
throw new Error('Editor container not set');
}
const content = doc.content || '';
// 检查操作是否仍然有效
if (!operationManager.isOperationValid(operationId, documentId)) {
throw new Error('Operation cancelled');
}
// 基本扩展
// 获取基本扩展
const basicExtensions = createBasicSetup();
// 主题扩展
// 获取主题扩展
const themeExtension = createThemeExtension();
// Tab 扩展
// Tab相关扩展
const tabExtensions = getTabExtensions(
configStore.config.editing.tabSize,
configStore.config.editing.enableTabIndent,
@@ -89,7 +163,6 @@ export const useEditorStore = defineStore('editor', () => {
fontWeight: configStore.config.editing.fontWeight
});
// 滚轮缩放扩展
const wheelZoomExtension = createWheelZoomExtension({
increaseFontSize: () => configStore.increaseFontSizeLocal(),
decreaseFontSize: () => configStore.decreaseFontSizeLocal(),
@@ -98,16 +171,10 @@ export const useEditorStore = defineStore('editor', () => {
});
// 统计扩展
const statsExtension = createStatsUpdateExtension((stats: DocumentStats) => {
if (currentEditorId.value) {
editorStateStore.saveDocumentStats(currentEditorId.value, stats);
}
});
const statsExtension = createStatsUpdateExtension(updateDocumentStats);
// 内容变化扩展
const contentChangeExtension = createContentChangePlugin(() => {
handleContentChange(docId);
});
const contentChangeExtension = createContentChangePlugin();
// 代码块扩展
const codeBlockExtension = createCodeBlockExtension({
@@ -116,14 +183,29 @@ export const useEditorStore = defineStore('editor', () => {
});
// 光标位置持久化扩展
const cursorPositionExtension = createCursorPositionExtension(docId);
const cursorPositionExtension = createCursorPositionExtension(documentId);
// 再次检查操作有效性
if (!operationManager.isOperationValid(operationId, documentId)) {
throw new Error('Operation cancelled');
}
// 快捷键扩展
const keymapExtension = await createDynamicKeymapExtension();
// 动态扩展
// 检查操作有效性
if (!operationManager.isOperationValid(operationId, documentId)) {
throw new Error('Operation cancelled');
}
// 动态扩展传递文档ID以便扩展管理器可以预初始化
const dynamicExtensions = await createDynamicExtensions();
// 最终检查操作有效性
if (!operationManager.isOperationValid(operationId, documentId)) {
throw new Error('Operation cancelled');
}
// 组合所有扩展
const extensions: Extension[] = [
keymapExtension,
@@ -140,291 +222,322 @@ export const useEditorStore = defineStore('editor', () => {
];
// 获取保存的光标位置
const savedCursorPos = editorStateStore.getCursorPosition(docId);
const savedState = documentStore.documentStates[documentId];
const docLength = content.length;
const initialCursorPos = savedCursorPos !== undefined
? Math.min(savedCursorPos, docLength)
const initialCursorPos = savedState?.cursorPos !== undefined
? Math.min(savedState.cursorPos, docLength)
: docLength;
// 创建编辑器状态
// 创建编辑器状态,设置初始光标位置
const state = EditorState.create({
doc: content,
extensions,
selection: {anchor: initialCursorPos, head: initialCursorPos}
selection: { anchor: initialCursorPos, head: initialCursorPos }
});
const view = new EditorView({state});
return {
view,
documentId: docId,
contentTimestamp: doc.updated_at || '',
contentLength: content.length,
isDirty: false,
lastModified: Date.now()
};
return new EditorView({
state
});
};
// 更新编辑器内容
const updateEditorContent = (instance: EditorInstance, doc: Document) => {
const currentContent = instance.view.state.doc.toString();
const newContent = doc.content || '';
// 添加编辑器到缓存
const addEditorToCache = (documentId: number, view: EditorView, content: string) => {
const instance: EditorInstance = {
view,
documentId,
content,
isDirty: false,
lastModified: new Date(),
autoSaveTimer: createTimerManager(),
syntaxTreeCache: null,
editorState: documentStore.documentStates[documentId]
};
// 如果内容相同,只更新元数据
if (currentContent === newContent) {
instance.contentTimestamp = doc.updated_at || '';
instance.contentLength = newContent.length;
return;
}
// 保存当前光标位置
const currentCursorPos = instance.view.state.selection.main.head;
// 更新内容
instance.view.dispatch({
changes: {
from: 0,
to: instance.view.state.doc.length,
insert: newContent
// 使用LRU缓存的onEvict回调处理被驱逐的实例
editorCache.set(documentId, instance, (_evictedKey, evictedInstance) => {
// 清除自动保存定时器
evictedInstance.autoSaveTimer.clear();
// 移除DOM元素
if (evictedInstance.view.dom.parentElement) {
evictedInstance.view.dom.remove();
}
evictedInstance.view.destroy();
});
// 智能恢复光标位置
const newContentLength = newContent.length;
const safeCursorPos = Math.min(currentCursorPos, newContentLength);
// 初始化语法树缓存
ensureSyntaxTreeCached(view, documentId);
};
if (safeCursorPos > 0 && safeCursorPos < newContentLength) {
instance.view.dispatch({
selection: {anchor: safeCursorPos, head: safeCursorPos}
});
// 获取或创建编辑器
const getOrCreateEditor = async (
documentId: number,
content: string,
operationId: number
): Promise<EditorView> => {
// 检查缓存
const cached = editorCache.get(documentId);
if (cached) {
return cached.view;
}
// 同步元数据
instance.contentTimestamp = doc.updated_at || '';
instance.contentLength = newContent.length;
instance.isDirty = false;
// 检查操作是否仍然有效
if (!operationManager.isOperationValid(operationId, documentId)) {
throw new Error('Operation cancelled');
}
// 创建新的编辑器实例
const view = await createEditorInstance(content, operationId, documentId);
// 完善取消操作时的清理逻辑
if (!operationManager.isOperationValid(operationId, documentId)) {
// 如果操作已取消,彻底清理创建的实例
try {
// 移除 DOM 元素(如果已添加到文档)
if (view.dom && view.dom.parentElement) {
view.dom.remove();
}
// 销毁编辑器视图
view.destroy();
} catch (error) {
console.error('Error cleaning up cancelled editor:', error);
}
throw new Error('Operation cancelled');
}
addEditorToCache(documentId, view, content);
return view;
};
// 显示编辑器
const showEditor = (instance: EditorInstance) => {
if (!containerElement.value) return;
const showEditor = (documentId: number) => {
const instance = editorCache.get(documentId);
if (!instance || !containerElement.value) return;
try {
// 移除当前编辑器 DOM
const currentEditor = editorCache.get(currentEditorId.value || 0);
if (currentEditor && currentEditor.view.dom && currentEditor.view.dom.parentElement) {
currentEditor.view.dom.remove();
// 移除当前编辑器DOM
if (currentEditor.value && currentEditor.value.dom && currentEditor.value.dom.parentElement) {
currentEditor.value.dom.remove();
}
// 添加目标编辑器 DOM
// 目标编辑器DOM添加到容器
containerElement.value.appendChild(instance.view.dom);
currentEditorId.value = instance.documentId;
currentEditor.value = instance.view;
// 设置扩展管理器视图
setExtensionManagerView(instance.view, instance.documentId);
setExtensionManagerView(instance.view, documentId);
// 使用 requestAnimationFrame 确保 DOM 渲染
requestAnimationFrame(() => {
scrollToCursor(instance.view);
instance.view.focus();
//使用 nextTick + requestAnimationFrame 确保 DOM 完全渲染
nextTick(() => {
requestAnimationFrame(() => {
// 滚动到当前光标位置
scrollToCursor(instance.view);
// 聚焦编辑器
instance.view.focus();
// 使用缓存的语法树确保方法
ensureSyntaxTreeCached(instance.view, documentId);
});
});
} catch (error) {
console.error('Error showing editor:', error);
}
};
// 保存编辑器内容
const saveEditorContent = async (documentId: number): Promise<boolean> => {
const instance = editorCache.get(documentId);
if (!instance || !instance.isDirty) return true;
try {
const content = instance.view.state.doc.toString();
const lastModified = instance.lastModified;
await DocumentService.UpdateDocumentContent(documentId, content);
// 检查在保存期间内容是否又被修改了
if (instance.lastModified === lastModified) {
instance.content = content;
instance.isDirty = false;
instance.lastModified = new Date();
}
return true;
} catch (error) {
console.error('Failed to save editor content:', error);
return false;
}
};
// 内容变化处理
const handleContentChange = (docId: number) => {
const instance = editorCache.get(docId);
const onContentChange = () => {
const documentId = documentStore.currentDocumentId;
if (!documentId) return;
const instance = editorCache.get(documentId);
if (!instance) return;
// 标记为脏数据
// 立即设置脏标记和修改时间(切换文档时需要判断)
instance.isDirty = true;
instance.lastModified = Date.now();
instance.lastModified = new Date();
// 优使用防抖清理语法树缓存
debouncedClearSyntaxCache.debouncedFn(instance);
// 调度自动保存
const autoSaveDelay = configStore.config.editing.autoSaveDelay;
documentStore.scheduleAutoSave(
docId,
async () => {
const content = instance.view.state.doc.toString();
const savedDoc = await documentStore.saveDocument(docId, content);
// 同步版本信息
if (savedDoc) {
instance.contentTimestamp = savedDoc.updated_at || '';
instance.contentLength = (savedDoc.content || '').length;
instance.isDirty = false;
}
},
autoSaveDelay
);
// 设置自动保存定时器(已经是防抖效果:每次重置定时器)
instance.autoSaveTimer.set(() => {
saveEditorContent(documentId);
}, getAutoSaveDelay());
};
// 切换到指定编辑器
const switchToEditor = async (docId: number) => {
isLoading.value = true;
try {
// 直接从后端获取文档
const doc = await documentStore.getDocument(docId);
if (!doc) {
throw new Error(`Failed to load document ${docId}`);
}
const cached = editorCache.get(docId);
if (cached) {
// 场景1缓存有效
if (isCacheValid(cached, doc)) {
showEditor(cached);
return;
}
// 场景2有未保存修改
if (cached.isDirty) {
// 检查内容是否真的不同
if (!hasContentChanged(cached, doc)) {
// 内容实际相同,只是元数据变了,同步元数据
cached.contentTimestamp = doc.updated_at || '';
cached.contentLength = (doc.content || '').length;
cached.isDirty = false;
}
// 内容不同,保留用户编辑
showEditor(cached);
return;
}
// 场景3缓存失效且无脏数据更新内容
updateEditorContent(cached, doc);
showEditor(cached);
} else {
// 场景4创建新编辑器
const editor = await createEditorInstance(docId, doc);
// 添加到缓存
editorCache.set(docId, editor, (_evictedKey, evictedInstance) => {
// 保存光标位置
const cursorPos = evictedInstance.view.state.selection.main.head;
editorStateStore.saveCursorPosition(evictedInstance.documentId, cursorPos);
// 从扩展管理器移除
removeExtensionManagerView(evictedInstance.documentId);
// 移除 DOM
if (evictedInstance.view.dom.parentElement) {
evictedInstance.view.dom.remove();
}
// 销毁编辑器
evictedInstance.view.destroy();
});
showEditor(editor);
}
} catch (error) {
console.error('Failed to switch editor:', error);
} finally {
setTimeout(() => {
isLoading.value = false;
}, EDITOR_CONFIG.LOADING_DELAY);
}
};
// 获取当前内容
const getCurrentContent = (): string => {
if (!currentEditorId.value) return '';
const instance = editorCache.get(currentEditorId.value);
return instance ? instance.view.state.doc.toString() : '';
};
// 获取当前光标位置
const getCurrentCursorPosition = (): number => {
if (!currentEditorId.value) return 0;
const instance = editorCache.get(currentEditorId.value);
return instance ? instance.view.state.selection.main.head : 0;
};
// 检查是否有未保存修改
const hasUnsavedChanges = (docId: number): boolean => {
const instance = editorCache.get(docId);
return instance?.isDirty || false;
};
// 同步保存后的版本信息
const syncAfterSave = async (docId: number) => {
const instance = editorCache.get(docId);
if (!instance) return;
const doc = await documentStore.getDocument(docId);
if (doc) {
instance.contentTimestamp = doc.updated_at || '';
instance.contentLength = (doc.content || '').length;
instance.isDirty = false;
}
};
// 销毁编辑器
const destroyEditor = async (docId: number) => {
const instance = editorCache.get(docId);
if (!instance) return;
try {
// 保存光标位置
const cursorPos = instance.view.state.selection.main.head;
editorStateStore.saveCursorPosition(docId, cursorPos);
// 从扩展管理器移除
removeExtensionManagerView(docId);
// 移除 DOM
if (instance.view.dom && instance.view.dom.parentElement) {
instance.view.dom.remove();
}
// 销毁编辑器
instance.view.destroy();
// 从缓存删除
editorCache.delete(docId);
// 清空当前编辑器引用
if (currentEditorId.value === docId) {
currentEditorId.value = null;
}
} catch (error) {
console.error('Error destroying editor:', error);
}
};
// 清空所有编辑器
const destroyAllEditors = () => {
editorCache.clear((_documentId, instance) => {
// 保存光标位置
const cursorPos = instance.view.state.selection.main.head;
editorStateStore.saveCursorPosition(instance.documentId, cursorPos);
// 从扩展管理器移除
removeExtensionManagerView(instance.documentId);
// 移除 DOM
if (instance.view.dom.parentElement) {
instance.view.dom.remove();
}
// 销毁编辑器
instance.view.destroy();
});
currentEditorId.value = null;
};
// 设置编辑器容器
const setEditorContainer = (container: HTMLElement | null) => {
containerElement.value = container;
// 如果设置容器时已有当前文档,立即加载编辑器
if (container && documentStore.currentDocument && documentStore.currentDocument.id !== undefined) {
loadEditor(documentStore.currentDocument.id, documentStore.currentDocument.content || '');
}
};
// 加载编辑器
const loadEditor = async (documentId: number, content: string) => {
// 修复:使用计数器精确管理加载状态
loadingOperations.value++;
isLoading.value = true;
// 开始新的操作
const { operationId } = operationManager.startOperation(documentId);
try {
// 验证参数
if (!documentId) {
throw new Error('Invalid parameters for loadEditor');
}
// 保存当前编辑器内容
if (currentEditor.value) {
const currentDocId = documentStore.currentDocumentId;
if (currentDocId && currentDocId !== documentId) {
await saveEditorContent(currentDocId);
// 检查操作是否仍然有效
if (!operationManager.isOperationValid(operationId, documentId)) {
return;
}
}
}
// 获取或创建编辑器
const view = await getOrCreateEditor(documentId, content, operationId);
// 检查操作是否仍然有效
if (!operationManager.isOperationValid(operationId, documentId)) {
return;
}
// 更新内容(如果需要)
const instance = editorCache.get(documentId);
if (instance && instance.content !== content) {
// 确保编辑器视图有效
if (view && view.state && view.dispatch) {
view.dispatch({
changes: {
from: 0,
to: view.state.doc.length,
insert: content
}
});
instance.content = content;
instance.isDirty = false;
// 清理语法树缓存,因为内容已更新
instance.syntaxTreeCache = null;
// 修复:内容变了,清空光标位置,避免越界
instance.editorState = undefined;
delete documentStore.documentStates[documentId];
}
}
// 最终检查操作有效性
if (!operationManager.isOperationValid(operationId, documentId)) {
return;
}
// 显示编辑器
showEditor(documentId);
} catch (error) {
if (error instanceof Error && error.message === 'Operation cancelled') {
console.log(`Editor loading cancelled for document ${documentId}`);
} else {
console.error('Failed to load editor:', error);
}
} finally {
// 完成操作
operationManager.completeOperation(operationId);
// 修复:使用计数器精确管理加载状态,避免快速切换时状态不准确
loadingOperations.value--;
// 延迟一段时间后再取消加载状态,但要确保所有操作都完成了
setTimeout(() => {
if (loadingOperations.value <= 0) {
loadingOperations.value = 0;
isLoading.value = false;
}
}, EDITOR_CONFIG.LOADING_DELAY);
}
};
// 移除编辑器
const removeEditor = async (documentId: number) => {
const instance = editorCache.get(documentId);
if (instance) {
try {
// 如果正在加载这个文档,取消操作
if (operationManager.getCurrentContext() === documentId) {
operationManager.cancelAllOperations();
}
// 修复:移除前先保存内容(如果有未保存的修改)
if (instance.isDirty) {
await saveEditorContent(documentId);
}
// 清除自动保存定时器
instance.autoSaveTimer.clear();
// 从扩展管理器中移除视图
removeExtensionManagerView(documentId);
// 移除DOM元素
if (instance.view && instance.view.dom && instance.view.dom.parentElement) {
instance.view.dom.remove();
}
// 销毁编辑器
if (instance.view && instance.view.destroy) {
instance.view.destroy();
}
// 清理引用
if (currentEditor.value === instance.view) {
currentEditor.value = null;
}
// 从缓存中删除
editorCache.delete(documentId);
} catch (error) {
console.error('Error removing editor:', error);
}
}
};
// 更新文档统计
const updateDocumentStats = (stats: DocumentStats) => {
documentStats.value = stats;
};
// 应用字体设置
const applyFontSettings = () => {
@@ -445,7 +558,8 @@ export const useEditorStore = defineStore('editor', () => {
});
};
// 应用 Tab 设置
// 应用Tab设置
const applyTabSettings = () => {
editorCache.values().forEach(instance => {
updateTabConfig(
@@ -459,6 +573,7 @@ export const useEditorStore = defineStore('editor', () => {
// 应用快捷键设置
const applyKeymapSettings = async () => {
// 确保所有编辑器实例的快捷键都更新
await Promise.all(
editorCache.values().map(instance =>
updateKeymapExtension(instance.view)
@@ -466,36 +581,104 @@ export const useEditorStore = defineStore('editor', () => {
);
};
const hasContainer = computed(() => containerElement.value !== null);
const currentEditor = computed(() => {
if (!currentEditorId.value) return null;
const instance = editorCache.get(currentEditorId.value);
return instance ? instance.view : null;
// 清空所有编辑器
const clearAllEditors = () => {
// 取消所有挂起的操作
operationManager.cancelAllOperations();
editorCache.clear((_documentId, instance) => {
// 清除自动保存定时器
instance.autoSaveTimer.clear();
// 从扩展管理器移除
removeExtensionManagerView(instance.documentId);
// 移除DOM元素
if (instance.view.dom.parentElement) {
instance.view.dom.remove();
}
// 销毁编辑器
instance.view.destroy();
});
currentEditor.value = null;
};
// 更新扩展
const updateExtension = async (id: number, enabled: boolean, config?: any) => {
// 更新启用状态
await ExtensionService.UpdateExtensionEnabled(id, enabled);
// 如果需要更新配置
if (config !== undefined) {
await ExtensionService.UpdateExtensionConfig(id, config);
}
// 重新加载扩展配置
await extensionStore.loadExtensions();
// 获取更新后的扩展名称
const extension = extensionStore.extensions.find(ext => ext.id === id);
if (!extension) return;
// 更新前端编辑器扩展 - 应用于所有实例
const manager = getExtensionManager();
if (manager) {
// 直接更新前端扩展至所有视图
manager.updateExtension(extension.name, enabled, config);
}
await useKeybindingStore().loadKeyBindings();
await applyKeymapSettings();
};
// 监听文档切换
watch(() => documentStore.currentDocument, async (newDoc, oldDoc) => {
if (newDoc && newDoc.id !== undefined && containerElement.value) {
// 等待 DOM 更新完成,再加载新文档的编辑器
await nextTick();
loadEditor(newDoc.id, newDoc.content || '');
}
});
// 创建字体配置的计算属性
const fontConfig = computed(() => ({
fontSize: configStore.config.editing.fontSize,
fontFamily: configStore.config.editing.fontFamily,
lineHeight: configStore.config.editing.lineHeight,
fontWeight: configStore.config.editing.fontWeight
}));
// 创建Tab配置的计算属性
const tabConfig = computed(() => ({
tabSize: configStore.config.editing.tabSize,
enableTabIndent: configStore.config.editing.enableTabIndent,
tabType: configStore.config.editing.tabType
}));
// 监听字体配置变化
watch(fontConfig, applyFontSettings, { deep: true });
// 监听Tab配置变化
watch(tabConfig, applyTabSettings, { deep: true });
return {
// 状态
currentEditorId: readonly(currentEditorId),
currentEditor,
isLoading: readonly(isLoading),
hasContainer,
documentStats,
isLoading,
// 编辑器管理
// 方法
setEditorContainer,
switchToEditor,
destroyEditor,
destroyAllEditors,
loadEditor,
removeEditor,
clearAllEditors,
onContentChange,
// 查询方法
getCurrentContent,
getCurrentCursorPosition,
hasUnsavedChanges,
syncAfterSave,
// 配置应用
// 配置更新方法
applyFontSettings,
applyThemeSettings,
applyTabSettings,
applyKeymapSettings,
// 扩展管理方法
updateExtension,
editorView: currentEditor,
};
});

View File

@@ -18,9 +18,12 @@ export const useTabStore = defineStore('tab', () => {
const tabsMap = ref<Record<number, Tab>>({});
const tabOrder = ref<number[]>([]); // 维护标签页顺序
const draggedTabId = ref<number | null>(null);
// === 计算属性 ===
const isTabsEnabled = computed(() => configStore.config.general.enableTabs);
const canCloseTab = computed(() => tabOrder.value.length > 1);
const currentDocumentId = computed(() => documentStore.currentDocumentId);
// 按顺序返回标签页数组用于UI渲染
const tabs = computed(() => {
@@ -72,7 +75,7 @@ export const useTabStore = defineStore('tab', () => {
/**
* 关闭标签页
*/
const closeTab = async (documentId: number) => {
const closeTab = (documentId: number) => {
if (!hasTab(documentId)) return;
const tabIndex = tabOrder.value.indexOf(documentId);
@@ -92,7 +95,7 @@ export const useTabStore = defineStore('tab', () => {
if (nextIndex >= 0 && tabOrder.value[nextIndex]) {
const nextDocumentId = tabOrder.value[nextIndex];
await switchToTabAndDocument(nextDocumentId);
switchToTabAndDocument(nextDocumentId);
}
}
};
@@ -117,15 +120,15 @@ export const useTabStore = defineStore('tab', () => {
/**
* 切换到指定标签页并打开对应文档
*/
const switchToTabAndDocument = async (documentId: number) => {
const switchToTabAndDocument = (documentId: number) => {
if (!hasTab(documentId)) return;
// 如果点击的是当前已激活的文档,不需要重复请求
if (documentStore.currentDocumentId === documentId) {
return;
}
await documentStore.openDocument(documentId);
documentStore.openDocument(documentId);
};
/**
@@ -151,9 +154,8 @@ export const useTabStore = defineStore('tab', () => {
/**
* 验证并清理无效的标签页
*/
const validateTabs = async () => {
const docs = await documentStore.getDocumentList();
const validDocIds = docs.map(doc => doc.id).filter((id): id is number => id !== undefined);
const validateTabs = () => {
const validDocIds = Object.keys(documentStore.documents).map(Number);
// 找出无效的标签页(文档已被删除)
const invalidTabIds = tabOrder.value.filter(docId => !validDocIds.includes(docId));
@@ -170,9 +172,9 @@ export const useTabStore = defineStore('tab', () => {
/**
* 初始化标签页(当前文档)
*/
const initTab = async () => {
// 先验证并清理无效的标签页
await validateTabs();
const initializeTab = () => {
// 先验证并清理无效的标签页(处理持久化的脏数据)
validateTabs();
if (isTabsEnabled.value) {
const currentDoc = documentStore.currentDocument;
@@ -187,7 +189,7 @@ export const useTabStore = defineStore('tab', () => {
/**
* 关闭其他标签页(除了指定的标签页)
*/
const closeOtherTabs = async (keepDocumentId: number) => {
const closeOtherTabs = (keepDocumentId: number) => {
if (!hasTab(keepDocumentId)) return;
// 获取所有其他标签页的ID
@@ -198,14 +200,14 @@ export const useTabStore = defineStore('tab', () => {
// 如果当前打开的文档在被关闭的标签中,需要切换到保留的文档
if (otherTabIds.includes(documentStore.currentDocumentId!)) {
await switchToTabAndDocument(keepDocumentId);
switchToTabAndDocument(keepDocumentId);
}
};
/**
* 关闭指定标签页右侧的所有标签页
*/
const closeTabsToRight = async (documentId: number) => {
const closeTabsToRight = (documentId: number) => {
const index = getTabIndex(documentId);
if (index === -1) return;
@@ -217,14 +219,14 @@ export const useTabStore = defineStore('tab', () => {
// 如果当前打开的文档在被关闭的右侧标签中,需要切换到指定的文档
if (rightTabIds.includes(documentStore.currentDocumentId!)) {
await switchToTabAndDocument(documentId);
switchToTabAndDocument(documentId);
}
};
/**
* 关闭指定标签页左侧的所有标签页
*/
const closeTabsToLeft = async (documentId: number) => {
const closeTabsToLeft = (documentId: number) => {
const index = getTabIndex(documentId);
if (index <= 0) return;
@@ -236,7 +238,7 @@ export const useTabStore = defineStore('tab', () => {
// 如果当前打开的文档在被关闭的左侧标签中,需要切换到指定的文档
if (leftTabIds.includes(documentStore.currentDocumentId!)) {
await switchToTabAndDocument(documentId);
switchToTabAndDocument(documentId);
}
};
@@ -260,6 +262,7 @@ export const useTabStore = defineStore('tab', () => {
// 计算属性
isTabsEnabled,
canCloseTab,
currentDocumentId,
// 方法
addOrActivateTab,
@@ -270,7 +273,7 @@ export const useTabStore = defineStore('tab', () => {
switchToTabAndDocument,
moveTab,
getTabIndex,
initTab,
initializeTab,
clearAllTabs,
updateTabTitle,
validateTabs,

View File

@@ -4,12 +4,12 @@ import {SystemThemeType} from '@/../bindings/voidraft/internal/models/models';
import {Type as ThemeType} from '@/../bindings/voidraft/internal/models/ent/theme/models';
import {ThemeService} from '@/../bindings/voidraft/internal/services';
import {useConfigStore} from './configStore';
import {useEditorStore} from './editorStore';
import type {ThemeColors} from '@/views/editor/theme/types';
import {cloneThemeColors, FALLBACK_THEME_NAME, themePresetList, themePresetMap} from '@/views/editor/theme/presets';
import {useEditorStore} from "@/stores/editorStore";
// 类型定义
type ThemeOption = { name: string; type: ThemeType };
type ThemeOption = {name: string; type: ThemeType};
// 解析主题名称,确保返回有效的主题
const resolveThemeName = (name?: string): string =>
@@ -62,11 +62,15 @@ export const useThemeStore = defineStore('theme', () => {
// 从服务器获取主题颜色
const fetchThemeColors = async (themeName: string): Promise<ThemeColors> => {
const safeName = resolveThemeName(themeName);
const theme = await ThemeService.GetThemeByName(safeName);
if (theme?.colors) {
const colors = cloneThemeColors(theme.colors as ThemeColors);
colors.themeName = safeName;
return colors;
try {
const theme = await ThemeService.GetThemeByName(safeName);
if (theme?.colors) {
const colors = cloneThemeColors(theme.colors as ThemeColors);
colors.themeName = safeName;
return colors;
}
} catch (error) {
console.error('Failed to load theme override:', error);
}
return getPresetColors(safeName);
};
@@ -76,36 +80,21 @@ export const useThemeStore = defineStore('theme', () => {
const targetName = resolveThemeName(
themeName || configStore.config?.appearance?.currentTheme
);
currentColors.value = getPresetColors(targetName);
currentColors.value = await fetchThemeColors(targetName);
};
// 获取可用的主题颜色
const getEffectiveColors = (): ThemeColors => {
const targetName = resolveThemeName(
currentColors.value?.themeName || configStore.config?.appearance?.currentTheme
);
return currentColors.value ?? getPresetColors(targetName);
};
// 同步应用到 DOM 与编辑器
const applyAllThemes = () => {
applyThemeToDOM(currentTheme.value);
const editorStore = useEditorStore();
editorStore.applyThemeSettings();
};
// 初始化主题
const initTheme = async () => {
applyThemeToDOM(currentTheme.value);
await loadThemeColors();
applyAllThemes();
refreshEditorTheme();
};
// 设置系统主题
const setTheme = async (theme: SystemThemeType) => {
await configStore.setSystemTheme(theme);
applyAllThemes();
applyThemeToDOM(theme);
refreshEditorTheme();
};
// 切换到指定主题
@@ -117,7 +106,7 @@ export const useThemeStore = defineStore('theme', () => {
await loadThemeColors(themeName);
await configStore.setCurrentTheme(themeName);
applyAllThemes();
refreshEditorTheme();
return true;
};
@@ -139,7 +128,7 @@ export const useThemeStore = defineStore('theme', () => {
await ThemeService.UpdateTheme(themeName, currentColors.value);
await loadThemeColors(themeName);
applyAllThemes();
refreshEditorTheme();
return true;
};
@@ -153,10 +142,16 @@ export const useThemeStore = defineStore('theme', () => {
await ThemeService.ResetTheme(themeName);
await loadThemeColors(themeName);
applyAllThemes();
refreshEditorTheme();
return true;
};
// 刷新编辑器主题
const refreshEditorTheme = () => {
applyThemeToDOM(currentTheme.value);
const editorStore = useEditorStore();
editorStore?.applyThemeSettings();
};
return {
availableThemes,
@@ -169,8 +164,7 @@ export const useThemeStore = defineStore('theme', () => {
updateCurrentColors,
saveCurrentTheme,
resetCurrentTheme,
refreshEditorTheme,
applyThemeToDOM,
applyAllThemes,
getEffectiveColors,
};
});

View File

@@ -28,16 +28,11 @@ onMounted(async () => {
const urlDocumentId = windowStore.currentDocumentId ? parseInt(windowStore.currentDocumentId) : undefined;
await documentStore.initDocument(urlDocumentId);
await documentStore.initialize(urlDocumentId);
editorStore.setEditorContainer(editorElement.value);
const currentDocId = documentStore.currentDocumentId;
if (currentDocId) {
await editorStore.switchToEditor(currentDocId);
}
await tabStore.initTab();
await tabStore.initializeTab();
});
onBeforeUnmount(() => {

View File

@@ -1,13 +1,13 @@
import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view';
import type {Text} from '@codemirror/state';
import {useEditorStore} from '@/stores/editorStore';
/**
* 内容变化监听扩展
* 通过回调函数解耦,不直接依赖 Store
*/
export function createContentChangePlugin(onContentChange: () => void) {
export function createContentChangePlugin() {
return ViewPlugin.fromClass(
class ContentChangePlugin {
private readonly editorStore = useEditorStore();
private lastDoc: Text;
private rafId: number | null = null;
private pendingNotification = false;
@@ -40,7 +40,7 @@ export function createContentChangePlugin(onContentChange: () => void) {
this.rafId = requestAnimationFrame(() => {
this.pendingNotification = false;
this.rafId = null;
onContentChange(); // 调用注入的回调
this.editorStore.onContentChange();
});
}
}

View File

@@ -1,15 +1,15 @@
import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view';
import {useEditorStateStore} from '@/stores/editorStateStore';
import {useDocumentStore} from '@/stores/documentStore';
import {createDebounce} from '@/common/utils/debounce';
/**
* 光标位置持久化扩展
* 实时监听光标位置变化并持久化到 editorStateStore
* 实时监听光标位置变化并持久化到 documentStore
*/
export function createCursorPositionExtension(documentId: number) {
return ViewPlugin.fromClass(
class CursorPositionPlugin {
private readonly editorStateStore = useEditorStateStore();
private readonly documentStore = useDocumentStore();
private readonly debouncedSave;
constructor(private view: EditorView) {
@@ -42,7 +42,11 @@ export function createCursorPositionExtension(documentId: number) {
private saveCursorPosition() {
const cursorPos = this.view.state.selection.main.head;
this.editorStateStore.saveCursorPosition(documentId, cursorPos);
if (!this.documentStore.documentStates[documentId]) {
this.documentStore.documentStates[documentId] = {cursorPos};
} else {
this.documentStore.documentStates[documentId].cursorPos = cursorPos;
}
}
}
);

View File

@@ -1,6 +1,6 @@
import {Extension} from '@codemirror/state';
import {EditorView} from '@codemirror/view';
import {DocumentStats} from '@/stores/editorStateStore';
import {DocumentStats} from '@/stores/editorStore';
import {getActiveNoteBlock} from '@/views/editor/extensions/codeblock/state';
// 更新编辑器文档统计信息

View File

@@ -9,11 +9,15 @@ export const themeCompartment = new Compartment();
/**
* 根据主题类型获取主题扩展
*/
const getThemeExtension = (): Extension => {
const getThemeExtension = (): Extension | null => {
const themeStore = useThemeStore();
// 获取有效主题颜色
const colors = themeStore.getEffectiveColors();
// 直接获取当前主题颜色配置
const colors = themeStore.currentColors;
if (!colors) {
return null;
}
// 使用颜色配置创建主题
return createThemeByColors(colors);
@@ -24,6 +28,12 @@ const getThemeExtension = (): Extension => {
*/
export const createThemeExtension = (): Extension => {
const extension = getThemeExtension();
// 如果主题未加载,返回空扩展
if (!extension) {
return themeCompartment.of([]);
}
return themeCompartment.of(extension);
};
@@ -38,6 +48,11 @@ export const updateEditorTheme = (view: EditorView): void => {
try {
const extension = getThemeExtension();
// 如果主题未加载,不更新
if (!extension) {
return;
}
view.dispatch({
effects: themeCompartment.reconfigure(extension)
});
@@ -45,3 +60,4 @@ export const updateEditorTheme = (view: EditorView): void => {
console.error('Failed to update editor theme:', error);
}
};

View File

@@ -39,9 +39,6 @@ export interface CodeBlockOptions {
/** 新建块时的默认语言 */
defaultLanguage?: SupportedLanguage;
/** 分隔符高度(像素) */
separatorHeight?: number;
}
/**
@@ -89,7 +86,6 @@ export function createCodeBlockExtension(options: CodeBlockOptions = {}): Extens
showBackground = true,
enableAutoDetection = true,
defaultLanguage = 'text',
separatorHeight = 12,
} = options;
return [
@@ -108,8 +104,7 @@ export function createCodeBlockExtension(options: CodeBlockOptions = {}): Extens
// 视觉装饰系统
...getBlockDecorationExtensions({
showBackground,
separatorHeight
showBackground
}),
// 光标保护(防止方向键移动到分隔符上)

View File

@@ -1,17 +1,12 @@
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
import { ref, computed } from 'vue';
import { ref } from 'vue';
import { useRouter, useRoute } from 'vue-router';
import { useConfigStore } from '@/stores/configStore';
import MemoryMonitor from '@/components/monitor/MemoryMonitor.vue';
const { t } = useI18n();
const router = useRouter();
const route = useRoute();
const configStore = useConfigStore();
// 计算属性
const enableMemoryMonitor = computed(() => configStore.config.general.enableMemoryMonitor);
// 导航配置
const navItems = [
@@ -69,7 +64,7 @@ const goBackToEditor = async () => {
<span class="nav-text">{{ item.id === 'test' ? 'Test' : t(`settings.${item.id}`) }}</span>
</div>
</div>
<div class="settings-footer" v-if="enableMemoryMonitor">
<div class="settings-footer">
<div class="memory-info-section">
<div class="section-title">{{ t('settings.systemInfo') }}</div>
<MemoryMonitor />

View File

@@ -133,13 +133,16 @@ const updateLocalColor = (colorKey: string, value: string) => {
const applyChanges = async () => {
try {
if (!tempColors.value) return;
// 更新 store 中的颜色
themeStore.updateCurrentColors(tempColors.value);
// 保存到数据库
await themeStore.saveCurrentTheme();
// 刷新编辑器主题
themeStore.refreshEditorTheme();
// 清除未保存标记
hasUnsavedChanges.value = false;
} catch (error) {

View File

@@ -2,18 +2,48 @@
import {useConfigStore} from '@/stores/configStore';
import {useBackupStore} from '@/stores/backupStore';
import {useI18n} from 'vue-i18n';
import {computed} from 'vue';
import {computed, ref, watch, onUnmounted} from 'vue';
import SettingSection from '../components/SettingSection.vue';
import SettingItem from '../components/SettingItem.vue';
import ToggleSwitch from '../components/ToggleSwitch.vue';
import {AuthMethod} from '@/../bindings/voidraft/internal/models/models';
import {DialogService} from '@/../bindings/voidraft/internal/services';
import toast from '@/components/toast';
const {t} = useI18n();
const configStore = useConfigStore();
const backupStore = useBackupStore();
// 消息显示状态
const message = ref<string | null>(null);
const isError = ref(false);
let messageTimer: ReturnType<typeof setTimeout> | null = null;
const clearMessage = () => {
if (messageTimer) {
clearTimeout(messageTimer);
messageTimer = null;
}
message.value = null;
};
// 监听同步完成,显示消息并自动消失
watch(() => backupStore.isSyncing, (syncing, wasSyncing) => {
if (wasSyncing && !syncing) {
clearMessage();
if (backupStore.error) {
message.value = backupStore.error;
isError.value = true;
messageTimer = setTimeout(clearMessage, 5000);
} else {
message.value = 'Sync successful';
isError.value = false;
messageTimer = setTimeout(clearMessage, 3000);
}
}
});
onUnmounted(clearMessage);
const authMethodOptions = computed(() => [
{value: AuthMethod.Token, label: t('settings.backup.authMethods.token')},
{value: AuthMethod.SSHKey, label: t('settings.backup.authMethods.sshKey')},
@@ -34,15 +64,6 @@ const selectSshKeyFile = async () => {
configStore.setSshKeyPath(selectedPath.trim());
}
};
const handleSync = async () => {
try {
await backupStore.sync();
toast.success('Sync successful');
} catch (e) {
toast.error(e instanceof Error ? e.message : String(e));
}
};
</script>
<template>
@@ -181,10 +202,14 @@ const handleSync = async () => {
<!-- 备份操作 -->
<SettingSection :title="t('settings.backup.backupOperations')">
<SettingItem :title="t('settings.backup.syncToRemote')">
<SettingItem
:title="t('settings.backup.syncToRemote')"
:description="message || undefined"
:descriptionType="message ? (isError ? 'error' : 'success') : 'default'"
>
<button
class="sync-button"
@click="handleSync"
@click="backupStore.sync"
:disabled="!configStore.config.backup.enabled || !configStore.config.backup.repo_url || backupStore.isSyncing"
:class="{ 'syncing': backupStore.isSyncing }"
>
@@ -197,6 +222,10 @@ const handleSync = async () => {
</template>
<style scoped lang="scss">
.settings-page {
//max-width: 800px;
}
// 统一的输入控件样式
.repo-url-input,
.branch-input,

View File

@@ -1,6 +1,5 @@
<script setup lang="ts">
import { useConfigStore } from '@/stores/configStore';
import { useEditorStore } from '@/stores/editorStore';
import { useI18n } from 'vue-i18n';
import {computed, onMounted } from 'vue';
import SettingSection from '../components/SettingSection.vue';
@@ -10,7 +9,6 @@ import { TabType } from '@/../bindings/voidraft/internal/models/';
const { t } = useI18n();
const configStore = useConfigStore();
const editorStore = useEditorStore();
// 确保配置已加载
onMounted(async () => {
@@ -29,7 +27,6 @@ const fontFamilyModel = computed({
set: async (fontFamily: string) => {
if (fontFamily) {
await configStore.setFontFamily(fontFamily);
editorStore.applyFontSettings();
}
}
});
@@ -53,7 +50,6 @@ const fontWeightModel = computed({
set: async (value: string) => {
if (value) {
await configStore.setFontWeight(value);
editorStore.applyFontSettings();
}
}
});
@@ -62,24 +58,20 @@ const fontWeightModel = computed({
const increaseLineHeight = async () => {
const newLineHeight = Math.min(3.0, configStore.config.editing.lineHeight + 0.1);
await configStore.setLineHeight(Math.round(newLineHeight * 10) / 10);
editorStore.applyFontSettings();
};
const decreaseLineHeight = async () => {
const newLineHeight = Math.max(1.0, configStore.config.editing.lineHeight - 0.1);
await configStore.setLineHeight(Math.round(newLineHeight * 10) / 10);
editorStore.applyFontSettings();
};
// 字体大小控制
const increaseFontSize = async () => {
await configStore.increaseFontSize();
editorStore.applyFontSettings();
};
const decreaseFontSize = async () => {
await configStore.decreaseFontSize();
editorStore.applyFontSettings();
};
// Tab类型切换
@@ -92,18 +84,15 @@ const tabTypeText = computed(() => {
// Tab大小增减
const increaseTabSize = async () => {
await configStore.increaseTabSize();
editorStore.applyTabSettings();
};
const decreaseTabSize = async () => {
await configStore.decreaseTabSize();
editorStore.applyTabSettings();
};
// Tab相关操作
const handleToggleTabType = async () => {
await configStore.toggleTabType();
editorStore.applyTabSettings();
};
// 创建双向绑定的计算属性
@@ -111,7 +100,6 @@ const enableTabIndent = computed({
get: () => configStore.config.editing.enableTabIndent,
set: async (value: boolean) => {
await configStore.setEnableTabIndent(value);
editorStore.applyTabSettings();
}
});
@@ -199,13 +187,13 @@ const handleAutoSaveDelayChange = async (event: Event) => {
<button
@click="decreaseTabSize"
class="control-button"
:disabled="!enableTabIndent || configStore.config.editing.tabSize <= 2"
:disabled="!enableTabIndent || configStore.config.editing.tabSize <= configStore.tabSize.min"
>-</button>
<span>{{ configStore.config.editing.tabSize }}</span>
<button
@click="increaseTabSize"
class="control-button"
:disabled="!enableTabIndent || configStore.config.editing.tabSize >= 8"
:disabled="!enableTabIndent || configStore.config.editing.tabSize >= configStore.tabSize.max"
>+</button>
</div>
</SettingItem>

View File

@@ -3,7 +3,6 @@ import {computed, onMounted, ref} from 'vue';
import {useI18n} from 'vue-i18n';
import {useEditorStore} from '@/stores/editorStore';
import {useExtensionStore} from '@/stores/extensionStore';
import {useKeybindingStore} from '@/stores/keybindingStore';
import {ExtensionService} from '@/../bindings/voidraft/internal/services';
import {
getExtensionDefaultConfig,
@@ -11,16 +10,13 @@ import {
getExtensionDisplayName, getExtensionsMap,
hasExtensionConfig
} from '@/views/editor/manager/extensions';
import {getExtensionManager} from '@/views/editor/manager';
import SettingSection from '../components/SettingSection.vue';
import AccordionContainer from '@/components/accordion/AccordionContainer.vue';
import AccordionItem from '@/components/accordion/AccordionItem.vue';
import SettingItem from '../components/SettingItem.vue';
import ToggleSwitch from '../components/ToggleSwitch.vue';
const {t} = useI18n();
const editorStore = useEditorStore();
const extensionStore = useExtensionStore();
const keybindingStore = useKeybindingStore();
// 页面初始化时加载扩展数据
onMounted(async () => {
@@ -28,11 +24,11 @@ onMounted(async () => {
});
// 展开状态管理
const expandedExtensions = ref<number[]>([]);
const expandedExtensions = ref<Set<number>>(new Set());
// 获取所有可用的扩展
const availableExtensions = computed(() => {
const extensions = getExtensionsMap().map(name => {
return getExtensionsMap().map(name => {
const extension = extensionStore.extensions.find(ext => ext.name === name);
return {
id: extension?.id ?? 0,
@@ -45,37 +41,21 @@ const availableExtensions = computed(() => {
defaultConfig: getExtensionDefaultConfig(name)
};
});
console.log('Available Extensions:', extensions);
return extensions;
});
// 获取扩展图标路径(直接使用扩展名称作为文件名)
const getExtensionIcon = (name: string): string => {
return `/images/${name}.svg`;
// 切换展开状态
const toggleExpanded = (extensionId: number) => {
if (expandedExtensions.value.has(extensionId)) {
expandedExtensions.value.delete(extensionId);
} else {
expandedExtensions.value.add(extensionId);
}
};
// 更新扩展状态
const updateExtension = async (extensionId: number, enabled: boolean) => {
try {
// 更新后端
await ExtensionService.UpdateExtensionEnabled(extensionId, enabled);
// 重新加载各个 Store 的状态
await extensionStore.loadExtensions();
await keybindingStore.loadKeyBindings();
// 获取更新后的扩展
const extension = extensionStore.extensions.find(ext => ext.id === extensionId);
if (!extension) return;
// 应用到编辑器
const manager = getExtensionManager();
if (manager) {
manager.updateExtension(extension.name, enabled, extension.config);
}
// 更新快捷键
await editorStore.applyKeymapSettings();
await editorStore.updateExtension(extensionId, enabled);
} catch (error) {
console.error('Failed to update extension:', error);
}
@@ -95,18 +75,9 @@ const updateExtensionConfig = async (extensionId: number, configKey: string, val
} else {
updatedConfig[configKey] = value;
}
// 更新后端配置
await ExtensionService.UpdateExtensionConfig(extensionId, updatedConfig);
// 重新加载状态
await extensionStore.loadExtensions();
// 应用到编辑器
const manager = getExtensionManager();
if (manager) {
manager.updateExtension(extension.name, extension.enabled ?? false, updatedConfig);
}
// 使用editorStore的updateExtension方法更新确保应用到所有编辑器实例
await editorStore.updateExtension(extensionId, extension.enabled ?? false, updatedConfig);
} catch (error) {
console.error('Failed to update extension config:', error);
}
@@ -118,16 +89,14 @@ const resetExtension = async (extensionId: number) => {
// 重置到默认配置
await ExtensionService.ResetExtensionConfig(extensionId);
// 重新加载扩展状态
// 重新加载扩展状态以获取最新配置
await extensionStore.loadExtensions();
// 获取重置后的状态,应用到编辑器
// 获取重置后的状态,立即应用到所有编辑器视图
const extension = extensionStore.extensions.find(ext => ext.id === extensionId);
if (extension) {
const manager = getExtensionManager();
if (manager) {
manager.updateExtension(extension.name, extension.enabled ?? false, extension.config);
}
// 通过editorStore更新确保所有视图都能同步
await editorStore.updateExtension(extensionId, extension.enabled ?? false, extension.config);
}
} catch (error) {
console.error('Failed to reset extension:', error);
@@ -192,227 +161,152 @@ const handleConfigInput = async (
<template>
<div class="settings-page">
<SettingSection :title="t('settings.extensions')">
<!-- 空状态提示 -->
<div v-if="availableExtensions.length === 0" class="empty-state">
<p>{{ t('settings.extensionsPage.loading') }}</p>
</div>
<!-- 扩展列表 -->
<AccordionContainer v-else v-model="expandedExtensions" :multiple="false">
<AccordionItem
v-for="extension in availableExtensions"
:key="extension.id"
:id="extension.id"
:class="{ 'extension-disabled': !extension.enabled }"
<div
v-for="extension in availableExtensions"
:key="extension.name"
class="extension-item"
>
<!-- 扩展主项 -->
<SettingItem
:title="extension.displayName"
:description="extension.description"
>
<!-- 标题插槽显示图标和扩展名称 -->
<template #title>
<div class="extension-header">
<div class="extension-icon-wrapper">
<div class="extension-icon-placeholder" :class="{ 'disabled': !extension.enabled }">
<!-- 直接使用扩展名称作为图标文件名 -->
<img
:src="getExtensionIcon(extension.name)"
:alt="extension.displayName"
class="extension-icon-img"
/>
</div>
</div>
<div class="extension-info">
<div class="extension-name">{{ extension.displayName }}</div>
<div class="extension-description">{{ extension.description }}</div>
</div>
</div>
</template>
<!-- 默认插槽显示开关和配置项 -->
<div class="extension-content">
<!-- 启用开关 -->
<div class="extension-toggle-section">
<label class="toggle-label">{{ t('settings.extensionsPage.enabled') }}</label>
<ToggleSwitch
:model-value="extension.enabled"
@update:model-value="updateExtension(extension.id, $event)"
/>
</div>
<!-- 配置项 -->
<div v-if="extension.hasConfig" class="extension-config-section">
<div class="config-header">
<h4 class="config-title">{{ t('settings.extensionsPage.configuration') }}</h4>
<button
class="reset-button"
@click="resetExtension(extension.id)"
:title="t('settings.extensionsPage.resetToDefault')"
>
{{ t('settings.reset') }}
</button>
</div>
<div class="config-table-wrapper">
<table class="config-table">
<tbody>
<tr
v-for="[configKey, configValue] in Object.entries(extension.defaultConfig)"
:key="configKey"
>
<th scope="row" class="config-table-key">
{{ configKey }}
</th>
<td class="config-table-value">
<input
class="config-value-input"
type="text"
:value="formatConfigValue(getConfigValue(extension.config, configKey, configValue))"
@change="handleConfigInput(extension.id, configKey, configValue, $event)"
@keyup.enter.prevent="handleConfigInput(extension.id, configKey, configValue, $event)"
/>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="extension-controls">
<button
v-if="extension.hasConfig"
class="config-button"
@click="toggleExpanded(extension.id)"
:class="{ expanded: expandedExtensions.has(extension.id) }"
:title="t('settings.extensionsPage.configuration')"
>
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
stroke-linecap="round" stroke-linejoin="round">
<path
d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z"/>
<circle cx="12" cy="12" r="3"/>
</svg>
</button>
<div v-else class="config-placeholder"></div>
<ToggleSwitch
:model-value="extension.enabled"
@update:model-value="updateExtension(extension.id, $event)"
/>
</div>
</AccordionItem>
</AccordionContainer>
</SettingItem>
<!-- 可展开的配置区域 -->
<div
v-if="extension.hasConfig && expandedExtensions.has(extension.id)"
class="extension-config"
>
<!-- 配置项标题和重置按钮 -->
<div class="config-header">
<h4 class="config-title">{{ t('settings.extensionsPage.configuration') }}</h4>
<button
class="reset-button"
@click="resetExtension(extension.id)"
:title="t('settings.extensionsPage.resetToDefault')"
>
{{ t('settings.reset') }}
</button>
</div>
<div class="config-table-wrapper">
<table class="config-table">
<tbody>
<tr
v-for="[configKey, configValue] in Object.entries(extension.defaultConfig)"
:key="configKey"
>
<th scope="row" class="config-table-key">
{{ configKey }}
</th>
<td class="config-table-value">
<input
class="config-value-input"
type="text"
:value="formatConfigValue(getConfigValue(extension.config, configKey, configValue))"
@change="handleConfigInput(extension.id, configKey, configValue, $event)"
@keyup.enter.prevent="handleConfigInput(extension.id, configKey, configValue, $event)"
/>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</SettingSection>
</div>
</template>
<style scoped lang="scss">
.empty-state {
padding: 40px 20px;
text-align: center;
color: var(--settings-text-secondary);
font-size: 14px;
}
.extension-item {
border-bottom: 1px solid var(--settings-input-border);
// 禁用状态的扩展项
:deep(.extension-disabled) {
background-color: rgba(0, 0, 0, 0.02);
.accordion-header {
opacity: 0.7;
&:hover {
background-color: rgba(0, 0, 0, 0.03);
opacity: 0.8;
}
}
&.is-expanded {
background-color: rgba(0, 0, 0, 0.03);
.accordion-header {
opacity: 0.8;
}
}
.extension-description {
opacity: 0.7;
&:last-child {
border-bottom: none;
}
}
.extension-header {
.extension-controls {
display: flex;
align-items: center;
gap: 12px;
width: 100%;
min-width: 140px;
justify-content: flex-end;
}
.extension-icon-wrapper {
.config-button {
padding: 4px;
border: none;
background: none;
color: var(--settings-text-secondary);
cursor: pointer;
transition: all 0.2s ease;
border-radius: 4px;
flex-shrink: 0;
}
.extension-icon-placeholder {
width: 40px;
height: 40px;
width: 24px;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 8px;
background: linear-gradient(135deg, rgba(var(--settings-accent-rgb, 74, 158, 255), 0.12), rgba(var(--settings-accent-rgb, 74, 158, 255), 0.06));
border: 1px solid rgba(var(--settings-accent-rgb, 74, 158, 255), 0.15);
color: white;
transition: all 0.2s ease;
position: relative;
overflow: hidden;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
&.disabled {
background: linear-gradient(135deg, rgba(136, 136, 136, 0.08), rgba(136, 136, 136, 0.04));
border-color: rgba(136, 136, 136, 0.1);
box-shadow: none;
.extension-icon-img {
opacity: 0.4;
filter: grayscale(1);
}
&:hover {
background-color: var(--settings-hover);
color: var(--settings-text);
}
&.expanded {
color: var(--settings-accent);
background-color: var(--settings-hover);
}
svg {
transition: all 0.2s ease;
}
}
.extension-icon-img {
width: 28px;
height: 28px;
object-fit: contain;
transition: all 0.2s ease;
.config-placeholder {
width: 24px;
height: 24px;
flex-shrink: 0;
}
.extension-info {
flex: 1;
min-width: 0;
}
.extension-name {
font-size: 14px;
font-weight: 500;
color: var(--settings-text);
margin-bottom: 2px;
}
.extension-description {
font-size: 12px;
color: var(--settings-text-secondary);
line-height: 1.5;
word-wrap: break-word;
word-break: break-word;
}
.extension-content {
display: flex;
flex-direction: column;
gap: 16px;
}
.extension-toggle-section {
display: flex;
align-items: center;
justify-content: space-between;
padding: 8px 12px;
.extension-config {
background-color: var(--settings-input-bg);
border-radius: 4px;
border: 1px solid var(--settings-input-border);
}
.toggle-label {
font-size: 13px;
font-weight: 500;
color: var(--settings-text);
margin: 0;
}
.extension-config-section {
display: flex;
flex-direction: column;
gap: 8px;
border-left: 2px solid var(--settings-accent);
margin: 4px 0 12px 0;
padding: 8px 10px;
border-radius: 2px;
font-size: 12px;
}
.config-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 4px;
margin-bottom: 6px;
}
.config-title {
@@ -425,10 +319,10 @@ const handleConfigInput = async (
}
.reset-button {
padding: 4px 10px;
padding: 3px 8px;
font-size: 12px;
border: 1px solid var(--settings-input-border);
border-radius: 3px;
border-radius: 2px;
background-color: transparent;
color: var(--settings-text-secondary);
cursor: pointer;
@@ -444,7 +338,7 @@ const handleConfigInput = async (
.config-table-wrapper {
border: 1px solid var(--settings-input-border);
border-radius: 4px;
border-radius: 2px;
overflow: hidden;
background-color: var(--settings-panel, var(--settings-input-bg));
}
@@ -452,7 +346,7 @@ const handleConfigInput = async (
.config-table {
width: 100%;
border-collapse: collapse;
font-size: 12px;
font-size: 11px;
}
.config-table tr + tr {
@@ -461,7 +355,7 @@ const handleConfigInput = async (
.config-table th,
.config-table td {
padding: 6px 10px;
padding: 5px 8px;
vertical-align: middle;
}
@@ -473,36 +367,36 @@ const handleConfigInput = async (
border-right: 1px solid var(--settings-input-border);
background-color: rgba(0, 0, 0, 0.05);
font-family: ui-monospace, SFMono-Regular, "SF Mono", Consolas, monospace;
font-size: 12px;
font-size: 10px;
}
.config-table-value {
padding: 4px 6px;
padding: 3px 4px;
}
.config-value-input {
width: 100%;
padding: 5px 8px;
padding: 4px 6px;
border: 1px solid transparent;
border-radius: 3px;
border-radius: 2px;
background: transparent;
color: var(--settings-text);
font-size: 12px;
font-size: 11px;
font-family: ui-monospace, SFMono-Regular, "SF Mono", Consolas, monospace;
line-height: 1.4;
line-height: 1.3;
box-sizing: border-box;
transition: border-color 0.15s ease, background-color 0.15s ease;
}
&:hover {
border-color: var(--settings-input-border);
background-color: var(--settings-hover);
}
.config-value-input:hover {
border-color: var(--settings-input-border);
background-color: var(--settings-hover);
}
&:focus {
outline: none;
border-color: var(--settings-accent);
background-color: var(--settings-input-bg);
}
.config-value-input:focus {
outline: none;
border-color: var(--settings-accent);
background-color: var(--settings-input-bg);
}
</style>

View File

@@ -9,7 +9,6 @@ import ToggleSwitch from '../components/ToggleSwitch.vue';
import {DialogService, HotkeyService, MigrationService} from '@/../bindings/voidraft/internal/services';
import {useSystemStore} from "@/stores/systemStore";
import {useConfirm, usePolling} from '@/composables';
import toast from '@/components/toast';
const {t} = useI18n();
const {
@@ -19,7 +18,6 @@ const {
setDataPath,
setEnableGlobalHotkey,
setEnableLoadingAnimation,
setEnableMemoryMonitor,
setEnableSystemTray,
setEnableTabs,
setEnableWindowSnap,
@@ -31,6 +29,7 @@ const tabStore = useTabStore();
// 进度条显示控制
const showBar = ref(false);
const manualError = ref(''); // 用于捕获 MigrateDirectory 抛出的错误
let hideTimer = 0;
// 轮询迁移进度
@@ -40,20 +39,15 @@ const {data: progress, error: pollError, isActive: migrating, start, stop, reset
interval: 300,
shouldStop: ({progress, error}) => !!error || progress >= 100,
onStop: () => {
const error = pollError.value || progress.value?.error;
if (error) {
toast.error(error);
} else if ((progress.value?.progress ?? 0) >= 100) {
toast.success('Migration successful');
}
hideTimer = window.setTimeout(hideAll, 3000);
const hasError = pollError.value || progress.value?.error;
hideTimer = window.setTimeout(hideAll, hasError ? 5000 : 3000);
}
}
);
// 派生状态
const migrationError = computed(() => manualError.value || pollError.value || progress.value?.error || '');
const currentProgress = computed(() => progress.value?.progress ?? 0);
const migrationError = computed(() => pollError.value || progress.value?.error || '');
const barClass = computed(() => {
if (!showBar.value) return '';
@@ -70,7 +64,8 @@ const hideAll = () => {
clearTimeout(hideTimer);
hideTimer = 0;
showBar.value = false;
reset();
manualError.value = '';
reset(); // 清除轮询状态
};
// 重置设置确认
@@ -130,7 +125,7 @@ const enableTabs = computed({
await setEnableTabs(value);
if (value) {
// 开启tabs功能时初始化当前文档到标签页
tabStore.initTab();
tabStore.initializeTab();
} else {
// 关闭tabs功能时清空所有标签页
tabStore.clearAllTabs();
@@ -138,12 +133,6 @@ const enableTabs = computed({
}
});
// 计算属性 - 启用内存监视器
const enableMemoryMonitor = computed({
get: () => general.enableMemoryMonitor,
set: (value: boolean) => setEnableMemoryMonitor(value)
});
// 计算属性 - 开机启动
const startAtLogin = computed({
get: () => general.startAtLogin,
@@ -204,8 +193,10 @@ const selectDataDirectory = async () => {
const [oldPath, newPath] = [currentDataPath.value, selectedPath.trim()];
// 清除之前的状态并开始轮询
hideAll();
showBar.value = true;
manualError.value = '';
start();
try {
@@ -213,9 +204,10 @@ const selectDataDirectory = async () => {
await setDataPath(newPath);
} catch (e) {
stop();
toast.error(String(e).replace(/^Error:\s*/i, '') || 'Migration failed');
// 设置手动捕获的错误(当轮询还没获取到错误时)
manualError.value = String(e).replace(/^Error:\s*/i, '') || 'Migration failed';
showBar.value = true;
hideTimer = window.setTimeout(hideAll, 3000);
hideTimer = window.setTimeout(hideAll, 5000);
}
};
</script>
@@ -280,9 +272,6 @@ const selectDataDirectory = async () => {
<SettingItem :title="t('settings.enableTabs')">
<ToggleSwitch v-model="enableTabs"/>
</SettingItem>
<SettingItem :title="t('settings.enableMemoryMonitor')">
<ToggleSwitch v-model="enableMemoryMonitor"/>
</SettingItem>
</SettingSection>
<SettingSection :title="t('settings.startup')">
@@ -311,6 +300,11 @@ const selectDataDirectory = async () => {
<!-- 进度条 -->
<div class="progress-bar" :class="[{'active': showBar}, barClass]" :style="{width: barWidth}"/>
</div>
<!-- 错误提示 -->
<Transition name="error-fade">
<div v-if="migrationError" class="progress-error">{{ migrationError }}</div>
</Transition>
</div>
</div>
</SettingSection>
@@ -543,6 +537,13 @@ const selectDataDirectory = async () => {
}
}
}
.progress-error {
font-size: 12px;
color: #ef4444;
opacity: 1;
transition: all 0.3s ease;
}
}
.reset-button {
@@ -601,4 +602,35 @@ const selectDataDirectory = async () => {
box-shadow: 0 0 0 0 rgba(255, 71, 87, 0);
}
}
// 消息点脉冲动画
@keyframes pulse-dot {
0%, 100% {
opacity: 1;
transform: scale(1);
}
50% {
opacity: 0.5;
transform: scale(1.2);
}
}
// 错误提示动画
.error-fade-enter-active {
transition: all 0.3s ease;
}
.error-fade-leave-active {
transition: all 0.3s ease;
}
.error-fade-enter-from {
opacity: 0;
transform: translateY(-4px);
}
.error-fade-leave-to {
opacity: 0;
transform: translateY(-4px);
}
</style>

View File

@@ -1,9 +1,8 @@
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
import { onMounted, computed, ref, nextTick } from 'vue';
import { onMounted, computed, ref, onUnmounted, watch } from 'vue';
import SettingSection from '../components/SettingSection.vue';
import SettingItem from '../components/SettingItem.vue';
import { AccordionContainer, AccordionItem } from '@/components/accordion';
import { useKeybindingStore } from '@/stores/keybindingStore';
import { useSystemStore } from '@/stores/systemStore';
import { useConfigStore } from '@/stores/configStore';
@@ -12,7 +11,6 @@ import { getCommandDescription } from '@/views/editor/keymap/commands';
import { KeyBindingType } from '@/../bindings/voidraft/internal/models/models';
import { KeyBindingService } from '@/../bindings/voidraft/internal/services';
import { useConfirm } from '@/composables/useConfirm';
import toast from '@/components/toast';
const { t } = useI18n();
const keybindingStore = useKeybindingStore();
@@ -22,26 +20,16 @@ const editorStore = useEditorStore();
interface EditingState {
id: number;
name: string;
originalKey: string;
}
const editingBinding = ref<EditingState | null>(null);
const inputKey = ref('');
const capturedKey = ref('');
const capturedKeyDisplay = ref<string[]>([]);
const isConflict = ref(false);
// 将快捷键字符串拆分为独立的键
const splitKeys = (keyStr: string): string[] => {
if (!keyStr) return [];
return keyStr.split(/[-+]/).filter(Boolean);
};
// 动态设置 ref 并自动聚焦
const setInputRef = (el: any) => {
if (el && el instanceof HTMLInputElement) {
// 使用 nextTick 确保 DOM 完全渲染后再聚焦
nextTick(() => {
el.focus();
});
}
};
const isEditing = computed(() => !!editingBinding.value);
onMounted(async () => {
await keybindingStore.loadKeyBindings();
@@ -75,10 +63,7 @@ const keyBindings = computed(() =>
command: getDisplayKeybinding(kb),
rawKey: getRawKey(kb),
extension: kb.extension || '',
description: getCommandDescription(kb.name) || kb.name || '',
enabled: kb.enabled,
preventDefault: kb.preventDefault,
originalData: kb
description: getCommandDescription(kb.name) || kb.name || ''
}))
);
@@ -97,8 +82,6 @@ const getDisplayKeybinding = (kb: any): string[] => {
};
const parseKeyString = (keyStr: string): string[] => {
if (!keyStr) return [];
const symbolMap: Record<string, string> = {
'Mod': systemStore.isMacOS ? '⌘' : 'Ctrl',
'Cmd': '⌘',
@@ -119,141 +102,128 @@ const parseKeyString = (keyStr: string): string[] => {
.filter(Boolean);
};
// 切换启用状态
const toggleEnabled = async (binding: any) => {
try {
await KeyBindingService.UpdateKeyBindingEnabled(binding.id, !binding.enabled);
await keybindingStore.loadKeyBindings();
await editorStore.applyKeymapSettings();
} catch (error) {
console.error('Failed to update enabled status:', error);
}
// 键盘事件捕获
const SPECIAL_KEYS: Record<string, string> = {
' ': 'Space',
'ArrowUp': 'ArrowUp',
'ArrowDown': 'ArrowDown',
'ArrowLeft': 'ArrowLeft',
'ArrowRight': 'ArrowRight',
'Enter': 'Enter',
'Tab': 'Tab',
'Backspace': 'Backspace',
'Delete': 'Delete',
'Home': 'Home',
'End': 'End',
'PageUp': 'PageUp',
'PageDown': 'PageDown',
};
// 切换 PreventDefault
const togglePreventDefault = async (binding: any) => {
try {
await KeyBindingService.UpdateKeyBindingPreventDefault(binding.id, !binding.preventDefault);
await keybindingStore.loadKeyBindings();
await editorStore.applyKeymapSettings();
} catch (error) {
console.error('Failed to update preventDefault:', error);
}
const MODIFIER_KEYS = ['Control', 'Alt', 'Shift', 'Meta'];
const MAX_KEY_PARTS = 3; // 最多3个键
const captureKeyBinding = (event: KeyboardEvent): string | null => {
// 忽略单独的修饰键
if (MODIFIER_KEYS.includes(event.key)) return null;
const parts: string[] = [];
// 添加修饰键
if (event.ctrlKey || event.metaKey) parts.push('Mod');
if (event.altKey) parts.push('Alt');
if (event.shiftKey) parts.push('Shift');
// 获取主键
const mainKey = SPECIAL_KEYS[event.key] ??
(event.key.length === 1 ? event.key.toLowerCase() : event.key);
if (mainKey) parts.push(mainKey);
// 限制最多3个键
if (parts.length > MAX_KEY_PARTS) return null;
return parts.join('-');
};
// 开始添加快捷键
const startAddKey = (bindingId: number) => {
editingBinding.value = {
id: bindingId
};
inputKey.value = '';
};
// 取消编辑
const cancelEdit = () => {
window.removeEventListener('keydown', handleKeyCapture, true);
editingBinding.value = null;
inputKey.value = '';
capturedKey.value = '';
capturedKeyDisplay.value = [];
isConflict.value = false;
};
// 验证快捷键格式
const validateKeyFormat = (key: string): boolean => {
if (!key || key.trim() === '') return false;
const handleKeyCapture = (event: KeyboardEvent) => {
if (!isEditing.value) return;
// 基本格式验证:允许 Mod/Ctrl/Alt/Shift + 其他键
const validPattern = /^(Mod|Ctrl|Alt|Shift|Cmd)(-[A-Za-z0-9\[\]\\/;',.\-=`]|-(ArrowUp|ArrowDown|ArrowLeft|ArrowRight|Enter|Tab|Backspace|Delete|Home|End|PageUp|PageDown|Space|Escape))+$/;
const simpleKeyPattern = /^[A-Za-z0-9]$/;
const specialKeyPattern = /^(ArrowUp|ArrowDown|ArrowLeft|ArrowRight|Enter|Tab|Backspace|Delete|Home|End|PageUp|PageDown|Space|Escape)$/;
event.preventDefault();
event.stopPropagation();
return validPattern.test(key) || simpleKeyPattern.test(key) || specialKeyPattern.test(key);
// ESC 取消编辑
if (event.key === 'Escape') {
cancelEdit();
return;
}
const key = captureKeyBinding(event);
if (key) {
capturedKey.value = key;
capturedKeyDisplay.value = parseKeyString(key);
isConflict.value = false;
}
};
// 检查快捷键冲突
const checkConflict = (newKey: string, currentBindingId: number): { conflict: boolean; conflictWith?: string } => {
const conflictBinding = keyBindings.value.find(kb =>
kb.rawKey === newKey && kb.id !== currentBindingId
const startEditBinding = (binding: any) => {
editingBinding.value = {
id: binding.id,
name: binding.name,
originalKey: binding.rawKey
};
capturedKey.value = '';
capturedKeyDisplay.value = [];
isConflict.value = false;
// 手动添加键盘监听
window.addEventListener('keydown', handleKeyCapture, true);
};
const checkConflict = (newKey: string): boolean =>
keyBindings.value.some(kb =>
kb.rawKey === newKey && kb.name !== editingBinding.value?.name
);
if (conflictBinding) {
return {
conflict: true,
conflictWith: conflictBinding.description
};
}
return { conflict: false };
};
// 添加新键到快捷键
const addKeyPart = async () => {
if (!editingBinding.value || !inputKey.value.trim()) {
return;
}
const newPart = inputKey.value.trim();
const binding = keyBindings.value.find(kb => kb.id === editingBinding.value!.id);
if (!binding) return;
// 检查键数量限制最多4个
const currentParts = splitKeys(binding.rawKey);
if (currentParts.length >= 4) {
toast.error(t('keybindings.maxKeysReached'));
inputKey.value = '';
return;
}
// 获取现有的键
const currentKey = binding.rawKey;
const newKey = currentKey ? `${currentKey}-${newPart}` : newPart;
// 验证格式
if (!validateKeyFormat(newKey)) {
toast.error(t('keybindings.invalidFormat'));
inputKey.value = '';
return;
}
const confirmKeybinding = async () => {
if (!editingBinding.value || !capturedKey.value) return;
// 检查冲突
const conflictCheck = checkConflict(newKey, editingBinding.value.id);
if (conflictCheck.conflict) {
toast.error(t('keybindings.conflict', { command: conflictCheck.conflictWith }));
inputKey.value = '';
if (checkConflict(capturedKey.value)) {
isConflict.value = true;
setTimeout(cancelEdit, 600);
return;
}
try {
await keybindingStore.updateKeyBinding(editingBinding.value.id, newKey);
await editorStore.applyKeymapSettings();
inputKey.value = '';
} catch (error) {
console.error('Failed to add key part:', error);
}
};
// 删除快捷键的某个部分
const removeKeyPart = async (bindingId: number, index: number) => {
const binding = keyBindings.value.find(kb => kb.id === bindingId);
if (!binding) return;
const parts = splitKeys(binding.rawKey);
parts.splice(index, 1);
const newKey = parts.join('-');
try {
await keybindingStore.updateKeyBinding(bindingId, newKey);
await keybindingStore.updateKeyBinding(
editingBinding.value.id,
capturedKey.value
);
await editorStore.applyKeymapSettings();
} catch (error) {
console.error('Failed to remove key part:', error);
console.error(error);
} finally {
cancelEdit();
}
};
</script>
<template>
<div class="settings-page">
<!-- 快捷键模式设置 -->
<SettingSection :title="t('keybindings.keymapMode')">
<SettingItem :title="t('keybindings.keymapMode')">
<SettingItem
:title="t('keybindings.keymapMode')">
<select
:value="configStore.config.editing.keymapMode"
@change="updateKeymapMode(($event.target as HTMLSelectElement).value as KeyBindingType)"
@@ -281,111 +251,68 @@ const removeKeyPart = async (bindingId: number, index: number) => {
</button>
</template>
<AccordionContainer :multiple="false">
<AccordionItem
<div class="key-bindings-container">
<div class="key-bindings-header">
<div class="keybinding-col">{{ t('keybindings.headers.shortcut') }}</div>
<div class="extension-col">{{ t('keybindings.headers.extension') }}</div>
<div class="description-col">{{ t('keybindings.headers.description') }}</div>
</div>
<div
v-for="binding in keyBindings"
:key="binding.id"
:id="binding.id!"
:key="binding.name"
class="key-binding-row"
>
<!-- 标题插槽 -->
<template #title>
<div class="binding-title" :class="{ 'disabled': !binding.enabled }">
<div class="binding-name">
<span class="binding-description">{{ binding.description }}</span>
<span class="binding-extension">{{ binding.extension }}</span>
</div>
<div class="binding-keys">
<!-- 快捷键列 -->
<div
class="keybinding-col"
:class="{ 'editing': editingBinding?.name === binding.name }"
@click.stop="editingBinding?.name !== binding.name && startEditBinding(binding)"
>
<!-- 编辑模式 -->
<template v-if="editingBinding?.name === binding.name">
<template v-if="!capturedKey">
<span class="key-badge waiting">waiting...</span>
</template>
<template v-else>
<span
v-for="(key, index) in binding.command"
v-for="(key, index) in capturedKeyDisplay"
:key="index"
class="key-badge"
class="key-badge captured"
:class="{ 'conflict': isConflict }"
>
{{ key }}
</span>
<span v-if="!binding.command.length" class="key-badge-empty">-</span>
</div>
</div>
</template>
<!-- 展开内容 -->
<div class="binding-config">
<!-- Enabled 配置 -->
<div class="config-row">
<span class="config-label">{{ t('keybindings.config.enabled') }}</span>
<label class="switch">
<input
type="checkbox"
:checked="binding.enabled"
@change="toggleEnabled(binding)"
>
<span class="slider"></span>
</label>
</div>
<!-- PreventDefault 配置 -->
<div class="config-row">
<span class="config-label">{{ t('keybindings.config.preventDefault') }}</span>
<label class="switch">
<input
type="checkbox"
:checked="binding.preventDefault"
@change="togglePreventDefault(binding)"
>
<span class="slider"></span>
</label>
</div>
<!-- Key 配置 -->
<div class="config-row">
<span class="config-label">{{ t('keybindings.config.keybinding') }}</span>
<div class="key-input-wrapper">
<div class="key-tags">
<!-- 显示现有快捷键的每个部分 -->
<template v-if="binding.rawKey">
<span
v-for="(keyPart, index) in splitKeys(binding.rawKey)"
:key="index"
class="key-tag"
>
<span class="key-tag-text">{{ keyPart }}</span>
<button
class="key-tag-remove"
@click="removeKeyPart(binding.id!, index)"
>×</button>
</span>
</template>
<!-- 添加输入框 -->
<template v-if="editingBinding?.id === binding.id">
<input
:ref="setInputRef"
v-model="inputKey"
type="text"
class="key-input"
:placeholder="t('keybindings.keyPlaceholder')"
@keydown.enter="addKeyPart"
@keydown.escape="cancelEdit"
@blur="cancelEdit"
/>
</template>
<!-- 添加按钮 -->
<template v-else>
<button
class="key-tag-add"
@click="startAddKey(binding.id!)"
>
<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6 1V11M1 6H11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
</svg>
</button>
</template>
</div>
</div>
</div>
</template>
<button
@click.stop="confirmKeybinding"
class="btn-mini btn-confirm"
:disabled="!capturedKey"
title="Ok"
></button>
<button
@click.stop="cancelEdit"
class="btn-mini btn-cancel"
title="Cancel"
></button>
</template>
<!-- 显示模式 -->
<template v-else>
<span
v-for="(key, index) in binding.command"
:key="index"
class="key-badge"
>
{{ key }}
</span>
</template>
</div>
</AccordionItem>
</AccordionContainer>
<div class="extension-col">{{ binding.extension }}</div>
<div class="description-col">{{ binding.description }}</div>
</div>
</div>
</SettingSection>
</div>
</template>
@@ -448,275 +375,167 @@ const removeKeyPart = async (bindingId: number, index: number) => {
}
}
.binding-title {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
gap: 16px;
.key-bindings-container {
&.disabled {
opacity: 0.5;
.key-bindings-header {
display: flex;
padding: 0 0 8px 0;
border-bottom: 1px solid var(--settings-border);
color: var(--text-muted);
font-size: 12px;
font-weight: 500;
}
}
.binding-name {
flex: 1;
display: flex;
flex-direction: column;
gap: 4px;
}
.binding-description {
font-size: 13px;
font-weight: 500;
color: var(--settings-text);
}
.binding-extension {
font-size: 11px;
color: var(--text-muted);
text-transform: capitalize;
}
.binding-keys {
display: flex;
gap: 4px;
align-items: center;
}
.key-badge {
background-color: var(--settings-input-bg);
padding: 2px 6px;
border-radius: 3px;
font-size: 11px;
border: 1px solid var(--settings-input-border);
color: var(--settings-text);
white-space: nowrap;
}
.key-badge-empty {
font-size: 11px;
color: var(--text-muted);
font-style: italic;
}
.binding-config {
display: flex;
flex-direction: column;
gap: 16px;
}
.config-row {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
}
.config-label {
font-size: 13px;
color: var(--settings-text);
font-weight: 500;
}
// Switch 开关样式
.switch {
position: relative;
display: inline-block;
width: 36px;
height: 20px;
flex-shrink: 0;
input {
opacity: 0;
width: 0;
height: 0;
.key-binding-row {
display: flex;
padding: 10px 0;
border-bottom: 1px solid var(--settings-border);
align-items: center;
transition: background-color 0.2s ease;
&:checked + .slider {
background-color: #4a9eff;
&:hover {
background-color: var(--settings-hover);
}
}
.keybinding-col {
width: 150px;
display: flex;
gap: 4px;
padding: 0 10px 0 0;
color: var(--settings-text);
align-items: center;
cursor: pointer;
transition: all 0.2s ease;
&:hover:not(.editing) .key-badge {
border-color: #4a9eff;
}
&.editing {
cursor: default;
}
.key-badge {
background-color: var(--settings-input-bg);
padding: 2px 6px;
border-radius: 3px;
font-size: 11px;
border: 1px solid var(--settings-input-border);
color: var(--settings-text);
transition: border-color 0.2s ease;
white-space: nowrap;
&:before {
transform: translateX(16px);
&.waiting {
border: none;
background-color: transparent;
padding: 0;
color: #4a9eff;
font-style: italic;
animation: colorPulse 1.5s ease-in-out infinite;
}
&.captured {
background-color: #4a9eff;
color: white;
border-color: #4a9eff;
&.conflict {
background-color: #dc3545;
border-color: #dc3545;
animation: shake 0.6s ease-in-out;
}
}
}
}
.btn-mini {
width: 16px;
height: 16px;
min-width: 16px;
border: none;
border-radius: 2px;
cursor: pointer;
font-size: 10px;
transition: opacity 0.2s ease;
display: flex;
align-items: center;
justify-content: center;
padding: 0;
line-height: 1;
margin-left: auto;
&.btn-confirm {
background-color: #28a745;
color: white;
&:hover:not(:disabled) {
opacity: 0.85;
}
&:disabled {
background-color: var(--settings-input-border);
cursor: not-allowed;
opacity: 0.5;
}
}
&:focus + .slider {
box-shadow: 0 0 1px #4a9eff;
&.btn-cancel {
background-color: #dc3545;
color: white;
margin-left: 2px;
&:hover {
opacity: 0.85;
}
}
}
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: var(--settings-input-border);
transition: 0.3s;
border-radius: 20px;
&:before {
position: absolute;
content: "";
height: 14px;
width: 14px;
left: 3px;
bottom: 3px;
background-color: white;
transition: 0.3s;
border-radius: 50%;
.extension-col {
width: 80px;
padding: 0 10px 0 0;
font-size: 13px;
color: var(--settings-text);
text-transform: capitalize;
}
.description-col {
flex: 1;
font-size: 13px;
color: var(--settings-text);
}
}
.key-input-wrapper {
flex: 1;
display: flex;
align-items: center;
gap: 8px;
}
.key-tags {
display: flex;
gap: 6px;
align-items: center;
flex-wrap: wrap;
flex: 1;
min-height: 28px;
}
.key-tag {
display: inline-flex;
align-items: center;
gap: 4px;
padding: 4px 8px;
height: 28px;
background-color: var(--settings-input-bg);
border: 1px solid var(--settings-input-border);
border-radius: 4px;
font-size: 12px;
font-weight: 500;
color: var(--settings-text);
transition: all 0.2s ease;
box-sizing: border-box;
&:hover {
border-color: #4a9eff;
.key-tag-remove {
opacity: 1;
}
}
}
.key-tag-text {
user-select: none;
}
.key-tag-remove {
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
width: 16px;
height: 16px;
border: none;
background: none;
color: var(--text-muted);
cursor: pointer;
font-size: 18px;
line-height: 1;
padding: 0;
margin: 0;
opacity: 0.6;
transition: all 0.2s ease;
&:hover {
color: #e74c3c;
@keyframes colorPulse {
0%, 100% {
color: #4a9eff;
opacity: 1;
}
50% {
color: #2080ff;
opacity: 0.6;
}
}
.key-tag-add {
display: flex;
align-items: center;
justify-content: center;
width: 28px;
height: 28px;
flex-shrink: 0;
border: 1px dashed var(--settings-input-border);
border-radius: 4px;
background-color: transparent;
@keyframes shake {
0%, 100% {
transform: translateX(0);
}
10%, 30%, 50%, 70%, 90% {
transform: translateX(-4px);
}
20%, 40%, 60%, 80% {
transform: translateX(4px);
}
}
.coming-soon-placeholder {
padding: 20px;
background-color: var(--settings-card-bg);
border-radius: 6px;
color: var(--text-muted);
cursor: pointer;
transition: all 0.2s ease;
box-sizing: border-box;
&:hover {
border-color: #4a9eff;
background-color: var(--settings-input-bg);
color: #4a9eff;
}
text-align: center;
font-style: italic;
font-size: 13px;
}
.key-input {
padding: 4px 8px;
height: 28px;
border: 1px solid #4a9eff;
border-radius: 4px;
background-color: var(--settings-input-bg);
color: var(--settings-text);
font-size: 12px;
width: 60px;
outline: none;
box-sizing: border-box;
&::placeholder {
color: var(--text-muted);
font-size: 11px;
}
}
.btn-mini {
width: 24px;
height: 24px;
min-width: 24px;
border: none;
border-radius: 3px;
cursor: pointer;
font-size: 12px;
transition: opacity 0.2s ease;
display: flex;
align-items: center;
justify-content: center;
padding: 0;
line-height: 1;
flex-shrink: 0;
&.btn-confirm {
background-color: #28a745;
color: white;
&:hover:not(:disabled) {
opacity: 0.85;
}
&:disabled {
background-color: var(--settings-input-border);
cursor: not-allowed;
opacity: 0.5;
}
}
&.btn-cancel {
background-color: #dc3545;
color: white;
&:hover {
opacity: 0.85;
}
}
}
</style>
</style>

View File

@@ -72,72 +72,6 @@
</div>
</SettingSection>
<!-- Toast 通知测试区域 -->
<SettingSection title="Toast Notification Test">
<SettingItem title="Toast Message">
<input
v-model="toastMessage"
type="text"
placeholder="Enter toast message"
class="select-input"
/>
</SettingItem>
<SettingItem title="Toast Title (Optional)">
<input
v-model="toastTitle"
type="text"
placeholder="Enter toast title"
class="select-input"
/>
</SettingItem>
<SettingItem title="Position">
<select v-model="toastPosition" class="select-input">
<option value="top-right">Top Right</option>
<option value="top-left">Top Left</option>
<option value="top-center">Top Center</option>
<option value="bottom-right">Bottom Right</option>
<option value="bottom-left">Bottom Left</option>
<option value="bottom-center">Bottom Center</option>
</select>
</SettingItem>
<SettingItem title="Duration (ms)">
<input
v-model.number="toastDuration"
type="number"
min="0"
step="500"
placeholder="4000"
class="select-input"
/>
</SettingItem>
<SettingItem title="Toast Types">
<div class="button-group">
<button @click="showToast('success')" class="test-button toast-success-btn">
Success
</button>
<button @click="showToast('error')" class="test-button toast-error-btn">
Error
</button>
<button @click="showToast('warning')" class="test-button toast-warning-btn">
Warning
</button>
<button @click="showToast('info')" class="test-button toast-info-btn">
Info
</button>
</div>
</SettingItem>
<SettingItem title="Quick Tests">
<div class="button-group">
<button @click="showMultipleToasts" class="test-button">
Show Multiple Toasts
</button>
<button @click="clearAllToasts" class="test-button">
Clear All Toasts
</button>
</div>
</SettingItem>
</SettingSection>
<!-- 清除所有测试状态 -->
<SettingSection title="Cleanup">
<SettingItem title="Clear All">
@@ -157,8 +91,6 @@ import { ref } from 'vue';
import * as TestService from '@/../bindings/voidraft/internal/services/testservice';
import SettingSection from '../components/SettingSection.vue';
import SettingItem from '../components/SettingItem.vue';
import toast from '@/components/toast';
import type { ToastPosition, ToastType } from '@/components/toast/types';
// Badge测试状态
const badgeText = ref('');
@@ -170,12 +102,6 @@ const notificationSubtitle = ref('');
const notificationBody = ref('');
const notificationStatus = ref<{ type: string; message: string } | null>(null);
// Toast 测试状态
const toastMessage = ref('This is a test toast notification!');
const toastTitle = ref('');
const toastPosition = ref<ToastPosition>('top-right');
const toastDuration = ref(4000);
// 清除状态
const clearStatus = ref<{ type: string; message: string } | null>(null);
@@ -246,57 +172,13 @@ const clearAll = async () => {
showStatus(clearStatus, 'error', `Failed to clear test states: ${error.message || error}`);
}
};
// Toast 相关函数
const showToast = (type: ToastType) => {
const message = toastMessage.value || `This is a ${type} toast notification!`;
const title = toastTitle.value || undefined;
const options = {
position: toastPosition.value,
duration: toastDuration.value,
};
switch (type) {
case 'success':
toast.success(message, title, options);
break;
case 'error':
toast.error(message, title, options);
break;
case 'warning':
toast.warning(message, title, options);
break;
case 'info':
toast.info(message, title, options);
break;
}
};
const showMultipleToasts = () => {
const positions: ToastPosition[] = ['top-right', 'top-left', 'bottom-right', 'bottom-left'];
const types: ToastType[] = ['success', 'error', 'warning', 'info'];
positions.forEach((position, index) => {
setTimeout(() => {
const type = types[index % types.length];
toast.show({
type,
message: `Toast from ${position}`,
title: `${type.charAt(0).toUpperCase() + type.slice(1)} Toast`,
position,
duration: 5000,
});
}, index * 200);
});
};
const clearAllToasts = () => {
toast.clear();
};
</script>
<style scoped lang="scss">
.settings-page {
//padding: 20px 0 20px 0;
}
.dev-description {
color: var(--settings-text-secondary);
font-size: 12px;
@@ -367,50 +249,6 @@ const clearAllToasts = () => {
opacity: 0.9;
}
}
&.toast-success-btn {
background-color: #16a34a;
color: white;
border-color: #16a34a;
&:hover {
background-color: #15803d;
border-color: #15803d;
}
}
&.toast-error-btn {
background-color: #dc2626;
color: white;
border-color: #dc2626;
&:hover {
background-color: #b91c1c;
border-color: #b91c1c;
}
}
&.toast-warning-btn {
background-color: #f59e0b;
color: white;
border-color: #f59e0b;
&:hover {
background-color: #d97706;
border-color: #d97706;
}
}
&.toast-info-btn {
background-color: #3b82f6;
color: white;
border-color: #3b82f6;
&:hover {
background-color: #2563eb;
border-color: #2563eb;
}
}
}
.test-status {

10
go.mod
View File

@@ -13,15 +13,15 @@ require (
github.com/knadh/koanf/v2 v2.3.0
github.com/mattn/go-sqlite3 v1.14.32
github.com/stretchr/testify v1.11.1
github.com/wailsapp/wails/v3 v3.0.0-alpha.54
github.com/wailsapp/wails/v3 v3.0.0-alpha.51
golang.org/x/net v0.48.0
golang.org/x/sys v0.39.0
golang.org/x/text v0.32.0
resty.dev/v3 v3.0.0-beta.6
resty.dev/v3 v3.0.0-beta.5
)
require (
ariga.io/atlas v1.0.0 // indirect
ariga.io/atlas v0.38.0 // indirect
code.gitea.io/sdk/gitea v0.22.1 // indirect
dario.cat/mergo v1.0.2 // indirect
git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
@@ -48,11 +48,11 @@ require (
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/inflect v0.21.5 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/godbus/dbus/v5 v5.2.2 // indirect
github.com/godbus/dbus/v5 v5.2.1 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-github/v74 v74.0.0 // indirect
github.com/google/go-querystring v1.2.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/hashicorp/go-version v1.8.0 // indirect

23
go.sum
View File

@@ -1,5 +1,5 @@
ariga.io/atlas v1.0.0 h1:v9DQH49xK+SM2kKwk4OQBjfz/KNRMUR+pvDiEIxSJto=
ariga.io/atlas v1.0.0/go.mod h1:esBbk3F+pi/mM2PvbCymDm+kWhaOk4PaaiegQdNELk8=
ariga.io/atlas v0.38.0 h1:MwbtwVtDWJFq+ECyeTAz2ArvewDnpeiw/t/sgNdDsdo=
ariga.io/atlas v0.38.0/go.mod h1:D7XMK6ei3GvfDqvzk+2VId78j77LdqHrqPOWamn51/s=
code.gitea.io/sdk/gitea v0.22.1 h1:7K05KjRORyTcTYULQ/AwvlVS6pawLcWyXZcTr7gHFyA=
code.gitea.io/sdk/gitea v0.22.1/go.mod h1:yyF5+GhljqvA30sRDreoyHILruNiy4ASufugzYg0VHM=
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
@@ -76,17 +76,17 @@ github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
github.com/godbus/dbus/v5 v5.2.1 h1:I4wwMdWSkmI57ewd+elNGwLRf2/dtSaFz1DujfWYvOk=
github.com/godbus/dbus/v5 v5.2.1/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/go-github/v74 v74.0.0 h1:yZcddTUn8DPbj11GxnMrNiAnXH14gNs559AsUpNpPgM=
github.com/google/go-github/v74 v74.0.0/go.mod h1:ubn/YdyftV80VPSI26nSJvaEsTOnsjrxG3o9kJhcyak=
github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0=
github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
@@ -178,8 +178,8 @@ github.com/wailsapp/go-webview2 v1.0.23 h1:jmv8qhz1lHibCc79bMM/a/FqOnnzOGEisLav+
github.com/wailsapp/go-webview2 v1.0.23/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
github.com/wailsapp/wails/v3 v3.0.0-alpha.54 h1:XlQ+9dwDtOyfxIyA0h1AeT0zdUP3SFdhLkpIgPjWnWc=
github.com/wailsapp/wails/v3 v3.0.0-alpha.54/go.mod h1:yaz8baG0+YzoiN8J6osn0wKiEi0iUux0ZU5NsZFu6OQ=
github.com/wailsapp/wails/v3 v3.0.0-alpha.51 h1:n8KT0H4lvtWld9tMIiHVX4nrR0wEMT2zy5hM/R6luMU=
github.com/wailsapp/wails/v3 v3.0.0-alpha.51/go.mod h1:yaz8baG0+YzoiN8J6osn0wKiEi0iUux0ZU5NsZFu6OQ=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0=
@@ -238,6 +238,7 @@ golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -250,5 +251,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
resty.dev/v3 v3.0.0-beta.6 h1:ghRdNpoE8/wBCv+kTKIOauW1aCrSIeTq7GxtfYgtevU=
resty.dev/v3 v3.0.0-beta.6/go.mod h1:NTOerrC/4T7/FE6tXIZGIysXXBdgNqwMZuKtxpea9NM=
resty.dev/v3 v3.0.0-beta.5 h1:NV1xbqOLzSq7XMTs1t/HLPvu7xrxoXzF90SR4OO6faQ=
resty.dev/v3 v3.0.0-beta.5/go.mod h1:NTOerrC/4T7/FE6tXIZGIysXXBdgNqwMZuKtxpea9NM=

View File

@@ -79,7 +79,6 @@ type GeneralConfig struct {
// 界面设置
EnableLoadingAnimation bool `json:"enableLoadingAnimation"` // 是否启用加载动画
EnableTabs bool `json:"enableTabs"` // 是否启用标签页模式
EnableMemoryMonitor bool `json:"enableMemoryMonitor"` // 是否启用内存监视器
}
// HotkeyCombo 热键组合定义
@@ -189,7 +188,6 @@ func NewDefaultAppConfig() *AppConfig {
EnableGlobalHotkey: false,
EnableLoadingAnimation: true, // 默认启用加载动画
EnableTabs: false, // 默认不启用标签页模式
EnableMemoryMonitor: true, // 默认启用内存监视器
GlobalHotkey: HotkeyCombo{
Ctrl: false,
Shift: false,

View File

@@ -106,7 +106,7 @@ const (
CopyBlockImage KeyBindingName = "copyBlockImage" // 复制块为图片
)
const DefaultExtension = "editor"
const defaultExtension = "editor"
// NewDefaultKeyBindings 创建默认快捷键配置
func NewDefaultKeyBindings() []KeyBinding {
@@ -135,7 +135,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockSelectAll,
Type: Standard,
Key: "Mod-a",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -143,7 +143,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockAddAfterCurrent,
Type: Standard,
Key: "Mod-Enter",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -151,7 +151,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockAddAfterLast,
Type: Standard,
Key: "Mod-Shift-Enter",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -159,7 +159,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockAddBeforeCurrent,
Type: Standard,
Key: "Alt-Enter",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -167,7 +167,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockGotoPrevious,
Type: Standard,
Key: "Mod-ArrowUp",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -175,7 +175,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockGotoNext,
Type: Standard,
Key: "Mod-ArrowDown",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -183,7 +183,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockSelectPrevious,
Type: Standard,
Key: "Mod-Shift-ArrowUp",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -191,7 +191,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockSelectNext,
Type: Standard,
Key: "Mod-Shift-ArrowDown",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -199,7 +199,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockDelete,
Type: Standard,
Key: "Mod-Shift-d",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -207,7 +207,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockMoveUp,
Type: Standard,
Key: "Shift-Mod-ArrowUp",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -215,7 +215,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockMoveDown,
Type: Standard,
Key: "Shift-Mod-ArrowDown",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -223,7 +223,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockDeleteLine,
Type: Standard,
Key: "Mod-Shift-k",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -231,7 +231,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockMoveLineUp,
Type: Standard,
Key: "Alt-ArrowUp",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -239,7 +239,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockMoveLineDown,
Type: Standard,
Key: "Alt-ArrowDown",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -247,7 +247,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockTransposeChars,
Type: Standard,
Key: "Mod-t",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -255,7 +255,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockFormat,
Type: Standard,
Key: "Mod-Shift-f",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -263,7 +263,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockCopy,
Type: Standard,
Key: "Mod-c",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -271,7 +271,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockCut,
Type: Standard,
Key: "Mod-x",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -279,7 +279,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockPaste,
Type: Standard,
Key: "Mod-v",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -335,7 +335,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: HistoryUndo,
Type: Standard,
Key: "Mod-z",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -344,7 +344,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Type: Standard,
Key: "Mod-Shift-z",
Windows: "Ctrl-y",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -352,7 +352,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: HistoryUndoSelection,
Type: Standard,
Key: "Mod-u",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -361,7 +361,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Type: Standard,
Key: "Mod-Shift-u",
Windows: "Alt-u",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -373,7 +373,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Ctrl-ArrowLeft",
Windows: "Alt-ArrowLeft",
Linux: "Alt-ArrowLeft",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -383,7 +383,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Ctrl-ArrowRight",
Windows: "Alt-ArrowRight",
Linux: "Alt-ArrowRight",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -391,7 +391,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectSyntaxLeft,
Type: Standard,
Key: "Shift-Alt-ArrowLeft",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -399,7 +399,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectSyntaxRight,
Type: Standard,
Key: "Shift-Alt-ArrowRight",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -407,7 +407,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CopyLineUp,
Type: Standard,
Key: "Shift-Alt-ArrowUp",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -415,7 +415,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CopyLineDown,
Type: Standard,
Key: "Shift-Alt-ArrowDown",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -423,9 +423,9 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: InsertBlankLine,
Type: Standard,
Key: "Mod-Enter",
Extension: DefaultExtension,
Enabled: false,
PreventDefault: false,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
{
Name: SelectLine,
@@ -433,7 +433,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Ctrl-l",
Windows: "Alt-l",
Linux: "Alt-l",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -441,7 +441,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectParentSyntax,
Type: Standard,
Key: "Mod-i",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -449,7 +449,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SimplifySelection,
Type: Standard,
Key: "Escape",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -459,7 +459,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Cmd-Alt-ArrowUp",
Windows: "Ctrl-Alt-ArrowUp",
Linux: "Ctrl-Alt-ArrowUp",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -469,7 +469,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Cmd-Alt-ArrowDown",
Windows: "Ctrl-Alt-ArrowDown",
Linux: "Ctrl-Alt-ArrowDown",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -479,7 +479,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Windows: "Ctrl-ArrowLeft",
Linux: "Ctrl-ArrowLeft",
Macos: "Alt-ArrowLeft",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -489,7 +489,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Windows: "Ctrl-ArrowRight",
Linux: "Ctrl-ArrowRight",
Macos: "Alt-ArrowRight",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -499,7 +499,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Windows: "Ctrl-Shift-ArrowLeft",
Linux: "Ctrl-Shift-ArrowLeft",
Macos: "Alt-Shift-ArrowLeft",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -509,7 +509,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Windows: "Ctrl-Shift-ArrowRight",
Linux: "Ctrl-Shift-ArrowRight",
Macos: "Alt-Shift-ArrowRight",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -519,7 +519,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Ctrl-k",
Windows: "Ctrl-k",
Linux: "Ctrl-k",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -527,7 +527,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteToLineStart,
Type: Standard,
Key: "Mod-Shift-Backspace",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -535,7 +535,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorLineStart,
Type: Standard,
Key: "Home",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -543,7 +543,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorLineEnd,
Type: Standard,
Key: "End",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -551,7 +551,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectLineStart,
Type: Standard,
Key: "Shift-Home",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -559,7 +559,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectLineEnd,
Type: Standard,
Key: "Shift-End",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -567,7 +567,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorDocStart,
Type: Standard,
Key: "Mod-Home",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -575,7 +575,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorDocEnd,
Type: Standard,
Key: "Mod-End",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -583,7 +583,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectDocStart,
Type: Standard,
Key: "Mod-Shift-Home",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -591,7 +591,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectDocEnd,
Type: Standard,
Key: "Mod-Shift-End",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -599,7 +599,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectMatchingBracket,
Type: Standard,
Key: "Mod-Shift-p",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -609,7 +609,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Macos: "Ctrl-o",
Windows: "Ctrl-o",
Linux: "Ctrl-o",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -618,7 +618,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: IndentLess,
Type: Standard,
Key: "Mod-[",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -626,7 +626,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: IndentMore,
Type: Standard,
Key: "Mod-]",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -634,7 +634,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: IndentSelection,
Type: Standard,
Key: "Mod-Alt-\\",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -642,7 +642,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorMatchingBracket,
Type: Standard,
Key: "Shift-Mod-\\",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -650,7 +650,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: ToggleComment,
Type: Standard,
Key: "Mod-/",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -658,7 +658,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: ToggleBlockComment,
Type: Standard,
Key: "Shift-Alt-a",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -667,7 +667,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: InsertNewlineAndIndent,
Type: Standard,
Key: "Enter",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -675,7 +675,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteCharBackward,
Type: Standard,
Key: "Backspace",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -683,7 +683,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteCharForward,
Type: Standard,
Key: "Delete",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: false,
},
@@ -691,7 +691,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteGroupBackward,
Type: Standard,
Key: "Mod-Backspace",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -699,7 +699,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteGroupForward,
Type: Standard,
Key: "Mod-Delete",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -712,7 +712,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorCharLeft,
Type: Emacs,
Key: "Ctrl-b",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -720,7 +720,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectCharLeft,
Type: Emacs,
Key: "Shift-Ctrl-b",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -728,7 +728,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorCharRight,
Type: Emacs,
Key: "Ctrl-f",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -736,7 +736,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectCharRight,
Type: Emacs,
Key: "Shift-Ctrl-f",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -746,7 +746,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorLineUp,
Type: Emacs,
Key: "Ctrl-p",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -754,7 +754,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectLineUp,
Type: Emacs,
Key: "Shift-Ctrl-p",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -762,7 +762,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorLineDown,
Type: Emacs,
Key: "Ctrl-n",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -770,7 +770,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectLineDown,
Type: Emacs,
Key: "Shift-Ctrl-n",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -780,7 +780,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorLineStart,
Type: Emacs,
Key: "Ctrl-a",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -788,7 +788,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectLineStart,
Type: Emacs,
Key: "Shift-Ctrl-a",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -796,7 +796,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorLineEnd,
Type: Emacs,
Key: "Ctrl-e",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -804,7 +804,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SelectLineEnd,
Type: Emacs,
Key: "Shift-Ctrl-e",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -814,7 +814,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorPageDown,
Type: Emacs,
Key: "Ctrl-v",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -822,7 +822,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: CursorPageUp,
Type: Emacs,
Key: "Alt-v",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -832,7 +832,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteCharForward,
Type: Emacs,
Key: "Ctrl-d",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -840,7 +840,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteCharBackward,
Type: Emacs,
Key: "Ctrl-h",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -848,7 +848,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteToLineEnd,
Type: Emacs,
Key: "Ctrl-k",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -856,7 +856,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: DeleteGroupBackward,
Type: Emacs,
Key: "Ctrl-Alt-h",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -864,7 +864,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: SplitLine,
Type: Emacs,
Key: "Ctrl-o",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -872,7 +872,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockTransposeChars,
Type: Emacs,
Key: "Ctrl-t",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -882,7 +882,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockSelectAll,
Type: Emacs,
Key: "Mod-Shift-a",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},
@@ -890,7 +890,7 @@ func NewDefaultKeyBindings() []KeyBinding {
Name: BlockPaste,
Type: Emacs,
Key: "Mod-Shift-v",
Extension: DefaultExtension,
Extension: defaultExtension,
Enabled: true,
PreventDefault: true,
},

View File

@@ -6,7 +6,6 @@ import (
"voidraft/internal/models"
"voidraft/internal/models/ent"
"voidraft/internal/models/ent/extension"
"voidraft/internal/models/ent/keybinding"
"voidraft/internal/models/schema/mixin"
@@ -113,74 +112,45 @@ func (s *KeyBindingService) SyncKeyBindings(ctx context.Context) error {
// GetKeyBindings 根据类型获取快捷键
func (s *KeyBindingService) GetKeyBindings(ctx context.Context, kbType models.KeyBindingType) ([]*ent.KeyBinding, error) {
// 获取启用的扩展名称集合
enabledExts, err := s.db.Client.Extension.Query().
Where(extension.Enabled(true)).
All(ctx)
if err != nil {
return nil, fmt.Errorf("query enabled extensions error: %w", err)
}
enabledExtMap := make(map[string]bool, len(enabledExts))
for _, ext := range enabledExts {
enabledExtMap[ext.Name] = true
}
if kbType == models.Standard {
// Standard 模式:返回扩展已启用的快捷键
bindings, err := s.db.Client.KeyBinding.Query().
Where(keybinding.Type(string(kbType))).
Order(ent.Asc(keybinding.FieldID)).
// Standard 模式:返回 type=standard 且 enabled=true
return s.db.Client.KeyBinding.Query().
Where(
keybinding.Type(string(kbType)),
keybinding.Enabled(true),
).
All(ctx)
if err != nil {
return nil, err
}
return filterByExtension(bindings, enabledExtMap), nil
}
// Emacs 模式:获取所有快捷键
allBindings, err := s.db.Client.KeyBinding.Query().
Order(ent.Asc(keybinding.FieldID)).
// Emacs 模式:获取所有 enabled=true 的快捷键
allEnabled, err := s.db.Client.KeyBinding.Query().
Where(keybinding.Enabled(true)).
All(ctx)
if err != nil {
return nil, fmt.Errorf("query key bindings error: %w", err)
return nil, fmt.Errorf("query enabled key bindings error: %w", err)
}
// 构建 emacs 快捷键的 name 集合
emacsNames := make(map[string]bool)
for _, kb := range allBindings {
for _, kb := range allEnabled {
if kb.Type == string(models.Emacs) {
emacsNames[kb.Name] = true
}
}
// 过滤:去掉与 emacs 冲突的 standard 快捷键,并过滤扩展未启用的
// 过滤:去掉与 emacs 冲突的 standard 快捷键
var result []*ent.KeyBinding
for _, kb := range allBindings {
for _, kb := range allEnabled {
// 如果是 standard 类型,且与 emacs 有 name 冲突,则跳过
if kb.Type == string(models.Standard) && emacsNames[kb.Name] {
continue
}
// editor 扩展始终包含,不检查启用状态
if kb.Extension != models.DefaultExtension && !enabledExtMap[kb.Extension] {
continue
}
result = append(result, kb)
}
return result, nil
}
// filterByExtension 过滤出扩展已启用的快捷键
func filterByExtension(bindings []*ent.KeyBinding, enabledExtMap map[string]bool) []*ent.KeyBinding {
result := make([]*ent.KeyBinding, 0, len(bindings))
for _, kb := range bindings {
// editor 扩展始终包含,不检查启用状态
if kb.Extension == models.DefaultExtension || enabledExtMap[kb.Extension] {
result = append(result, kb)
}
}
return result
}
// GetKeyBindingByID 根据ID获取快捷键
func (s *KeyBindingService) GetKeyBindingByID(ctx context.Context, id int) (*ent.KeyBinding, error) {
kb, err := s.db.Client.KeyBinding.Get(ctx, id)
@@ -193,7 +163,7 @@ func (s *KeyBindingService) GetKeyBindingByID(ctx context.Context, id int) (*ent
return kb, nil
}
// UpdateKeyBindingKeys 更新快捷键绑定
// UpdateKeyBindingKeys 更新快捷键绑定(根据操作系统自动判断更新哪个字段)
func (s *KeyBindingService) UpdateKeyBindingKeys(ctx context.Context, id int, key string) error {
kb, err := s.GetKeyBindingByID(ctx, id)
if err != nil {
@@ -234,20 +204,6 @@ func (s *KeyBindingService) UpdateKeyBindingEnabled(ctx context.Context, id int,
Exec(ctx)
}
// UpdateKeyBindingPreventDefault 更新快捷键 PreventDefault 状态
func (s *KeyBindingService) UpdateKeyBindingPreventDefault(ctx context.Context, id int, preventDefault bool) error {
kb, err := s.GetKeyBindingByID(ctx, id)
if err != nil {
return err
}
if kb == nil {
return fmt.Errorf("key binding not found: id=%d", id)
}
return s.db.Client.KeyBinding.UpdateOneID(kb.ID).
SetPreventDefault(preventDefault).
Exec(ctx)
}
// GetDefaultKeyBindings 获取默认快捷键配置
func (s *KeyBindingService) GetDefaultKeyBindings() []models.KeyBinding {
return models.NewDefaultKeyBindings()

View File

@@ -1 +1 @@
VERSION=1.5.6
VERSION=1.5.5