zhangxiang/lx-music-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'beta' of github.com:lyswhut/lx-music-desktop into beta

Browse Source
This commit is contained in:
Folltoshe 2022-11-09 23:08:43 +08:00
commit 3384b36570
15 changed files with 506 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

532
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "lx-music-desktop", "name": "lx-music-desktop",
"version": "2.0.0-beta.6", "version": "2.0.0-beta.7",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "lx-music-desktop", "name": "lx-music-desktop",
"version": "2.0.0-beta.6", "version": "2.0.0-beta.7",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
@ -31,7 +31,7 @@
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"tunnel": "^0.0.6", "tunnel": "^0.0.6",
"utf-8-validate": "^5.0.10", "utf-8-validate": "^5.0.10",
"vue": "^3.2.41", "vue": "^3.2.42",
"vue-router": "^4.1.6" "vue-router": "^4.1.6"
}, },
"devDependencies": { "devDependencies": {
@ -46,8 +46,8 @@
"@types/better-sqlite3": "^7.6.2", "@types/better-sqlite3": "^7.6.2",
"@types/needle": "^2.5.3", "@types/needle": "^2.5.3",
"@types/tunnel": "^0.0.3", "@types/tunnel": "^0.0.3",
"@typescript-eslint/eslint-plugin": "^5.42.0", "@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.0", "@typescript-eslint/parser": "^5.42.1",
"@volar/vue-language-plugin-pug": "^1.0.9", "@volar/vue-language-plugin-pug": "^1.0.9",
"babel-loader": "^9.1.0", "babel-loader": "^9.1.0",
"browserslist": "^4.21.4", "browserslist": "^4.21.4",
@ -65,13 +65,13 @@
"electron-devtools-installer": "^3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-to-chromium": "^1.4.284", "electron-to-chromium": "^1.4.284",
"electron-updater": "^6.0.0-alpha.2", "electron-updater": "^6.0.0-alpha.2",
"eslint": "^8.26.0", "eslint": "^8.27.0",
"eslint-config-standard": "^17.0.0", "eslint-config-standard": "^17.0.0",
"eslint-config-standard-with-typescript": "^23.0.0", "eslint-config-standard-with-typescript": "^23.0.0",
"eslint-formatter-friendly": "github:lyswhut/eslint-friendly-formatter#2170d1320e2fad13615a9dcf229669f0bb473a53", "eslint-formatter-friendly": "github:lyswhut/eslint-friendly-formatter#2170d1320e2fad13615a9dcf229669f0bb473a53",
"eslint-plugin-html": "^7.1.0", "eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
"eslint-plugin-n": "^15.4.0", "eslint-plugin-n": "^15.5.1",
"eslint-plugin-promise": "^6.1.1", "eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^9.7.0", "eslint-plugin-vue": "^9.7.0",
"eslint-webpack-plugin": "^3.2.0", "eslint-webpack-plugin": "^3.2.0",
@ -2783,14 +2783,14 @@
"dev": true "dev": true
}, },
"node_modules/@typescript-eslint/eslint-plugin": { "node_modules/@typescript-eslint/eslint-plugin": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.1.tgz",
"integrity": "sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==", "integrity": "sha512-LyR6x784JCiJ1j6sH5Y0K6cdExqCCm8DJUTcwG5ThNXJj/G8o5E56u5EdG4SLy+bZAwZBswC+GYn3eGdttBVCg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.42.0", "@typescript-eslint/scope-manager": "5.42.1",
"@typescript-eslint/type-utils": "5.42.0", "@typescript-eslint/type-utils": "5.42.1",
"@typescript-eslint/utils": "5.42.0", "@typescript-eslint/utils": "5.42.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"ignore": "^5.2.0", "ignore": "^5.2.0",
"natural-compare-lite": "^1.4.0", "natural-compare-lite": "^1.4.0",
@ -2831,14 +2831,14 @@
} }
}, },
"node_modules/@typescript-eslint/parser": { "node_modules/@typescript-eslint/parser": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.1.tgz",
"integrity": "sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA==", "integrity": "sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.42.0", "@typescript-eslint/scope-manager": "5.42.1",
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/typescript-estree": "5.42.0", "@typescript-eslint/typescript-estree": "5.42.1",
"debug": "^4.3.4" "debug": "^4.3.4"
}, },
"engines": { "engines": {
@ -2858,13 +2858,13 @@
} }
}, },
"node_modules/@typescript-eslint/scope-manager": { "node_modules/@typescript-eslint/scope-manager": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz",
"integrity": "sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow==", "integrity": "sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/visitor-keys": "5.42.0" "@typescript-eslint/visitor-keys": "5.42.1"
}, },
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -2875,13 +2875,13 @@
} }
}, },
"node_modules/@typescript-eslint/type-utils": { "node_modules/@typescript-eslint/type-utils": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.1.tgz",
"integrity": "sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==", "integrity": "sha512-WWiMChneex5w4xPIX56SSnQQo0tEOy5ZV2dqmj8Z371LJ0E+aymWD25JQ/l4FOuuX+Q49A7pzh/CGIQflxMVXg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/typescript-estree": "5.42.0", "@typescript-eslint/typescript-estree": "5.42.1",
"@typescript-eslint/utils": "5.42.0", "@typescript-eslint/utils": "5.42.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
}, },
@ -2902,9 +2902,9 @@
} }
}, },
"node_modules/@typescript-eslint/types": { "node_modules/@typescript-eslint/types": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.1.tgz",
"integrity": "sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw==", "integrity": "sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -2915,13 +2915,13 @@
} }
}, },
"node_modules/@typescript-eslint/typescript-estree": { "node_modules/@typescript-eslint/typescript-estree": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz",
"integrity": "sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==", "integrity": "sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/visitor-keys": "5.42.0", "@typescript-eslint/visitor-keys": "5.42.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -2957,16 +2957,16 @@
} }
}, },
"node_modules/@typescript-eslint/utils": { "node_modules/@typescript-eslint/utils": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.1.tgz",
"integrity": "sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==", "integrity": "sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/json-schema": "^7.0.9", "@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12", "@types/semver": "^7.3.12",
"@typescript-eslint/scope-manager": "5.42.0", "@typescript-eslint/scope-manager": "5.42.1",
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/typescript-estree": "5.42.0", "@typescript-eslint/typescript-estree": "5.42.1",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"semver": "^7.3.7" "semver": "^7.3.7"
@ -2998,12 +2998,12 @@
} }
}, },
"node_modules/@typescript-eslint/visitor-keys": { "node_modules/@typescript-eslint/visitor-keys": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz",
"integrity": "sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg==", "integrity": "sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
}, },
"engines": { "engines": {
@ -3136,36 +3136,36 @@
} }
}, },
"node_modules/@vue/compiler-core": { "node_modules/@vue/compiler-core": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.42.tgz",
"integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==", "integrity": "sha512-qKpDdoGaKq53T1+U4R7pk62QeDe8Kc6RN1xSd7tGi4DK3mGrqT32gyOL542wpt73Ftza0AvWmVCchmKtTpwxDg==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"node_modules/@vue/compiler-dom": { "node_modules/@vue/compiler-dom": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.42.tgz",
"integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==", "integrity": "sha512-QVrAVX9zzvLltyQy1uxxgOmsKLStFalw0f/8HEdWIR95YjJsNo3S3SwBJDR2cnjwcVGftXBLksf1ikMyAl8bUw==",
"dependencies": { "dependencies": {
"@vue/compiler-core": "3.2.41", "@vue/compiler-core": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"node_modules/@vue/compiler-sfc": { "node_modules/@vue/compiler-sfc": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.42.tgz",
"integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==", "integrity": "sha512-lWiyxMfQ3SXGhFszSpKuPT5JcSM1ypAbLJOpHpCqvbSaJE+FAZYMbFzAC/y4MC3jSbNQ0moWncOS1gO4aXMbNQ==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.41", "@vue/compiler-core": "3.2.42",
"@vue/compiler-dom": "3.2.41", "@vue/compiler-dom": "3.2.42",
"@vue/compiler-ssr": "3.2.41", "@vue/compiler-ssr": "3.2.42",
"@vue/reactivity-transform": "3.2.41", "@vue/reactivity-transform": "3.2.42",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7", "magic-string": "^0.25.7",
"postcss": "^8.1.10", "postcss": "^8.1.10",
@ -3173,12 +3173,12 @@
} }
}, },
"node_modules/@vue/compiler-ssr": { "node_modules/@vue/compiler-ssr": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.42.tgz",
"integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==", "integrity": "sha512-2Q0IclcvsX1A8N8/M7Ub32gitdnKdsjRHdj6R3Z/HGW34CXGsb4tHzjthOuT5fiyPG+CzyyAn4HiqCN8oI4iqg==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.41", "@vue/compiler-dom": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"node_modules/@vue/devtools-api": { "node_modules/@vue/devtools-api": {
@ -3187,60 +3187,60 @@
"integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==" "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
}, },
"node_modules/@vue/reactivity": { "node_modules/@vue/reactivity": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.42.tgz",
"integrity": "sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g==", "integrity": "sha512-X30I+iS7d6c8DZDY7SqahkTRN2THfnkNtf0oCUktuk2gTKRxNOzaARItSmsPKLC7UVUG61Hne8Si3wtQBBDj+A==",
"dependencies": { "dependencies": {
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"node_modules/@vue/reactivity-transform": { "node_modules/@vue/reactivity-transform": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.42.tgz",
"integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==", "integrity": "sha512-u5Qp09PCGa0yJqfbHbJXDfm9BrNx5xYtHIl5CuWbnUtBAxr8vKRjMZmFpa4CmSufixWcbwvKvSD9weamEVbfeA==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.41", "@vue/compiler-core": "3.2.42",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
} }
}, },
"node_modules/@vue/runtime-core": { "node_modules/@vue/runtime-core": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.42.tgz",
"integrity": "sha512-0LBBRwqnI0p4FgIkO9q2aJBBTKDSjzhnxrxHYengkAF6dMOjeAIZFDADAlcf2h3GDALWnblbeprYYpItiulSVQ==", "integrity": "sha512-9JCPD4k/p4eXXc5ja+YcYwGu+ES9BIgoVty7UlOMEG0Bdz7awxxY78PXIHg1b7HlxQuUdGq6r3COg1cyvDrRCw==",
"dependencies": { "dependencies": {
"@vue/reactivity": "3.2.41", "@vue/reactivity": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"node_modules/@vue/runtime-dom": { "node_modules/@vue/runtime-dom": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.42.tgz",
"integrity": "sha512-U7zYuR1NVIP8BL6jmOqmapRAHovEFp7CSw4pR2FacqewXNGqZaRfHoNLQsqQvVQ8yuZNZtxSZy0FFyC70YXPpA==", "integrity": "sha512-i4OZblZQvFjJ/isNo+jrqXsjJgq4Nz0R/W2iNu40pTLJrikijYPaUOcOJcjVih9eL7zz101RJsbP8zKluQLqRA==",
"dependencies": { "dependencies": {
"@vue/runtime-core": "3.2.41", "@vue/runtime-core": "3.2.42",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"csstype": "^2.6.8" "csstype": "^2.6.8"
} }
}, },
"node_modules/@vue/server-renderer": { "node_modules/@vue/server-renderer": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.42.tgz",
"integrity": "sha512-7YHLkfJdTlsZTV0ae5sPwl9Gn/EGr2hrlbcS/8naXm2CDpnKUwC68i1wGlrYAfIgYWL7vUZwk2GkYLQH5CvFig==", "integrity": "sha512-xo6XMaJTuKmYRlnS53QN358j0pmZMFNtisLkzV7oXFww0bpkn2MzjkPt4YvOjMNto9NlI609xQKJboEk5nMu2A==",
"dependencies": { "dependencies": {
"@vue/compiler-ssr": "3.2.41", "@vue/compiler-ssr": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
}, },
"peerDependencies": { "peerDependencies": {
"vue": "3.2.41" "vue": "3.2.42"
} }
}, },
"node_modules/@vue/shared": { "node_modules/@vue/shared": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.42.tgz",
"integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==" "integrity": "sha512-cheJw3tpW34LWVUL3fySuwCmF1/gFBHWZ3WjmMcBIHMcnKrS/SRapvkbYWzyw5FiM8OcpYHO5e7hWYOFCsyHmA=="
}, },
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
"version": "1.11.1", "version": "1.11.1",
@ -7345,9 +7345,9 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.26.0", "version": "8.27.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
"integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==", "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^1.3.3", "@eslint/eslintrc": "^1.3.3",
@ -7615,19 +7615,19 @@
"dev": true "dev": true
}, },
"node_modules/eslint-plugin-n": { "node_modules/eslint-plugin-n": {
"version": "15.5.0", "version": "15.5.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.5.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.5.1.tgz",
"integrity": "sha512-VCqQiZDpdm1Q9grnvy+XsENZoXDgTLqPHRQwgl9qFNNgTKR4YEnQOMN0pFB/9TbmrQ88jdeTnqTcNwRvjqMOtg==", "integrity": "sha512-kAd+xhZm7brHoFLzKLB7/FGRFJNg/srmv67mqb7tto22rpr4wv/LV6RuXzAfv3jbab7+k1wi42PsIhGviywaaw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"builtins": "^5.0.1", "builtins": "^5.0.1",
"eslint-plugin-es": "^4.1.0", "eslint-plugin-es": "^4.1.0",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"ignore": "^5.1.1", "ignore": "^5.1.1",
"is-core-module": "^2.10.0", "is-core-module": "^2.11.0",
"minimatch": "^3.1.2", "minimatch": "^3.1.2",
"resolve": "^1.22.1", "resolve": "^1.22.1",
"semver": "^7.3.7" "semver": "^7.3.8"
}, },
"engines": { "engines": {
"node": ">=12.22.0" "node": ">=12.22.0"
@ -13287,6 +13287,32 @@
"readable-stream": "^3.1.1" "readable-stream": "^3.1.1"
} }
}, },
"node_modules/posthtml-transform/node_modules/json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"dependencies": {
"minimist": "^1.2.0"
},
"bin": {
"json5": "lib/cli.js"
}
},
"node_modules/posthtml-transform/node_modules/loader-utils": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
"integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
"dev": true,
"dependencies": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
},
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/posthtml-transform/node_modules/posthtml": { "node_modules/posthtml-transform/node_modules/posthtml": {
"version": "0.11.6", "version": "0.11.6",
"resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz", "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz",
@ -15896,6 +15922,18 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/svg-baker/node_modules/json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"dependencies": {
"minimist": "^1.2.0"
},
"bin": {
"json5": "lib/cli.js"
}
},
"node_modules/svg-baker/node_modules/kind-of": { "node_modules/svg-baker/node_modules/kind-of": {
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
@ -15905,6 +15943,20 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/svg-baker/node_modules/loader-utils": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
"integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
"dev": true,
"dependencies": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
},
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/svg-baker/node_modules/micromatch": { "node_modules/svg-baker/node_modules/micromatch": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.0.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.0.tgz",
@ -17081,15 +17133,15 @@
"dev": true "dev": true
}, },
"node_modules/vue": { "node_modules/vue": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.41.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.42.tgz",
"integrity": "sha512-uuuvnrDXEeZ9VUPljgHkqB5IaVO8SxhPpqF2eWOukVrBnRBx2THPSGQBnVRt0GrIG1gvCmFXMGbd7FqcT1ixNQ==", "integrity": "sha512-gH7e5YD9IkX9Lv0QmB+Z7Jac2t7GYHg2AZrgkzQdCmyaUIdSbp6DhdeTM5HO6JbPuRgD1Iu06N9MXxjJ//NnNQ==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.41", "@vue/compiler-dom": "3.2.42",
"@vue/compiler-sfc": "3.2.41", "@vue/compiler-sfc": "3.2.42",
"@vue/runtime-dom": "3.2.41", "@vue/runtime-dom": "3.2.42",
"@vue/server-renderer": "3.2.41", "@vue/server-renderer": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"node_modules/vue-eslint-parser": { "node_modules/vue-eslint-parser": {
@ -19774,14 +19826,14 @@
"dev": true "dev": true
}, },
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.1.tgz",
"integrity": "sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==", "integrity": "sha512-LyR6x784JCiJ1j6sH5Y0K6cdExqCCm8DJUTcwG5ThNXJj/G8o5E56u5EdG4SLy+bZAwZBswC+GYn3eGdttBVCg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "5.42.0", "@typescript-eslint/scope-manager": "5.42.1",
"@typescript-eslint/type-utils": "5.42.0", "@typescript-eslint/type-utils": "5.42.1",
"@typescript-eslint/utils": "5.42.0", "@typescript-eslint/utils": "5.42.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"ignore": "^5.2.0", "ignore": "^5.2.0",
"natural-compare-lite": "^1.4.0", "natural-compare-lite": "^1.4.0",
@ -19802,53 +19854,53 @@
} }
}, },
"@typescript-eslint/parser": { "@typescript-eslint/parser": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.1.tgz",
"integrity": "sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA==", "integrity": "sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "5.42.0", "@typescript-eslint/scope-manager": "5.42.1",
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/typescript-estree": "5.42.0", "@typescript-eslint/typescript-estree": "5.42.1",
"debug": "^4.3.4" "debug": "^4.3.4"
} }
}, },
"@typescript-eslint/scope-manager": { "@typescript-eslint/scope-manager": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz",
"integrity": "sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow==", "integrity": "sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/visitor-keys": "5.42.0" "@typescript-eslint/visitor-keys": "5.42.1"
} }
}, },
"@typescript-eslint/type-utils": { "@typescript-eslint/type-utils": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.1.tgz",
"integrity": "sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==", "integrity": "sha512-WWiMChneex5w4xPIX56SSnQQo0tEOy5ZV2dqmj8Z371LJ0E+aymWD25JQ/l4FOuuX+Q49A7pzh/CGIQflxMVXg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/typescript-estree": "5.42.0", "@typescript-eslint/typescript-estree": "5.42.1",
"@typescript-eslint/utils": "5.42.0", "@typescript-eslint/utils": "5.42.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
} }
}, },
"@typescript-eslint/types": { "@typescript-eslint/types": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.1.tgz",
"integrity": "sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw==", "integrity": "sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA==",
"dev": true "dev": true
}, },
"@typescript-eslint/typescript-estree": { "@typescript-eslint/typescript-estree": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz",
"integrity": "sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==", "integrity": "sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/visitor-keys": "5.42.0", "@typescript-eslint/visitor-keys": "5.42.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -19868,16 +19920,16 @@
} }
}, },
"@typescript-eslint/utils": { "@typescript-eslint/utils": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.1.tgz",
"integrity": "sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==", "integrity": "sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/json-schema": "^7.0.9", "@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12", "@types/semver": "^7.3.12",
"@typescript-eslint/scope-manager": "5.42.0", "@typescript-eslint/scope-manager": "5.42.1",
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"@typescript-eslint/typescript-estree": "5.42.0", "@typescript-eslint/typescript-estree": "5.42.1",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"semver": "^7.3.7" "semver": "^7.3.7"
@ -19895,12 +19947,12 @@
} }
}, },
"@typescript-eslint/visitor-keys": { "@typescript-eslint/visitor-keys": {
"version": "5.42.0", "version": "5.42.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz",
"integrity": "sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg==", "integrity": "sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "5.42.0", "@typescript-eslint/types": "5.42.1",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
}, },
"dependencies": { "dependencies": {
@ -20021,36 +20073,36 @@
} }
}, },
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.42.tgz",
"integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==", "integrity": "sha512-qKpDdoGaKq53T1+U4R7pk62QeDe8Kc6RN1xSd7tGi4DK3mGrqT32gyOL542wpt73Ftza0AvWmVCchmKtTpwxDg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"@vue/compiler-dom": { "@vue/compiler-dom": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.42.tgz",
"integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==", "integrity": "sha512-QVrAVX9zzvLltyQy1uxxgOmsKLStFalw0f/8HEdWIR95YjJsNo3S3SwBJDR2cnjwcVGftXBLksf1ikMyAl8bUw==",
"requires": { "requires": {
"@vue/compiler-core": "3.2.41", "@vue/compiler-core": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"@vue/compiler-sfc": { "@vue/compiler-sfc": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.42.tgz",
"integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==", "integrity": "sha512-lWiyxMfQ3SXGhFszSpKuPT5JcSM1ypAbLJOpHpCqvbSaJE+FAZYMbFzAC/y4MC3jSbNQ0moWncOS1gO4aXMbNQ==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.41", "@vue/compiler-core": "3.2.42",
"@vue/compiler-dom": "3.2.41", "@vue/compiler-dom": "3.2.42",
"@vue/compiler-ssr": "3.2.41", "@vue/compiler-ssr": "3.2.42",
"@vue/reactivity-transform": "3.2.41", "@vue/reactivity-transform": "3.2.42",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7", "magic-string": "^0.25.7",
"postcss": "^8.1.10", "postcss": "^8.1.10",
@ -20058,12 +20110,12 @@
} }
}, },
"@vue/compiler-ssr": { "@vue/compiler-ssr": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.42.tgz",
"integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==", "integrity": "sha512-2Q0IclcvsX1A8N8/M7Ub32gitdnKdsjRHdj6R3Z/HGW34CXGsb4tHzjthOuT5fiyPG+CzyyAn4HiqCN8oI4iqg==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.41", "@vue/compiler-dom": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"@vue/devtools-api": { "@vue/devtools-api": {
@ -20072,57 +20124,57 @@
"integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==" "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
}, },
"@vue/reactivity": { "@vue/reactivity": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.42.tgz",
"integrity": "sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g==", "integrity": "sha512-X30I+iS7d6c8DZDY7SqahkTRN2THfnkNtf0oCUktuk2gTKRxNOzaARItSmsPKLC7UVUG61Hne8Si3wtQBBDj+A==",
"requires": { "requires": {
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"@vue/reactivity-transform": { "@vue/reactivity-transform": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.42.tgz",
"integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==", "integrity": "sha512-u5Qp09PCGa0yJqfbHbJXDfm9BrNx5xYtHIl5CuWbnUtBAxr8vKRjMZmFpa4CmSufixWcbwvKvSD9weamEVbfeA==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.41", "@vue/compiler-core": "3.2.42",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
} }
}, },
"@vue/runtime-core": { "@vue/runtime-core": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.42.tgz",
"integrity": "sha512-0LBBRwqnI0p4FgIkO9q2aJBBTKDSjzhnxrxHYengkAF6dMOjeAIZFDADAlcf2h3GDALWnblbeprYYpItiulSVQ==", "integrity": "sha512-9JCPD4k/p4eXXc5ja+YcYwGu+ES9BIgoVty7UlOMEG0Bdz7awxxY78PXIHg1b7HlxQuUdGq6r3COg1cyvDrRCw==",
"requires": { "requires": {
"@vue/reactivity": "3.2.41", "@vue/reactivity": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"@vue/runtime-dom": { "@vue/runtime-dom": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.42.tgz",
"integrity": "sha512-U7zYuR1NVIP8BL6jmOqmapRAHovEFp7CSw4pR2FacqewXNGqZaRfHoNLQsqQvVQ8yuZNZtxSZy0FFyC70YXPpA==", "integrity": "sha512-i4OZblZQvFjJ/isNo+jrqXsjJgq4Nz0R/W2iNu40pTLJrikijYPaUOcOJcjVih9eL7zz101RJsbP8zKluQLqRA==",
"requires": { "requires": {
"@vue/runtime-core": "3.2.41", "@vue/runtime-core": "3.2.42",
"@vue/shared": "3.2.41", "@vue/shared": "3.2.42",
"csstype": "^2.6.8" "csstype": "^2.6.8"
} }
}, },
"@vue/server-renderer": { "@vue/server-renderer": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.42.tgz",
"integrity": "sha512-7YHLkfJdTlsZTV0ae5sPwl9Gn/EGr2hrlbcS/8naXm2CDpnKUwC68i1wGlrYAfIgYWL7vUZwk2GkYLQH5CvFig==", "integrity": "sha512-xo6XMaJTuKmYRlnS53QN358j0pmZMFNtisLkzV7oXFww0bpkn2MzjkPt4YvOjMNto9NlI609xQKJboEk5nMu2A==",
"requires": { "requires": {
"@vue/compiler-ssr": "3.2.41", "@vue/compiler-ssr": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.42.tgz",
"integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==" "integrity": "sha512-cheJw3tpW34LWVUL3fySuwCmF1/gFBHWZ3WjmMcBIHMcnKrS/SRapvkbYWzyw5FiM8OcpYHO5e7hWYOFCsyHmA=="
}, },
"@webassemblyjs/ast": { "@webassemblyjs/ast": {
"version": "1.11.1", "version": "1.11.1",
@ -23293,9 +23345,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "8.26.0", "version": "8.27.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
"integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==", "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@eslint/eslintrc": "^1.3.3", "@eslint/eslintrc": "^1.3.3",
@ -23535,19 +23587,19 @@
} }
}, },
"eslint-plugin-n": { "eslint-plugin-n": {
"version": "15.5.0", "version": "15.5.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.5.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.5.1.tgz",
"integrity": "sha512-VCqQiZDpdm1Q9grnvy+XsENZoXDgTLqPHRQwgl9qFNNgTKR4YEnQOMN0pFB/9TbmrQ88jdeTnqTcNwRvjqMOtg==", "integrity": "sha512-kAd+xhZm7brHoFLzKLB7/FGRFJNg/srmv67mqb7tto22rpr4wv/LV6RuXzAfv3jbab7+k1wi42PsIhGviywaaw==",
"dev": true, "dev": true,
"requires": { "requires": {
"builtins": "^5.0.1", "builtins": "^5.0.1",
"eslint-plugin-es": "^4.1.0", "eslint-plugin-es": "^4.1.0",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"ignore": "^5.1.1", "ignore": "^5.1.1",
"is-core-module": "^2.10.0", "is-core-module": "^2.11.0",
"minimatch": "latest", "minimatch": "latest",
"resolve": "^1.22.1", "resolve": "^1.22.1",
"semver": "^7.3.7" "semver": "^7.3.8"
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
@ -27653,7 +27705,7 @@
"dev": true, "dev": true,
"requires": { "requires": {
"color-parse": "^1.3.7", "color-parse": "^1.3.7",
"loader-utils": "^2", "loader-utils": "^1.1.0",
"lodash": "^4.17.14", "lodash": "^4.17.14",
"postcss-values-parser": "^1.5.0", "postcss-values-parser": "^1.5.0",
"posthtml": "^0.11.3", "posthtml": "^0.11.3",
@ -27731,6 +27783,26 @@
"readable-stream": "^3.1.1" "readable-stream": "^3.1.1"
} }
}, },
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
"integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
},
"posthtml": { "posthtml": {
"version": "0.11.6", "version": "0.11.6",
"resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz", "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz",
@ -29702,7 +29774,7 @@
"clone": "^2.1.1", "clone": "^2.1.1",
"he": "^1.1.1", "he": "^1.1.1",
"image-size": "^0.5.1", "image-size": "^0.5.1",
"loader-utils": "^2", "loader-utils": "^1.1.0",
"merge-options": "1.0.1", "merge-options": "1.0.1",
"micromatch": "3.1.0", "micromatch": "3.1.0",
"postcss": "latest", "postcss": "latest",
@ -29799,12 +29871,32 @@
"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true "dev": true
}, },
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"kind-of": { "kind-of": {
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
}, },
"loader-utils": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
"integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
},
"micromatch": { "micromatch": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.0.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.0.tgz",
@ -30747,15 +30839,15 @@
"dev": true "dev": true
}, },
"vue": { "vue": {
"version": "3.2.41", "version": "3.2.42",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.41.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.42.tgz",
"integrity": "sha512-uuuvnrDXEeZ9VUPljgHkqB5IaVO8SxhPpqF2eWOukVrBnRBx2THPSGQBnVRt0GrIG1gvCmFXMGbd7FqcT1ixNQ==", "integrity": "sha512-gH7e5YD9IkX9Lv0QmB+Z7Jac2t7GYHg2AZrgkzQdCmyaUIdSbp6DhdeTM5HO6JbPuRgD1Iu06N9MXxjJ//NnNQ==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.41", "@vue/compiler-dom": "3.2.42",
"@vue/compiler-sfc": "3.2.41", "@vue/compiler-sfc": "3.2.42",
"@vue/runtime-dom": "3.2.41", "@vue/runtime-dom": "3.2.42",
"@vue/server-renderer": "3.2.41", "@vue/server-renderer": "3.2.42",
"@vue/shared": "3.2.41" "@vue/shared": "3.2.42"
} }
}, },
"vue-eslint-parser": { "vue-eslint-parser": {

13
package.json
View File

@ -214,8 +214,8 @@
"@types/better-sqlite3": "^7.6.2", "@types/better-sqlite3": "^7.6.2",
"@types/needle": "^2.5.3", "@types/needle": "^2.5.3",
"@types/tunnel": "^0.0.3", "@types/tunnel": "^0.0.3",
"@typescript-eslint/eslint-plugin": "^5.42.0", "@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.0", "@typescript-eslint/parser": "^5.42.1",
"@volar/vue-language-plugin-pug": "^1.0.9", "@volar/vue-language-plugin-pug": "^1.0.9",
"babel-loader": "^9.1.0", "babel-loader": "^9.1.0",
"browserslist": "^4.21.4", "browserslist": "^4.21.4",
@ -233,13 +233,13 @@
"electron-devtools-installer": "^3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-to-chromium": "^1.4.284", "electron-to-chromium": "^1.4.284",
"electron-updater": "^6.0.0-alpha.2", "electron-updater": "^6.0.0-alpha.2",
"eslint": "^8.26.0", "eslint": "^8.27.0",
"eslint-config-standard": "^17.0.0", "eslint-config-standard": "^17.0.0",
"eslint-config-standard-with-typescript": "^23.0.0", "eslint-config-standard-with-typescript": "^23.0.0",
"eslint-formatter-friendly": "github:lyswhut/eslint-friendly-formatter#2170d1320e2fad13615a9dcf229669f0bb473a53", "eslint-formatter-friendly": "github:lyswhut/eslint-friendly-formatter#2170d1320e2fad13615a9dcf229669f0bb473a53",
"eslint-plugin-html": "^7.1.0", "eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
"eslint-plugin-n": "^15.4.0", "eslint-plugin-n": "^15.5.1",
"eslint-plugin-promise": "^6.1.1", "eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^9.7.0", "eslint-plugin-vue": "^9.7.0",
"eslint-webpack-plugin": "^3.2.0", "eslint-webpack-plugin": "^3.2.0",
@ -293,7 +293,7 @@
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"tunnel": "^0.0.6", "tunnel": "^0.0.6",
"utf-8-validate": "^5.0.10", "utf-8-validate": "^5.0.10",
"vue": "^3.2.41", "vue": "^3.2.42",
"vue-router": "^4.1.6" "vue-router": "^4.1.6"
}, },
"overrides": { "overrides": {
@ -306,6 +306,9 @@
"postcss": "latest", "postcss": "latest",
"loader-utils": "^2" "loader-utils": "^2"
}, },
"svg-baker": {
"postcss": "latest"
},
"pug-plain-loader": { "pug-plain-loader": {
"loader-utils": "^2" "loader-utils": "^2"
} }

