Skip to content

Commit 7daeee1

Browse files
committed
更新[BoxJs]: 修复部分情况下收藏应用排序失效问题
1 parent 473a999 commit 7daeee1

2 files changed

Lines changed: 22 additions & 13 deletions

File tree

‎box/release/box.release.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
{
22
"releases": [
3+
{
4+
"version": "0.4.11",
5+
"tags": ["beta"],
6+
"author": "@chavyleung",
7+
"icon": "https://avatars3.githubusercontent.com/u/29748519",
8+
"repo": "https://github.com/chavyleung",
9+
"notes": [
10+
{
11+
"name": "修复",
12+
"descs": ["收藏应用排序异常问题"]
13+
}
14+
]
15+
},
316
{
417
"version": "0.4.10",
518
"tags": ["beta"],

‎chavy.box.js‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const $ = new Env('BoxJs')
22
$.domain = '8.8.8.8'
33

4-
$.version = '0.4.10'
4+
$.version = '0.4.11'
55
$.versionType = 'beta'
66
$.KEY_sessions = 'chavy_boxjs_sessions'
77
$.KEY_versions = 'chavy_boxjs_versions'
@@ -575,7 +575,7 @@ async function handleApi() {
575575
}
576576

577577
async function getBoxData() {
578-
return {
578+
const box = {
579579
sessions: getSessions(),
580580
versions: await getVersions(),
581581
sysapps: getSystemApps(),
@@ -586,6 +586,11 @@ async function getBoxData() {
586586
globalbaks: getGlobalBaks(),
587587
colors: getSystemThemes()
588588
}
589+
const apps = []
590+
apps.push(...box.sysapps)
591+
box.appsubs.forEach((sub) => apps.push(...sub.apps))
592+
box.usercfgs.favapps = box.usercfgs.favapps.filter((favappId) => apps.find((app) => app.id === favappId))
593+
return box
589594
}
590595

591596
async function handleHome() {
@@ -915,11 +920,11 @@ function printHtml(data, curapp = null, curview = 'app') {
915920
<v-switch :label="setting.name" v-model="setting.val" :hint="setting.desc" :placeholder="setting.placeholder" v-else-if="setting.type === 'boolean'"></v-switch>
916921
<v-textarea :label="setting.name" v-model="setting.val" :hint="setting.desc" :auto-grow="setting.autoGrow" :placeholder="setting.placeholder" v-else-if="setting.type === 'textarea'"></v-textarea>
917922
<v-radio-group :label="setting.name" v-model="setting.val" :hint="setting.desc" :placeholder="setting.placeholder" v-else-if="setting.type === 'radios'">
918-
<v-radio :class="itemIdx === 0 ? 'mt-2' : ''" v-for="(item, itemIdx) in setting.items" :label="item.label" :value="item.key"></v-radio>
923+
<v-radio :class="itemIdx === 0 ? 'mt-2' : ''" v-for="(item, itemIdx) in setting.items" :label="item.label" :value="item.key" :key="item.key"></v-radio>
919924
</v-radio-group>
920925
<template v-else-if="setting.type === 'checkboxes'">
921926
<label>{{ setting.name }}</label>
922-
<v-checkbox class="mt-0" :hide-details="itemIdx + 1 !== setting.items.length" v-model="setting.val" :label="item.label" :value="item.key" v-for="(item, itemIdx) in setting.items" multiple></v-checkbox>
927+
<v-checkbox class="mt-0" :hide-details="itemIdx + 1 !== setting.items.length" v-model="setting.val" :label="item.label" :value="item.key" v-for="(item, itemIdx) in setting.items" :key="item.key" multiple></v-checkbox>
923928
</template>
924929
<v-text-field :label="setting.name" v-model="setting.val" :hint="setting.desc" :placeholder="setting.placeholder" v-else="setting.type === 'text'"></v-text-field>
925930
</template>
@@ -1715,15 +1720,6 @@ function printHtml(data, curapp = null, curview = 'app') {
17151720
},
17161721
onReload() {
17171722
window.location.reload()
1718-
// const refreshsecs = this.box.usercfgs.refreshsecs
1719-
// const sec = [undefined, null, 'null', 'undefined', ''].includes(refreshsecs) ? 3 : refreshsecs * 1
1720-
// if (sec === 0) {
1721-
// this.reload()
1722-
// } else {
1723-
// this.ui.overlay.show = false
1724-
// this.ui.reloadConfirmDialog.show = true
1725-
// this.ui.reloadConfirmDialog.sec = sec
1726-
// }
17271723
},
17281724
onDelSession(session) {
17291725
this.ui.overlay.show = true

0 commit comments

Comments
 (0)