diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue index abc22c4..8263aee 100644 --- a/src/components/EditSites.vue +++ b/src/components/EditSites.vue @@ -114,10 +114,17 @@
- - - - + + + 主分类过滤 + + + + + + 福利分类过滤 + + @@ -154,7 +161,8 @@ export default { group: '', isActive: true }, - filterKeywords: [], + rootClassFilterKeywords: [], + r18ClassFilterKeywords: [], siteGroup: [], rules: { name: [ @@ -272,12 +280,21 @@ export default { this.siteGroup = arr }, openFilterKeywordsDiag () { - this.filterKeywords = this.setting.classFilter.join() + this.rootClassFilterKeywords = this.setting.rootClassFilter?.join() + this.r18ClassFilterKeywords = this.setting.r18ClassFilter?.join() this.filterKeywordsDialogVisible = true }, saveFilterKeywords () { // 移除空格,然后按逗号分开 - this.setting.classFilter = this.filterKeywords.replace(/\s/g, '').split(',') + this.setting.rootClassFilter = this.rootClassFilterKeywords.replace(/\s/g, '').split(',') + this.setting.r18ClassFilter = this.r18ClassFilterKeywords.replace(/\s/g, '').split(',') + this.setting.classFilter = [] + if (this.setting.excludeRootClasses) { + this.setting.classFilter = this.setting.classFilter.concat(this.setting.rootClassFilter) + } + if (this.setting.excludeR18Films) { + this.setting.classFilter = this.setting.classFilter.concat(this.setting.r18ClassFilter) + } setting.update(this.setting) this.filterKeywordsDialogVisible = false }, diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js index e2e5d9e..ae59fcd 100644 --- a/src/lib/dexie/dexie.js +++ b/src/lib/dexie/dexie.js @@ -63,12 +63,13 @@ db.version(9).stores({ history: '++id, [site+ids], name, type, year, index, time, duration, detail, onlinePlay, hasUpdate' }) -db.version(10).stores({ - setting: 'id, theme, site, shortcut, view, volume, externalPlayer, searchGroup, forwardTimeInSec, starViewMode, recommandationViewMode, searchViewMode, password, proxy, allowPassWhenIptvCheck, autocleanWhenIptvCheck, classFilter' +db.version(11).stores({ + setting: 'id, theme, shortcut, view, volume, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, searchViewMode, password, proxy, allowPassWhenIptvCheck, autocleanWhenIptvCheck, rootClassFilter, r18ClassFilter, classFilter' }).upgrade(trans => { trans.setting.toCollection().modify(setting => { - delete setting.excludeRootClasses - delete setting.excludeR18Films + delete setting.site + setting.rootClassFilter = ['电影', '电影片', '电视剧', '连续剧', '综艺', '动漫'] + setting.r18ClassFilter = ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番', 'VIP'] setting.classFilter = ['电影', '电影片', '电视剧', '连续剧', '综艺', '动漫', '伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番', 'VIP'] }) })