22
src/common/utils/common.ts
View File

@ -180,3 +180,25 @@ export const encodePath = (path: string) => {
// https://github.com/lyswhut/lx-music-desktop/issues/963 // https://github.com/lyswhut/lx-music-desktop/issues/963
return path.replaceAll('%', '%25') return path.replaceAll('%', '%25')
} }
export const arrPush = <T>(list: T[], newList: T[]) => {
for (let i = 0; i * 1000 < newList.length; i++) {
list.push(...newList.slice(i * 1000, (i + 1) * 1000))
}
return list
}
export const arrUnshift = <T>(list: T[], newList: T[]) => {
for (let i = 0; i * 1000 < newList.length; i++) {
list.splice(i * 1000, 0, ...newList.slice(i * 1000, (i + 1) * 1000))
}
return list
}
export const arrPushByPosition = <T>(list: T[], newList: T[], position: number) => {
for (let i = 0; i * 1000 < newList.length; i++) {
list.splice(position + i * 1000, 0, ...newList.slice(i * 1000, (i + 1) * 1000))
}
return list
}

2
src/lang/en-us.json
View File

@ -556,7 +556,7 @@
"theme_selector_modal__theme_name": "Topic name", "theme_selector_modal__theme_name": "Topic name",
"theme_selector_modal__title": "Follow system theme settings", "theme_selector_modal__title": "Follow system theme settings",
"theme_selector_modal__title_tip": "Note: You can set a light theme and a dark theme in advance, and then it will automatically switch to the corresponding theme you set in advance according to the light and dark theme colors of the system.", "theme_selector_modal__title_tip": "Note: You can set a light theme and a dark theme in advance, and then it will automatically switch to the corresponding theme you set in advance according to the light and dark theme colors of the system.",
"toggle_source_failed": "Failed to automatically change the source, please try to manually search for the song in other sources to play", "toggle_source_failed": "Failed to change the source, please try to manually search for the song in other sources to play",
"toggle_source_try": "Try switching to another source...", "toggle_source_try": "Try switching to another source...",
"user_api__allow_show_update_alert": "Allow update popup to show", "user_api__allow_show_update_alert": "Allow update popup to show",
"user_api__btn_export": "Export", "user_api__btn_export": "Export",

2
src/lang/zh-cn.json
View File

@ -558,7 +558,7 @@
"theme_selector_modal__theme_name": "主题名称", "theme_selector_modal__theme_name": "主题名称",
"theme_selector_modal__title": "跟随系统主题设置", "theme_selector_modal__title": "跟随系统主题设置",
"theme_selector_modal__title_tip": "注：你可以预先设置一个亮色主题及暗色主题，此后将根据系统的亮、暗主题色自动切换为你预先设置的相应主题。", "theme_selector_modal__title_tip": "注：你可以预先设置一个亮色主题及暗色主题，此后将根据系统的亮、暗主题色自动切换为你预先设置的相应主题。",
"toggle_source_failed": "自动换源失败，请尝试手动在其他源搜索该歌曲播放", "toggle_source_failed": "换源失败，请尝试手动在其他源搜索该歌曲播放",
"toggle_source_try": "尝试切换到其他源...", "toggle_source_try": "尝试切换到其他源...",
"user_api__allow_show_update_alert": "允许显示更新弹窗", "user_api__allow_show_update_alert": "允许显示更新弹窗",
"user_api__btn_export": "导出", "user_api__btn_export": "导出",

2
src/lang/zh-tw.json
View File

@ -556,7 +556,7 @@
"theme_selector_modal__theme_name": "主題名稱", "theme_selector_modal__theme_name": "主題名稱",
"theme_selector_modal__title": "跟隨系統主題設置", "theme_selector_modal__title": "跟隨系統主題設置",
"theme_selector_modal__title_tip": "注：你可以預先設置一個亮色主題及暗色主題，此後將根據系統的亮、暗主題色自動切換為你預先設置的相應主題。", "theme_selector_modal__title_tip": "注：你可以預先設置一個亮色主題及暗色主題，此後將根據系統的亮、暗主題色自動切換為你預先設置的相應主題。",
"toggle_source_failed": "自動換源失敗，請嘗試手動在其他源搜索該歌曲播放", "toggle_source_failed": "換源失敗，請嘗試手動在其他源搜索該歌曲播放",
"toggle_source_try": "嘗試切換到其他源...", "toggle_source_try": "嘗試切換到其他源...",
"user_api__allow_show_update_alert": "允許顯示更新彈窗", "user_api__allow_show_update_alert": "允許顯示更新彈窗",
"user_api__btn_export": "導出", "user_api__btn_export": "導出",

17
src/main/worker/dbService/modules/download/index.ts
View File

@ -1,3 +1,4 @@
import { arrPush, arrUnshift } from '@common/utils/common'
import { import {
queryDownloadList, queryDownloadList,
inertDownloadList, inertDownloadList,
@ -69,14 +70,14 @@ export const downloadInfoSave = (downloadInfos: LX.Download.ListItem[], addMusic
if (!list) initDownloadList() if (!list) initDownloadList()
if (addMusicLocationType == 'top') { if (addMusicLocationType == 'top') {
let newList = [...list] let newList = [...list]
newList.unshift(...downloadInfos) arrUnshift(newList, downloadInfos)
inertDownloadList(toDBDownloadInfo(downloadInfos), newList.slice(downloadInfos.length - 1).map((info, index) => { inertDownloadList(toDBDownloadInfo(downloadInfos), newList.slice(downloadInfos.length - 1).map((info, index) => {
return { id: info.id, position: index } return { id: info.id, position: index }
})) }))
list = newList list = newList
} else { } else {
inertDownloadList(toDBDownloadInfo(downloadInfos, list.length), []) inertDownloadList(toDBDownloadInfo(downloadInfos, list.length), [])
list.push(...downloadInfos) arrPush(list, downloadInfos)
} }
} }
@ -103,12 +104,12 @@ export const downloadInfoUpdate = (lists: LX.Download.ListItem[]) => {
export const downloadInfoRemove = (ids: string[]) => { export const downloadInfoRemove = (ids: string[]) => {
deleteDownloadList(ids) deleteDownloadList(ids)
if (list) { if (list) {
for (let i = list.length; i--;) { const listSet = new Set<string>()
let idx = ids.indexOf(list[i].id) for (const item of list) listSet.add(item.id)
if (idx < 0) continue for (const id of ids) listSet.delete(id)
list.splice(i, 1) const newList = list.filter(task => listSet.has(task.id))
ids.splice(idx, 1) list.splice(0, list.length)
} for (const item of newList) list.push(item)
} }
} }

70
src/main/worker/dbService/modules/list/index.ts
View File

@ -1,4 +1,5 @@
import { LIST_IDS } from '@common/constants' import { LIST_IDS } from '@common/constants'
import { arrPush, arrPushByPosition, arrUnshift } from '@common/utils/common'
import { import {
deleteUserLists, deleteUserLists,
inertUserLists, inertUserLists,
@ -180,7 +181,10 @@ export const getListMusics = (listId: string): LX.Music.MusicInfo[] => {
export const musicOverwrite = (listId: string, musicInfos: LX.Music.MusicInfo[]) => { export const musicOverwrite = (listId: string, musicInfos: LX.Music.MusicInfo[]) => {
let targetList = getListMusics(listId) let targetList = getListMusics(listId)
overwriteMusicInfo(listId, toDBMusicInfo(musicInfos, listId)) overwriteMusicInfo(listId, toDBMusicInfo(musicInfos, listId))
if (targetList) targetList.splice(0, targetList.length, ...musicInfos) if (targetList) {
targetList.splice(0, targetList.length)
arrPush(targetList, musicInfos)
}
} }
/** /**
@ -203,12 +207,12 @@ export const musicsAdd = (listId: string, musicInfos: LX.Music.MusicInfo[], addM
switch (addMusicLocationType) { switch (addMusicLocationType) {
case 'top': case 'top':
insertMusicInfoListAndRefreshOrder(toDBMusicInfo(musicInfos, listId), listId, toDBMusicInfo(targetList, listId, musicInfos.length)) insertMusicInfoListAndRefreshOrder(toDBMusicInfo(musicInfos, listId), listId, toDBMusicInfo(targetList, listId, musicInfos.length))
targetList.unshift(...musicInfos) arrUnshift(targetList, musicInfos)
break break
case 'bottom': case 'bottom':
default: default:
insertMusicInfoList(toDBMusicInfo(musicInfos, listId, targetList.length)) insertMusicInfoList(toDBMusicInfo(musicInfos, listId, targetList.length))
targetList.push(...musicInfos) arrPush(targetList, musicInfos)
break break
} }
} }
@ -221,15 +225,13 @@ export const musicsAdd = (listId: string, musicInfos: LX.Music.MusicInfo[], addM
export const musicsRemove = (listId: string, ids: string[]) => { export const musicsRemove = (listId: string, ids: string[]) => {
let targetList = getListMusics(listId) let targetList = getListMusics(listId)
if (!targetList.length) return if (!targetList.length) return
ids = [...ids]
removeMusicInfos(listId, ids) removeMusicInfos(listId, ids)
for (let i = targetList.length - 1; i > -1; i--) { const listSet = new Set<string>()
const item = targetList[i] for (const item of targetList) listSet.add(item.id)
const index = ids.indexOf(item.id) for (const id of ids) listSet.delete(id)
if (index < 0) continue const newList = targetList.filter(mInfo => listSet.has(mInfo.id))
ids.splice(index, 1) targetList.splice(0, targetList.length)
targetList.splice(i, 1) arrPush(targetList, newList)
}
} }
/** /**
@ -245,32 +247,32 @@ export const musicsMove = (fromId: string, toId: string, musicInfos: LX.Music.Mu
const ids = musicInfos.map(musicInfo => musicInfo.id) const ids = musicInfos.map(musicInfo => musicInfo.id)
const map = new Map<string, LX.Music.MusicInfo>() let listSet = new Set<string>()
for (const item of toList) map.set(item.id, item) for (const item of toList) listSet.add(item.id)
musicInfos = musicInfos.filter(item => { musicInfos = musicInfos.filter(item => {
if (map.has(item.id)) return false if (listSet.has(item.id)) return false
map.set(item.id, item) listSet.add(item.id)
return true return true
}) })
switch (addMusicLocationType) { switch (addMusicLocationType) {
case 'top': case 'top':
moveMusicInfoAndRefreshOrder(fromId, ids, toId, toDBMusicInfo(musicInfos, toId), toDBMusicInfo(toList, toId, musicInfos.length)) moveMusicInfoAndRefreshOrder(fromId, ids, toId, toDBMusicInfo(musicInfos, toId), toDBMusicInfo(toList, toId, musicInfos.length))
toList.unshift(...musicInfos) arrUnshift(toList, musicInfos)
break break
case 'bottom': case 'bottom':
default: default:
moveMusicInfo(fromId, ids, toDBMusicInfo(musicInfos, toId, toList.length)) moveMusicInfo(fromId, ids, toDBMusicInfo(musicInfos, toId, toList.length))
toList.push(...musicInfos) arrPush(toList, musicInfos)
break break
} }
for (let i = fromList.length - 1; i > -1; i--) {
const item = fromList[i] listSet = new Set<string>()
const index = ids.indexOf(item.id) for (const item of fromList) listSet.add(item.id)
if (index < 0) continue for (const id of ids) listSet.delete(id)
ids.splice(index, 1) const newList = fromList.filter(mInfo => listSet.has(mInfo.id))
fromList.splice(i, 1) fromList.splice(0, fromList.length)
} arrPush(fromList, newList)
} }
/** /**
@ -320,15 +322,17 @@ export const musicsPositionUpdate = (listId: string, position: number, ids: stri
let targetList = getListMusics(listId) let targetList = getListMusics(listId)
if (!targetList.length) return if (!targetList.length) return
const newTargetList = [...targetList] let newTargetList = [...targetList]
const infos = Array(ids.length)
for (let i = newTargetList.length; i--;) { const infos: LX.Music.MusicInfo[] = []
const item = newTargetList[i] const map = new Map<string, LX.Music.MusicInfo>()
const index = ids.indexOf(item.id) for (const item of newTargetList) map.set(item.id, item)
if (index < 0) continue for (const id of ids) {
infos.splice(index, 1, newTargetList.splice(i, 1)[0]) infos.push(map.get(id) as LX.Music.MusicInfo)
map.delete(id)
} }
newTargetList.splice(Math.min(position, newTargetList.length), 0, ...infos) newTargetList = newTargetList.filter(mInfo => map.has(mInfo.id))
arrPushByPosition(newTargetList, infos, Math.min(position, newTargetList.length))
updateMusicInfoOrder(listId, newTargetList.map((info, index) => { updateMusicInfoOrder(listId, newTargetList.map((info, index) => {
return { return {
@ -358,7 +362,7 @@ export const listDataOverwrite = (myListData: MakeOptional<LX.List.ListDataFull,
] ]
listData.userList.forEach(({ list, ...listInfo }, index) => { listData.userList.forEach(({ list, ...listInfo }, index) => {
dbLists.push({ ...listInfo, position: index }) dbLists.push({ ...listInfo, position: index })
dbMusicInfos.push(...toDBMusicInfo(list, listInfo.id)) arrPush(dbMusicInfos, toDBMusicInfo(list, listInfo.id))
}) })
overwriteListData(dbLists, dbMusicInfos) overwriteListData(dbLists, dbMusicInfos)

10
src/renderer/components/base/Selection.vue
View File

@ -52,10 +52,15 @@ export default {
} }
}, },
computed: { computed: {
activeIndex() {
if (this.modelValue == null) return -1
if (!this.itemName) return this.list.indexOf(this.modelValue)
return this.list.findIndex(l => l[this.itemKey] == this.modelValue)
},
label() { label() {
if (this.modelValue == null) return '' if (this.modelValue == null) return ''
if (this.itemName == null) return this.modelValue if (this.itemName == null) return this.modelValue
const item = this.list.find(l => l[this.itemKey] == this.modelValue) const item = this.list[this.activeIndex]
if (!item) return '' if (!item) return ''
return item[this.itemName] return item[this.itemName]
}, },
@ -86,6 +91,9 @@ export default {
this.show = true this.show = true
this.$nextTick(() => { this.$nextTick(() => {
this.listStyles.transform = `scaleY(1) translateY(${this.handleGetOffset()}px)` this.listStyles.transform = `scaleY(1) translateY(${this.handleGetOffset()}px)`
const activeItem = this.$refs.dom_list.children[this.activeIndex]
if (activeItem) this.$refs.dom_list.scrollTop = activeItem.offsetTop - this.$refs.dom_list.clientHeight * 0.38
}) })
}, },
handleGetOffset() { handleGetOffset() {

107
src/renderer/components/layout/PlayBar/index.vue
View File

@ -1,49 +1,48 @@
<template> <template>
<div :class="$style.player"> <div :class="$style.player">
<div :class="$style.picContent" :aria-label="$t('player__pic_tip')" @contextmenu="handleToMusicLocation" @click="showPlayerDetail"> <div
<img v-if="musicInfo.pic" :src="musicInfo.pic" loading="lazy" decoding="async" @error="imgError"> :class="$style.picContent"
:aria-label="$t('player__pic_tip')"
@contextmenu="handleToMusicLocation"
@click="showPlayerDetail"
>
<img v-if="musicInfo.pic" :src="musicInfo.pic" loading="lazy" decoding="async" @error="imgError" />
<div v-else :class="$style.emptyPic">L<span>X</span></div> <div v-else :class="$style.emptyPic">L<span>X</span></div>
</div> </div>
<div :class="$style.progressContent"> <div :class="$style.infoContent">
<div :class="$style.timeContent"> <div :class="$style.title" :aria-label="title + $t('copy_tip')" @click="handleCopy(title)">
<span>{{ nowPlayTimeStr }}</span> {{ title }}
<div :class="$style.progress">
<common-progress-bar v-if="!isShowPlayerDetail" :class-name="$style.progressBar" :progress="progress" :handle-transition-end="handleTransitionEnd" :is-active-transition="isActiveTransition" />
</div>
<span>{{ maxPlayTimeStr }}</span>
</div> </div>
<div :class="$style.status" :aria-label="statusText">{{ statusText }}</div>
</div> </div>
<div :class="$style.mainContent"> <div :class="$style.timeContent">
<div :class="$style.infoContent"> <span>{{ nowPlayTimeStr }}</span>
<div :class="$style.title" :aria-label=" title + $t('copy_tip')" @click="handleCopy(title)"> <div :class="$style.progress">
{{ title }} <common-progress-bar v-if="!isShowPlayerDetail" :class-name="$style.progressBar" :progress="progress" :handle-transition-end="handleTransitionEnd" :is-active-transition="isActiveTransition" />
</div>
<div :class="$style.status" :aria-label=" statusText + $t('copy_tip')" @click="handleCopy(statusText)">{{ statusText }}</div>
</div> </div>
<div :class="$style.rightContent"> <!-- <span style="margin: 0 1px;">/</span> -->
<div :class="$style.rightBtn"> <span>{{ maxPlayTimeStr }}</span>
<div :class="$style.playBtnContent"> </div>
<control-btns /> <!-- <play-progress /> -->
<div :class="$style.playBtn" :aria-label="$t('player__prev')" style="transform: rotate(180deg);" @click="playPrev()"> <control-btns />
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 220.847 220.847" space="preserve"> <div :class="$style.playBtnContent">
<use xlink:href="#icon-nextMusic" /> <div :class="$style.playBtn" :aria-label="$t('player__prev')" style="transform: rotate(180deg);" @click="playPrev()">
</svg> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 220.847 220.847" space="preserve">
</div> <use xlink:href="#icon-nextMusic" />
<div :class="$style.playBtn" :aria-label="isPlay ? $t('player__pause') : $t('player__play')" @click="togglePlay"> </svg>
<svg v-if="isPlay" version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 277.338 277.338" space="preserve"> </div>
<use xlink:href="#icon-pause" /> <div :class="$style.playBtn" :aria-label="isPlay ? $t('player__pause') : $t('player__play')" @click="togglePlay">
</svg> <svg v-if="isPlay" version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 277.338 277.338" space="preserve">
<svg v-else version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 170 170" space="preserve"> <use xlink:href="#icon-pause" />
<use xlink:href="#icon-play" /> </svg>
</svg> <svg v-else version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 170 170" space="preserve">
</div> <use xlink:href="#icon-play" />
<div :class="$style.playBtn" :aria-label="$t('player__next')" @click="playNext()"> </svg>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 220.847 220.847" space="preserve"> </div>
<use xlink:href="#icon-nextMusic" /> <div :class="$style.playBtn" :aria-label="$t('player__next')" @click="playNext()">
</svg> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 220.847 220.847" space="preserve">
</div> <use xlink:href="#icon-nextMusic" />
</div> </svg>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -65,10 +64,7 @@ import {
playInfo, playInfo,
playMusicInfo, playMusicInfo,
} from '@renderer/store/player/state' } from '@renderer/store/player/state'
import { import { setMusicInfo, setShowPlayerDetail } from '@renderer/store/player/action'
setMusicInfo,
setShowPlayerDetail,
} from '@renderer/store/player/action'
import { appSetting } from '@renderer/store/setting' import { appSetting } from '@renderer/store/setting'
import { togglePlay, playNext, playPrev } from '@renderer/core/player' import { togglePlay, playNext, playPrev } from '@renderer/core/player'
@ -81,19 +77,13 @@ export default {
setup() { setup() {
const router = useRouter() const router = useRouter()
const { const { nowPlayTimeStr, maxPlayTimeStr, progress, isActiveTransition, handleTransitionEnd } = usePlayProgress()
nowPlayTimeStr,
maxPlayTimeStr,
progress,
isActiveTransition,
handleTransitionEnd,
} = usePlayProgress()
const showPlayerDetail = () => { const showPlayerDetail = () => {
if (!playMusicInfo.musicInfo) return if (!playMusicInfo.musicInfo) return
setShowPlayerDetail(true) setShowPlayerDetail(true)
} }
const handleCopy = (text) => { const handleCopy = text => {
clipboardWriteText(text) clipboardWriteText(text)
} }
@ -118,7 +108,7 @@ export default {
const title = computed(() => { const title = computed(() => {
return musicInfo.name return musicInfo.name
? appSetting['download.fileName'].replace('歌名', musicInfo.name).replace('歌手', musicInfo.singer) ? appSetting['download.fileName'].replace('歌名', musicInfo.name).replace('歌手', musicInfo.singer)
: '^-^' : ''
}) })
// onBeforeUnmount(() => { // onBeforeUnmount(() => {
@ -148,7 +138,6 @@ export default {
} }
</script> </script>
<style lang="less" module> <style lang="less" module>
@import '@renderer/assets/styles/layout.less'; @import '@renderer/assets/styles/layout.less';
@ -175,7 +164,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: var(--color-main-background); background-color: var(--color-main-background);
opacity: .9; opacity: 0.9;
z-index: -1; z-index: -1;
} }
} }
@ -200,7 +189,7 @@ export default {
// align-items: center; // align-items: center;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
opacity: .8; opacity: 0.8;
} }
img { img {
box-shadow: 0 0 2px rgba(0, 0, 0, 0.3); box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
@ -223,7 +212,7 @@ export default {
color: var(--color-primary-light-400-alpha-200); color: var(--color-primary-light-400-alpha-200);
user-select: none; user-select: none;
font-size: 20px; font-size: 20px;
font-family: Consolas, "Courier New", monospace; font-family: Consolas, 'Courier New', monospace;
span { span {
padding-left: 3px; padding-left: 3px;
@ -239,6 +228,11 @@ export default {
top: 0px; top: 0px;
width: calc(100% - 65px - 10px); width: calc(100% - 65px - 10px);
justify-content: center; justify-content: center;
align-items: flex-start;
font-size: 13px;
color: var(--color-font);
min-width: 0;
line-height: 1.5;
} }
.timeContent { .timeContent {
width: 100%; width: 100%;
@ -345,5 +339,4 @@ export default {
opacity: 0.6; opacity: 0.6;
} }
} }
</style> </style>

2
src/renderer/components/layout/Toolbar/SearchInput.vue
View File

@ -28,7 +28,7 @@ export default {
const router = useRouter() const router = useRouter()
watch(() => route.name, (newValue, oldValue) => { watch(() => route.name, (newValue, oldValue) => {
if (newValue.name != 'search') { if (oldValue == 'Search') {
setTimeout(() => { setTimeout(() => {
if (appSetting['odc.isAutoClearSearchInput'] && searchText.value) searchText.value = '' if (appSetting['odc.isAutoClearSearchInput'] && searchText.value) searchText.value = ''
if (appSetting['odc.isAutoClearSearchList']) setSearchText('') if (appSetting['odc.isAutoClearSearchList']) setSearchText('')

33
src/renderer/store/download/action.ts
View File

@ -13,7 +13,7 @@ import { getMusicUrl, getPicUrl, getLyricInfo } from '@renderer/core/music/onlin
import { appSetting } from '../setting' import { appSetting } from '../setting'
import { qualityList } from '..' import { qualityList } from '..'
import { proxyCallback } from '@renderer/worker/utils' import { proxyCallback } from '@renderer/worker/utils'
import { joinPath } from '@renderer/utils' import { arrPush, arrUnshift, joinPath } from '@renderer/utils'
import { DOWNLOAD_STATUS } from '@common/constants' import { DOWNLOAD_STATUS } from '@common/constants'
const waitingUpdateTasks = new Map<string, LX.Download.ListItem>() const waitingUpdateTasks = new Map<string, LX.Download.ListItem>()
@ -48,7 +48,7 @@ export const getDownloadList = async(): Promise<LX.Download.ListItem[]> => {
break break
} }
} }
downloadList.push(...list) arrPush(downloadList, list)
} }
return downloadList return downloadList
} }
@ -59,9 +59,9 @@ const addTasks = async(list: LX.Download.ListItem[]) => {
await downloadTasksCreate(list.map(i => toRaw(i)), addMusicLocationType) await downloadTasksCreate(list.map(i => toRaw(i)), addMusicLocationType)
if (addMusicLocationType === 'top') { if (addMusicLocationType === 'top') {
downloadList.unshift(...list) arrUnshift(downloadList, list)
} else { } else {
downloadList.push(...list) arrPush(downloadList, list)
} }
window.app_event.downloadListUpdate() window.app_event.downloadListUpdate()
} }
@ -367,18 +367,21 @@ export const pauseDownloadTasks = async(list: LX.Download.ListItem[]) => {
*/ */
export const removeDownloadTasks = async(ids: string[]) => { export const removeDownloadTasks = async(ids: string[]) => {
await downloadTasksRemove(ids) await downloadTasksRemove(ids)
ids = [...ids]
for (let i = downloadList.length; i--;) { const listSet = new Set<string>()
const item = downloadList[i] for (const item of downloadList) listSet.add(item.id)
const index = ids.indexOf(item.id) for (const id of ids) listSet.delete(id)
if (index < 0) continue const newList = downloadList.filter(task => {
ids.splice(index, 1) if (runingTask.has(task.id)) {
downloadList.splice(i, 1) void window.lx.worker.download.removeTask(task.id)
if (runingTask.has(item.id)) { runingTask.delete(task.id)
void window.lx.worker.download.removeTask(item.id)
runingTask.delete(item.id)
} }
} return listSet.has(task.id)
})
downloadList.splice(0, downloadList.length)
arrPush(downloadList, newList)
void checkStartTask() void checkStartTask()
window.app_event.downloadListUpdate() window.app_event.downloadListUpdate()
} }

45
src/renderer/store/list/listManage/action.ts
View File

@ -8,6 +8,7 @@ import {
} from './state' } from './state'
import { overwriteListPosition, overwriteListUpdateInfo, removeListPosition, removeListUpdateInfo } from '@renderer/utils/data' import { overwriteListPosition, overwriteListUpdateInfo, removeListPosition, removeListUpdateInfo } from '@renderer/utils/data'
import { LIST_IDS } from '@common/constants' import { LIST_IDS } from '@common/constants'
import { arrPush, arrUnshift } from '@common/utils/common'
export const setUserLists = (lists: LX.List.UserListInfo[]) => { export const setUserLists = (lists: LX.List.UserListInfo[]) => {
userLists.splice(0, userLists.length, ...lists) userLists.splice(0, userLists.length, ...lists)
@ -25,7 +26,8 @@ const overwriteMusicList = (id: string, list: LX.Music.MusicInfo[]) => {
markRawList(list) markRawList(list)
let targetList = allMusicList.get(id) let targetList = allMusicList.get(id)
if (targetList) { if (targetList) {
targetList.splice(0, targetList.length, ...list) targetList.splice(0, targetList.length)
arrPush(targetList, list)
} else { } else {
allMusicList.set(id, shallowReactive(list)) allMusicList.set(id, shallowReactive(list))
} }
@ -179,16 +181,18 @@ export const userListsUpdatePosition = (position: number, ids: string[]) => {
const updateLists: LX.List.UserListInfo[] = [] const updateLists: LX.List.UserListInfo[] = []
for (let i = newUserLists.length; i--;) { // const targetItem = list[position]
if (ids.includes(newUserLists[i].id)) { const map = new Map<string, LX.List.UserListInfo>()
const list = newUserLists.splice(i, 1)[0] for (const item of newUserLists) map.set(item.id, item)
list.locationUpdateTime = Date.now() for (const id of ids) {
updateLists.push(list) const listInfo = map.get(id) as LX.List.UserListInfo
} listInfo.locationUpdateTime = Date.now()
updateLists.push(listInfo)
map.delete(id)
} }
position = Math.min(newUserLists.length, position) newUserLists.splice(0, newUserLists.length, ...newUserLists.filter(mInfo => map.has(mInfo.id)))
newUserLists.splice(Math.min(position, newUserLists.length), 0, ...updateLists)
newUserLists.splice(position, 0, ...updateLists)
setUserLists(newUserLists) setUserLists(newUserLists)
} }
@ -212,11 +216,11 @@ export const listMusicAdd = (id: string, musicInfos: LX.Music.MusicInfo[], addMu
}) })
switch (addMusicLocationType) { switch (addMusicLocationType) {
case 'top': case 'top':
targetList.unshift(...musicInfos) arrUnshift(targetList, musicInfos)
break break
case 'bottom': case 'bottom':
default: default:
targetList.push(...musicInfos) arrPush(targetList, musicInfos)
break break
} }
@ -234,14 +238,13 @@ export const listMusicRemove = (listId: string, ids: string[]): string[] => {
let targetList = allMusicList.get(listId) let targetList = allMusicList.get(listId)
if (!targetList) return listId == loveList.id ? [listId] : [] if (!targetList) return listId == loveList.id ? [listId] : []
ids = [...ids] const listSet = new Set<string>()
for (let i = targetList.length - 1; i > -1; i--) { for (const item of targetList) listSet.add(item.id)
const item = targetList[i] for (const id of ids) listSet.delete(id)
const index = ids.indexOf(item.id) const newList = targetList.filter(mInfo => listSet.has(mInfo.id))
if (index < 0) continue targetList.splice(0, targetList.length)
ids.splice(index, 1) arrPush(targetList, newList)
targetList.splice(i, 1)
}
return [listId] return [listId]
} }
@ -284,7 +287,9 @@ export const listMusicUpdatePosition = async(listId: string, position: number, i
const list = await window.lx.worker.main.createSortedList(toRaw(targetList), position, ids) const list = await window.lx.worker.main.createSortedList(toRaw(targetList), position, ids)
markRawList(list) markRawList(list)
targetList.splice(0, targetList.length, ...list) targetList.splice(0, targetList.length)
arrPush(targetList, list)
// console.timeEnd('ts') // console.timeEnd('ts')
return [listId] return [listId]
} }

5
src/renderer/store/player/action.ts
View File

@ -19,6 +19,7 @@ import { setProgress } from './playProgress'
import { playNext } from '@renderer/core/player' import { playNext } from '@renderer/core/player'
import { LIST_IDS } from '@common/constants' import { LIST_IDS } from '@common/constants'
import { toRaw } from '@common/utils/vueTools' import { toRaw } from '@common/utils/vueTools'
import { arrPush, arrUnshift } from '@common/utils/common'
type PlayerMusicInfoKeys = keyof typeof musicInfo type PlayerMusicInfoKeys = keyof typeof musicInfo
@ -231,8 +232,8 @@ export const addTempPlayList = (list: LX.Player.TempPlayListItem[]) => {
} }
return true return true
}) })
if (topList.length) tempPlayList.unshift(...topList.map(({ musicInfo, listId }) => ({ musicInfo, listId, isTempPlay: true }))) if (topList.length) arrUnshift(tempPlayList, topList.map(({ musicInfo, listId }) => ({ musicInfo, listId, isTempPlay: true })))
if (bottomList.length) tempPlayList.push(...bottomList.map(({ musicInfo, listId }) => ({ musicInfo, listId, isTempPlay: true }))) if (bottomList.length) arrPush(tempPlayList, bottomList.map(({ musicInfo, listId }) => ({ musicInfo, listId, isTempPlay: true })))
if (!playMusicInfo.musicInfo) void playNext() if (!playMusicInfo.musicInfo) void playNext()
} }

17
src/renderer/worker/main/list.ts
View File

@ -1,6 +1,6 @@
// import { throttle } from '@common/utils' // import { throttle } from '@common/utils'
import { filterFileName, sortInsert, similar } from '@common/utils/common' import { filterFileName, sortInsert, similar, arrPushByPosition } from '@common/utils/common'
import { joinPath, saveStrToFile } from '@common/utils/nodejs' import { joinPath, saveStrToFile } from '@common/utils/nodejs'
import { createLocalMusicInfo } from '@renderer/utils/music' import { createLocalMusicInfo } from '@renderer/utils/music'
@ -212,14 +212,15 @@ export const searchListMusic = (list: LX.Music.MusicInfo[], text: string) => {
* @returns * @returns
*/ */
export const createSortedList = (list: LX.Music.MusicInfo[], position: number, ids: string[]) => { export const createSortedList = (list: LX.Music.MusicInfo[], position: number, ids: string[]) => {
const infos = Array(ids.length) const infos: LX.Music.MusicInfo[] = []
for (let i = list.length; i--;) { const map = new Map<string, LX.Music.MusicInfo>()
const item = list[i] for (const item of list) map.set(item.id, item)
const index = ids.indexOf(item.id) for (const id of ids) {
if (index < 0) continue infos.push(map.get(id) as LX.Music.MusicInfo)
infos.splice(index, 1, list.splice(i, 1)[0]) map.delete(id)
} }
list.splice(Math.min(position, list.length), 0, ...infos) list = list.filter(mInfo => map.has(mInfo.id))
arrPushByPosition(list, infos, Math.min(position, list.length))
return list return list
} }